debian/rules.real: Don't specify ARCH on command line.

svn path=/dists/trunk/linux-2.6/; revision=7327
This commit is contained in:
Bastian Blank 2006-09-05 08:13:42 +00:00
parent 1d9c835a67
commit 813c6da9c4
1 changed files with 6 additions and 6 deletions

12
debian/rules.real vendored
View File

@ -141,7 +141,7 @@ define SETUP_DIR
echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
echo 'endif' >> '$(DIR)/.kernelvariables'
cd '$(DIR)'; $(setup_env) make reportoldconfig ARCH=$(KERNEL_ARCH)
cd '$(DIR)'; $(setup_env) make reportoldconfig
endef
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
@ -151,12 +151,12 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
$(SETUP_DIR)
cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
touch '$@'
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
$(SETUP_DIR)
cd '$(DIR)'; $(setup_env) make prepare ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
touch '$@'
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@ -168,11 +168,11 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
touch '$@'
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG) image
cd '$(DIR)'; $(setup_env) make $(JOBS_ARG) image
touch '$@'
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
cd '$(DIR)'; $(setup_env) make ARCH=$(KERNEL_ARCH) $(JOBS_ARG)
cd '$(DIR)'; $(setup_env) make $(JOBS_ARG)
python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
touch '$@'
@ -378,7 +378,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
cd $(DIR); $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
cd $(DIR); $(setup_env) make 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}