debian/rules.real: Cleanup kpkg usage.
svn path=/dists/trunk/linux-2.6/; revision=9488
This commit is contained in:
parent
43880c682f
commit
4034d31404
|
@ -17,34 +17,27 @@ export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
|
|||
|
||||
include debian/rules.defs
|
||||
|
||||
#
|
||||
# Here we construct the command lines for different make-kpkg
|
||||
# calls (build, linux-image, linux-headers) based on the values
|
||||
# of variables defined so far and provided by the arch/subarch
|
||||
# in Makefile.inc. @flavour@ in the expressions is going to be
|
||||
# replaced by the flavour for which the command is run.
|
||||
#
|
||||
kpkg_image := make-kpkg
|
||||
kpkg_image += --arch '$(firstword $(KPKG_ARCH) $(ARCH))' --cross-compile=-
|
||||
kpkg_image += --stem linux
|
||||
kpkg_image += --config silentoldconfig
|
||||
ifdef DEBIAN_KERNEL_JOBS
|
||||
JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
|
||||
endif
|
||||
|
||||
setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
|
||||
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
|
||||
|
||||
MAKE_CLEAN = $(setup_env) $(MAKE)
|
||||
MAKE_SELF = $(MAKE) -f debian/rules.real
|
||||
|
||||
kpkg_image := $(setup_env)
|
||||
ifdef DEBIAN_KERNEL_JOBS
|
||||
kpkg_image += CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
|
||||
endif
|
||||
kpkg_image += make-kpkg --arch '$(firstword $(KPKG_ARCH) $(ARCH))' --cross-compile=- --stem linux --config silentoldconfig
|
||||
ifneq ($(INITRAMFS),False)
|
||||
kpkg_image += --initrd
|
||||
endif
|
||||
ifdef KPKG_SUBARCH
|
||||
kpkg_image += --subarch '$(KPKG_SUBARCH)'
|
||||
endif
|
||||
setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
|
||||
|
||||
ifdef DEBIAN_KERNEL_JOBS
|
||||
setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
|
||||
JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
|
||||
endif
|
||||
|
||||
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
|
||||
|
||||
MAKE_CLEAN = $(setup_env) $(MAKE)
|
||||
MAKE_SELF = $(MAKE) -f debian/rules.real
|
||||
|
||||
#
|
||||
# Targets
|
||||
|
@ -136,7 +129,7 @@ $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
|
|||
mkdir -p '$(DIR)/debian'
|
||||
cp debian/{changelog,control,copyright} '$(DIR)/debian'
|
||||
touch '$(DIR)/debian/official'
|
||||
cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
|
||||
cd '$(DIR)'; $(kpkg_image) configure
|
||||
touch '$@'
|
||||
|
||||
$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
|
||||
|
@ -150,7 +143,7 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/b
|
|||
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
|
||||
|
||||
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
|
||||
cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) $(kpkg_image) build
|
||||
cd '$(DIR)'; $(kpkg_image) build
|
||||
python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
|
||||
touch '$@'
|
||||
|
||||
|
@ -383,7 +376,7 @@ ifdef IMAGE_POSTPROC
|
|||
install -d '$(DIR)/debian/image.d'
|
||||
install 'debian/bin/$(IMAGE_POSTPROC)' '$(DIR)/debian/image.d'
|
||||
endif
|
||||
cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
|
||||
cd '$(DIR)'; $(kpkg_image) kernel-image
|
||||
cat '$(DIR)/debian/files' >> debian/files
|
||||
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
|
||||
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
|
||||
|
|
Loading…
Reference in New Issue