Author: waldi
Date: Mon Sep 10 11:29:21 2007
New Revision: 9488
Log:
debian/rules.real: Cleanup kpkg usage.
Modified:
dists/trunk/linux-2.6/debian/rules.real
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 Mon Sep 10 11:29:21 2007
@@ -17,35 +17,28 @@
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
-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 := 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
+
#
# Targets
#
@@ -136,7 +129,7 @@
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):
$(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 @@
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\" .."; \
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
