[Lunar-commits] r18768 - lunar-iso/trunk/scripts

[Auke Kok]

Author: sofar
Date: 2006-02-17 15:24:15 +0000 (Fri, 17 Feb 2006)
New Revision: 18768

Modified:
   lunar-iso/trunk/scripts/rebuild
   lunar-iso/trunk/scripts/unpack
Log:
We don't need to compile the kernel first - we can just put the kernel-headers-package in place.


Modified: lunar-iso/trunk/scripts/rebuild
===================================================================
--- lunar-iso/trunk/scripts/rebuild	2006-02-17 06:04:52 UTC (rev 18767)
+++ lunar-iso/trunk/scripts/rebuild	2006-02-17 15:24:15 UTC (rev 18768)
@@ -33,11 +33,6 @@
 chroot $ISO_TARGET /dev/install-devices.sh
 chroot $ISO_TARGET rm -rf /var/build/makedev-*
 
-echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo "+          STARTING KERNEL COMPILE                     +"
-echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo ""
-
 case ${ISO_KSUFFIX} in
 	2.4)
 		cp kernels/conf/${ISO_KSUFFIX}/base $ISO_TARGET/etc/lunar/local/.config
@@ -46,8 +41,6 @@
 		cp kernels/conf/${ISO_KSUFFIX}/base $ISO_TARGET/etc/lunar/local/.config.2.6.stable
 		;;
 esac
-yes '' | chroot $ISO_TARGET lin linux-${ISO_KSUFFIX}
-chroot $ISO_TARGET lin kernel-headers-${ISO_KSUFFIX}
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "+          STARTING COMPILE PHASE OF ALL MODULES       +"

Modified: lunar-iso/trunk/scripts/unpack
===================================================================
--- lunar-iso/trunk/scripts/unpack	2006-02-17 06:04:52 UTC (rev 18767)
+++ lunar-iso/trunk/scripts/unpack	2006-02-17 15:24:15 UTC (rev 18768)
@@ -25,8 +25,8 @@
   resurrect $mods
 done
 
-rm -rf $ISO_TARGET/usr/include/{linux,asm}
-cp -a /usr/include/{linux,asm} $ISO_TARGET/usr/include/
+# we need kernel headers too
+resurrect kernel-headers-$ISO_KSUFFIX
 
 # fill var/spool/lunar dir
 for mod in $(cat conf/sources.list conf/sources.list-${ISO_KSUFFIX} conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do