Bug#697838: unblock: nvidia-graphics-drivers/304.64-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-graphics-drivers
nvidia-detect does not correctly detect Debian 7.0 (wheezy), making that
package useless as it will only fail, reporting "could not determine
your Debian version". Fixed by adjusting the regexps.
Well, this check should be reimplemented to use something more portable
- but not this time.
I also added a trivial patch to fix module build for Linux 3.7. While
this is not needed for wheezy, it may be helpful for people that need to
run an updated kernel from wheezy-backports in the future. Does not
change anything while compiling against 3.6 or earlier.
Some whitespace changes in older changelog entries also crept in, sorry
for that.
Andreas
unblock nvidia-graphics-drivers/304.64-4
diffstat for nvidia-graphics-drivers-304.64 nvidia-graphics-drivers-304.64
changelog | 14 +++++++++++---
detect/nvidia-detect.in | 9 +++++----
module/debian/patches/kernel-3.7.patch | 22 ++++++++++++++++++++++
module/debian/patches/series | 1 +
4 files changed, 39 insertions(+), 7 deletions(-)
diff -Nru nvidia-graphics-drivers-304.64/debian/changelog nvidia-graphics-drivers-304.64/debian/changelog
--- nvidia-graphics-drivers-304.64/debian/changelog 2012-12-20 20:02:36.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/changelog 2013-01-08 13:13:08.000000000 +0100
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (304.64-4) unstable; urgency=low
+
+ * nvidia-detect: Fix detection of Debian 7.0 (wheezy). (Closes: #697282)
+ * kernel-3.7.patch: New patch to fix compilation with Linux 3.7 (which
+ replaced VM_RESERVED by VM_DONTEXPAND | VM_DONTDUMP). (Closes: #697061)
+
+ -- Andreas Beckmann <debian@abeckmann.de> Tue, 08 Jan 2013 11:44:34 +0100
+
nvidia-graphics-drivers (304.64-3) unstable; urgency=low
* Add libxvmcnvidia1 package for the libXvMCNVIDIA*.so.1 library that was
@@ -361,7 +369,7 @@
* Update nv-readme.ids.
* Update symbols control files.
* Update lintian overrides.
- * Work around dpkg-gencontrol bug #659814.
+ * Work around dpkg-gencontrol bug #659814.
* Convert *-ia32 into transitional packages due to ia32-libs transition:
- $pkg:i386 Provides: $pkg-i386
- $pkg-ia32 Recommends: $pkg-i386
@@ -808,7 +816,7 @@
nvidia-graphics-drivers (290.03-1) experimental; urgency=low
* New upstream beta 290.03 (2011-10-21).
- - Fixed a bug that prevented the driver from loading on some systems with
+ - Fixed a bug that prevented the driver from loading on some systems with
integrated graphics.
- Fixed issues in VDPAU that prevented allocating and displaying extremely
large VdpOutputSurfaces.
@@ -1396,7 +1404,7 @@
moved to /proc/driver/nvidia/gpus/0..N/information
- Added new shared library: libnvidia-ml.so.
NVML provides programmatic access to static information and monitoring
- data for NVIDIA GPUs, as well as limited managment capabilities. It is
+ data for NVIDIA GPUs, as well as limited managment capabilities. It is
intended for use with Tesla compute products.
See web-based documentation and associated nvml.h header for more info.
- Added a new X configuration option "3DVisionDisplayType" to specify
diff -Nru nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in
--- nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in 2012-06-30 18:15:58.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in 2013-01-08 13:13:08.000000000 +0100
@@ -92,7 +92,7 @@
exit 0;
fi
- if grep -q "lenny\|5" /etc/debian_version;
+ if grep -q "lenny\|^5" /etc/debian_version;
then
if [[ -n ${VERSIONS[173]} ]];
then
@@ -138,7 +138,7 @@
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 "wheezy" /etc/debian_version;
+ elif grep -q "wheezy\|^7" /etc/debian_version;
then
if [[ -n ${VERSIONS[999]} ]]; then
if [[ -n ${VERSIONS[173]} ]]; then
@@ -155,11 +155,12 @@
echo "Your card is only supported up to the 173.14 legacy drivers series.";
PACKAGE="nvidia-glx-legacy-173xx"
elif [[ -n ${VERSIONS[96]} ]]; then
- echo "Uh oh. Your card is only supported up to the 96.43 legacy drivers series, which is no longer usable due to lack of support for current Xorg Xserver 1.12";
+ echo "Your card is only supported up to the 96.43 legacy drivers series.";
+ PACKAGE="nvidia-glx-legacy-96xx"
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;
+ elif grep -q "^4" /etc/debian_version;
then
echo "Uh oh. You are running Etch, which is no longer supported.";
else
diff -Nru nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch
--- nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch 2013-01-08 13:13:08.000000000 +0100
@@ -0,0 +1,22 @@
+Author: Andreas Beckmann <debian@abeckmann.de>
+Description: fix building against kernel 3.7
+ The VM_RESERVED flag was removed in kernel 3.7:
+ http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=314e51b9851b4f4e8ab302243ff5a6fc6147f379
+Bug-Debian: http://bugs.debian.org/697061
+
+--- nvidia-304.64.orig/nv-mmap.c 2012-10-30 17:58:25.000000000 +0000
++++ nvidia-304.64/nv-mmap.c 2013-01-08 10:13:20.152603291 +0000
+@@ -463,6 +463,13 @@
+ NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ nv_vm_list_page_count(&at->page_table[i], pages);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++// VM_RESERVED was replaced by VM_DONTEXPAND | VM_DONTDUMP in Linux 3.7
++# ifndef VM_RESERVED
++# define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
++# endif
++#endif
++
+ vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+
+ #if defined(VM_DRIVER_PAGES)
diff -Nru nvidia-graphics-drivers-304.64/debian/module/debian/patches/series nvidia-graphics-drivers-304.64/debian/module/debian/patches/series
--- nvidia-graphics-drivers-304.64/debian/module/debian/patches/series 2012-09-09 04:42:17.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/module/debian/patches/series 2013-01-08 13:13:08.000000000 +0100
@@ -4,3 +4,4 @@
avoid-ld.gold.patch
fix-typos.patch
linux3.patch
+kernel-3.7.patch
Reply to: