r1388 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian

[jensen@haydn.debian.org]

Author: jensen
Date: 2004-08-27 08:40:23 -0600 (Fri, 27 Aug 2004)
New Revision: 1388

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Did the parallel build properly, while keeping kernel-package happy.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-27 12:31:06 UTC (rev 1387)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-27 14:40:23 UTC (rev 1388)
@@ -18,9 +18,6 @@
 debian	:= $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
 version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
 
-# how to call ourselves recursively
-RECURSION = $(MAKE) -f debian/rules
-
 # some files in debian/ get version numbers and stuff updated on the fly
 M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4FLAVOUR="$(flavour)"
 debian/%: debian/%.m4
@@ -48,7 +45,7 @@
 
 # environment for make-kpkg
 export APPEND_TO_VERSION=-$(flavour)
-export PARALLEL_BUILD=-j3
+export PARALLEL_BUILD=-j2
 export INITRD=Yes
 export INITRD_OK=WeKnowWhatWeAreDoing
 export KPKG_SUBARCH=pmac
@@ -96,7 +93,7 @@
 ifeq (0,$(MAKELEVEL))
 
 stamp-configure-flavour-%:
-	$(RECURSION) stamp-configure-flavour-$* flavour=$*
+	$(MAKE) -f debian/rules stamp-configure-flavour-$* flavour=$*
 
 else
 ifeq (1,$(MAKELEVEL))
@@ -131,7 +128,7 @@
 
 stamp-build: \
 stamp-configure stamp-build-prepare
-	$(RECURSION) $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-build-flavour-$(flavour))
+	$(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-build-flavour-$(flavour))
 	touch $@
 
 stamp-build-prepare:
@@ -141,13 +138,13 @@
 ifeq (0,$(MAKELEVEL))
 
 stamp-build-flavour-%:
-	$(RECURSION) $@
+	$(MAKE) -f debian/rules $@
 
 else
 ifeq (1,$(MAKELEVEL))
 
 stamp-build-flavour-%:
-	$(RECURSION) stamp-build-flavour-$* flavour=$*
+	$(MAKE) -f debian/rules stamp-build-flavour-$* flavour=$*
 
 else
 ifeq (2,$(MAKELEVEL))
@@ -155,6 +152,7 @@
 # build the pmac kernel and the modules for a given flavour
 stamp-build-flavour-$(flavour): \
 stamp-configure-flavour-$(flavour) stamp-build-prepare
+	MAKEFLAGS=$(filter-out -j --j%,$(MAKEFLAGS))
 	cd $(KFLAVOUR); make-kpkg build
 	touch $@
 
@@ -174,8 +172,8 @@
 install: stamp-install
 
 stamp-install: \
-stamp-build stamp-install-patch \
-$(foreach flavour,$(flavours),stamp-install-flavour-$(flavour))
+stamp-build stamp-install-patch
+	$(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-install-flavour-$(flavour))
 	touch $@
 
 # do the usual checks
@@ -201,11 +199,17 @@
 ifeq (0,$(MAKELEVEL))
 
 stamp-install-flavour-%:
-	$(RECURSION) stamp-install-flavour-$* flavour=$*
+	$(MAKE) -f debian/rules $@
 
 else
 ifeq (1,$(MAKELEVEL))
 
+stamp-install-flavour-%:
+	$(MAKE) -f debian/rules stamp-install-flavour-$* flavour=$*
+
+else
+ifeq (2,$(MAKELEVEL))
+
 # create an intermediate kernel-image package from the build tree,
 # immediately unpack it into the install directory, and re-arrange a
 # few things.  Also, install the build infrastructure for modules from
@@ -215,6 +219,7 @@
 stamp-build-flavour-$(flavour) stamp-install-prepare
 
 # create and unpack the intermediate kernel image package
+	MAKEFLAGS=$(filter-out -j --j%,$(MAKEFLAGS))
 	cd $(KFLAVOUR); make-kpkg kernel-image
 	dpkg -x $(KDUMMY) $(KIMAGE)
 
@@ -236,6 +241,7 @@
 
 endif
 endif
+endif
 
 # the binary target is responsible for creating Debian packages from
 # the various package directories created by the install target.
@@ -257,7 +263,7 @@
 ifeq (0,$(MAKELEVEL))
 
 binary-flavour-%:
-	$(RECURSION) binary-flavour-$* flavour=$*
+	$(MAKE) -f debian/rules binary-flavour-$* flavour=$*
 
 else
 ifeq (1,$(MAKELEVEL))
@@ -299,7 +305,7 @@
 #	chmod 755 $(KIMAGE)/DEBIAN/$$file; done
 
 binary-kernel-image-$(kernel)-%: stamp-install-flavour-$(flavour)
-	$(RECURSION) binary-image-package DH_OPTIONS=-pkernel-image-$(kernel)-$*
+	$(MAKE) -f debian/rules binary-image-package DH_OPTIONS=-pkernel-image-$(kernel)-$*
 
 binary-image-package: binary-common-package
 	dpkg -e $(KDUMMY) $(KIMAGE)/DEBIAN
@@ -308,9 +314,9 @@
 	dh_builddeb
 
 binary-kernel-patch-%: stamp-install-patch
-	$(RECURSION) binary-package DH_OPTIONS=-pkernel-patch-$*
+	$(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-patch-$*
 binary-kernel-%: stamp-install-flavour-$(flavour)
-	$(RECURSION) binary-package DH_OPTIONS=-pkernel-$*
+	$(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-$*
 binary-package: binary-common-package
 	dh_gencontrol
 	dh_md5sums