[Lunar-commits] r22938 - lunar-iso/trunk/lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2007-01-13 23:30:58 +0100 (Sat, 13 Jan 2007)
New Revision: 22938

Modified:
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
Fix unpacking of kernel sources.

This was still broken - it's just really hard to get multiple commands run in the chroot without making a script. So lets just make a script and chroot run that instead.


Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2007-01-13 15:56:21 UTC (rev 22937)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2007-01-13 22:30:58 UTC (rev 22938)
@@ -1065,11 +1065,14 @@
 			# unpack a kernel source and preconfigure ir
 			percent_msg "Extracting kernel sources..."
 			(
-				BUILD_DIRECTORY=$TARGET/usr/src
-				MOONBASE=$TARGET/$MOONBASE
-				is_26 && run_details linux-2.6 > /dev/null || run_details linux-2.4
-				run_pre_build
-				zcat /proc/config.gz > $TARGET/usr/src/linux-$VERSION/.config
+				if is_26 ; then
+					echo ". /etc/lunar/config ; run_details linux-2.6 ; run_pre_build"
+				else
+					echo ". /etc/lunar/config ; run_details linux-2.4 ; run_pre_build"
+				fi > $ISO_TARGET/tmp/unpack_kernel.sh
+				chroot_run /bin/bash /tmp/unpack_kernel.sh
+				rm -f $ISO_TARGET/tmp/unpack_kernel.sh
+				is_26 && zcat /proc/config.gz > $TARGET/usr/src/linux-$VERSION/.config
 				chroot_run make -C /usr/src/linux oldconfig
 				chroot_run make -C /usr/src/linux prepare
 				chroot_run make -C /usr/src/linux _modinst_