debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/rules.real 

- Add environment setup to $(MAKE).
- Use $(MAKE).

svn path=/dists/trunk/linux-2.6/; revision=8758
This commit is contained in:
Bastian Blank 2007-05-24 18:19:19 +00:00
parent a4b948c903
commit 383b3989d2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
debian/rules.real vendored
View File

@ -54,6 +54,8 @@ endif
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
MAKE := $(setup_env) ${MAKE}
#
# Targets
#
@ -139,7 +141,7 @@ define SETUP_DIR
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
$(SETUP_DIR_HOST_TYPE)
cd '$(DIR)'; $(setup_env) make reportoldconfig
$(MAKE) -C '$(DIR)' reportoldconfig
endef
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
@ -154,7 +156,7 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
$(SETUP_DIR)
cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
$(MAKE) -C '$(DIR)' prepare $(JOBS_ARG)
touch '$@'
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@ -168,7 +170,7 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
cd '$(DIR)'; $(setup_env) make $(JOBS_ARG)
$(MAKE) -C '$(DIR)' $(JOBS_ARG)
python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
touch '$@'
@ -177,7 +179,7 @@ $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
$(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
$(setup_env) make -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
$(MAKE) -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
touch '$@'
$(STAMPS_DIR)/build-libc-dev: SOURCE_DIR = $(BUILD_DIR)/source
@ -347,8 +349,8 @@ install-libc-dev_$(ARCH): $(STAMPS_DIR)/build-libc-dev
dh_testdir
dh_testroot
dh_clean -d -k
make -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
make -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(DIR)'
$(MAKE) -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
$(MAKE) -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH='$(DIR)'
# XXX: Needs to be removed from libc6-dev
rm -rf '$(DIR)'/include/scsi
$(MAKE) -f debian/rules.real install-base
@ -405,7 +407,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain:
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_image \
DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
ifeq ($(MODULES),True)
cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
$(MAKE) -C $(DIR) modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
@ -429,10 +431,10 @@ install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
ifeq ($(KERNEL_ARCH),ppc)
# TODO: GNA
$(setup_env) make -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
$(MAKE) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
else
$(setup_env) make -C '$(DIR)' mkvmlinuz_support_install \
$(MAKE) -C '$(DIR)' mkvmlinuz_support_install \
INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
endif
@ -495,7 +497,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot' 'var/lib/$(PACKAGE_NAME)'
DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
$(MAKE) -C $(DIR) modules_install INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}