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

[Bastian Blank]

Author: waldi
Date: Sat Mar  4 10:26:20 2006
New Revision: 6055

Modified:
   dists/trunk/linux-2.6/debian/rules.real
Log:
debian/rules.real:
Use DEBIAN_KERNEL_JOBS to provide proper -j settings for the build.


Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sat Mar  4 10:26:20 2006
@@ -57,6 +57,11 @@
 endif
 setup_env += MAKEFLAGS='$(setup_makeflags)'
 
+ifdef DEBIAN_KERNEL_JOBS
+  setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
+  JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
+endif
+
 #
 # Targets
 #
@@ -127,11 +132,11 @@
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
-	cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
+	cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
 	touch '$@'
 
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
-	cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH)
+	cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
 	touch '$@'
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -149,7 +154,7 @@
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$<' '$(DIR)/.config'
 	echo '$(KPKG_ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
-	cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH)
+	cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
 	touch '$@'
 
 install-base:
@@ -345,7 +350,6 @@
 	dh_clean -d -k $(DH_OPTIONS)
 	dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
 	dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
-#	Install the debian patches
 	sed \
 	  -e 's, at home@,$(pbase)/debian,' \
 	  -e 's, at revisions@,$(REVISIONS),' \