r3855 - people/waldi/kernel/source/linux-2.6/debian/templates

Bastian Blank waldi at costa.debian.org
Sun Aug 14 12:39:58 UTC 2005


Author: waldi
Date: 2005-08-14 12:39:57 +0000 (Sun, 14 Aug 2005)
New Revision: 3855

Modified:
   people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
Log:
debian/templates/post-install.in: Always install generated files.


Modified: people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-14 12:07:36 UTC (rev 3854)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-14 12:39:57 UTC (rev 3855)
@@ -35,11 +35,10 @@
 # trailing dash, if it is non-empty.
 #
 append='@append_subarch@'
-suffix=${version#*$debnum-}
-prefix=${append}${version%%-*}${debnum}
-pkg=linux-headers-$version
+prefix=$DEBIAN_VERSION-$DEBIAN_ABINAME
+pkg=linux-headers-$prefix-$DEBIAN_FLAVOUR
 top=$PWD/debian/$pkg
-dir=$top/usr/src/linux-headers-$version
+dir=$top/usr/src/$pkg
 #
 # Here we need to find the kernel architecture which
 # is appropriate for the current flavour. It is available
@@ -59,6 +58,8 @@
 # Stuff below is ugly as hell, but does the trick so I'm not
 # touching it until we can invent something better.
 #
+mkdir -p $dir/arch/$arch/kernel
+mkdir -p $dir/include/asm-$arch
 mkdir -p $dir/include/linux
 cp -a .config $dir
 echo $debnum-$suffix > $dir/.extraversion
@@ -66,26 +67,38 @@
 
 find . -mindepth 1 -maxdepth 1 \
 	! -name debian -a ! -name Documentation -a ! -name include -a \
-	! -name DEBIAN -a ! -name scripts -a ! -name '.*' -a \( \
+	! -name DEBIAN -a ! -name scripts -a ! -name arch -a ! -name '.*' -a \( \
 	-name Makefile -o -type d \) \
 	-printf "../linux-headers-$prefix/%f\n" |
 	xargs ln -s --target-directory="$dir"
 
-cd include
-find . -mindepth 1 -maxdepth 1 \
+find arch/$arch -mindepth 1 -maxdepth 1 \( \
+	-type d -a ! -name kernel -o \
+	-type f -a \( -name 'Makefile*' -o -name 'Kconfig*' \) \) \
+	-printf "../../../linux-headers-$prefix/%p\n" |
+	xargs ln -s --target-directory=$dir/arch/$arch
+[ -f arch/$arch/kernel/asm-offsets.s ] && ln -f arch/$arch/kernel/asm-offsets.s $dir/arch/$arch/kernel
+ln -s ../../../../linux-headers-$prefix/arch/$arch/kernel/Makefile $dir/arch/$arch/kernel
+find include -mindepth 1 -maxdepth 1 \
 	! -name config -a ! -name linux -a \( \
-	! -name 'asm-*' -o -name asm-generic -o -name asm-${arch} \) \
-	-printf "../../linux-headers-$prefix/include/%f\n" |
+	! -name 'asm-*' -o -name asm-generic \) \
+	-printf "../../linux-headers-$prefix/%p\n" |
 	xargs ln -s --target-directory=$dir/include
-cp -a config $dir/include
+cp -a include/config $dir/include
 ln -sf asm-${arch} $dir/include/asm
-find linux -mindepth 1 -maxdepth 1 \
+find include/asm-$arch -mindepth 1 -maxdepth 1 \
+	\( -type f -a ! -links 2 -o ! -type f \) \
+	-printf "../../../linux-headers-$prefix/%p\n" |
+	xargs ln -s --target-directory=$dir/include/asm-$arch
+find include/asm-$arch -mindepth 1 -maxdepth 1 \
+	-type f -links 2 |
+	xargs ln -f --target-directory=$dir/include/asm-$arch
+find include/linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
-	-printf "../../../linux-headers-$prefix/include/linux/%f\n" |
+	-printf "../../../linux-headers-$prefix/%p\n" |
 	xargs ln -s --target-directory=$dir/include/linux
-cp -a linux/autoconf.h linux/compile.h \
-	linux/version.h $dir/include/linux
-cd ..
+cp -a include/linux/autoconf.h include/linux/compile.h \
+	include/linux/version.h $dir/include/linux
 
 mkdir -p $top/lib/modules/$version
 ln -s /usr/src/linux-headers-$version $top/lib/modules/$version/build




More information about the Kernel-svn-changes mailing list