r3818 - people/waldi/kernel/source/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-08-10 12:29:17 +0000 (Wed, 10 Aug 2005)
New Revision: 3818

Modified:
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/rules.real: Add seperate setup step for headers package.


Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:22:26 UTC (rev 3817)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:29:17 UTC (rev 3818)
@@ -53,10 +53,10 @@
 # in Makefile.inc. @flavour@ in the expressions is going to be
 # replaced by the flavour for which the command is run. 
 #
-kpkg_headers := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_headers += make-kpkg --append-to-version $(append)$(ABINAME)
-kpkg_headers += --stem linux
-kpkg_headers += --config defconfig
+kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
+kpkg_header += make-kpkg --append-to-version $(append)$(ABINAME)
+kpkg_header += --stem linux
+kpkg_header += --config defconfig
 kpkg_image := make-kpkg --append-to-version $(ABINAME)-$(FLAVOUR)
 kpkg_image += --stem linux
 kpkg_image += --initrd
@@ -64,7 +64,7 @@
   kpkg_image += --subarch $(build_subarch)
 endif
 ifdef headers_subarch
-  kpkg_headers += --subarch $(headers_subarch)
+  kpkg_header += --subarch $(headers_subarch)
 endif
 setup_env := env -i HOME=$(HOME) LOGNAME=$(LOGNAME) PATH=$(PATH)
 ifdef build_makeflags
@@ -84,7 +84,7 @@
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 setup-arch: $(STAMPS_DIR)/source
-setup-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
 setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/$@
@@ -96,12 +96,12 @@
 	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
 	rm -rf $(DIR)
 
-install-header-subarch-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
+install-header-subarch-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
 install-header-subarch-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/$@
-install-header-subarch-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
+install-header-subarch-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
 	rm -rf $(DIR)
 	cp -al $(SOURCE_DIR) $(DIR)
-	cd $(DIR); $(setup_env) $(kpkg_headers) kernel-headers
+	cd $(DIR); $(setup_env) $(kpkg_header) kernel-headers
 	cat $(DIR)/debian/files >> files
 	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
 	rm -rf $(DIR)
@@ -136,7 +136,7 @@
 # config file by setting include_common_config = no in the
 # arch/$(karch)/Makefile.inc.
 #
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(ccommon) $(basedir)/config.$(FLAVOUR)
+$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR)
 	@echo "configs=$(configs)"
 	@echo "Generating configuration file $@:"
 	rm -f $@
@@ -210,9 +210,7 @@
 	  cp -a "$$(pwd)/$${src}" "$${dst}";			\
 	fi
 	touch $@
-#
-# Creates a build directory for a particular flavour
-#
+
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -222,6 +220,14 @@
 	cd $(DIR); $(setup_env) $(kpkg_image) configure
 	touch $@
 
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
+	cd $(DIR); $(setup_env) $(kpkg_header) configure
+	touch $@
+
 binary-dummy:
 	dh_testdir
 	dh_testroot