[pkg-nvidia-devel] r766 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/patches/fix-2.6.33-build.patch debian.binary/patches/series debian.binary/rules debian/changelog debian/control debian/control.in

rra at users.alioth.debian.org rra at users.alioth.debian.org
Wed Apr 7 05:17:58 UTC 2010


Author: rra
Date: Wed Apr  7 05:17:58 2010
New Revision: 766

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=766
Log:
Switch patch system to quilt and fix 2.6.33 build

Patch from Andreas Beckmann.

* nvidia-kernel-source: switch patch system from dpatch to quilt
* debian.binary/patches/fix-2.6.33-build.patch: new patch to fix module
  build with kernel 2.6.33 (closes: #573251)

Added:
    packages/nvidia-graphics-drivers/trunk/debian.binary/patches/fix-2.6.33-build.patch
    packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series
Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/control.in

Added: packages/nvidia-graphics-drivers/trunk/debian.binary/patches/fix-2.6.33-build.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/patches/fix-2.6.33-build.patch?rev=766&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/patches/fix-2.6.33-build.patch (added)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/patches/fix-2.6.33-build.patch Wed Apr  7 05:17:58 2010
@@ -1,0 +1,19 @@
+Description: fix compilation problems with kernel 2.6.33
+Origin: http://bugs.gentoo.org/show_bug.cgi?id=301318
+Acked-by: Andreas Beckmann <debian at abeckmann.de>
+
+Index: b/nvacpi.c
+===================================================================
+--- a/nvacpi.c	2010-03-28 19:52:35.519537444 +0000
++++ b/nvacpi.c	2010-03-28 19:54:36.055536902 +0000
+@@ -14,6 +14,10 @@
+ #include "os-interface.h"
+ #include "nv-linux.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,NULL,e,f)
++#endif
++
+ #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
+ 
+ static int         nv_acpi_add             (struct acpi_device *);

Added: packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series?rev=766&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series (added)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series Wed Apr  7 05:17:58 2010
@@ -1,0 +1,1 @@
+fix-2.6.33-build.patch

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=766&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Wed Apr  7 05:17:58 2010
@@ -23,6 +23,7 @@
 -include /usr/share/modass/include/common-rules.make
 
 configure:
+	dh_quilt_patch
 	sed 's/#KVERS#/$(KVERS)/g' debian/control.template > $(CURDIR)/debian/control
 	sed 's/#KVERS#/$(KVERS)/g' debian/dirs.template > $(CURDIR)/debian/dirs
 	sed 's/#KVERS#/$(KVERS)/g' debian/override.template > $(CURDIR)/debian/override
@@ -59,7 +60,8 @@
 	dh_builddeb  --destdir=$(KPKG_DEST_DIR)
 	dh_prep
 
-clean:   unpatch
+clean:
+	dh_testdir
 	if [ -f $(CURDIR)/debian/control.template ]; then \
 		cp  $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \
 	fi
@@ -67,24 +69,18 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-
 	$(MAKE) clean SYSSRC=$(KSRC) -C $(CURDIR)/$(dirname) -f Makefile $(KPKG_EXTRAV_ARG)
         
 	-rm $(CURDIR)/$(dirname)/gcc-check
 	-rm $(CURDIR)/$(dirname)/cc-sanity-check
-	
-	-dh_clean
+
+	dh_quilt_unpatch
+	dh_clean
 
 	-rm $(CURDIR)/debian/control
 	-rm $(CURDIR)/debian/dirs
 	-rm $(CURDIR)/debian/override
 
-
-unpatch: 
-	if [ -e patch-stamp ]; then \
-	   dpatch deapply-all ; \
-	   rm -rf patch-stamp debian/patched ; \
-	fi
 
 binary_modules: binary-modules	
 	   
@@ -99,7 +95,9 @@
 # responsible for cleaning up any changes that have been made by the
 # other kdist_commands (except for the .deb files created).
 kdist_clean: 
+	dh_testdir
 	$(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS) clean
-	-dh_clean
+	dh_quilt_unpatch || quilt --quiltrc /dev/null pop -af
+	dh_clean
 
 .PHONY: clean binary-modules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=766&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Apr  7 05:17:58 2010
@@ -49,6 +49,9 @@
   * debian.binary/control.template: make module package depend on the
     corresponding linux-image (closes: #463403)
   * debian/*.NEWS: remove asterisks to make lintian happy
+  * nvidia-kernel-source: switch patch system from dpatch to quilt
+  * debian.binary/patches/fix-2.6.33-build.patch: new patch to fix module
+    build with kernel 2.6.33 (closes: #573251)
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 18 Mar 2010 18:44:40 -0400
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=766&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Apr  7 05:17:58 2010
@@ -164,7 +164,7 @@
 Package: nvidia-kernel-source
 Section: non-free/kernel
 Architecture: i386 amd64
-Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0), ${misc:Depends}
+Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), quilt (>= 0.46-7~), ${misc:Depends}
 Recommends: nvidia-glx (>= 190.53), kernel-package (>= 8.082), module-assistant, devscripts
 Conflicts: nvidia-kernel-src
 Replaces: nvidia-kernel-src

Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=766&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Wed Apr  7 05:17:58 2010
@@ -164,7 +164,7 @@
 Package: nvidia-kernel-source
 Section: non-free/kernel
 Architecture: i386 amd64
-Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0), ${misc:Depends}
+Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), quilt (>= 0.46-7~), ${misc:Depends}
 Recommends: nvidia-glx (>= #VERSION#), kernel-package (>= 8.082), module-assistant, devscripts
 Conflicts: nvidia-kernel-src
 Replaces: nvidia-kernel-src




More information about the Pkg-nvidia-devel mailing list