--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: stretch-pu: package nvidia-graphics-drivers-legacy-340xx/340.106-1~deb9u1
- From: Andreas Beckmann <anbe@debian.org>
- Date: Wed, 24 Jan 2018 07:35:19 +0100
- Message-id: <151677571950.30227.513118373434090486.reportbug@zam581.zam.kfa-juelich.de>
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
I'd like to update the 340xx legacy nvidia driver in stretch with a new
upstream version that brings spectre/meltdown mitigation fixes and
related kernel support. Security updates for the non-free drivers have
always been done via proposed-updates.
The package is a plain rebuild from sid with no further changes needed
and therefore contains also all the accumulated bugfixes from the
package in sid (and some of them are already in nvidia-graphics-drivers
in stretch, since we had a security update in the previous stretch point
release). The proposed package is now also available in
stretch-backports to allow further testing.
The changelog stanza in addition to the attached diff (debian/ tree only,
blobs excluded) will be
--- debian/changelog (revision 7831)
+++ debian/changelog (working copy)
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-legacy-340xx (340.106-1~deb9u1) stretch; urgency=medium
+
+ * Rebuild for stretch.
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 24 Jan 2018 07:06:23 +0100
+
nvidia-graphics-drivers-legacy-340xx (340.106-1) unstable; urgency=medium
* New upstream legacy 340xx branch release 340.106 (2018-01-16).
Andreas
Index: debian/libgl1-nvidia-glx.prerm.in
===================================================================
--- debian/libgl1-nvidia-glx.prerm.in (.../tags/340.102-1) (revision 7831)
+++ debian/libgl1-nvidia-glx.prerm.in (.../trunk) (revision 7831)
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-
-if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
-
- update-alternatives --remove nvidia /usr/lib/#PRIVATE#
- dpkg-trigger register-glx-alternative-nvidia
-
-fi
-
-
-#DEBHELPER#
Index: debian/nvidia-alternative.prerm.in
===================================================================
--- debian/nvidia-alternative.prerm.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-alternative.prerm.in (.../trunk) (revision 7831)
@@ -5,6 +5,7 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
update-alternatives --remove nvidia /usr/lib/#PRIVATE#
+ dpkg-trigger --no-await register-glx-alternative-nvidia
fi
Index: debian/not-installed.in
===================================================================
--- debian/not-installed.in (.../tags/340.102-1) (revision 0)
+++ debian/not-installed.in (.../trunk) (revision 7831)
@@ -0,0 +1,37 @@
+.manifest
+LICENSE
+gl.h
+glext.h
+glx.h
+glxext.h
+libGL.la
+#!armhf#libnvidia-tls.so.#VERSION#
+libnvidia-wfb.so.#VERSION#
+libvdpau.so.#VERSION#
+libvdpau_trace.so.#VERSION#
+makeself-help-script.sh
+makeself.sh
+mkprecompiled
+nvidia-installer
+nvidia-installer.1
+nvidia-modprobe
+nvidia-modprobe.1
+nvidia-persistenced
+nvidia-persistenced-init.tar.bz2
+nvidia-persistenced.1
+nvidia-settings
+nvidia-settings.1
+nvidia-settings.desktop
+nvidia-settings.png
+nvidia-xconfig
+nvidia-xconfig.1
+pci.ids
+pkg-history.txt
+tls_test
+tls_test_dso.so
+
+libOpenCL.so.1.0.0
+nvidia.icd
+nvidia-cuda-mps-control
+nvidia-cuda-mps-control.1
+nvidia-cuda-mps-server
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/340.102-1) (revision 7831)
+++ debian/changelog (.../trunk) (revision 7831)
@@ -1,3 +1,113 @@
+nvidia-graphics-drivers-legacy-340xx (340.106-1) unstable; urgency=medium
+
+ * New upstream legacy 340xx branch release 340.106 (2018-01-16).
+ * Fixed CVE-2017-5753, CVE-2017-5715 (spectre), CVE-2017-5754 (meltdown).
+ https://nvidia.custhelp.com/app/answers/detail/a_id/4611
+ (Closes: #886852)
+ * Improved compatibility with recent Linux kernels.
+
+ [ Luca Boccassi ]
+ * Drop nvidia-drm-pci-init.patch and timer.patch, fixed upstream.
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 17 Jan 2018 20:50:05 +0100
+
+nvidia-graphics-drivers-legacy-340xx (340.104-4) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * Bump Standards-Version to 4.1.3. No changes needed.
+ * Stop shipping the classic libnvidia-tls.so.* and ship the modern one (for
+ Linux 2.6 onwards) in the regular libdir instead of the tls/ subdir
+ (384.111-1). (Closes: #883615)
+ * Add #tls# substitution for the tls/ source directory (384.111-1).
+ * nvidia-legacy-340xx-alternative.prerm: Trigger register-glx-alternative-
+ nvidia upon removal (384.111-3). (Closes: #883637)
+ * libgl1-nvidia-legacy-340xx-glx.prerm: Do not forcibly remove the nvidia
+ alternative, this would reset it from manual mode to auto mode while it
+ could still be needed by other packages, e.g. libcuda1. Let the
+ nvidia-legacy-340xx-alternative triggers handle it instead (384.111-3).
+
+ [ Luca Boccassi ]
+ * Add timer.patch to fix kernel module build on Linux 4.15 and newer.
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 16 Jan 2018 03:08:52 +0100
+
+nvidia-graphics-drivers-legacy-340xx (340.104-3) unstable; urgency=medium
+
+ * B-D: dpkg-dev (>= 1.18.8) for SOURCE_DATE_EPOCH in pkg-info.mk (375.82-9).
+ * Set Rules-Requires-Root: no (375.82-9).
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 22 Nov 2017 10:29:33 +0100
+
+nvidia-graphics-drivers-legacy-340xx (340.104-2) unstable; urgency=medium
+
+ * Use debian/substvars for substitutions by dpkg-genchanges (dpkg 1.19)
+ (375.82-7).
+ * nvidia-detect: Detect devices in PCI classes 0301 (XGA compatible
+ controller) and 0302 (3D controller), too (375.82-7).
+ * bug-script: List these devices, too (375.82-7).
+ * Use https:// URLs where possible (375.82-8).
+
+ -- Andreas Beckmann <anbe@debian.org> Thu, 16 Nov 2017 02:31:15 +0100
+
+nvidia-graphics-drivers-legacy-340xx (340.104-1) unstable; urgency=medium
+
+ * New upstream legacy 340xx branch release 340.104 (2017-09-19).
+ * Improved compatibility with recent Linux kernels.
+
+ [ Andreas Beckmann ]
+ * Add GRID K1/K2/K340 to EoL models, no longer supported from 375.xx on.
+ * Bump Standards-Version to 4.1.1. No changes needed.
+ * bug-control: Add arch qualification to M-A:same packages in report-with
+ list otherwise reportbug will ignore them if more than one is installed
+ (375.82-5).
+ * Simplify upstream changelog handling (375.82-5).
+
+ [ Luca Boccassi ]
+ * Switch to my debian.org email address in Uploaders.
+ * Drop drm-driver-legacy.patch, deprecated-cpu-events.patch,
+ vmf-address.patch, drm-unload.patch, fatal-signal.patch and
+ set-memory.patch, fixed upstream.
+ * Refresh vm-fault.patch to remove fuzz from upstream changes.
+ * Add nvidia-drm-pci-init.patch to fix kernel module build on Linux 4.14
+ and newer.
+
+ [ Russ Allbery ]
+ * Remove myself from Uploaders.
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 13 Oct 2017 02:47:57 +0200
+
+nvidia-graphics-drivers-legacy-340xx (340.102-3) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * disable-preempt_rt_sanity_check.patch: Remove, unsupported upstream.
+ * Bump Standards-Version to 4.0.1. No changes needed.
+ * nvidia-alternative: Explicitly use interest-await triggers (375.82-2).
+ * Switch from dh_install --list-missing to dh_missing (375.82-2).
+ * Use dpkg makefile snippets instead of manual changelog parsing (375.82-2).
+ * build-module-packages.sh: Order kernels by descending version.
+ Skip PREEMPT_RT (*-rt-*) kernels, unsupported upstream (375.82-2).
+ * Switch watch URL from ftp:// to https:// (375.82-1).
+ * Update lintian overrides.
+
+ [ Luca Boccassi ]
+ * Add set-memory.patch to fix kernel module build on Linux 4.12 and newer.
+ (Closes: #872330)
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 18 Aug 2017 16:37:03 +0200
+
+nvidia-graphics-drivers-legacy-340xx (340.102-2) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * nvidia-kernel-dkms: Honor parallel setting from dkms (375.82-1).
+ * Do not prevent ccache usage. The bug was fixed in ccache 3.0 (in squeeze)
+ (375.82-1).
+
+ [ Luca Boccassi ]
+ * Add drm-unload.patch, fatal-signal.patch, and vm-fault.patch to fix kernel
+ module build on Linux 4.11 and newer. (Closes: #865964)
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 02 Jul 2017 00:26:32 +0200
+
nvidia-graphics-drivers-legacy-340xx (340.102-1) unstable; urgency=medium
* New upstream legacy 340xx branch release 340.102 (2017-02-14).
@@ -3,4 +113,5 @@
* Fixed CVE-2017-0309, CVE-2017-0310, CVE-2017-0311, CVE-2017-0318,
CVE-2017-0321. (Closes: #855278)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/4398
[ Andreas Beckmann ]
@@ -34,6 +145,7 @@
* New upstream legacy 340xx branch release 340.101 (2016-12-14).
* Fixed CVE-2016-8826. (Closes: #848196)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/4278
* Improved compatibility with recent Linux kernels.
[ Andreas Beckmann ]
@@ -47,6 +159,7 @@
* New upstream legacy 340xx branch release 340.98 (2016-09-26).
* Fixed CVE-2016-7382, CVE-2016-7389. (Closes: #846332)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/4246
- Added support for the screen_info.ext_lfb_base field, on kernels that
have it, in order to properly handle UEFI framebuffer consoles with
physical addresses above 4GB.
@@ -157,6 +270,7 @@
* New upstream legacy 340xx branch release 340.96 (2015-11-16).
* Fixed CVE-2015-7869: Unsanitized User Mode Input. (Closes: #805919)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/3808
* Improved compatibility with recent Linux kernels.
[ Andreas Beckmann ]
@@ -248,6 +362,7 @@
* New upstream legacy 340xx branch release 340.93 (2015-09-02).
* Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
+ https://nvidia.custhelp.com/app/answers/detail/a_id/3763
(Closes: #800568)
- 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.
@@ -401,6 +516,7 @@
* New upstream legacy 340xx branch release 340.65 (2014-12-08).
* Fixes CVE-2014-8298. (Closes: #772971)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/3610
- Fixed a bug that prevented internal 4K panels on some laptops from being
driven at a sufficient bandwidth to support their native resolutions.
- Fixed a regression that prevented the NVIDIA kernel module from loading
@@ -634,7 +750,7 @@
system configurations that disallow writing to executable memory.
- Added initial support for G-SYNC monitors. Additional details and system
requirements can be found at:
- http://www.geforce.com/hardware/technology/g-sync
+ https://www.geforce.com/hardware/technology/g-sync
- Improved support for running the NVIDIA driver in configurations where
writing to executable memory is disallowed. Driver optimizations that
require writing to executable memory can be forcefully disabled using the
Index: debian/rules.defs
===================================================================
--- debian/rules.defs (.../tags/340.102-1) (revision 7831)
+++ debian/rules.defs (.../trunk) (revision 7831)
@@ -7,7 +7,7 @@
XORG_ABI_LIST = 23 20 19 18 15 14 13 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.19.99)
-LINUX_KMOD_TESTED = 4.9
+LINUX_KMOD_TESTED = 4.15
LINUX_KMOD_TESTED_amd64 =
LINUX_KMOD_TESTED_i386 =
LINUX_KMOD_TESTED_armhf =
@@ -24,7 +24,7 @@
NVIDIA_FILENAME_amd64 = ${NVIDIA_DIRNAME_amd64}.run
NVIDIA_FILENAME_armhf = ${NVIDIA_DIRNAME_armhf}.run
-HTTPURL_PREFIX = http://http.download.nvidia.com/XFree86
+HTTPURL_PREFIX = https://http.download.nvidia.com/XFree86
HTTPURL_ARCHDIR_i386 = Linux-x86
HTTPURL_ARCHDIR_amd64 = Linux-x86_64
HTTPURL_ARCHDIR_armhf = Linux-32bit-ARM
Index: debian/watch.in
===================================================================
--- debian/watch.in (.../tags/340.102-1) (revision 7831)
+++ debian/watch.in (.../trunk) (revision 7831)
@@ -2,6 +2,6 @@
# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
# ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/319.32/NVIDIA-Linux-armv7l-gnueabihf-319.32.run
version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/(#WATCH_PATTERN#)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/(#WATCH_PATTERN#)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
-ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/(#WATCH_PATTERN#)/NVIDIA-Linux-armv7l-gnueabihf-([\d\.\-]+).run
+https://download.nvidia.com/XFree86/Linux-x86/(#WATCH_PATTERN#)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+https://download.nvidia.com/XFree86/Linux-x86_64/(#WATCH_PATTERN#)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
+https://download.nvidia.com/XFree86/Linux-32bit-ARM/(#WATCH_PATTERN#)/NVIDIA-Linux-armv7l-gnueabihf-([\d\.\-]+).run
Index: debian/libnvidia-glcore.install.in
===================================================================
--- debian/libnvidia-glcore.install.in (.../tags/340.102-1) (revision 7831)
+++ debian/libnvidia-glcore.install.in (.../trunk) (revision 7831)
@@ -1,3 +1,2 @@
libnvidia-glcore.so.#VERSION# #LIBDIR#/
-libnvidia-tls.so.#VERSION# #LIBDIR#/
-#!armhf#tls/libnvidia-tls.so.#VERSION# #LIBDIR#/tls/
+#tls#libnvidia-tls.so.#VERSION# #LIBDIR#/
Index: debian/module/debian/control.template.in
===================================================================
--- debian/module/debian/control.template.in (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/control.template.in (.../trunk) (revision 7831)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Build-Depends: debhelper (>= 10), quilt
-Standards-Version: 3.9.8
-Homepage: http://www.nvidia.com/
+Standards-Version: 4.1.3
+Homepage: https://www.nvidia.com/
Package: #NVIDIA#-kernel-#KVERS#
Architecture: #ARCH_LIST#
Index: debian/module/debian/rules.in
===================================================================
--- debian/module/debian/rules.in (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/rules.in (.../trunk) (revision 7831)
@@ -1,9 +1,5 @@
#!/usr/bin/make -f
-# Disable ccache, which causes strange build failures with the module.
-# See Bug#582748.
-export CCACHE_DISABLE := 1
-
export NV_VERBOSE := 1
MODULE_BASENAME = #MODULE#
Index: debian/module/debian/patches/disable-preempt_rt_sanity_check.patch
===================================================================
--- debian/module/debian/patches/disable-preempt_rt_sanity_check.patch (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/disable-preempt_rt_sanity_check.patch (.../trunk) (revision 7831)
@@ -1,14 +0,0 @@
-Author: Andreas Beckmann <anbe@debian.org>
-Description: disable preempt_rt_sanity_check
- we already skipped that test in our conftest.h
-
---- a/nvidia-modules-common.mk
-+++ b/nvidia-modules-common.mk
-@@ -243,6 +243,7 @@ BUILD_SANITY_CHECKS = \
-
- SKIP_SANITY_CHECKS =
- SKIP_SANITY_CHECKS += cc_version_check
-+SKIP_SANITY_CHECKS += preempt_rt_sanity_check
-
- build-sanity-checks: conftest-verbose
- @for SANITY_CHECK in $(filter-out $(SKIP_SANITY_CHECKS),$(BUILD_SANITY_CHECKS)); do \
Index: debian/module/debian/patches/vmf-address.patch
===================================================================
--- debian/module/debian/patches/vmf-address.patch (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/vmf-address.patch (.../trunk) (revision 7831)
@@ -1,19 +0,0 @@
-Author: Luca Boccassi <luca.boccassi@gmail.com>
-Description: Fix kernel module build on 4.10 and greater
- From kernel 4.10 and newer (commit 1a29d85eb0f19) virtual_address is no longer
- available as a member of struct vm_fault. Use the address member as suggested
- by the changelog.
---- a/uvm/nvidia_uvm_lite.c
-+++ b/uvm/nvidia_uvm_lite.c
-@@ -820,7 +820,11 @@
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
- int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- unsigned long vaddr = (unsigned long)vmf->virtual_address;
-+#else
-+ unsigned long vaddr = vmf->address;
-+#endif
- struct page *page = NULL;
- int retval;
-
Index: debian/module/debian/patches/drm-driver-legacy.patch
===================================================================
--- debian/module/debian/patches/drm-driver-legacy.patch (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/drm-driver-legacy.patch (.../trunk) (revision 7831)
@@ -1,20 +0,0 @@
-Author: Luca Boccassi <luca.boccassi@gmail.com>
-Description: Fix kernel module load on 4.9 and greater
- From kernel 4.9 and newer (commit fa5386459f06) non-modesetting drivers have
- to use the DRM flag DRIVER_LEGACY. Without this flag the kernel module does
- not load correctly.
-
---- a/nv-drm.c
-+++ b/nv-drm.c
-@@ -115,7 +115,11 @@
- };
-
- static struct drm_driver nv_drm_driver = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- .driver_features = DRIVER_GEM | DRIVER_PRIME,
-+#else
-+ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
-+#endif
- .load = nv_drm_load,
- .unload = nv_drm_unload,
- .fops = &nv_drm_fops,
Index: debian/module/debian/patches/deprecated-cpu-events.patch
===================================================================
--- debian/module/debian/patches/deprecated-cpu-events.patch (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/deprecated-cpu-events.patch (.../trunk) (revision 7831)
@@ -1,49 +0,0 @@
-Author: Luca Boccassi <luca.boccassi@gmail.com>
-Description: Fix kernel module build on 4.10 and greater
- From kernel 4.10 and newer (commit 530e9b76ae8f8) CPU_DOWN_FAILED and
- CPU_DOWN_PREPARE are no longer available as events, together with their
- callback registers.
---- a/nv-pat.c
-+++ b/nv-pat.c
-@@ -210,19 +210,23 @@
-
- switch (action)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- case CPU_DOWN_FAILED:
-+#endif
- case CPU_ONLINE:
- if (cpu == (NvUPtr)hcpu)
- nv_setup_pat_entries(NULL);
- else
- NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, hcpu, 1);
- break;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- case CPU_DOWN_PREPARE:
- if (cpu == (NvUPtr)hcpu)
- nv_restore_pat_entries(NULL);
- else
- NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, hcpu, 1);
- break;
-+#endif
- }
-
- put_cpu();
-@@ -252,7 +256,7 @@
- if (!disable_pat)
- {
- nv_enable_pat_support();
--#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
-+#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
- {
- if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
-@@ -279,7 +283,7 @@
- if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
- {
- nv_disable_pat_support();
--#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
-+#if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
- unregister_hotcpu_notifier(&nv_hotcpu_nfb);
- #endif
- }
Index: debian/module/debian/patches/vm-fault.patch
===================================================================
--- debian/module/debian/patches/vm-fault.patch (.../tags/340.102-1) (revision 0)
+++ debian/module/debian/patches/vm-fault.patch (.../trunk) (revision 7831)
@@ -0,0 +1,69 @@
+Author: Luca Boccassi <luca.boccassi@gmail.com>
+Description: Fix kernel module load on 4.11 and greater
+ From kernel 4.11 and newer (11bac80004) the vm_area_struct member was removed
+ from the fault callback signature, as it is already contained in struct
+ vm_fault.
+--- a/uvm/nvidia_uvm_lite.c
++++ b/uvm/nvidia_uvm_lite.c
+@@ -30,6 +30,8 @@
+ #include "nvidia_uvm_lite_counters.h"
+ #include "ctrl2080mc.h"
+
++#include <linux/version.h>
++
+ //
+ // nvidia_uvm_lite.c
+ // This file contains code that is specific to the UVM-Lite mode of operation.
+@@ -689,9 +691,16 @@
+ // return SIGBUS.
+ // 3. Otherwise, map in a page from the cache, and allow access.
+ //
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _fault_common(struct vm_fault *vmf, unsigned long vaddr,
++#else
+ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
++#endif
+ struct page **ppage, unsigned vmfFlags)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++ struct vm_area_struct *vma = vmf->vma;
++#endif
+ int retValue = VM_FAULT_SIGBUS;
+ UvmCommitRecord *pRecord;
+ DriverPrivate *pPriv;
+@@ -818,7 +827,11 @@
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _fault(struct vm_fault *vmf)
++#else
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +841,11 @@
+ struct page *page = NULL;
+ int retval;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++ retval = _fault_common(vmf, vaddr, &page, vmf->flags);
++#else
+ retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#endif
+
+ vmf->page = page;
+
+@@ -866,7 +883,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _sigbus_fault(struct vm_fault *vmf)
++#else
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;
Index: debian/module/debian/patches/series.in
===================================================================
--- debian/module/debian/patches/series.in (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/series.in (.../trunk) (revision 7831)
@@ -1,8 +1,6 @@
# kernel support
-drm-driver-legacy.patch
unregister_procfs_on_failure.patch
-deprecated-cpu-events.patch
-vmf-address.patch
+vm-fault.patch
# build system updates
separate-makefile-kbuild.patch
@@ -13,7 +11,6 @@
conftest-verbose.patch
conftest-via-kbuild.patch
disable-cc_version_check.patch
-disable-preempt_rt_sanity_check.patch
not-silent.patch
use-nv-kernel-ARCH.o_shipped.patch
avoid-ld.gold.patch
Index: debian/module/debian/patches/avoid-ld.gold.patch
===================================================================
--- debian/module/debian/patches/avoid-ld.gold.patch (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/patches/avoid-ld.gold.patch (.../trunk) (revision 7831)
@@ -4,7 +4,7 @@
problems with the nvidia kernel module. Therefore explicitly link with
ld.bfd. This patch is not compatible with lenny which does neither have
ld.bfd nor ld.gold, but we are not supporting lenny backports anyway.
-Bug-Debian: http://bugs.debian.org/626279
+Bug-Debian: https://bugs.debian.org/626279
--- a/nvidia-modules-common.mk
+++ b/nvidia-modules-common.mk
Index: debian/module/debian/README.Debian
===================================================================
--- debian/module/debian/README.Debian (.../tags/340.102-1) (revision 7831)
+++ debian/module/debian/README.Debian (.../trunk) (revision 7831)
@@ -4,9 +4,9 @@
Please report any actual driver related bugs (not packaging related) to
NVIDIA directly.
-Please check http://www.nvidia.com/object/linux.html
+Please check https://www.nvidia.com/object/linux.html
and
-http://www.nvnews.net/vbulletin/forumdisplay.php?s=&forumid=14
+https://devtalk.nvidia.com/default/board/98/linux/
for known bugs.
-- Randall Donald <rdonald@debian.org>, Tue, 12 Jul 2005 23:30:00 -0700
Index: debian/README.source
===================================================================
--- debian/README.source (.../tags/340.102-1) (revision 7831)
+++ debian/README.source (.../trunk) (revision 7831)
@@ -1,3 +1,17 @@
+Building "bleeding edge" from SVN for users
+
+ As new upstream versions of the proprietary driver are released, upload
+ might not happen immediately. This might be for various reasons, including
+ waiting for new binary packages to clear the NEW queue.
+ Users wishing to try to build new version locally can follow the
+ instructions on the Debian wiki:
+
+ https://wiki.debian.org/NvidiaGraphicsDrivers#Building_newer_releases_from_SVN
+
+ WARNING: these will most likely be work in progress, and the final upload
+ may be different and may not support clean upgrades from/to the versions
+ uploaded in the archive.
+
Importing a New Upstream Release
The *.orig.tar.gz file for nvidia-graphics-drivers contains just a
Index: debian/control.models
===================================================================
--- debian/control.models (.../tags/340.102-1) (revision 7831)
+++ debian/control.models (.../trunk) (revision 7831)
@@ -3,7 +3,7 @@
GeForce 305M [GT218M], GeForce 310 [GT218], GeForce 310M [GT218M],
GeForce 315 [GT216], GeForce 315 [GT218], GeForce 315M [GT218M],
GeForce 320M [MCP89], GeForce 405 [GT216], GeForce 405 [GT218],
-GeForce 8100 / nForce 720a [C77], GeForce 8200 [C77], GeForce 8200M [C77],
+GeForce 8100 [C77], GeForce 8200 [C77], GeForce 8200M [C77],
GeForce 8200M G [C77], GeForce 8200M G [MCP79], GeForce 8300 [C77],
GeForce 8300 GS [G84], GeForce 8300 GS [G86], GeForce 8300 GS [G98],
GeForce 8400 [G98], GeForce 8400 GS [G84], GeForce 8400 GS [G86],
@@ -16,33 +16,32 @@
GeForce 8800 GTX [G80], GeForce 8800 Ultra [G80], GeForce 8800M GTS [G92M],
GeForce 8800M GTX [G92M], GeForce 9100 [C78], GeForce 9100M G [C77],
GeForce 9100M G [C79], GeForce 9200 [C77], GeForce 9200 [C79],
-GeForce 9200M GS [G98M], GeForce 9300 / nForce 730i [C79],
+GeForce 9200M GS [G98M], GeForce 9300 [C79], GeForce 9300/ION [C79],
GeForce 9300 GE [G98], GeForce 9300 GS [G98], GeForce 9300 GS Rev. 2 [GT218],
-GeForce 9300 SE [G98], GeForce 9300 [C79], GeForce 9300/ION [C79],
-GeForce 9300M G [G86M], GeForce 9300M GS [G98M], GeForce 9400 GT [G86],
-GeForce 9400 GT [G96], GeForce 9400 [C79], GeForce 9400 [MCP7A],
-GeForce 9400M [C79], GeForce 9400M G [C79], GeForce 9400M [ION VGA],
-GeForce 9500 GS [G96], GeForce 9500 GT [G96], GeForce 9500M G [G96M],
-GeForce 9500M GS [G84M], GeForce 9600 GS [G94], GeForce 9600 GSO 512 [G94],
-GeForce 9600 GSO [G92], GeForce 9600 GSO [G94], GeForce 9600 GT [G94],
-GeForce 9600M GS [G96M], GeForce 9600M GT [G96M], GeForce 9650 S [G96],
-GeForce 9650M GS [G84M], GeForce 9650M GT [G96M], GeForce 9700M GT [G96M],
-GeForce 9700M GTS [G94M], GeForce 9800 GT [G92],
-GeForce 9800 GTX / 9800 GTX+ [G92], GeForce 9800 GTX+ [G92],
-GeForce 9800 GX2 [G92], GeForce 9800M GS [G94M], GeForce 9800M GT [G92M],
-GeForce 9800M GTS [G94M], GeForce 9800M GTX [G92M], GeForce G 100 [G98],
-GeForce G 102M [C79], GeForce G 103M [G98M], GeForce G 105M [G98M],
-GeForce G 105M [GT218M], GeForce G 110M [G96M], GeForce G 210 [GT218],
-GeForce G 210M [GT218M], GeForce GT 120 [G96], GeForce GT 120M [G96M],
-GeForce GT 130 [G94], GeForce GT 130M [G96M], GeForce GT 140 [G94],
-GeForce GT 220 [GT215], GeForce GT 220 [GT216], GeForce GT 220/315 [GT215],
-GeForce GT 220M [G96M], GeForce GT 230 OEM [G92], GeForce GT 230 [G94],
-GeForce GT 230M [GT216M], GeForce GT 240 [GT215], GeForce GT 240M [GT216M],
-GeForce GT 320 [GT215], GeForce GT 320M [GT216M], GeForce GT 325M [GT216M],
-GeForce GT 330 [G92], GeForce GT 330 [GT215], GeForce GT 330M [GT216M],
-GeForce GT 335M [GT215M], GeForce GT 340 [GT215], GeForce GT 415 [GT216],
-GeForce GTS 150M [G94M], GeForce GTS 160M [G94M], GeForce GTS 240 [G92],
-GeForce GTS 250 [G92], GeForce GTS 250M [GT215M], GeForce GTS 260M [GT215M],
+GeForce 9300 SE [G98], GeForce 9300M G [G86M], GeForce 9300M GS [G98M],
+GeForce 9400 [C79], GeForce 9400 [MCP7A], GeForce 9400 GT [G86],
+GeForce 9400 GT [G96], GeForce 9400M [C79], GeForce 9400M [ION VGA],
+GeForce 9400M G [C79], GeForce 9500 GS [G96], GeForce 9500 GT [G96],
+GeForce 9500M G [G96M], GeForce 9500M GS [G84M], GeForce 9600 GS [G94],
+GeForce 9600 GSO 512 [G94], GeForce 9600 GSO [G92], GeForce 9600 GSO [G94],
+GeForce 9600 GT [G94], GeForce 9600M GS [G96M], GeForce 9600M GT [G96M],
+GeForce 9650 S [G96], GeForce 9650M GS [G84M], GeForce 9650M GT [G96M],
+GeForce 9700M GT [G96M], GeForce 9700M GTS [G94M], GeForce 9800 GT [G92],
+GeForce 9800 GTX [G92], GeForce 9800 GTX+ [G92], GeForce 9800 GX2 [G92],
+GeForce 9800M GS [G94M], GeForce 9800M GT [G92M], GeForce 9800M GTS [G94M],
+GeForce 9800M GTX [G92M], GeForce G 100 [G98], GeForce G 102M [C79],
+GeForce G 103M [G98M], GeForce G 105M [G98M], GeForce G 105M [GT218M],
+GeForce G 110M [G96M], GeForce G 210 [GT218], GeForce G 210M [GT218M],
+GeForce GT 120 [G96], GeForce GT 120M [G96M], GeForce GT 130 [G94],
+GeForce GT 130M [G96M], GeForce GT 140 [G94], GeForce GT 220 [GT215],
+GeForce GT 220 [GT216], GeForce GT 220/315 [GT215], GeForce GT 220M [G96M],
+GeForce GT 230 OEM [G92], GeForce GT 230 [G94], GeForce GT 230M [GT216M],
+GeForce GT 240 [GT215], GeForce GT 240M [GT216M], GeForce GT 320 [GT215],
+GeForce GT 320M [GT216M], GeForce GT 325M [GT216M], GeForce GT 330 [G92],
+GeForce GT 330 [GT215], GeForce GT 330M [GT216M], GeForce GT 335M [GT215M],
+GeForce GT 340 [GT215], GeForce GT 415 [GT216], GeForce GTS 150M [G94M],
+GeForce GTS 160M [G94M], GeForce GTS 240 [G92], GeForce GTS 250 [G92],
+GeForce GTS 250M [GT215M], GeForce GTS 260M [GT215M],
GeForce GTS 350M [GT215M], GeForce GTS 360M [GT215M],
GeForce GTX 260 [GT200], GeForce GTX 260M [G92M], GeForce GTX 275 [GT200b],
GeForce GTX 280 [GT200], GeForce GTX 280M [G92M], GeForce GTX 285 [GT200b],
@@ -64,9 +63,11 @@
Quadro NVS 160M [G98M], Quadro NVS 290 [G86], Quadro NVS 295 [G98],
Quadro NVS 320M [G84GLM], Quadro NVS 420 [G98], Quadro NVS 450 [G98],
Quadro Plex 2200 D2 [GT200GL], Quadro Plex 2200 S4 [GT200GL],
-Quadro VX 200 [G92GL], Tesla C870 [G80GL], Tesla C1060 / M1060 [GT200GL],
-nForce 730a [C77], nForce 750a SLI [C77], nForce 760i SLI [C79],
-nForce 780a/980a SLI [C77].
+Quadro VX 200 [G92GL], Tesla C870 [G80GL], Tesla C1060 [GT200GL],
+Tesla M1060 [GT200GL], nForce 720a [C77], nForce 730a [C77],
+nForce 730i [C79], nForce 750a SLI [C77], nForce 760i SLI [C79],
+nForce 780a SLI [C77], nForce 980a SLI [C77], GRID K1 [GK107GL],
+GRID K2 [GK104GL], GRID K340 [GK107GL].
There are several "more modern" GPUs supported by this package, too, but the
updated drivers in the newer legacy packages or the current nvidia-driver
Index: debian/nvidia-kernel-source.README.Debian.in
===================================================================
--- debian/nvidia-kernel-source.README.Debian.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-kernel-source.README.Debian.in (.../trunk) (revision 7831)
@@ -178,7 +178,7 @@
For any news on this package check
-http://bugs.debian.org/#NVIDIA#-kernel-source
+https://bugs.debian.org/#NVIDIA#-kernel-source
-- Russ Allbery <rra@debian.org>, Sat, 25 Sep 2010 23:30:28 -0700
Index: debian/nvidia-driver-bin.lintian-overrides.in
===================================================================
--- debian/nvidia-driver-bin.lintian-overrides.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-driver-bin.lintian-overrides.in (.../trunk) (revision 7831)
@@ -1,6 +1,7 @@
# The NVIDIA license does not allow any form of modification.
[!amd64]: binary-file-built-without-LFS-support
embedded-library usr/lib/#PRIVATE#/nvidia-debugdump: zlib
+[armhf]: spelling-error-in-binary
hardening-no-bindnow
hardening-no-fortify-functions
hardening-no-pie
Index: debian/build-module-packages.sh.in
===================================================================
--- debian/build-module-packages.sh.in (.../tags/340.102-1) (revision 7831)
+++ debian/build-module-packages.sh.in (.../trunk) (revision 7831)
@@ -4,16 +4,35 @@
cd /usr/src
-kernels="$(ls -d1 /lib/modules/*/build 2>/dev/null | cut -d/ -f4)"
+kernels=
+slenrek=
+failed=
+for k in $(ls -dvr1 /lib/modules/*/build 2>/dev/null | cut -d/ -f4) ; do
+ case $k in
+ *-rt-*)
+ : # skip PREEMPT_RT kernel
+ ;;
+ *)
+ kernels="$kernels $k"
+ slenrek="$k $slenrek"
+ ;;
+ esac
+done
modules=#NVIDIA#-kernel
module-assistant clean $modules
-module-assistant build --text-mode --force --kvers-list "$kernels" $modules
+for k in $kernels ; do
+ module-assistant build --text-mode --force --kvers-list "$k" $modules || failed="$failed $k"
+done
-ls -l *.deb
+ls -l *.deb || true
for m in $modules ; do
- for k in $kernels ; do
+ for k in $slenrek ; do
echo "* ${m} ${k}:"
- ls -l ${m}-${k}_*.deb
+ ls -l ${m}-${k}_*.deb || true
done
done
+
+for k in $failed ; do
+ echo "$modules MODULE BUILD FAILED FOR $k"
+done
Index: debian/supported-eol.list
===================================================================
--- debian/supported-eol.list (.../tags/340.102-1) (revision 7831)
+++ debian/supported-eol.list (.../trunk) (revision 7831)
@@ -20,7 +20,7 @@
10DE0A26 GeForce 405 [GT216]
10DE0A27 GeForce 405 [GT216]
10DE10C5 GeForce 405 [GT218]
-10DE084F GeForce 8100 / nForce 720a [C77]
+10DE084F GeForce 8100 [C77]
10DE0849 GeForce 8200 [C77]
10DE084B GeForce 8200 [C77]
10DE0840 GeForce 8200M [C77]
@@ -65,30 +65,30 @@
10DE086D GeForce 9200 [C79]
10DE0871 GeForce 9200 [C79]
10DE06E8 GeForce 9200M GS [G98M]
-10DE086C GeForce 9300 / nForce 730i [C79]
+10DE0860 GeForce 9300 [C79]
+10DE0864 GeForce 9300 [C79]
+10DE086C GeForce 9300 [C79]
+10DE0865 GeForce 9300/ION [C79]
10DE06E0 GeForce 9300 GE [G98]
10DE06E1 GeForce 9300 GS [G98]
10DE10C0 GeForce 9300 GS Rev. 2 [GT218]
10DE06E7 GeForce 9300 SE [G98]
-10DE0860 GeForce 9300 [C79]
-10DE0864 GeForce 9300 [C79]
-10DE0865 GeForce 9300/ION [C79]
10DE042E GeForce 9300M G [G86M]
10DE06E5 GeForce 9300M GS [G98M]
10DE06E9 GeForce 9300M GS [G98M]
-10DE042C GeForce 9400 GT [G86]
-10DE0641 GeForce 9400 GT [G96]
-10DE065B GeForce 9400 GT [G96]
10DE0861 GeForce 9400 [C79]
10DE0867 GeForce 9400 [C79]
10DE086A GeForce 9400 [C79]
10DE087A GeForce 9400 [C79]
10DE0869 GeForce 9400 [MCP7A]
+10DE042C GeForce 9400 GT [G86]
+10DE0641 GeForce 9400 GT [G96]
+10DE065B GeForce 9400 GT [G96]
10DE0863 GeForce 9400M [C79]
10DE0870 GeForce 9400M [C79]
+10DE0876 GeForce 9400M [ION VGA]
10DE0862 GeForce 9400M G [C79]
10DE0866 GeForce 9400M G [C79]
-10DE0876 GeForce 9400M [ION VGA]
10DE0644 GeForce 9500 GS [G96]
10DE0645 GeForce 9500 GS [G96]
10DE0640 GeForce 9500 GT [G96]
@@ -115,7 +115,8 @@
10DE0601 GeForce 9800 GT [G92]
10DE0605 GeForce 9800 GT [G92]
10DE0614 GeForce 9800 GT [G92]
-10DE0612 GeForce 9800 GTX / 9800 GTX+ [G92]
+10DE0612 GeForce 9800 GTX [G92]
+10DE0612 GeForce 9800 GTX+ [G92]
10DE0613 GeForce 9800 GTX+ [G92]
10DE0604 GeForce 9800 GX2 [G92]
10DE062B GeForce 9800M GS [G94M]
@@ -237,8 +238,15 @@
10DE05F8 Quadro Plex 2200 S4 [GT200GL]
10DE061B Quadro VX 200 [G92GL]
10DE0197 Tesla C870 [G80GL]
-10DE05E7 Tesla C1060 / M1060 [GT200GL]
+10DE05E7 Tesla C1060 [GT200GL]
+10DE05E7 Tesla M1060 [GT200GL]
+10DE084F nForce 720a [C77]
10DE084A nForce 730a [C77]
+10DE086C nForce 730i [C79]
10DE084D nForce 750a SLI [C77]
10DE0868 nForce 760i SLI [C79]
-10DE084C nForce 780a/980a SLI [C77]
+10DE084C nForce 780a SLI [C77]
+10DE084C nForce 980a SLI [C77]
+10DE0FF2 GRID K1 [GK107GL]
+10DE11BF GRID K2 [GK104GL]
+10DE0FEF GRID K340 [GK107GL]
Index: debian/bug-script
===================================================================
--- debian/bug-script (.../tags/340.102-1) (revision 7831)
+++ debian/bug-script (.../trunk) (revision 7831)
@@ -21,8 +21,8 @@
fi
if (lspci --version) > /dev/null 2>&1; then
- echo "lspci 'VGA compatible controller [0300]':"
- for device in `lspci -mn | awk '{ if ($2 == "\"0300\"") { print $1 } }'`; do
+ echo "lspci 'display controller [030?]':"
+ for device in $(lspci -mn | awk '{ if ($2 ~ "\"030[0-2]\"") { print $1 } }'); do
LC_ALL=C lspci -vvnn -s $device
done
fi
Index: debian/libnvidia-ml1.lintian-overrides
===================================================================
--- debian/libnvidia-ml1.lintian-overrides (.../tags/340.102-1) (revision 7831)
+++ debian/libnvidia-ml1.lintian-overrides (.../trunk) (revision 7831)
@@ -1,6 +1,7 @@
# The NVIDIA license does not allow any form of modification.
[i386 armhf]: binary-file-built-without-LFS-support
[i386]: shlib-with-non-pic-code
+[amd64 i386]: spelling-error-in-binary
hardening-no-bindnow
hardening-no-fortify-functions
hardening-no-relro
Index: debian/nvidia-driver.README.Debian.in
===================================================================
--- debian/nvidia-driver.README.Debian.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-driver.README.Debian.in (.../trunk) (revision 7831)
@@ -9,7 +9,7 @@
X Server and GL libraries of the NVIDIA driver offering.
For any news on this package check
-http://bugs.debian.org/#NVIDIA#-driver
+https://bugs.debian.org/#NVIDIA#-driver
NOTES ABOUT GLX DRIVER AND OPENGL:
@@ -55,7 +55,7 @@
If you see this error in /var/log/Xorg.0.log, please ensure that the versions
of linux-image-* and the corresponding linux-headers-* are identical up to
the last digit. Rebuild the module for this exactly matching kernel+header
-pair and reboot. See http://bugs.debian.org/642497 for details.
+pair and reboot. See https://bugs.debian.org/642497 for details.
NOTES ABOUT XEN:
@@ -65,7 +65,7 @@
linux-image-*-xen-*) running under the Xen hypervisor (xen-hypervisor-*).
It does work however if this kernel is running standalone.
Xen is currently not supported by NVIDIA. For more information, please
-see http://bugs.debian.org/570365
+see https://bugs.debian.org/570365
If you manage to get the NVIDIA driver to function properly when running
under the Xen hypervisor (e.g. by using a custom kernel configuration or
Index: debian/rules
===================================================================
--- debian/rules (.../tags/340.102-1) (revision 7831)
+++ debian/rules (.../trunk) (revision 7831)
@@ -3,12 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/pkg-info.mk
-NVIDIA_RELEASE := $(shell dpkg-parsechangelog --show-field=Version | sed -r 's/^[0-9]+://; s/-[^-]+$$//')
-BUILD_DATE := $(shell dpkg-parsechangelog --show-field=Date)
-
include debian/rules.defs
NVIDIA_LEGACY ?=
WATCH_VERSION ?= $(NVIDIA_LEGACY)
@@ -22,6 +19,7 @@
ARCH_DEPS_i386 ?=
UVM_ARCH_LIST ?= $(ARCH_LIST)
+NVIDIA_RELEASE = $(DEB_VERSION_UPSTREAM)
version = $(NVIDIA_RELEASE)
version_major = $(firstword $(subst ., ,$(version)))
deb_version_after_jessie = $(DEB_VERSION_AFTER_jessie)
@@ -74,6 +72,7 @@
AUTOGEN += debian/module/debian/changelog
AUTOGEN += $(patsubst %.in,%,$(RENAMED_CONTROL))
AUTOGEN += debian/bug-control
+AUTOGEN += debian/substvars
AUTOKEEP = debian/watch
AUTOCLEAN = $(filter-out $(AUTOKEEP),$(AUTOGEN))
@@ -86,7 +85,10 @@
xorg_depends += $(comma) xserver-xorg-core $(XORG_BOUND)
xorg_provides = xorg-driver-video
+# Use the amd64 changelog for all architectures to be M-A:same safe.
+upstream_changelog = NVIDIA-Linux-amd64/NVIDIA_Changelog
+
.PHONY: autogen prepare patch
autogen: $(AUTOGEN)
prepare: autogen unpack-stamp nvidia.ids compare-copyright-license
@@ -163,8 +165,8 @@
install-into-tmp:
# "Install" into debian/tmp.
cp -al NVIDIA-Linux/ debian/tmp
+ rm -rf debian/tmp/32
rm -f debian/tmp/NVIDIA_Changelog
- cp -al NVIDIA-Linux-amd64/NVIDIA_Changelog debian/tmp/
gzip -9fn debian/tmp/nvidia-smi.1
build-kernel-source-tree: install-into-tmp
@@ -173,7 +175,7 @@
mv debian/tmp/kernel/* $(module_source)/
# This copy of the changelog is going to be installed into the module
# binary packages.
- cp -a debian/tmp/NVIDIA_Changelog $(module_source)/
+ cp -al $(upstream_changelog) $(module_source)/
ifneq (,$(has_uvm))
ln -sf ../conftest.sh $(module_source)/uvm
@@ -195,8 +197,8 @@
# Fix permissions.
chmod -R a-sx,u=rwX,go=rX $(module_source)/../..
chmod a+x $(module_source)/debian/rules
- find '$(module_source)/../../modules' -depth -newermt '$(BUILD_DATE)' -print0 | \
- xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+ find '$(module_source)/../../modules' -depth -newermt '@$(SOURCE_DATE_EPOCH)' -print0 | \
+ xargs -0r touch --no-dereference --date='@$(SOURCE_DATE_EPOCH)'
# Build the tarball.
(cd $(module_source)/../.. && find modules -print0) | \
@@ -224,11 +226,8 @@
cp -a $(module_source) $@
cd $@ && QUILT_PATCHES=../debian/module/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
-override_dh_install:
- dh_install --list-missing
-
override_dh_installchangelogs:
- dh_installchangelogs debian/tmp/NVIDIA_Changelog
+ dh_installchangelogs $(upstream_changelog)
override_dh_dkms:
dh_dkms -V $(version)
@@ -236,6 +235,9 @@
override_dh_bugfiles:
dh_bugfiles -A
+override_dh_missing:
+ dh_missing --list-missing
+
override_dh_shlibdeps:
LD_LIBRARY_PATH=/$(libdir)/$(nvidia_private):$(LD_LIBRARY_PATH) dh_shlibdeps
@@ -257,6 +259,11 @@
-Vnvidia:kmod:Description="`cat debian/control.kmod`" \
-Vnvidia:Models="`cat debian/control.models`"
+# used by dpkg-genchanges
+debian/substvars:
+ echo 'nvidia:LegacyDesc=$(legacy_description)' > $@
+ echo 'nvidia:LegacyDescShort=$(legacy_description_short)' >> $@
+
# Do not run dh_strip here. The NVIDIA license says:
#
# 2.1.2 Linux/FreeBSD Exception. Notwithstanding the foregoing terms of
@@ -288,6 +295,7 @@
-e 's{#ARCH_LIST#}{$(ARCH_LIST)}g;' \
-e 's{#HAS_UVM#}{$(if $(has_uvm),,#)}g;' \
-e 's{#!armhf#}{$(if $(filter armhf,$(DEB_HOST_ARCH)),#)}g;' \
+ -e 's{#tls#}{$(if $(filter armhf,$(DEB_HOST_ARCH)),,tls/)}g;' \
< $< > $@
debian/module/debian/changelog: debian/changelog
Index: debian/bug-control.mk
===================================================================
--- debian/bug-control.mk (.../tags/340.102-1) (revision 7831)
+++ debian/bug-control.mk (.../trunk) (revision 7831)
@@ -1,16 +1,18 @@
+multiarchify = $(if $(filter %:any,$1),$(foreach a,$(ARCH_LIST),$(1:any=$a)),$1)
+
debian/bug-control: debian/bug-control.mk debian/rules debian/rules.defs
$(RM) $@
- echo "report-with: $(foreach x,$(REPORT_WITH),$(strip $x))" > $@
+ echo "report-with: $(foreach x,$(REPORT_WITH),$(call multiarchify,$(strip $x)))" > $@
echo "" >> $@
echo "package-status: $(foreach x,$(PACKAGE_STATUS),$(strip $x))" >> $@
define REPORT_WITH
$(nvidia)-driver
- $(nvidia)-driver-libs
+ $(nvidia)-driver-libs:any
nvidia-glx$(legacy)
- libgl1-$(nvidia)-glx
- libgl1-glvnd-$(nvidia)-glx
+ libgl1-$(nvidia)-glx:any
+ libgl1-glvnd-$(nvidia)-glx:any
xserver-xorg-video-$(nvidia)
$(nvidia)-alternative
$(nvidia)-kernel-dkms
@@ -46,7 +48,12 @@
libdrm-nouveau2
xserver-xorg-video-nouveau
make
+ ccache
libopencl1
opencl-icd
+ libgl1
+ libegl1
+ libgles1
+ libgles2
endef
Index: debian/copyright
===================================================================
--- debian/copyright (.../tags/340.102-1) (revision 7831)
+++ debian/copyright (.../trunk) (revision 7831)
@@ -1,9 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: NVIDIA Linux Display Drivers
Upstream-Contact: NVIDIA Corporation <linux-bugs@nvidia.com>
Source:
- ftp://download.nvidia.com/XFree86/Linux-x86/
- ftp://download.nvidia.com/XFree86/Linux-x86_64/
+ https://download.nvidia.com/XFree86/Linux-x86/
+ https://download.nvidia.com/XFree86/Linux-x86_64/
+ https://download.nvidia.com/XFree86/Linux-32bit-ARM/
Disclaimer:
This package is not part of the GNU/Linux Debian distribution. It is
provided in the non-free archive area as a convenience to Debian users.
@@ -18,8 +19,9 @@
Files: debian/*
Copyright: 2001-2010 Randall Donald <rdonald@debian.org>
- 2009-2017 Andreas Beckmann <anbe@debian.org>
- 2010 Russ Allbery <rra@debian.org>
+ 2009-2018 Andreas Beckmann <anbe@debian.org>
+ 2010 Russ Allbery <rra@debian.org>
+ 2015-2018 Luca Boccassi <bluca@debian.org>
Based on packages by Christopher Cheney.
License: GPL-2.0+
@@ -46,7 +48,7 @@
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General Public
License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Index: debian/control
===================================================================
--- debian/control (.../tags/340.102-1) (revision 7831)
+++ debian/control (.../trunk) (revision 7831)
@@ -4,22 +4,22 @@
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Uploaders:
- Russ Allbery <rra@debian.org>,
Andreas Beckmann <anbe@debian.org>,
Vincent Cheng <vcheng@debian.org>,
- Luca Boccassi <luca.boccassi@gmail.com>,
+ Luca Boccassi <bluca@debian.org>,
Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/trunk
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-340xx/
Build-Depends:
debhelper (>= 10),
- dpkg-dev (>= 1.17),
+ dpkg-dev (>= 1.18.8),
xz-utils,
dkms,
libxext6,
quilt,
po-debconf,
-Standards-Version: 3.9.8
-Homepage: http://www.nvidia.com
+Rules-Requires-Root: no
+Standards-Version: 4.1.3
+Homepage: https://www.nvidia.com
XS-Autobuild: yes
#Package: ${nvidia}-driver
@@ -306,12 +306,12 @@
Depends:
${nvidia}-alternative (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
+Provides:
+ libnvidia-cfg1-any,
Breaks:
libgl1-${nvidia}-glx (<< 340.96-8~),
Replaces:
libgl1-${nvidia}-glx (<< 340.96-8~),
-Provides:
- libnvidia-cfg1-any,
Description: NVIDIA binary OpenGL/GLX configuration library${nvidia:LegacyDesc}
The NVIDIA binary driver provides optimized hardware acceleration of
OpenGL/GLX/EGL/GLES applications via a direct-rendering X Server
@@ -324,6 +324,7 @@
Architecture: i386 amd64 armhf
Multi-Arch: foreign
Pre-Depends:
+ dpkg (>= 1.17.21),
${nvidia:legacy-check},
Depends:
glx-alternative-nvidia (>= 0.7),
@@ -518,7 +519,7 @@
libcuda-6.0-1-i386 [i386],
libcuda-6.5-1,
libcuda-6.5-1-i386 [i386],
-Homepage: http://www.nvidia.com/CUDA
+Homepage: https://www.nvidia.com/CUDA
Description: NVIDIA CUDA Driver Library${nvidia:LegacyDesc}
The Compute Unified Device Architecture (CUDA) enables NVIDIA
graphics processing units (GPUs) to be used for massively parallel
@@ -642,7 +643,7 @@
${shlibs:Depends}, ${misc:Depends}
Breaks:
${nvidia}-smi (<< ${nvidia:Version}),
-Homepage: http://developer.nvidia.com/nvidia-management-library-NVML
+Homepage: https://developer.nvidia.com/nvidia-management-library-NVML
Description: NVIDIA Management Library (NVML) runtime library${nvidia:LegacyDesc}
The NVIDIA Management Library (NVML) provides a monitoring and management API.
It provides a direct access to the queries and commands exposed via nvidia-smi.
@@ -672,5 +673,5 @@
CPUs, GPUs and other processors.
.
This package provides the NVIDIA installable client driver (ICD) for OpenCL
- which supports NVIDIA GPUs.
+ which supports NVIDIA GPUs. This ICD supports OpenCL 1.x only.
Index: debian/nvidia-alternative.triggers.in
===================================================================
--- debian/nvidia-alternative.triggers.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-alternative.triggers.in (.../trunk) (revision 7831)
@@ -1,7 +1,7 @@
-interest register-#NVIDIA#-alternative
+interest-await register-#NVIDIA#-alternative
-interest /etc/#PRIVATE#
-interest /usr/lib/#PRIVATE#
-interest /usr/lib/i386-linux-gnu/#PRIVATE#
-interest /usr/lib/x86_64-linux-gnu/#PRIVATE#
-interest /usr/lib/arm-linux-gnueabihf/#PRIVATE#
+interest-await /etc/#PRIVATE#
+interest-await /usr/lib/#PRIVATE#
+interest-await /usr/lib/i386-linux-gnu/#PRIVATE#
+interest-await /usr/lib/x86_64-linux-gnu/#PRIVATE#
+interest-await /usr/lib/arm-linux-gnueabihf/#PRIVATE#
Index: debian/nvidia-kernel-dkms.dkms.in
===================================================================
--- debian/nvidia-kernel-dkms.dkms.in (.../tags/340.102-1) (revision 7831)
+++ debian/nvidia-kernel-dkms.dkms.in (.../trunk) (revision 7831)
@@ -9,8 +9,8 @@
DEST_MODULE_LOCATION[0]="/updates/dkms"
AUTOINSTALL=yes
-MAKE[0]="unset ARCH; env CCACHE_DISABLE=1 NV_VERBOSE=1 \
- make modules KERNEL_UNAME=${kernelver}"
+MAKE[0]="unset ARCH; env NV_VERBOSE=1 \
+ make ${parallel_jobs+-j$parallel_jobs} modules KERNEL_UNAME=${kernelver}"
CLEAN="make KERNEL_UNAME=${kernelver} clean"
#HAS_UVM#BUILT_MODULE_NAME[1]="nvidia-uvm"
Index: debian/libegl1-nvidia.lintian-overrides.in
===================================================================
--- debian/libegl1-nvidia.lintian-overrides.in (.../tags/340.102-1) (revision 7831)
+++ debian/libegl1-nvidia.lintian-overrides.in (.../trunk) (revision 7831)
@@ -1,5 +1,6 @@
# The NVIDIA license does not allow any form of modification.
[!amd64]: binary-file-built-without-LFS-support
+[armhf]: spelling-error-in-binary
hardening-no-bindnow
hardening-no-fortify-functions
hardening-no-relro
Index: debian/watch
===================================================================
--- debian/watch (.../tags/340.102-1) (revision 7831)
+++ debian/watch (.../trunk) (revision 7831)
@@ -2,6 +2,6 @@
# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
# ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/319.32/NVIDIA-Linux-armv7l-gnueabihf-319.32.run
version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
-ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-armv7l-gnueabihf-([\d\.\-]+).run
+https://download.nvidia.com/XFree86/Linux-x86/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+https://download.nvidia.com/XFree86/Linux-x86_64/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
+https://download.nvidia.com/XFree86/Linux-32bit-ARM/(340(?:\.[\d\.\-]+)?)/NVIDIA-Linux-armv7l-gnueabihf-([\d\.\-]+).run
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /packages/nvidia-graphics-drivers/branches/340-stretch:r7198-7815
Merged /packages/nvidia-graphics-drivers/branches/304-stretch:r7193-7805
Merged /packages/nvidia-graphics-drivers/branches/340:r7192-7813
Merged /packages/nvidia-graphics-drivers/branches/304:r7189-7792
Merged /packages/nvidia-graphics-drivers/branches/304-jessie:r7191-7794
--- End Message ---