r2078 - in trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8: . debian

Joshua Kwan joshk@haydn.debian.org
Mon, 27 Dec 2004 19:02:03 -0700


Author: joshk
Date: 2004-12-27 19:01:47 -0700 (Mon, 27 Dec 2004)
New Revision: 2078

Modified:
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/control
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/post-install
Log:
final buncha fixes, i think

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog	2004-12-28 01:57:36 UTC (rev 2077)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog	2004-12-28 02:01:47 UTC (rev 2078)
@@ -5,8 +5,9 @@
   * Build from 2.6.8-11.
   * Remove bogus export CC := gcc-3.4 that was only used for debugging
     and caused a FTBFS.
+  * Version kernel-headers dependency on kernel-kbuild-2.6-3.
 
- -- Joshua Kwan <joshk@triplehelix.org>  Fri, 24 Dec 2004 14:38:26 -0800
+ -- Joshua Kwan <joshk@triplehelix.org>  Mon, 27 Dec 2004 16:19:42 -0800
 
 kernel-image-2.6.8-sparc (2.6.8-5) unstable; urgency=high
 

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/control
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/control	2004-12-28 01:57:36 UTC (rev 2077)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/control	2004-12-28 02:01:47 UTC (rev 2078)
@@ -20,7 +20,7 @@
 Architecture: sparc
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3
+Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3 (>= 2.6.8-2)
 Provides: kernel-headers, kernel-headers-2.6
 Description: Header files related to Linux kernel version 2.6.8
  This package provides kernel header files for version 2.6.8, for sites

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/post-install
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/post-install	2004-12-28 01:57:36 UTC (rev 2077)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/post-install	2004-12-28 02:01:47 UTC (rev 2078)
@@ -25,6 +25,9 @@
 top=$PWD/debian/$pkg
 dir=$top/usr/src/kernel-headers-$version
 
+karch=${suffix%-smp}
+karch=${suffix%32}
+
 debhelper_pre $pkg
 
 mkdir -p $dir/include/linux
@@ -42,10 +45,11 @@
 cd include
 find . -mindepth 1 -maxdepth 1 \
 	! -name config -a ! -name linux -a \( \
-	! -name 'asm-*' -o -name asm-generic -o -name asm-sparc -o -name asm-sparc64 \) \
+	! -name 'asm-*' -o -name asm-generic -o -name asm-$karch \) \
 	-printf "../../kernel-headers-$prefix/include/%f\n" |
 	xargs ln -s --target-directory=$dir/include
 cp -a config $dir/include
+ln -sf asm-$karch $dir/include/asm
 find linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
 	-printf "../../../kernel-headers-$prefix/include/linux/%f\n" |