[pkg-nvidia-devel] r832 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/patches/select-nv-kernel.o.ARCH.patch debian.binary/patches/series debian/changelog debian/rules

Sun Apr 25 04:48:31 UTC 2010

Author: rra
Date: Sun Apr 25 04:48:29 2010
New Revision: 832

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=832
Log:
Use our patch system for the required NVIDIA makefile modification

[ Andreas Beckmann ]
* debian.binary/patches/select-nv-kernel.o.ARCH.patch: add new patch instead
  of editing files with sed when creating the tarball

Added:
    packages/nvidia-graphics-drivers/trunk/debian.binary/patches/select-nv-kernel.o.ARCH.patch
Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Added: packages/nvidia-graphics-drivers/trunk/debian.binary/patches/select-nv-kernel.o.ARCH.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/patches/select-nv-kernel.o.ARCH.patch?rev=832&op=file
==============================================================================

--- packages/nvidia-graphics-drivers/trunk/debian.binary/patches/select-nv-kernel.o.ARCH.patch (added)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/patches/select-nv-kernel.o.ARCH.patch Sun Apr 25 04:48:29 2010
@@ -1,0 +1,22 @@
+Author: Andreas Beckmann <debian at abeckmann.de>
+Description: Select the correct nv-kernel.o for the target architecture
+ The Debian nvidia-kernel-source package supports building both i386 and
+ amd64 kernels from one source by including both binary objects. This patch
+ makes the build system select the correct one depending on the kernel
+ architecture the module is built for.
+ This was previously done by a 'sed' command when building the module source
+ tarball.
+
+Index: b/Makefile.kbuild
+===================================================================
+--- a/Makefile.kbuild	2010-04-24 01:54:44.284537241 +0200
++++ b/Makefile.kbuild	2010-04-24 02:31:36.799037816 +0200
+@@ -44,7 +44,7 @@
+ # understands that we want a module.
+ #
+ 
+-CORE_OBJS := nv-kernel.o
++CORE_OBJS := nv-kernel.o$(NVARCH)
+ RESMAN_GLUE_OBJS := nv.o nv_gvi.o nv-vm.o os-agp.o os-interface.o os-registry.o nv-i2c.o nvacpi.o
+ 
+ $(MODULE_NAME)-objs := $(CORE_OBJS) $(RESMAN_GLUE_OBJS)

Modified: 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=832&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/patches/series Sun Apr 25 04:48:29 2010
@@ -1,1 +1,2 @@
+select-nv-kernel.o.ARCH.patch
 fix-2.6.33-build.patch

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=832&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:48:29 2010
@@ -78,6 +78,8 @@
   * debian/*.dirs: remove or minimize
   * debian/rules: reindent and simplify
   * debian/rules: switch to dh with a few overrides
+  * debian.binary/patches/select-nv-kernel.o.ARCH.patch: add new patch instead
+    of editing files with sed when creating the tarball
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=832&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:48:29 2010
@@ -71,16 +71,15 @@
 	cp -a NVIDIA-Linux/usr/src/nv/* debian/temp/modules/nvidia-kernel/
 	cp -a NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog debian/temp/modules/nvidia-kernel/
 
-	# We don't want this makefile that doesn't work with kbuild
+	# We don't want these makefiles that don't work with kbuild
 	rm debian/temp/modules/nvidia-kernel/makefile
+	rm debian/temp/modules/nvidia-kernel/Makefile.nvidia
 
 	# We want both 32 and 64 bit versions of nv-kernel.o
+	# Do not use a name matching *.o to prevent accidental deletion by some clean target
 	cp -a NVIDIA-Linux-i386/usr/src/nv/nv-kernel.o debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
 	cp -a NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
 	rm -f debian/temp/modules/nvidia-kernel/nv-kernel.o
-
-	# and then make Makefile.kbuild actually use our names
-	sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' debian/temp/modules/nvidia-kernel/Makefile.kbuild
 
 	# We have new conftest files that work purely with kbuild and don't require root
 	cp -a Makefile conftest.* patches.h debian/temp/modules/nvidia-kernel/


