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

[Bastian Blank]

Author: waldi
Date: 2005-08-10 15:07:29 +0000 (Wed, 10 Aug 2005)
New Revision: 3828

Modified:
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/rules.real
- Move some install rules.
- Support cross compilation.


Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 14:57:07 UTC (rev 3827)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 15:07:29 UTC (rev 3828)
@@ -8,24 +8,10 @@
 # variable. It will also be passed a list of source files
 #
 SHELL  := sh -e
+DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
 #
-# These variables control the behaviour of make-kpkg
-#
-# enable cross-compiling for m68k
-#DEB_HOST_ARCH := m68k
-#
-DEBIAN_UPSTREAM_VERSION := $(version)
-ifeq (,$(DEB_HOST_ARCH))
-  DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-  DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-endif
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-  cross_compile := $(DEB_HOST_ARCH)
-endif
-export version DEBIAN_UPSTREAM_VERSION DEBIAN_STEM
-
-karch := $(DEB_HOST_ARCH)
-#
 # Build the list of common config files to be included
 #
 ifeq ($(SUBARCH),none)
@@ -55,9 +41,11 @@
 #
 kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
 kpkg_header += make-kpkg --append-to-version $(append)$(ABINAME)
+kpkg_header += --arch $(ARCH)
 kpkg_header += --stem linux
 kpkg_header += --config defconfig
 kpkg_image := make-kpkg --append-to-version $(ABINAME)-$(FLAVOUR)
+kpkg_image += --arch $(ARCH)
 kpkg_image += --stem linux
 kpkg_image += --initrd
 ifdef build_subarch
@@ -66,20 +54,23 @@
 ifdef headers_subarch
   kpkg_header += --subarch $(headers_subarch)
 endif
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+  kpkg_image := --cross-compile=-$(DEB_HOST_GNU_TYPE)
+endif
 setup_env := env -i HOME=$(HOME) LOGNAME=$(LOGNAME) PATH=$(PATH)
 ifdef build_makeflags
   setup_env += MAKEFLAGS=$(build_makeflags)
 endif
 ifndef headers_dirs
-  headers_dirs = $(karch)
+  headers_dirs = $(DEB_HOST_ARCH)
 endif
 ccommon = debian/arch/config debian/arch/$(ARCH)/config debian/arch/$(ARCH)/$(SUBARCH)/config
 
 #
 # Targets
 #
-binary-arch-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
-binary-arch-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
+binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 binary-indep: install-doc install-patch install-source install-tree
 
@@ -89,26 +80,6 @@
 setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
 setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
-install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/$@
-install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-	rm -rf $(DIR)
-	cp -al $(SOURCE_DIR) $(DIR)
-	cd $(DIR); $(setup_env) $(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 ..; mv $(BUILD_DIR)/$$i ..; done
-	rm -rf $(DIR)
-
-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)/setup-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
-	rm -rf $(DIR)
-	cp -al $(SOURCE_DIR) $(DIR)
-	cd $(DIR); $(setup_env) $(kpkg_header) kernel-headers
-	cat $(DIR)/debian/files >> debian/files
-	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
-	rm -rf $(DIR)
-
 $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/header-install.in
 	sed -e 's, at kbpkg@,$(kbpkg),g'				\
 	    -e 's, at ksource_dir@,$(CURDIR)/$(kdir),g'		\
@@ -262,6 +233,26 @@
 	dh_installdocs
 	$(MAKE) -f debian/rules.real install-base
 
+install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/$@
+install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
+	cd $(DIR); $(setup_env) $(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 ..; mv $(BUILD_DIR)/$$i ..; done
+	rm -rf $(DIR)
+
+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)/setup-$(ARCH)-$(SUBARCH) $(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
+	cd $(DIR); $(setup_env) $(kpkg_header) kernel-headers
+	cat $(DIR)/debian/files >> debian/files
+	@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $(BUILD_DIR)/$$i ..; mv $(BUILD_DIR)/$$i ..; done
+	rm -rf $(DIR)
+
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(VERSION)
 $(BUILD_DIR)/linux-source-$(VERSION).tar.bz2: $(STAMPS_DIR)/source