[pkg-nvidia-devel] r840 - in /packages/nvidia-graphics-modules/trunk/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 05:31:33 2010
New Revision: 840

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=840
Log:
Split building each kernel flavor into a separate rule

[ Andreas Beckmann ]
- split from binary-arch target: binary-arch-meta, binary-module-%

Modified:
    packages/nvidia-graphics-modules/trunk/debian/changelog
    packages/nvidia-graphics-modules/trunk/debian/rules

Modified: packages/nvidia-graphics-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/changelog?rev=840&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules/trunk/debian/changelog Sun Apr 25 05:31:33 2010
@@ -8,6 +8,8 @@
     - improve readability of binary-arch target
     - stop special handling of the amd64 package, the module source already
       cares for linking with the correct binary object file
+    - split from binary-arch target: binary-arch-meta, binary-module-%
+    - move configurable settings to debian/rules.defs
   * create a common module building package for i386 and amd64
   * rename source package to nvidia-graphics-modules
   * move configurable settings from debian/rules to debian/rules.defs

Modified: packages/nvidia-graphics-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules?rev=840&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules Sun Apr 25 05:31:33 2010
@@ -47,7 +47,7 @@
 # the kernel packages, which will then be overwritten by the real packages.
 binary: binary-arch binary-indep
 binary-indep:
-binary-arch: build
+binary-arch-meta: build
 	dh_installdirs
 	dh_installchangelogs
 	dh_installdocs
@@ -57,19 +57,21 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+
+.NOTPARALLEL:
+binary-module-%: build binary-arch-meta
 	set -e; cd modules/nvidia-kernel; \
-	    for i in $(KERNEL_FLAVORS_$(DEB_BUILD_ARCH)); do \
-	        kernel=$(KERNEL_VERSION)-$$i ; \
-		KSRC=/usr/src/linux-headers-$$kernel \
-		    KVERS=$$kernel \
-		    KERNEL_DEPENDS=y \
-		    KPKG_DEST_DIR=../.. \
-		    debian/rules binary_modules ; \
-		KSRC=/usr/src/linux-headers-$$kernel \
-		    KVERS=$$kernel \
-		    HAVECONFIG=y \
-		    debian/rules clean; \
-	    done
+		KSRC=/usr/src/linux-headers-$* \
+			KVERS=$* \
+			KERNEL_DEPENDS=y \
+			KPKG_DEST_DIR=../.. \
+			debian/rules binary_modules ; \
+		KSRC=/usr/src/linux-headers-$* \
+			KVERS=$* \
+			HAVECONFIG=y \
+			debian/rules clean
+
+binary-arch: build binary-arch-meta $(foreach f,$(KERNELFLAVORS),binary-module-$(KERNELVERSION)-$(f))
 	for p in *.deb; do \
 	    dpkg-distaddfile $$p "non-free/kernel" optional; \
 	done
@@ -121,4 +123,3 @@
 	@echo been generated SUCCESSFULLY.
 	@echo
 	exit 1
-