r3851 - in trunk/kernel/source/linux-2.6/debian: . arch/powerpc templates

[Jurij Smakov]

Author: jurij-guest
Date: 2005-08-13 16:13:58 +0000 (Sat, 13 Aug 2005)
New Revision: 3851

Modified:
   trunk/kernel/source/linux-2.6/debian/Makefile
   trunk/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
   trunk/kernel/source/linux-2.6/debian/templates/post-install.in
Log:
Fix for 322610:
 - added m68 to headers_dirs on powepc.
 - changed Makefile to pass headers_dirs to post-install.
 - changed post-install to add links to all headers
   directories, specified in headers_dirs.


Modified: trunk/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6/debian/Makefile	2005-08-13 15:26:59 UTC (rev 3850)
+++ trunk/kernel/source/linux-2.6/debian/Makefile	2005-08-13 16:13:58 UTC (rev 3851)
@@ -159,6 +159,7 @@
 	sed -e 's, at initrd_modules@,$(initrd_modules),'			\
 	    -e 's, at append_subarch@,$(append),'				\
 	    -e 's, at extra_postinstall_command@,$(extra_command),'	\
+	    -e 's, at headers_dirs@,$(headers_dirs),'			\
 	    templates/post-install.in > post-install-$(subarch)
 #
 # Generates the kernel config file for a subarch by merging

Modified: trunk/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-13 15:26:59 UTC (rev 3850)
+++ trunk/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-13 16:13:58 UTC (rev 3851)
@@ -1,6 +1,6 @@
 #
 # Variables 
 #
-headers_dirs = ppc | ppc64
+headers_dirs = ppc | ppc64 | m68k
 headers_subarch = powerpc
 build_subarch = powerpc

Modified: trunk/kernel/source/linux-2.6/debian/templates/post-install.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-13 15:26:59 UTC (rev 3850)
+++ trunk/kernel/source/linux-2.6/debian/templates/post-install.in	2005-08-13 16:13:58 UTC (rev 3851)
@@ -79,6 +79,21 @@
 	xargs ln -s --target-directory=$dir/include
 cp -a config $dir/include
 ln -sf asm-${arch} $dir/include/asm
+# Link in the additional header directories, 
+# specified in header_dirs 
+for i in asm-*
+do
+  case ${i#asm-} in
+      generic | @headers_dirs@)
+        if [ ! -L $dir/include/${i} ]; then
+          ln -sf ../../linux-headers-$prefix/include/${i} $dir/include/${i}
+	fi
+	;;
+      *)
+        ;;
+  esac
+done
+
 find linux -mindepth 1 -maxdepth 1 \
 	! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
 	-printf "../../../linux-headers-$prefix/include/linux/%f\n" |