r3652 - in trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8: . debian

[Simon Horman]

Author: horms
Date: 2005-08-01 05:52:16 +0000 (Mon, 01 Aug 2005)
New Revision: 3652

Modified:
   trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
   trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install
   trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
Log:
* Fix bogus source symlink in /lib/modules/2.6.8-2-flavour
* Allow build to work with kernel-package >= 9.002


Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2005-08-01 00:52:45 UTC (rev 3651)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2005-08-01 05:52:16 UTC (rev 3652)
@@ -7,8 +7,10 @@
     in putting in gcc-4.0 fixes, but at the same time,
     there is some value in being able to use it with unstable.
     (Simon Horman)
+  * Fix bogus source symlink in /lib/modules/2.6.8-2-flavour
+  * Allow build to work with kernel-package >= 9.002
 
- -- Simon Horman <horms at debian.org>  Fri, 29 Jul 2005 19:30:50 +0900
+ -- Simon Horman <horms at debian.org>  Mon,  1 Aug 2005 13:35:19 +0900
 
 kernel-image-2.6.8-i386 (2.6.8-16) unstable; urgency=low
 

Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install	2005-08-01 00:52:45 UTC (rev 3651)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/header-install	2005-08-01 05:52:16 UTC (rev 3652)
@@ -4,15 +4,25 @@
 
 kbpkg=@kbpkg@
 
-cd $DEBIAN_SRCTOP
-{
-	find . -path './scripts/*' -prune -o \
-		-path './Documentation/*' -prune -o \
-		-path './debian/*' -prune -o \
-		-type f \( -name Makefile -o -name 'Kconfig*' \) -print
-	echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
-} | cpio -pd --preserve-modification-time $OLDPWD
-cd - > /dev/null
+# As of make-kpkg 9.002 these files are added automatically
+# This foo is to allow this package to build on Sarge
+# (kernel-package 8.135) and unstable, and to produce
+# packages with the same file layout as the original
+# sarge kernel-header packages.
+kpkg_version=`dpkg -p kernel-package | sed -ne 's/Version: //; T; p; q'`
+if dpkg --compare-versions "$kpkg_version" "<" "9.002"; then
+	cd $DEBIAN_SRCTOP
+	{
+		find . -path './scripts/*' -prune -o \
+			-path './Documentation/*' -prune -o \
+			-path './debian/*' -prune -o \
+			-type f \( -name Makefile -o -name 'Kconfig*' \) -print
+		echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
+	} | cpio -pd --preserve-modification-time $OLDPWD
+	cd - > /dev/null
+else
+	rm -r scripts
+fi
 ln -s ../$kbpkg/scripts .
 
 remove=

Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install	2005-08-01 00:52:45 UTC (rev 3651)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/post-install	2005-08-01 05:52:16 UTC (rev 3652)
@@ -58,6 +58,8 @@
 
 mkdir -p $top/lib/modules/$version
 ln -s /usr/src/kernel-headers-$version $top/lib/modules/$version/build
+rm -f $top/lib/modules/$version/source
+ln -s /usr/src/kernel-headers-$version $top/lib/modules/$version/source
 
 debhelper_post $pkg