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

jensen@haydn.debian.org jensen@haydn.debian.org
Sat, 28 Aug 2004 20:42:54 -0600


Author: jensen
Date: 2004-08-27 08:54:00 -0600 (Fri, 27 Aug 2004)
New Revision: 1389

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Corrected the previous changes to the parallel build some more.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-08-27 14:40:23 UTC (rev 1388)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-08-27 14:54:00 UTC (rev 1389)
@@ -13,8 +13,8 @@
     optionally a ramdisk.  This is mainly intended for users who want to
     build their own initrd kernel-image packages on subarchs that don't
     have a bootloader, but is also useful for creating rescue systems
-    capable of working around a broken bootloader installation.  (Jens
-    Schmalzing).
+    capable of working around a broken bootloader installation
+    (Jens Schmalzing).
 
  -- Jens Schmalzing <jensen@debian.org>  Fri, 27 Aug 2004 14:28:58 +0200
 

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 14:40:23 UTC (rev 1388)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-27 14:54:00 UTC (rev 1389)
@@ -152,8 +152,9 @@
 # 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
+	cd $(KFLAVOUR); \
+	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
+	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" make-kpkg build
 	touch $@
 
 endif
@@ -219,8 +220,9 @@
 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
+	cd $(KFLAVOUR); \
+	MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
+	MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" make-kpkg kernel-image
 	dpkg -x $(KDUMMY) $(KIMAGE)
 
 # remove the coff image