Bug#801892: jessie-pu: package nvidia-graphics-drivers-legacy-304xx/304.128-1
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
this is the next update in the series for fixing CVE-2015-5950.
The diff is essentially the same as in nvidia-graphics-drivers 304.128-1
(wheezy) and nvidia-graphics-drivers 340.93-0+deb8u1 (jessie) merged
into the legacy package.
This version is currently not in unstable, but it will be there (and at
a release of -5 or so to leave some space (-1 .. -4) for further jessie
updates) at the time I would upload this for jessie.
Again trying to avoid long 1+deb8u1 version numbers ...
Andreas
Index: debian/README.source
===================================================================
--- debian/README.source (revision 5221)
+++ debian/README.source (revision 5678)
@@ -77,6 +77,39 @@
-- Andreas Beckmann <anbe@debian.org> Sun, 09 Nov 2014 14:49:10 +0100
+Testing kernel module compilation
+
+ The following approach has been useful to test nvidia-kernel-source (or
+ a corresponding legacy variant) against a range of kernel headers. The
+ dkms packages are less suited for semi-automatic testing.
+
+ Initial setup amd64/i386:
+ * setup a minimal sid chroot for the target architecture (debootstrap)
+ * setup a schroot configuration for easy usage
+ * include all releases to be tested in the sources.list
+ (the linux-headers-*-all metapackages from oldstable/stable/backports/
+ testing/ sid/experimental/*-backports are co-installable)
+ * install as many linux-headers-* (meta-)packages as you want to test
+
+ Initial setup armhf:
+ * install the package: qemu-user-static (MUST be version >= 1:2.3)
+ * cowbuilder yields best results compared to chroot/schroot/pbuilder, for
+ detailed instructions see: https://wiki.debian.org/cowbuilder
+ * define or export DEBOOTSTRAP="qemu-debootstrap" ARCH="armhf" before every
+ step
+
+ Testing a new nvidia*-kernel-source package:
+ * enter the chroot as root, update it, install new linux-headers-*
+ * install the new package to be tested with dpkg
+ * run
+ sh /usr/share/doc/nvidia-kernel-source/build-module-packages.sh
+ * and wait, this will iterate over all available linux-headers
+ * should any fail to build, module-assistant will print an error and
+ wait for return being pressed before continuing
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 04 Aug 2015 11:54:28 +0200
+
+
Importing a new upstream release that moved support for some legacy cards
to a new legacy driver
Index: debian/bug-control.in
===================================================================
--- debian/bug-control.in (revision 5221)
+++ debian/bug-control.in (revision 5678)
@@ -1,3 +1,3 @@
report-with: #NVIDIA#-driver nvidia-glx#LEGACY# libgl1-#NVIDIA#-glx xserver-xorg-video-#NVIDIA# #NVIDIA_ALTERNATIVE# #NVIDIA#-kernel-dkms #NVIDIA#-kernel-source glx-alternative-nvidia xserver-xorg-video-intel
-package-status: #NVIDIA#-driver nvidia-glx#LEGACY# #NVIDIA#-kernel-dkms #NVIDIA#-kernel-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-legacy-96xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common nvidia-modprobe xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a libdrm-nouveau2 xserver-xorg-video-nouveau ia32-libs make
+package-status: #NVIDIA#-driver nvidia-glx#LEGACY# #NVIDIA#-kernel-dkms #NVIDIA#-kernel-source nvidia-kernel-support-any nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-legacy-96xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any libcuda1 libcuda1-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common nvidia-modprobe xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a libdrm-nouveau2 xserver-xorg-video-nouveau ia32-libs make
Index: debian/rules.defs
===================================================================
--- debian/rules.defs (revision 5221)
+++ debian/rules.defs (revision 5678)
@@ -5,6 +5,11 @@
XORG_ABI_LIST = 19 18 15 14 13 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.17.99)
+LINUX_KMOD_TESTED = 4.2
+LINUX_KMOD_TESTED_amd64 =
+LINUX_KMOD_TESTED_i386 =
+LINUX_KMOD_TESTED_armhf =
+
NVIDIA_DIRNAME_X86 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}
NVIDIA_DIRNAME_X86_64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
NVIDIA_FILENAME_X86 = ${NVIDIA_DIRNAME_X86}.run
Index: debian/module/conftest.h
===================================================================
--- debian/module/conftest.h (revision 5221)
+++ debian/module/conftest.h (revision 5678)
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 346.22, 343.36, 340.65, 319.82, 304.125, 173.14.39, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 352.41, 349.16, 346.96, 343.36, 340.93, 304.128, 173.14.39, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
@@ -122,6 +122,7 @@
#undef NV_FOLLOW_PFN_PRESENT
#endif
+/* removed in 349.xx */
/* Implement conftest.sh function vmap */
/* I can not find any released kernel that uses the 2 argument variant */
/* of vmap */
@@ -254,6 +255,7 @@
/* nv-xen.h does not exist */
#undef HAVE_NV_XEN
+/* removed in 352 */
/* Implement conftest.sh function nvmap_support */
/* nv-android.h does not exist */
#undef HAVE_NV_ANDROID
@@ -373,6 +375,33 @@
#undef NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
#endif
+/* removed in 352 */
+/* Implement conftest.sh function sg_init_table */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+ #define NV_SG_INIT_TABLE_PRESENT
+#else
+ #undef NV_SG_INIT_TABLE_PRESENT
+#endif
+
+/* Implement conftest.sh function sg_table */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+ #define NV_SG_TABLE_PRESENT
+#else
+ #undef NV_SG_TABLE_PRESENT
+#endif
+
+/* Implement conftest.sh function sg_alloc_table */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+ #define NV_SG_ALLOC_TABLE_PRESENT
+#else
+ #undef NV_SG_ALLOC_TABLE_PRESENT
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ #define NV_SG_ALLOC_TABLE_FROM_PAGES_PRESENT
+#else
+ #undef NV_SG_ALLOC_TABLE_FROM_PAGES_PRESENT
+#endif
+
/* Implement conftest.sh function efi_enabled */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
#define NV_EFI_ENABLED_PRESENT
@@ -387,6 +416,13 @@
#undef NV_DOM0_KERNEL_PRESENT
#endif
+/* Implement conftest.sh function nvidia_grid_build */
+#if 0
+ #define NV_GRID_BUILD
+#else
+ #undef NV_GRID_BUILD
+#endif
+
/* Implement conftest.sh function drm_available */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) && IS_ENABLED(CONFIG_DRM)
#define NV_DRM_AVAILABLE
@@ -455,6 +491,13 @@
#undef NV_TASK_STRUCT_HAS_CRED
#endif
+/* Implement conftest.sh function backing_dev_info */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+ #define NV_ADDRESS_SPACE_HAS_BACKING_DEV_INFO
+#else
+ #undef NV_ADDRESS_SPACE_HAS_BACKING_DEV_INFO
+#endif
+
/* Implement conftest.sh function address_space */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) && \
LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
@@ -498,32 +541,95 @@
#undef NV_PM_VT_SWITCH_REQUIRED_PRESENT
#endif
-/* Implement conftest.sh function sg_table */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
- #define NV_SG_TABLE_PRESENT
+/* Implement conftest.sh function list_cut_position */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+ #define NV_LIST_CUT_POSITION_PRESENT
#else
- #undef NV_SG_TABLE_PRESENT
+ #undef NV_LIST_CUT_POSITION_PRESENT
#endif
-/* Implement conftest.sh function sg_alloc_table */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
- #define NV_SG_ALLOC_TABLE_PRESENT
+/* Implement conftest.sh function file_inode */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ #define NV_FILE_HAS_INODE
#else
- #undef NV_SG_ALLOC_TABLE_PRESENT
+ #undef NV_FILE_HAS_INODE
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- #define NV_SG_ALLOC_TABLE_FROM_PAGES_PRESENT
+
+/* Implement conftest.sh function drm_pci_set_busid */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ #define NV_DRM_PCI_SET_BUSID_PRESENT
#else
- #undef NV_SG_ALLOC_TABLE_FROM_PAGES_PRESENT
+ #undef NV_DRM_PCI_SET_BUSID_PRESENT
#endif
-/* Implement conftest.sh function sg_init_table */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
- #define NV_SG_INIT_TABLE_PRESENT
+/* Implement conftest.sh function xen_ioemu_inject_msi */
+/* this seems to require some xen patch for the kernel */
+#if 0
+ #define NV_XEN_IOEMU_INJECT_MSI
#else
- #undef NV_SG_INIT_TABLE_PRESENT
+ #undef NV_XEN_IOEMU_INJECT_MSI
#endif
+/* Implement conftest.sh function phys_to_dma */
+#if ((IS_ENABLED(CONFIG_X86) || (IS_ENABLED(CONFIG_PPC)) \
+ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) || \
+ (IS_ENABLED(CONFIG_ARM64) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) || \
+ (IS_ENABLED(CONFIG_ARM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)))
+ #define NV_PHYS_TO_DMA_PRESENT
+#else
+ #undef NV_PHYS_TO_DMA_PRESENT
+#endif
+
+/* Implement conftest.sh function dma_ops */
+#if (IS_ENABLED(CONFIG_X86) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) || \
+ (IS_ENABLED(CONFIG_X86_64) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) || \
+ (IS_ENABLED(CONFIG_ARM64) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) || \
+ (IS_ENABLED(CONFIG_ARM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) || \
+ (IS_ENABLED(CONFIG_PPC) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) || \
+ (IS_ENABLED(CONFIG_PPC64) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
+ #define NV_DMA_OPS_PRESENT
+#else
+ #undef NV_DMA_OPS_PRESENT
+#endif
+
+/* Implement conftest.sh function dma_map_ops */
+#if (IS_ENABLED(CONFIG_X86) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)) || \
+ (IS_ENABLED(CONFIG_ARM64) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) || \
+ (IS_ENABLED(CONFIG_ARM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) || \
+ (IS_ENABLED(CONFIG_PPC) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) || \
+ (IS_ENABLED(CONFIG_PPC64) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+ #define NV_DMA_MAP_OPS_PRESENT
+#else
+ #undef NV_DMA_MAP_OPS_PRESENT
+#endif
+
+/* Implement conftest.sh function get_dma_ops */
+#if (IS_ENABLED(CONFIG_X86) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) || \
+ (IS_ENABLED(CONFIG_ARM64) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) || \
+ (IS_ENABLED(CONFIG_ARM) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) || \
+ (IS_ENABLED(CONFIG_PPC) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) || \
+ (IS_ENABLED(CONFIG_PPC64) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
+ #define NV_GET_DMA_OPS_PRESENT
+#else
+ #undef NV_GET_DMA_OPS_PRESENT
+#endif
+
+/* Implement conftest.sh function noncoherent_swiotlb_dma_ops */
+#if IS_ENABLED(CONFIG_ARM64) && LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) && \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
+ #define NV_NONCOHERENT_SWIOTLB_DMA_OPS_PRESENT
+#else
+ #undef NV_NONCOHERENT_SWIOTLB_DMA_OPS_PRESENT
+#endif
+
+/* Implement conftest.sh function write_cr4 */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) && \
+ LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
+ #define NV_WRITE_CR4_PRESENT
+#else
+ #undef NV_WRITE_CR4_PRESENT
+#endif
+
/* Check for linux/semaphore.h */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#define NV_LINUX_SEMAPHORE_H_PRESENT
@@ -601,6 +707,7 @@
#undef NV_LINUX_SCREEN_INFO_H_PRESENT
#endif
+/* removed in 352 */
/* Check for linux/nvmap.h */
// does not (yet) exist in kernel source
#undef NV_LINUX_NVMAP_H_PRESENT
@@ -625,3 +732,18 @@
#else
#undef NV_LINUX_PRIO_TREE_H_PRESENT
#endif
+
+/* Check for linux/log2.h */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+ #define NV_LINUX_LOG2_H_PRESENT
+#else
+ #undef NV_LINUX_LOG2_H_PRESENT
+#endif
+
+/* Check for xen/ioemu.h */
+/* this seems to require some xen patch for the kernel */
+#if 0
+ #define NV_XEN_IOEMU_H_PRESENT
+#else
+ #undef NV_XEN_IOEMU_H_PRESENT
+#endif
Index: debian/changelog
===================================================================
--- debian/changelog (revision 5221)
+++ debian/changelog (revision 5678)
@@ -1,3 +1,57 @@
+nvidia-graphics-drivers-legacy-304xx (304.128-1) jessie; urgency=medium
+
+ * New upstream legacy 304xx branch release 304.128 (2015-08-31).
+ * Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
+ (Closes: #800567)
+ * Improved compatibility with recent Linux kernels.
+ * Removed f_path.dentry.patch, fixed upstream.
+ * Removed fixes-for-kernel-4.0.0.patch, fixed upstream.
+ * Synchronize packaging with nvidia-graphics-drivers 340.93-0+deb8u1:
+ * Synchronize packaging with nvidia-graphics-drivers 340.76-4:
+ - Add ignore_xen_on_arm.patch needed for dkms build on armhf: armmp
+ kernel headers ship with CONFIG_XEN enabled, which breaks the build,
+ so since running this driver on XEN is currently not supported,
+ ignore the check for XEN in nv-linux.h as a workaround on arm, and
+ also disable CONFIG_XEN and CONFIG_XEN_DOM0 if building on <= 3.16.
+ - README.source: Document setup for testing module compilation.
+ * Synchronize packaging with nvidia-graphics-drivers 340.76-3:
+ - Add Luca Boccassi to Uploaders.
+ - nvidia-legacy-304xx-driver, nvidia-legacy-304xx-kernel-*: Report the
+ latest tested Linux version that can build the kernel module in the
+ package description.
+ * Synchronize packaging with nvidia-graphics-drivers 340.76-1:
+ nvidia-legacy-304xx-kernel-source: Use reproducible timestamps and file
+ order inside /usr/src/nvidia-legacy-304xx-kernel.tar.xz.
+ * Synchronize packaging with nvidia-graphics-drivers 304.128-1:
+ - libgl1-nvidia-legacy-304xx-glx: Add Provides+Conflicts:
+ libgl1-nvidia-glx-${nvidia:Version} to forbid co-installation of
+ libgl1-nvidia-glx from the same upstream version due to file
+ conflicts on versioned files that are not handled via alternatives.
+ - bug-script: Synchronize with nvidia-graphics-drivers 340.93-4.
+ * conftest.h:
+ - Implement new conftest.sh functions file_inode, drm_pci_set_busid
+ (340.76).
+ - Implement check for linux/log2.h (346.16).
+ - Implement check for xen/ioemu.h (346.59).
+ - Implement new conftest.sh functions write_cr4, xen_ioemu_inject_msi
+ (346.59), list_cut_position (349.12).
+ - Implement new conftest.sh functions backing_dev_info (346.82),
+ phys_to_dma, dma_ops, get_dma_ops, noncoherent_swiotlb_dma_ops (352.09).
+ - Implement new conftest.sh function dma_map_ops (352.30).
+ - Reorder conftest.h to match conftest.sh.
+ - Implement new conftest.sh function nvidia_grid_build (352.41).
+ * Update lintian overrides.
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 11 Oct 2015 13:12:51 +0100
+
+nvidia-graphics-drivers-legacy-304xx (304.125-2) unstable; urgency=medium
+
+ * Add f_path.dentry.patch and fixes-for-kernel-4.0.0.patch (cherrypicked
+ from svn branches/343 and trunk respectively) to fix FTBFS with linux
+ 3.19 and 4.0. (Closes: #785442, #786383)
+
+ -- Vincent Cheng <vcheng@debian.org> Wed, 17 Jun 2015 02:33:37 -0700
+
nvidia-graphics-drivers-legacy-304xx (304.125-1) unstable; urgency=medium
* New upstream legacy 304xx branch release 304.125 (2014-12-05).
Index: debian/rules
===================================================================
--- debian/rules (revision 5221)
+++ debian/rules (revision 5678)
@@ -7,12 +7,14 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
NVIDIA_RELEASE := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
+BUILD_DATE := $(shell dpkg-parsechangelog --show-field=Date)
include debian/rules.defs
NVIDIA_LEGACY ?=
WATCH_VERSION ?= $(NVIDIA_LEGACY)
WATCH_PATTERN ?=
XORG_ABI_LIST ?=
XORG_BOUND ?=
+LINUX_KMOD_TESTED ?=
BACKPORT ?=
NVIDIA_SETTINGS ?= nvidia-settings$(legacy)
NVIDIA_ALTERNATIVE ?= nvidia$(legacy)-alternative
@@ -220,11 +222,16 @@
chmod a+x $(module_source)/debian/rules
chmod a+x $(module_source)/conftest.sh
chmod a+x $(module_source)/conftest_nvidia.sh
+ find '$(module_source)/../../modules' -depth -newermt '$(BUILD_DATE)' -print0 | \
+ xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
# Build the tarball.
- tar cfJ $(module_txz) \
+ (cd $(module_source)/../.. && find modules -print0) | \
+ LC_ALL=C sort -z | \
+ tar cfJ $(module_txz) \
--owner=root --group=src -C $(module_source)/../.. \
- --exclude '*.in' --exclude '.svn' modules
+ --exclude '*.in' --exclude '.svn' \
+ --null -T - --no-recursion
tar tfvJ $(module_txz)
build-kernel-dkms-tree: build-kernel-source-tree
@@ -275,6 +282,7 @@
-V'nvidia-settings=$(NVIDIA_SETTINGS)' \
-V'nvidia:kmod:binary=$${nvidia}-kernel-dkms (= $${binary:Version}) | $${nvidia}-kernel-$${nvidia:Version}$${nvidia:Perfkit}' \
-V'nvidia:kmod:source=$${nvidia}-kernel-dkms (>= $${nvidia:Version}) | $${nvidia}-kernel-source (>= $${nvidia:Version})' \
+ -V'nvidia:kmod:tested:Linux=$(strip $(or $(LINUX_KMOD_TESTED_$(DEB_HOST_ARCH)),$(LINUX_KMOD_TESTED),???))' \
-Vnvidia:kmod:Description="`cat debian/control.kmod`" \
-Vnvidia:Models="`cat debian/control.models`"
Index: debian/copyright
===================================================================
--- debian/copyright (revision 5221)
+++ debian/copyright (revision 5678)
@@ -18,7 +18,7 @@
Files: debian/*
Copyright: 2001-2010 Randall Donald <rdonald@debian.org>
- 2009-2014 Andreas Beckmann <anbe@debian.org>
+ 2009-2015 Andreas Beckmann <anbe@debian.org>
2010 Russ Allbery <rra@debian.org>
Based on packages by Christopher Cheney.
License: GPL-2.0+
Index: debian/libgl1-nvidia-glx.lintian-overrides.in
===================================================================
--- debian/libgl1-nvidia-glx.lintian-overrides.in (revision 5221)
+++ debian/libgl1-nvidia-glx.lintian-overrides.in (revision 5678)
@@ -16,6 +16,3 @@
# implementation of libGL.so.1, so the package name won't ever be able to
# match the library names it provides.
package-name-doesnt-match-sonames
-
-# File conflict on libnvidia-tls.so.304.108.
-conflicts-with-version libgl1-nvidia-glx (<< #VERSION#.0)
Index: debian/bug-script
===================================================================
--- debian/bug-script (revision 5221)
+++ debian/bug-script (revision 5678)
@@ -33,6 +33,11 @@
echo
fi
+echo "Device node permissions:"
+ls -l /dev/dri/* /dev/nvidia* 2>/dev/null
+getent group video
+echo
+
echo "OpenGL and NVIDIA library files installed:"
ls -l /etc/alternatives/glx* \
/etc/alternatives/nvidia* \
@@ -44,12 +49,14 @@
/usr/lib/libGL.* \
/usr/lib/libGLES*.* \
/usr/lib/libGLcore* \
+ /usr/lib/libcuda* \
/usr/lib/libnvidia* \
- /usr/lib/*-linux-gnu/libEGL.* \
- /usr/lib/*-linux-gnu/libGL.* \
- /usr/lib/*-linux-gnu/libGLES*.* \
- /usr/lib/*-linux-gnu/libGLcore* \
- /usr/lib/*-linux-gnu/libnvidia* \
+ /usr/lib/*-linux-gnu*/libEGL.* \
+ /usr/lib/*-linux-gnu*/libGL.* \
+ /usr/lib/*-linux-gnu*/libGLES*.* \
+ /usr/lib/*-linux-gnu*/libGLcore* \
+ /usr/lib/*-linux-gnu*/libcuda* \
+ /usr/lib/*-linux-gnu*/libnvidia* \
/usr/lib32/libGL.* \
/usr/lib32/libGLcore* \
/usr/lib32/libnvidia* \
@@ -64,12 +71,12 @@
/etc/nvidia/ \
/usr/lib/nvidia/ \
/usr/lib/nvidia/*/ \
- /usr/lib/*-linux-gnu/nvidia/ \
- /usr/lib/*-linux-gnu/nvidia/*/ \
+ /usr/lib/*-linux-gnu*/nvidia/ \
+ /usr/lib/*-linux-gnu*/nvidia/*/ \
/usr/lib/mesa/ \
- /usr/lib/*-linux-gnu/mesa/ \
+ /usr/lib/*-linux-gnu*/mesa/ \
/usr/lib/mesa-diverted/ \
- /usr/lib/mesa-diverted/*-linux-gnu/ \
+ /usr/lib/mesa-diverted/*-linux-gnu*/ \
/usr/lib32/nvidia/ \
/usr/lib32/nvidia/diversions/ \
/etc/X11/xorg.conf.d/ \
@@ -83,6 +90,13 @@
grep -ri nouveau /etc/modprobe.d/
echo
+echo "/etc/modules-load.d:"
+ls -la /etc/modules /etc/modules-load.d/ 2>&1
+echo
+grep -ri nvidia /etc/modules /etc/modules-load.d/ 2>/dev/null
+grep -ri nouveau /etc/modules /etc/modules-load.d/ 2>/dev/null
+echo
+
echo "Files from nvidia-installer:"
ls -la /usr/bin/nvidia-installer /usr/bin/nvidia-uninstall /var/lib/nvidia 2>/dev/null
echo
Index: debian/control
===================================================================
--- debian/control (revision 5221)
+++ debian/control (revision 5678)
@@ -6,7 +6,8 @@
Uploaders:
Russ Allbery <rra@debian.org>,
Andreas Beckmann <anbe@debian.org>,
- Vincent Cheng <vcheng@debian.org>
+ Vincent Cheng <vcheng@debian.org>,
+ Luca Boccassi <luca.boccassi@gmail.com>,
Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-304xx/trunk
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-304xx/
Build-Depends:
@@ -53,6 +54,8 @@
.
See /usr/share/doc/${nvidia}-driver/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
+ .
+ Building the kernel module has been tested up to Linux ${nvidia:kmod:tested:Linux}.
#Package: xserver-xorg-video-${nvidia}
Package: xserver-xorg-video-nvidia-legacy-304xx
@@ -105,8 +108,9 @@
${nvidia:kmod:source},
Provides:
libgl1-nvidia-glx-any,
+ libgl1-nvidia-glx-${nvidia:Version},
Conflicts:
- libgl1-nvidia-glx (<< ${nvidia:Version}.0),
+ libgl1-nvidia-glx-${nvidia:Version},
Breaks:
ia32-libs (<< 1:0),
libxvmcnvidia1 (<< 305),
@@ -191,6 +195,8 @@
.
See /usr/share/doc/${nvidia}-kernel-dkms/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
+ .
+ Building the kernel module has been tested up to Linux ${nvidia:kmod:tested:Linux}.
#Package: ${nvidia}-kernel-source
Package: nvidia-legacy-304xx-kernel-source
@@ -228,4 +234,6 @@
.
See /usr/share/doc/${nvidia}-kernel-source/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
+ .
+ Building the kernel module has been tested up to Linux ${nvidia:kmod:tested:Linux}.
Reply to: