r1909 - in trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27: . debian

[Simon Horman]

Author: horms
Date: 2004-11-24 23:11:09 -0700 (Wed, 24 Nov 2004)
New Revision: 1909

Modified:
   trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
   trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
   trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/post-install
Log:
getting ready for 2.4.27-6

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog	2004-11-25 06:10:29 UTC (rev 1908)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog	2004-11-25 06:11:09 UTC (rev 1909)
@@ -1,12 +1,17 @@
-kernel-image-2.4.27-i386 (2.4.27-3) UNRELEASED; urgency=low
+kernel-image-2.4.27-i386 (2.4.27-6) UNRELEASED; urgency=low
 
   * Enable Zoran Video Devices. (Simon Horman)
   * Added symlinks to missing files Rules.make and
     arch/$(KERNEL_ARCH)/Makefile to kernel-headers packages.
-    (Closes: Bug#273878)
-  * Enable Magic SysRq (Closes: Bug#270297)
+    (Closes: Bug#273878) (Simon Horman)
+  * Enable Magic SysRq (Closes: Bug#270297) (Simon Horman)
+  * Use DEB_HOST_ARCH instead of ARCH in post-install (Simon Horman)
+  * Added link to scripts in header packages (Simon Horman)
+  * Removed headers that are both non-i386 and non-generic
+    from header packges (Simon Horman)
+  * Built against kernel-source-2.4.27 2.4.27-6
 
- -- Simon Horman <horms@debian.org>  Tue,  2 Nov 2004 18:23:27 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 25 Nov 2004 13:55:34 +0900
 
 kernel-image-2.4.27-i386 (2.4.27-2) unstable; urgency=high
 

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules	2004-11-25 06:10:29 UTC (rev 1908)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules	2004-11-25 06:11:09 UTC (rev 1909)
@@ -37,6 +37,10 @@
 		debian/control \
 )
 
+kbsed := s/^Depends: .*\(kernel-kbuild-[^ ,]*\).*/\1/p
+kbpkg := $(shell sed -n '$(kbsed); t e; b; :e q' debian/control)
+export DEBIAN_SRCTOP := $(CURDIR)/kernel-source-$(version)
+
 unpack: unpack-stamp
 unpack-stamp:
 	dh_testdir
@@ -56,6 +60,8 @@
 			build-$$i/debian/$(kpm)-$(debver)-$$i.postinst; \
 	done
 	cp config/default kernel-source-$(version)/.config
+	sed 's/@kbpkg@/$(kbpkg)/g' header-install > header-install.out
+	chmod u+x header-install.out
 
 	touch unpack-stamp
 
@@ -93,6 +99,7 @@
 	dh_testdir
 
 	cd kernel-source-$(version); \
+		HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
 		make-kpkg $(appvan) kernel-headers
 	mv kernel-source-$(version)/debian/files debian
 

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/post-install
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/post-install	2004-11-25 06:10:29 UTC (rev 1908)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/post-install	2004-11-25 06:11:09 UTC (rev 1909)
@@ -2,8 +2,6 @@
 
 set -e
 
-ARCH=i386
-
 debhelper_pre() {
 	dh_clean -k --package="$1"
 	dh_installdirs --package="$1"
@@ -52,15 +50,18 @@
 cp -a .config $dir
 ln -s --target-directory=$dir ../kernel-headers-$prefix/Makefile \
 	../kernel-headers-$prefix/kernel-headers.revision \
-	../kernel-headers-$prefix/Rules.make
-mkdir -p $dir/arch/$ARCH/
-ln -s --target-directory=$dir/arch/$ARCH/ \
-	../../../kernel-headers-$prefix/arch/$ARCH/Makefile
+	../kernel-headers-$prefix/Rules.make ../kernel-headers-$prefix/scripts
+mkdir -p $dir/arch/$DEB_HOST_ARCH/
+ln -s --target-directory=$dir/arch/$DEB_HOST_ARCH/ \
+	../../../kernel-headers-$prefix/arch/$DEB_HOST_ARCH/Makefile
 cd include
 find . -mindepth 1 -maxdepth 1 \
-	! -name config -a ! -name linux \
+	! -name config -a ! -name linux -a ! -name "asm-*" \
 	-printf "../../kernel-headers-$prefix/include/%f\n" |
 	xargs ln -s --target-directory=$dir/include
+ln -s --target-directory=$dir/include \
+	../../kernel-headers-$prefix/include/asm-generic \
+	../../kernel-headers-$prefix/include/asm-$DEB_HOST_ARCH
 cp -a config $dir/include
 find linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name modules -a ! -name modversions.h -a \