Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package nvidia-graphics-drivers working around some upgrade issues if a wheezy system has nvidia-opencl-icd installed, but no nvidia hardware ... the dependencies in wheezy allowed installation without proper driver backend ... wheezy only had two packages in non-free provide opencl-icd, but some packages in contrib depended/recommended that virtual package ... For jessie the dependencies had been tightened (to make nvidia-opencl-icd useable out-of-the-box if it is installed consciously on a machine with an nvidia gpu), unfortunately this resulted in upgrade problems: systems without nvidia gpu pulled in the full nvidia driver stack. So let's relax the dependencies again a bit. An alternative solution would have been to rename nvidia-opencl-icd to e.g. nvidia-icd and add a dummy nvidia-opencl-icd package that at most Suggests: nvidia-icd. (But it's probably to late in the release cycle to do this now.) + * nvidia-kernel-dkms: Switch to Recommends: nvidia-driver | libcuda1 + to break the chain libcuda1 -> nvidia-kernel-dkms -> nvidia-driver. (headless) CUDA operation does not need to recommend the X driver + * nvidia-opencl-icd: Downgrade the Depends: libcuda1 to Suggests. This + should avoid pulling in too many NVIDIA packages on wheezy -> jessie + upgrades of systems that have no NVIDIA hardware, but nvidia-opencl-icd + installed nevertheless. (Closes: #769072 and many duplicates) + * nvidia-detect: Update list of newer PCI IDs from release 346.16. Make nvidia-detect output more useful for hardware that exists today and is supported only by the driver in experimental (and jessie-backports at some point). (346.46 will be uploaded within a few days) The attached debdiff excludes the renamed pci id list (and the additions to the new one). unblock nvidia-graphics-drivers/340.46-6 Andreas
diffstat for nvidia-graphics-drivers-340.46 nvidia-graphics-drivers-340.46 changelog | 14 ++ control | 8 + detect/nvidia-343.ids | 240 ---------------------------------------------- detect/nvidia-346.ids | 248 ++++++++++++++++++++++++++++++++++++++++++++++++ detect/nvidia-detect.in | 6 - 5 files changed, 270 insertions(+), 246 deletions(-) diff -Nru nvidia-graphics-drivers-340.46/debian/changelog nvidia-graphics-drivers-340.46/debian/changelog --- nvidia-graphics-drivers-340.46/debian/changelog 2014-11-22 18:49:24.000000000 +0100 +++ nvidia-graphics-drivers-340.46/debian/changelog 2014-11-30 20:08:09.000000000 +0100 @@ -1,3 +1,15 @@ +nvidia-graphics-drivers (340.46-6) unstable; urgency=medium + + * nvidia-kernel-dkms: Switch to Recommends: nvidia-driver | libcuda1 + to break the chain libcuda1 -> nvidia-kernel-dkms -> nvidia-driver. + * nvidia-opencl-icd: Downgrade the Depends: libcuda1 to Suggests. This + should avoid pulling in too many NVIDIA packages on wheezy -> jessie + upgrades of systems that have no NVIDIA hardware, but nvidia-opencl-icd + installed nevertheless. (Closes: #769072 and many duplicates) + * nvidia-detect: Update list of newer PCI IDs from release 346.16. + + -- Andreas Beckmann <[email protected]> Sun, 30 Nov 2014 20:08:09 +0100 + nvidia-graphics-drivers (340.46-5) unstable; urgency=medium * nvidia-driver-bin: Breaks+Replaces nvidia-glx from wheezy. @@ -13,7 +25,7 @@ nvidia-graphics-drivers (340.46-4) unstable; urgency=medium * Fix installation of nvidia-smi. (Closes: #766343) - * Add more dependencies on nvidia-alternative. + * Add more dependencies on nvidia-alternative. * d/rules: Add #!armhf# and #!legacy# substitutions. * nvidia-driver: Stop shipping nvidia-persistenced, this is being moved to a separate source package. diff -Nru nvidia-graphics-drivers-340.46/debian/control nvidia-graphics-drivers-340.46/debian/control --- nvidia-graphics-drivers-340.46/debian/control 2014-11-22 18:49:24.000000000 +0100 +++ nvidia-graphics-drivers-340.46/debian/control 2014-11-23 02:05:48.000000000 +0100 @@ -314,7 +314,7 @@ ${nvidia-alternative}--kmod-alias, ${misc:Depends} Recommends: - ${nvidia}-driver (>= ${nvidia:Version}), + ${nvidia}-driver (>= ${nvidia:Version}) | ${libcuda1} (>= ${nvidia:Version}), Provides: ${nvidia}-kernel-${nvidia:Version}${nvidia:Perfkit}, Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc} @@ -636,9 +636,10 @@ nvidia-opencl-common, ocl-icd-libopencl1 | nvidia-libopencl1 | libopencl1, ${nvidia-alternative}, - ${libcuda1} (= ${binary:Version}), lib${nvidia}-compiler (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: + ${libcuda1} (= ${binary:Version}), Enhances: libopencl1, Conflicts: @@ -654,6 +655,9 @@ . This package provides the NVIDIA installable client driver (ICD) for OpenCL which supports NVIDIA GPUs. + . + The ${libcuda1} package may be required additionally to get a working OpenCL + setup for NVIDIA GPUs. Package: nvidia-libopencl1 Architecture: i386 amd64 diff -Nru nvidia-graphics-drivers-340.46/debian/detect/nvidia-343.ids nvidia-graphics-drivers-340.46/debian/detect/nvidia-343.ids diff -Nru nvidia-graphics-drivers-340.46/debian/detect/nvidia-346.ids nvidia-graphics-drivers-340.46/debian/detect/nvidia-346.ids diff -Nru nvidia-graphics-drivers-340.46/debian/detect/nvidia-detect.in nvidia-graphics-drivers-340.46/debian/detect/nvidia-detect.in --- nvidia-graphics-drivers-340.46/debian/detect/nvidia-detect.in 2014-10-17 12:34:34.000000000 +0200 +++ nvidia-graphics-drivers-340.46/debian/detect/nvidia-detect.in 2014-11-30 20:00:23.000000000 +0100 @@ -101,9 +101,9 @@ VERSIONS[295]=295.59 fi -if grep -q -i $NVGA $IDLISTDIR/nvidia-343.ids 2>/dev/null +if grep -q -i $NVGA $IDLISTDIR/nvidia-346.ids 2>/dev/null then - VERSIONS[343]=343.22 + VERSIONS[346]=346.16 fi if grep -q -i $NVGA $IDLISTDIR/nvidia.ids 2>/dev/null @@ -204,7 +204,7 @@ elif [[ -n ${VERSIONS[304]} ]]; then echo "Your card is only supported up to the 304 legacy drivers series." PACKAGE="nvidia-legacy-304xx-driver" - elif [[ -n ${VERSIONS[343]} ]]; then + elif [[ -n ${VERSIONS[346]} ]]; then echo "Your card is only supported by a newer driver that will be made available in jessie-backports." echo "See http://backports.debian.org for instructions how to use backports." echo "You may also find driver packages in experimental."
