debian/rules.real:
Use DEBIAN_KERNEL_JOBS to provide proper -j settings for the build. svn path=/dists/trunk/linux-2.6/; revision=6055
This commit is contained in:
parent
dac278843b
commit
81e2da9578
|
@ -57,6 +57,11 @@ else
|
||||||
endif
|
endif
|
||||||
setup_env += MAKEFLAGS='$(setup_makeflags)'
|
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
|
# Targets
|
||||||
#
|
#
|
||||||
|
@ -127,11 +132,11 @@ $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source
|
||||||
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
$(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)
|
$(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 '$@'
|
touch '$@'
|
||||||
|
|
||||||
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
$(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 '$@'
|
touch '$@'
|
||||||
|
|
||||||
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||||
|
@ -149,7 +154,7 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: $(BUILD_DIR)/config
|
||||||
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
||||||
cp '$<' '$(DIR)/.config'
|
cp '$<' '$(DIR)/.config'
|
||||||
echo '$(KPKG_ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
|
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 '$@'
|
touch '$@'
|
||||||
|
|
||||||
install-base:
|
install-base:
|
||||||
|
@ -345,7 +350,6 @@ install-patch:
|
||||||
dh_clean -d -k $(DH_OPTIONS)
|
dh_clean -d -k $(DH_OPTIONS)
|
||||||
dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
|
dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
|
||||||
dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
|
dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
|
||||||
# Install the debian patches
|
|
||||||
sed \
|
sed \
|
||||||
-e 's,@home@,$(pbase)/debian,' \
|
-e 's,@home@,$(pbase)/debian,' \
|
||||||
-e 's,@revisions@,$(REVISIONS),' \
|
-e 's,@revisions@,$(REVISIONS),' \
|
||||||
|
|
Loading…
Reference in New Issue