[kernel] r5368 - in people/waldi/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Mon Jan  9 00:20:17 2006
New Revision: 5368

Removed:
   people/waldi/linux-2.6/debian/bin/install-header
Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/rules.real
Log:
Use minimal headers package build, as we can use a clean tree for that. It puts
all arches into the package for now.

* debian/bin/gencontrol.py: Set LOCALVERSION on subarch level.
* debian/bin/install-header: Remove.
* debian/rules.real: Add minimal headers package build.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Mon Jan  9 00:20:17 2006
@@ -48,6 +48,10 @@
         for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]
+        localversion_headers = ''
+        if subarch != 'none':
+            localversion_headers = '-' + subarch
+        makeflags['LOCALVERSION_HEADERS'] = localversion_headers
 
     def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
         headers_subarch = self.templates["control.headers.subarch"]

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Mon Jan  9 00:20:17 2006
@@ -32,20 +32,14 @@
 # in Makefile.inc. @flavour@ in the expressions is going to be
 # replaced by the flavour for which the command is run. 
 #
-kpkg_header += make-kpkg --append-to-version '$(KPKG_ABINAME)$(LOCALVERSION_HEADERS)'
-kpkg_header += --arch '$(ARCH)'
-kpkg_header += --stem linux
-kpkg_header += --config defconfig
 kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)$(LOCALVERSION)'
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
 kpkg_image += --initrd
 ifdef KPKG_SUBARCH
   kpkg_image += --subarch '$(KPKG_SUBARCH)'
-  kpkg_header += --subarch '$(KPKG_SUBARCH)'
 endif
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-  kpkg_header += --cross-compile='$(DEB_HOST_GNU_TYPE)'
   kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
 endif
 setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION
@@ -69,7 +63,7 @@
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 setup-arch: $(STAMPS_DIR)/source
-setup-subarch: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
+setup-subarch:
 setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 #
@@ -148,14 +142,6 @@
 	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 '$@'
-
 install-base:
 	dh_compress
 	dh_fixperms
@@ -207,24 +193,26 @@
 	done
 	rm -rf '$(DIR)'
 
-install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)
-install-header-$(ARCH)-$(SUBARCH): DIR=$(BUILD_DIR)/$@
-install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)
-	rm -rf '$(DIR)'
-	cp -al '$(SOURCE_DIR)' '$(DIR)'
-	install debian/bin/install-header '$(DIR)/install-header'
-	cd '$(DIR)'; $(setup_env) HEADER_CLEAN_HOOK='$(CURDIR)/$(DIR)/install-header' $(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)'
+install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(VERSION)$(KPKG_ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH): export DH_OPTIONS = -p$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
+install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+	dh_testdir
+	dh_testroot
+	dh_clean -k -d
+	dh_install $(SOURCE_DIR)/include $(BASE_DIR)
+	cd $(SOURCE_DIR); \
+	find . -path './scripts/*' -prune -o -path './Documentation/*' -prune -o -type f \
+	  \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Rules.make' \) -print | \
+	  cpio -pd --preserve-modification-time $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
+	$(MAKE) -f debian/rules.real install-base
 
 install-headers-all: DH_OPTIONS = -plinux-headers-$(VERSION)
 install-headers-all:
 	dh_testdir
 	dh_testroot
+	dh_install $(DH_OPTIONS) debian/bin/gencontrol-modules.py '/usr/src/linux-headers-$(VERSION)/bin'
 	dh_install $(DH_OPTIONS) debian/arch '/usr/src/linux-headers-$(VERSION)'
 	dh_install $(DH_OPTIONS) debian/lib '/usr/src/linux-headers-$(VERSION)'
 	dh_installdocs $(DH_OPTIONS)