--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: jessie-pu: package nvidia-graphics-drivers/340.93-0+deb8u1
- From: Andreas Beckmann <anbe@debian.org>
- Date: Sun, 04 Oct 2015 16:53:21 +0200
- Message-id: <20151004145321.5706.65202.reportbug@zam581.zam.kfa-juelich.de>
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Second PU request for fixing CVE-2015-5950.
This requires a new upstream release, too, that is two or three releases
ahead of what is currently in jessie.
The proposed changes are all already included and tested in sid.
This includes changes from several uploads to sid (up to 340.76-4) that
are a new upstream release and several bugfixes and minor features that
I consider appropriate for jessie.
The big changes done in sid 340.76-5 onwards are excluded, instead the
changes needed for jessie were cherry-picked into 340.93-0+deb8u1.
Regarding the version number, 340.93-1 was uploaded to sid (before the
CVE was made public), so we need to use 340.93-0+deb8u1 this time (or
would 340.93-0 be ok?). (A shorter version number reduces version string
inflation when rebuilding nvidia-graphics-modules.)
Annotated, reordered and merged changelog:
+nvidia-graphics-drivers (340.93-0+deb8u1) jessie; urgency=medium
+
+ * New upstream legacy 340xx branch release 340.93 (2015-09-02).
+ * Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
+ (Closes: #800566)
+ * New upstream legacy 340xx branch release 340.76 (2015-01-27).
+ * Improved compatibility with recent Linux kernels. (Closes: #778698)
+ * Update lintian overrides.
New upstream blob with security bugfix.
+ * nvidia-driver-bin, libnvidia-compiler, libnvidia-eglcore,
+ libgl1-nvidia-glx: Add Provides+Conflicts: $pkg-${nvidia:Version} to
+ forbid co-installation with the respective legacy packages from the same
+ upstream version due to file conflicts on versioned files that are not
+ handled via alternatives.
improve and simplify co-existence with legacy packages
+ * bug-script: Report file information in arm-linux-gnueabihf directories.
+ * bug-script: Collect information from /etc/modules{,-load.d/}.
get better information from reportbug
+ * README.source: Document my schroot setup for testing module compilation.
+ * README.source: Document armhf setup for testing module compilation.
maintainer documentation
+ * 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.
+ (Closes: #794435)
Allow the kernel module to be compiled for the Debian armhf kernels.
The driver is packaged for armhf, but cannot be tested due to lack of hardware.
+ * nvidia-detect: Detect stretch as supported suite, and parse -h as --help.
+ (Closes: #792801)
+ * Fix nvidia-modprobe.conf module unload ordering, to stop nvidia-uvm
+ getting stuck until a second modprobe -r nvidia-current is issued.
+ Fix provided by Jö Fahlke. Thanks! (Closes: #793386)
important bugfix for bumblebee users
+ * Add Luca Boccassi to Uploaders.
+ * nvidia-driver, nvidia-kernel-*: Report the latest tested Linux version
+ that can build the kernel module in the package description.
Maybe that gives some hints to people complaining about the jessie
driver not supporting the latest kernels from jessie-backports ...
+ * Split some old UNRELEASED changelog entries to linearize the BTS history.
+ * nvidia-kernel-source: Use reproducible timestamps and file order inside
+ /usr/src/nvidia-kernel.tar.xz.
+ * conftest.h:
+ - Implement new conftest.sh function nvidia_grid_build (352.41).
+ - 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 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 file_inode, drm_pci_set_busid
+ (340.76).
We maintain only one conftest.h for all upstream release branches.
Most of the checks that were added in newer release branches are now
also needed for 340.93.
Andreas
Index: debian/libnvidia-eglcore.lintian-overrides.in
===================================================================
--- debian/libnvidia-eglcore.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/libnvidia-eglcore.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -1,6 +1,5 @@
# The NVIDIA license does not allow any form of modification.
[!amd64]: binary-file-built-without-LFS-support
-shlib-calls-exit
[i386]: shlib-with-non-pic-code
spelling-error-in-binary
hardening-no-fortify-functions
Index: debian/nvidia-opencl-icd.lintian-overrides.in
===================================================================
--- debian/nvidia-opencl-icd.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/nvidia-opencl-icd.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -8,9 +8,6 @@
hardening-no-relro
hardening-no-stackprotector
-# This library is only used indirectly via nvidia.icd.
-package-name-doesnt-match-sonames libnvidia-opencl1
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/libnvidia-ifr1.lintian-overrides
===================================================================
--- debian/libnvidia-ifr1.lintian-overrides (.../tags/340.65-2) (revision 5555)
+++ debian/libnvidia-ifr1.lintian-overrides (.../branches/340) (revision 5555)
@@ -1,12 +1,8 @@
# The NVIDIA license does not allow any form of modification.
[i386]: binary-file-built-without-LFS-support
-[i386]: shlib-with-non-pic-code
hardening-no-fortify-functions
hardening-no-relro
-# A single symbolic link does not justify the creation of a new package.
-non-dev-pkg-with-shlib-symlink
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/detect/nvidia-detect.in
===================================================================
--- debian/detect/nvidia-detect.in (.../tags/340.65-2) (revision 5555)
+++ debian/detect/nvidia-detect.in (.../branches/340) (revision 5555)
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
#
-if [ "$1" = "--help" ]; then
+if [ "$1" = "-h" -o "$1" = "--help" ]; then
echo "Usage: nvidia-detect [PCIID]"
echo " Reports the Debian packages supporting the NVIDIA GPU that is"
echo " installed on the local system (or given as a PCIID parameter)."
@@ -216,6 +216,25 @@
else
echo "Uh oh. Your card is only supported by the 71.86 legacy drivers series, which is not in any current Debian suite."
fi
+ elif grep -q "stretch\|^9" /etc/debian_version
+ then
+ if [[ -n ${VERSIONS[999]} ]]; then
+ if [[ -n ${VERSIONS[304]} ]]; then
+ echo "Your card is supported by the default drivers and legacy driver series 304."
+ else
+ echo "Your card is supported by the default drivers."
+ fi
+ PACKAGE="nvidia-driver"
+ 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[173]} ]]; then
+ echo "Uh oh. Your card is only supported by the 173.14 legacy drivers series, which is not in any current Debian suite."
+ elif [[ -n ${VERSIONS[96]} ]]; then
+ echo "Uh oh. Your card is only supported by the 96.43 legacy drivers series, which is not in any current Debian suite."
+ else
+ echo "Uh oh. Your card is only supported by the 71.86 legacy drivers series, which is not in any current Debian suite."
+ fi
elif grep -q "^4" /etc/debian_version;
then
echo "Uh oh. You are running Etch, which is no longer supported.";
Index: debian/libnvidia-compiler.lintian-overrides.in
===================================================================
--- debian/libnvidia-compiler.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/libnvidia-compiler.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -1,7 +1,7 @@
# The NVIDIA license does not allow any form of modification.
[i386]: binary-file-built-without-LFS-support
binary-has-unneeded-section
-shlib-with-executable-stack
+[i386]: shlib-with-executable-stack
spelling-error-in-binary
hardening-no-fortify-functions
hardening-no-relro
Index: debian/libnvcuvid1.lintian-overrides
===================================================================
--- debian/libnvcuvid1.lintian-overrides (.../tags/340.65-2) (revision 5555)
+++ debian/libnvcuvid1.lintian-overrides (.../branches/340) (revision 5555)
@@ -5,9 +5,6 @@
hardening-no-relro
hardening-no-stackprotector
-# A single symbolic link does not justify the creation of a new package.
-non-dev-pkg-with-shlib-symlink
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/libnvidia-ml1.lintian-overrides
===================================================================
--- debian/libnvidia-ml1.lintian-overrides (.../tags/340.65-2) (revision 5555)
+++ debian/libnvidia-ml1.lintian-overrides (.../branches/340) (revision 5555)
@@ -5,9 +5,6 @@
hardening-no-relro
hardening-no-stackprotector
-# A single symbolic link does not justify the creation of a new package.
-non-dev-pkg-with-shlib-symlink
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/340.65-2) (revision 5555)
+++ debian/changelog (.../branches/340) (revision 5555)
@@ -1,3 +1,114 @@
+nvidia-graphics-drivers (340.93-0+deb8u1) jessie; urgency=medium
+
+ * New upstream legacy 340xx branch release 340.93 (2015-09-02).
+ * Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
+ (Closes: #800566)
+ - Fixed a bug that caused the X server to crash if an OpenGL application
+ tried to allocate a drawable when GPU-accessible memory is exhausted.
+ - Fixed a bug that could cause an Xid error when terminating a video
+ playback application using the overlay presentation queue in VDPAU.
+ - Fixed a rare deadlock condition when running applications that use
+ OpenGL in multiple threads on a Quadro GPU.
+ - Fixed a bug which caused truncation of the EGLAttribEXT value returned
+ by eglQueryDeviceAttribEXT() on 64-bit systems.
+ - Fixed a kernel memory leak that occurred when looping hardware-
+ accelerated video decoding with VDPAU on Maxwell-based GPUs.
+ - Fixed a bug that caused the X server to crash if a RandR 1.4 output
+ provided by a Sink Output provider was selected as the primary output on
+ X.Org xserver 1.17 and higher.
+ - Fixed a bug that caused waiting on X Sync Fence objects in OpenGL to
+ hang indefinitely in some cases.
+ - Fixed a bug that prevented OpenGL from properly recovering from
+ hardware errors or sync object waits that had timed out.
+ * Improved compatibility with recent Linux kernels.
+ * fixes-for-kernel-4.0.0.patch: Remove, fixed upstream.
+ * conftest.h:
+ - Implement new conftest.sh function nvidia_grid_build (352.41).
+ * Update lintian overrides.
+ * nvidia-driver-bin, libnvidia-compiler, libnvidia-eglcore,
+ libgl1-nvidia-glx: Add Provides+Conflicts: $pkg-${nvidia:Version} to
+ forbid co-installation with the respective legacy packages from the same
+ upstream version due to file conflicts on versioned files that are not
+ handled via alternatives.
+ * bug-script: Report file information in arm-linux-gnueabihf directories.
+ * bug-script: Collect information from /etc/modules{,-load.d/}.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 14 Sep 2015 01:00:49 +0200
+
+nvidia-graphics-drivers (340.76-4) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * README.source: Document my schroot setup for testing module compilation.
+ * Update lintian overrides.
+
+ [ Luca Boccassi ]
+ * conftest.h:
+ - dma_map_ops and dma_ops are available for PPC and ARM too
+ * 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.
+ (Closes: #794435)
+ * README.source: Document armhf setup for testing module compilation.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 10 Aug 2015 02:23:23 +0200
+
+nvidia-graphics-drivers (340.76-3) unstable; urgency=medium
+
+ [ Vincent Cheng ]
+ * nvidia-detect: Detect stretch as supported suite, and parse -h as --help.
+ (Closes: #792801)
+
+ [ Luca Boccassi ]
+ * Fix nvidia-modprobe.conf module unload ordering, to stop nvidia-uvm
+ getting stuck until a second modprobe -r nvidia-current is issued.
+ Fix provided by Jö Fahlke. Thanks! (Closes: #793386)
+
+ [ Andreas Beckmann ]
+ * Add Luca Boccassi to Uploaders.
+ * nvidia-driver, nvidia-kernel-*: Report the latest tested Linux version
+ that can build the kernel module in the package description.
+ * conftest.h:
+ - Fix conftest.sh function write_cr4.
+ - 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.
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 02 Aug 2015 22:33:27 +0200
+
+nvidia-graphics-drivers (340.76-2) unstable; urgency=medium
+
+ * fixes-for-kernel-4.0.0.patch: New patch to add support for Linux 4.0,
+ thanks to Jessie Frazelle. (Closes: #781810)
+ * conftest.h:
+ - 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).
+ * Split some old UNRELEASED changelog entries to linearize the BTS history.
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 12 May 2015 20:47:07 +0200
+
+nvidia-graphics-drivers (340.76-1) unstable; urgency=medium
+
+ * New upstream legacy 340xx branch release 340.76 (2015-01-27).
+ - Fixed a bug that caused frequent AMD-Vi page faults on systems with
+ some AMD 8xx/9xx-series chipsets when used with some NVIDIA GPUs.
+ - Fixed a regression that could cause system crashes when terminating the
+ X server on systems with an NVIDIA Quadro SDI Capture card installed.
+ - Fixed a bug that caused audio over HDMI to not work on some GPUs while
+ using a display that supports HDMI 3D.
+ * Improved compatibility with recent Linux kernels. (Closes: #778698)
+ * nvidia-kernel-source: Use reproducible timestamps and file order inside
+ /usr/src/nvidia-kernel.tar.xz.
+ * conftest.h:
+ - Implement new conftest.sh functions file_inode, drm_pci_set_busid
+ (340.76).
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 18 Mar 2015 19:42:13 +0100
+
nvidia-graphics-drivers (340.65-2) unstable; urgency=medium
* Merge changes from 304.125-1.
@@ -150,6 +261,7 @@
* Merge changes from 304.123 (UNRELEASED).
* Bump Standards-Version to 3.9.6. No changes needed.
* Update lintian overrides.
+ * Restrict watch file to releases from the 340.xx long lived branch.
* libgl1-nvidia-glx.preinst: Implement hardware check for legacy GPUs that
require the nvidia-legacy-304xx-driver package. Based on the
implementation of the same feature in fglrx-driver (libfglrx.preinst).
@@ -403,6 +515,11 @@
* New upstream long lived branch release 331.113 (2014-12-05).
* Fixes CVE-2014-8298.
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 12 Dec 2014 08:27:26 +0100
+
+nvidia-graphics-drivers (331.104-1) UNRELEASED; urgency=medium
+
* New upstream long lived branch release 331.104 (2014-10-08).
- Fixed a bug that could cause the CUDA debugger to fail after
exiting X on systems with persistence mode enabled.
@@ -434,7 +551,7 @@
in an SLI Mosaic layout.
- Fixed a bug that corrupted certain software rendering on 32-bit systems.
- -- Andreas Beckmann <anbe@debian.org> Fri, 12 Dec 2014 08:27:26 +0100
+ -- Andreas Beckmann <anbe@debian.org> Sun, 12 Oct 2014 02:40:55 +0200
nvidia-graphics-drivers (331.79-1) unstable; urgency=medium
@@ -856,6 +973,15 @@
when the boot display was on an external DisplayPort monitor, for example
if the laptop was booted while the lid was closed.
- Added support for the following GPU: GeForce GTX 760 Ti OEM.
+ * Update nv-readme.ids.
+ * Update symbols control files.
+ * man-fixes-nvidia-smi.patch: Updated for newly added hyphens.
+ * Upload to unstable.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 21 Oct 2013 10:55:26 +0200
+
+nvidia-graphics-drivers (319.49-1) UNRELEASED; urgency=low
+
* New upstream long lived branch release 319.49 (2013-08-20).
- Fixed a bug that caused DisplayPort monitors connected to Quadro FX 3800,
4800, or 5800 to remain off after DPMS.
@@ -882,17 +1008,14 @@
- Fixed a bug that caused the X server to crash when querying the current
mode of disabled displays.
* Update nv-readme.ids.
- * Update symbols control files.
* linux-3.10-{i2c,procfs}.patch: Remove. Fixed upstream.
- * man-fixes-nvidia-smi.patch: Updated for newly added hyphens.
* libnvidia-ifr1: New package for NvIFROpenGL (libnvidia-ifr.so.1).
* VDPAU is now available on armhf, too.
* nvidia-detect [armhf]: Don't ship PCI ID lists for legacy drivers.
* Restrict watch file to releases from the 319.xx long lived branch.
* Merge changes from 304.108-4 and 313.30-3.
- * Upload to unstable.
- -- Andreas Beckmann <anbe@debian.org> Mon, 21 Oct 2013 10:55:26 +0200
+ -- Andreas Beckmann <anbe@debian.org> Sun, 15 Sep 2013 10:30:58 +0200
nvidia-graphics-drivers (319.32-2) experimental; urgency=low
@@ -1151,6 +1274,14 @@
- Fixed a regression that could cause an X server crash when performing
a modeset (e.g. changing resolutions, transformation settings, or
display layout) when some connected display devices are disabled.
+ * Merge changes from 304.108-4.
+ * Refresh patches.
+ * Upload to unstable.
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 18 Oct 2013 03:50:09 +0200
+
+nvidia-graphics-drivers (310.44-1) UNRELEASED; urgency=low
+
* New upstream long lived branch release 310.44 (2013-04-02).
* Fixed CVE-2013-0131: NVIDIA UNIX GPU Driver ARGB Cursor Buffer
Overflow in "NoScanout" Mode. This buffer overflow, which occurred
@@ -1160,6 +1291,11 @@
arbitrary code execution.
For more details, see:
http://nvidia.custhelp.com/app/answers/detail/a_id/3290
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 05 Apr 2013 02:41:13 +0200
+
+nvidia-graphics-drivers (310.40-1) UNRELEASED; urgency=low
+
* New upstream long lived branch release 310.40 (2013-03-08).
- Reduced the amount of time needed to establish framelock in some
stereo configurations with many monitors.
@@ -1199,13 +1335,10 @@
boundaries.
- Fix performance issues when using some versions of HyperMesh with Quadro
GPUs.
- * Merge changes from 304.108-4.
* Restrict watch file to releases from the 310.xx long lived branch.
* Update nv-readme.ids.
- * Refresh patches.
- * Upload to unstable.
- -- Andreas Beckmann <anbe@debian.org> Fri, 18 Oct 2013 03:50:09 +0200
+ -- Andreas Beckmann <anbe@debian.org> Sun, 10 Mar 2013 17:57:05 +0100
nvidia-graphics-drivers (310.19-1) experimental; urgency=low
@@ -1259,6 +1392,17 @@
-- Andreas Beckmann <debian@abeckmann.de> Wed, 17 Oct 2012 19:54:34 +0200
+nvidia-graphics-drivers (304.128-1) UNRELEASED; urgency=medium
+
+ * New upstream legacy 304xx branch release 304.128 (2015-08-31).
+ * Improved compatibility with recent Linux kernels.
+ * libgl1-nvidia-glx: Add Provides+Conflicts:
+ libgl1-nvidia-glx-${nvidia:Version} to forbid co-installation of
+ libgl1-nvidia-legacy-304xx-glx from the same upstream version due to file
+ conflicts on versioned files that are not handled via alternatives.
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 13 Sep 2015 23:34:49 +0200
+
nvidia-graphics-drivers (304.125-1) wheezy; urgency=medium
* New upstream legacy 304xx branch release 304.125 (2014-12-05).
Index: debian/xserver-xorg-video-nvidia.lintian-overrides.in
===================================================================
--- debian/xserver-xorg-video-nvidia.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/xserver-xorg-video-nvidia.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -2,6 +2,7 @@
[!amd64]: binary-file-built-without-LFS-support
embedded-library usr/lib/#PRIVATE#/nvidia_drv.so: zlib
embedded-library usr/lib/#PRIVATE#/nvidia_drv.so: libpng
+spelling-error-in-binary
hardening-no-fortify-functions
hardening-no-relro
hardening-no-stackprotector
Index: debian/control
===================================================================
--- debian/control (.../tags/340.65-2) (revision 5555)
+++ debian/control (.../branches/340) (revision 5555)
@@ -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/trunk
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers/
Build-Depends:
@@ -61,6 +62,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: ${nvidia}-driver-bin
Package: nvidia-driver-bin
@@ -71,6 +74,10 @@
${shlibs:Depends}, ${misc:Depends}
Recommends:
${nvidia}-driver,
+Provides:
+ nvidia-driver-bin-${nvidia:Version},
+Conflicts:
+ nvidia-driver-bin-${nvidia:Version},
Breaks:
${nvidia}-driver (<< 340.46-4~),
nvidia-glx${nvidia:Legacy} (<< 319),
@@ -150,7 +157,9 @@
${nvidia:kmod:source},
Provides:
libgl1-nvidia-glx-any,
+ libgl1-nvidia-glx-${nvidia:Version},
Conflicts:
+ libgl1-nvidia-glx-${nvidia:Version},
libgl1-nvidia${nvidia:Legacy}-glx-ia32,
nvidia-glx${nvidia:Legacy}-ia32,
libgl1-nvidia-glx-ia32-any,
@@ -251,6 +260,10 @@
${misc:Pre-Depends}
Depends:
${shlibs:Depends}, ${misc:Depends}
+Provides:
+ libnvidia-eglcore-${nvidia:Version},
+Conflicts:
+ libnvidia-eglcore-${nvidia:Version},
Description: NVIDIA binary EGL core libraries${nvidia:LegacyDesc}
EGL provides a platform-agnostic mechanism for creating rendering surfaces
for use with other graphics libraries, such as OpenGL|ES and OpenVG.
@@ -333,6 +346,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-kernel-source
@@ -370,6 +385,8 @@
.
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}.
#Package: ${nvidia}-vdpau-driver
Package: nvidia-vdpau-driver
@@ -514,7 +531,10 @@
${misc:Pre-Depends}
Depends:
${shlibs:Depends}, ${misc:Depends}
+Provides:
+ libnvidia-compiler-${nvidia:Version},
Conflicts:
+ libnvidia-compiler-${nvidia:Version},
libnvidia-compiler-ia32,
Replaces:
libnvidia-compiler-ia32,
Index: debian/README.source
===================================================================
--- debian/README.source (.../tags/340.65-2) (revision 5555)
+++ debian/README.source (.../branches/340) (revision 5555)
@@ -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/nvidia-modprobe.conf.in
===================================================================
--- debian/nvidia-modprobe.conf.in (.../tags/340.65-2) (revision 5555)
+++ debian/nvidia-modprobe.conf.in (.../branches/340) (revision 5555)
@@ -1,2 +1,2 @@
alias nvidia #MODULE#
-remove #MODULE# rmmod nvidia nvidia-uvm
+remove #MODULE# rmmod nvidia-uvm nvidia
Index: debian/rules.defs
===================================================================
--- debian/rules.defs (.../tags/340.65-2) (revision 5555)
+++ debian/rules.defs (.../branches/340) (revision 5555)
@@ -6,6 +6,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 =
+
ARCH_LIST = i386 amd64 armhf
NVIDIA_DIRNAME_X86 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}
NVIDIA_DIRNAME_X86_64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
Index: debian/libgles1-nvidia.lintian-overrides.in
===================================================================
--- debian/libgles1-nvidia.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/libgles1-nvidia.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -1,7 +1,5 @@
# The NVIDIA license does not allow any form of modification.
[!amd64]: binary-file-built-without-LFS-support
-[i386]: shlib-with-non-pic-code
-spelling-error-in-binary
hardening-no-fortify-functions
hardening-no-relro
hardening-no-stackprotector
Index: debian/libgles2-nvidia.lintian-overrides.in
===================================================================
--- debian/libgles2-nvidia.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/libgles2-nvidia.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -1,7 +1,5 @@
# The NVIDIA license does not allow any form of modification.
[!amd64]: binary-file-built-without-LFS-support
-[i386]: shlib-with-non-pic-code
-spelling-error-in-binary
hardening-no-fortify-functions
hardening-no-relro
hardening-no-stackprotector
Index: debian/module/debian/patches/ignore_xen_on_arm.patch
===================================================================
--- debian/module/debian/patches/ignore_xen_on_arm.patch (.../tags/340.65-2) (revision 0)
+++ debian/module/debian/patches/ignore_xen_on_arm.patch (.../branches/340) (revision 5555)
@@ -0,0 +1,37 @@
+Author: Luca Boccassi <luca.boccassi@gmail.com>
+Description: Undef CONFIG_XEN and CONFIG_XEN_DOM0 if building on ARM
+ Currently armmp kernel headers (3.16, 4.0, 4.1) have CONFIG_XEN enabled and
+ CONFIG_PARAVIRT disabled. This causes a build failure of the armhf dkms modules
+ in all current versions of the Nvidia driver.
+ Since running this driver on Xen is currently not supported anyway on Debian,
+ this patch undefines CONFIG_XEN and CONFIG_XEN_DOM0 if building on ARM, and
+ avoid including asm/maddr.h and xen/interface/memory.h.
+ Note that this has been tested only on qemu.
+ It is recommended to build an armmp kernel with CONFIG_XEN disabled (or with
+ CONFIG_XEN_PARAVIRT enabled) to use the Nvidia drivers.
+
+--- a/nv-linux.h
++++ b/nv-linux.h
+@@ -27,7 +27,12 @@
+ #include <linux/autoconf.h>
+ #endif
+ #endif
++
++#if defined(NVCPU_ARM) && LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
++#undef CONFIG_XEN
++#undef CONFIG_XEN_DOM0
++#endif
+
+ #if defined(NV_GENERATED_UTSRELEASE_H_PRESENT)
+ #include <generated/utsrelease.h>
+ #endif
+@@ -258,7 +258,7 @@
+ * NVIDIA graphics driver has no way of knowing and is unlikely
+ * to work correctly.
+ */
+-#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
++#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) && !defined(NVCPU_ARM)
+ #include <asm/maddr.h>
+ #include <xen/interface/memory.h>
+ #define NV_XEN_SUPPORT_FULLY_VIRTUALIZED_KERNEL
+ #endif
Index: debian/module/debian/patches/series
===================================================================
--- debian/module/debian/patches/series (.../tags/340.65-2) (revision 5555)
+++ debian/module/debian/patches/series (.../branches/340) (revision 5555)
@@ -3,3 +3,4 @@
use-nv-kernel-ARCH.o_shipped.patch
conditionally-include-linux_version.h.patch
uvm-symvers.patch
+ignore_xen_on_arm.patch
Index: debian/module/conftest.h
===================================================================
--- debian/module/conftest.h (.../tags/340.65-2) (revision 5555)
+++ debian/module/conftest.h (.../branches/340) (revision 5555)
@@ -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/libcuda1.lintian-overrides.in
===================================================================
--- debian/libcuda1.lintian-overrides.in (.../tags/340.65-2) (revision 5555)
+++ debian/libcuda1.lintian-overrides.in (.../branches/340) (revision 5555)
@@ -4,14 +4,10 @@
[!armhf]: shlib-with-executable-stack
[i386]: shlib-with-non-pic-code
spelling-error-in-binary
-unstripped-binary-or-object
hardening-no-fortify-functions
hardening-no-relro
hardening-no-stackprotector
-# libcudart.so.2 does dlopen("libcuda.so").
-non-dev-pkg-with-shlib-symlink
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/rules
===================================================================
--- debian/rules (.../tags/340.65-2) (revision 5555)
+++ debian/rules (.../branches/340) (revision 5555)
@@ -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/libnvidia-fbc1.lintian-overrides
===================================================================
--- debian/libnvidia-fbc1.lintian-overrides (.../tags/340.65-2) (revision 5555)
+++ debian/libnvidia-fbc1.lintian-overrides (.../branches/340) (revision 5555)
@@ -2,9 +2,6 @@
hardening-no-fortify-functions
hardening-no-relro
-# A single symbolic link does not justify the creation of a new package.
-non-dev-pkg-with-shlib-symlink
-
# Lintian and debhelper disagree w.r.t a library in a private directory.
postinst-has-useless-call-to-ldconfig
postrm-has-useless-call-to-ldconfig
Index: debian/copyright
===================================================================
--- debian/copyright (.../tags/340.65-2) (revision 5555)
+++ debian/copyright (.../branches/340) (revision 5555)
@@ -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/nvidia-vdpau-driver.lintian-overrides
===================================================================
--- debian/nvidia-vdpau-driver.lintian-overrides (.../tags/340.65-2) (revision 5555)
+++ debian/nvidia-vdpau-driver.lintian-overrides (.../branches/340) (revision 5555)
@@ -1,5 +1,5 @@
# The NVIDIA license does not allow any form of modification.
-[i386]: binary-file-built-without-LFS-support
+[!amd64]: binary-file-built-without-LFS-support
[i386]: shlib-with-non-pic-code
hardening-no-fortify-functions
hardening-no-relro
Index: debian/bug-script
===================================================================
--- debian/bug-script (.../tags/340.65-2) (revision 5555)
+++ debian/bug-script (.../branches/340) (revision 5555)
@@ -45,11 +45,11 @@
/usr/lib/libGLES*.* \
/usr/lib/libGLcore* \
/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*/libnvidia* \
/usr/lib32/libGL.* \
/usr/lib32/libGLcore* \
/usr/lib32/libnvidia* \
@@ -64,12 +64,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 +83,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
--- End Message ---