r1325 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: config debian

[Jens Schmalzing]

Author: jensen
Date: 2004-08-26 00:07:00 -0600 (Thu, 26 Aug 2004)
New Revision: 1325

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Added a missing config option.
Showed debian/rules how to do a parallel build itself, since the kernel Makefile does not support this any more.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub	2004-08-26 05:45:40 UTC (rev 1324)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/config/common.stub	2004-08-26 06:07:00 UTC (rev 1325)
@@ -475,6 +475,7 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration

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-26 05:45:40 UTC (rev 1324)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2004-08-26 06:07:00 UTC (rev 1325)
@@ -48,7 +48,7 @@
 
 # environment for make-kpkg
 export APPEND_TO_VERSION=-$(flavour)
-export CONCURRENCY_LEVEL=3
+export PARALLEL_BUILD=-j3
 export INITRD=Yes
 export INITRD_OK=WeKnowWhatWeAreDoing
 export KPKG_SUBARCH=pmac
@@ -130,21 +130,21 @@
 endif
 
 stamp-build: \
-stamp-configure stamp-build-prepare \
-$(foreach flavour,$(flavours),stamp-build-flavour-$(flavour))
+stamp-configure stamp-build-prepare
+	$(RECURSION) $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-build-flavour-$(flavour))
 	touch $@
 
 stamp-build-prepare:
 	dh_testdir
 	touch $@
 
-ifeq (0,$(MAKELEVEL))
+ifeq (1,$(MAKELEVEL))
 
 stamp-build-flavour-%:
 	$(RECURSION) stamp-build-flavour-$* flavour=$*
 
 else
-ifeq (1,$(MAKELEVEL))
+ifeq (2,$(MAKELEVEL))
 
 # build the pmac kernel and the modules for a given flavour
 stamp-build-flavour-$(flavour): \
@@ -379,4 +379,3 @@
 	$(M4CONTROL) debian/control-image.m4 >> $@; \
 	cat debian/flavour-$$flavour >> $@; \
 	done
-