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

[Auke Kok]

Author: sofar
Date: 2005-11-13 22:26:00 +0000 (Sun, 13 Nov 2005)
New Revision: 17296

Modified:
   lunar-iso/trunk/scripts/aaa_base
   lunar-iso/trunk/scripts/isofs
Log:
I seem to be losing my lunar/theedge every time, so now we explicitly back it up so we can re-insert it at the end - thus making sure it's really there (use make test to verify-). Also add a symlink as 'lunar.iso' for easy access by bochs.


Modified: lunar-iso/trunk/scripts/aaa_base
===================================================================
--- lunar-iso/trunk/scripts/aaa_base	2005-11-13 22:20:40 UTC (rev 17295)
+++ lunar-iso/trunk/scripts/aaa_base	2005-11-13 22:26:00 UTC (rev 17296)
@@ -7,6 +7,10 @@
 unset VERBOSE
 optimize
 
+# backup core tools
+echo "+ backing up \"$ISO_LUNAR_MODULE-*-$ISO_BUILD.tar.bz2\""
+cp $ISO_TARGET/var/cache/lunar/$ISO_LUNAR_MODULE-*-$ISO_BUILD.tar.bz2 aaa_base/$ISO_LUNAR_MODULE-$ISO_DATE-$ISO_BUILD.tar.bz2
+
 echo "+ cleaning up (some) file structure items"
 rm -rf $ISO_TARGET/var/cache/ccache/*
 rmdir /usr/lib/locale/*
@@ -57,6 +61,7 @@
 diff -U0 $ISO_TARGET/.tracked $ISO_TARGET/.present | grep '^\+[^+]' | sed 's/^+//g' > $ISO_TARGET/.aaa_base.list
 echo "/etc/lunar/local/optimizations" >> $ISO_TARGET/.aaa_base.list
 
+
 # make the tarball
 chroot $ISO_TARGET tar cjf /var/cache/lunar/aaa_base.tar.bz2 -T .aaa_base.list --no-recursion
 mv $ISO_TARGET/var/cache/lunar/aaa_base.tar.bz2 $ISO_SOURCE/aaa_base/aaa_base.tar.bz2

Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs	2005-11-13 22:20:40 UTC (rev 17295)
+++ lunar-iso/trunk/scripts/isofs	2005-11-13 22:26:00 UTC (rev 17296)
@@ -15,11 +15,14 @@
 cp $ISO_SOURCE/kernels/.kernels $ISO_TARGET/kernels/.kernels
 cp $ISO_SOURCE/kernels/kernel-modules-$ISO_KSUFFIX $ISO_TARGET/kernels/.kernel-modules
 
+echo "+ adding core toolset \"$ISO_LUNAR_MODULE\""
+cp $ISO_SOURCE/aaa_base/$ISO_LUNAR_MODULE-$ISO_DATE-$ISO_BUILD.tar.bz2 $ISO_TARGET/var/cache/lunar/
+
 # copy the installed code over:
 echo "+ copying installer program"
 cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
 cp lunar-install/sbin/lunar-install $ISO_TARGET/sbin/
-ln -s /etc/init.d/lunar-install $ISO_TARGET/etc/rc2.d/S20lunar-install
+ln -sf /etc/init.d/lunar-install $ISO_TARGET/etc/rc2.d/S20lunar-install
 cp $ISO_SOURCE/lunar-install/etc/inittab $ISO_TARGET/etc/
 
 echo "+ adding isolinux code"
@@ -63,6 +66,8 @@
         -c isolinux/boot.cat \
         -A "Lunar-${ISO_VERSION}" .
 
+ln -sf lunar-${ISO_VERSION}.iso ../lunar.iso
+
 touch .cachefill .dirs .etcf .init .proper .rebuild .unpack
 rm -f .lunar.cd
 cd $ISO_SOURCE