[kernel] r8760 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Thu May 24 18:55:08 2007
New Revision: 8760

Log:
debian/rules.real: Change SETUP_DIR into real target.


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	Thu May 24 18:55:08 2007
@@ -118,34 +118,27 @@
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all
 
+setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all:
+	rm -rf '$(DIR)'
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
+	cp '$(CONFIG)' '$(DIR)/.config'
+	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
+	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
+	echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
+	echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
 # TODO: Should we set CROSS_COMPILE always?
 ifdef OVERRIDE_HOST_TYPE
-define SETUP_DIR_HOST_TYPE
 	echo 'override CROSS_COMPILE = $(OVERRIDE_HOST_TYPE)-' >> '$(DIR)/.kernelvariables'
-endef
 else
-define SETUP_DIR_HOST_TYPE
 	echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
 	echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
 	echo 'endif' >> '$(DIR)/.kernelvariables'
-endef
 endif
-
-define SETUP_DIR
-	rm -rf '$(DIR)'
-	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	cp '$(CONFIG)' '$(DIR)/.config'
-	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
-	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
-	echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
-	echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
-	$(SETUP_DIR_HOST_TYPE)
 	$(MAKE) -C '$(DIR)' reportoldconfig
-endef
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
-	$(SETUP_DIR)
 	mkdir -p '$(DIR)/debian'
 	cp debian/{changelog,control,copyright} '$(DIR)/debian'
 	touch '$(DIR)/debian/official'
@@ -155,7 +148,6 @@
 $(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)
 	$(MAKE) -C '$(DIR)' prepare $(JOBS_ARG)
 	touch '$@'