[kernel] r18200 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Fri Oct 28 22:28:39 2011
New Revision: 18200

Log:
debian/rules, debian/rules.real: Move job definition into main makefile.

Modified:
   dists/trunk/linux-2.6/debian/rules
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-2.6/debian/rules	Fri Oct 28 21:32:59 2011	(r18199)
+++ dists/trunk/linux-2.6/debian/rules	Fri Oct 28 22:28:39 2011	(r18200)
@@ -11,6 +11,13 @@
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  DEBIAN_KERNEL_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+ifdef DEBIAN_KERNEL_JOBS
+  MAKEFLAGS += -j$(DEBIAN_KERNEL_JOBS)
+endif
+
 .NOTPARALLEL:
 
 source: debian/control $(STAMPS_DIR)/source-base

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Fri Oct 28 21:32:59 2011	(r18199)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Oct 28 22:28:39 2011	(r18200)
@@ -25,13 +25,6 @@
 
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  DEBIAN_KERNEL_JOBS := $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-ifdef DEBIAN_KERNEL_JOBS
-  JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
-endif
-
 setup_env := env -u ABINAME -u ABINAME_PART -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION
 setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
 
@@ -125,7 +118,7 @@
 endif
 	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' V=1 listnewconfig
 	+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null
-	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' $(JOBS_ARG) prepare
+	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' prepare
 	@$(stamp)
 
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
@@ -138,7 +131,7 @@
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390x-tape \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
-	+$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET)
+	+$(MAKE_CLEAN) -C '$(DIR)' $(BUILD_TARGET)
 	python debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	@$(stamp)
 
@@ -147,8 +140,8 @@
 $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
 	rm -rf $(DIR)
 	mkdir $(DIR)
-	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) xmldocs
-	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' $(JOBS_ARG) htmldocs mandocs
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' xmldocs
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' htmldocs mandocs
 	@$(stamp)
 
 install-base: