From 381d952cef88eb995e4750b16a383130627cca7c Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 28 Oct 2011 22:28:39 +0000 Subject: [PATCH] debian/rules, debian/rules.real: Move job definition into main makefile. svn path=/dists/trunk/linux-2.6/; revision=18200 --- debian/rules | 7 +++++++ debian/rules.real | 15 ++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/rules b/debian/rules index 78b44bf92..e2568b2ad 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,13 @@ include debian/rules.defs 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 diff --git a/debian/rules.real b/debian/rules.real index 8d672bf81..3e91973b8 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -25,13 +25,6 @@ include debian/rules.defs 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 @@ ifdef CFLAGS_KERNEL 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 \ $(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: DIR=$(BUILD_DIR)/build-doc $(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: