[Lunar-commits] r22872 - in lunar-iso/trunk: . scripts

[Auke Kok]

Author: sofar
Date: 2007-01-06 20:26:56 +0100 (Sat, 06 Jan 2007)
New Revision: 22872

Added:
   lunar-iso/trunk/scripts/toolset
Removed:
   lunar-iso/trunk/scripts/moonbase
Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/scripts/aaa_base
   lunar-iso/trunk/scripts/isofs
   lunar-iso/trunk/scripts/proper
   lunar-iso/trunk/scripts/rebuild
Log:
Rewrite how we handle the toolset a bit - prepare and use lsh to get module_version instead of ISO_DATE which is never the same anyway. backup toolset into aaa_base so that you can rebuild using the same toolset later over and over again and change the ISO_DATE. rename moonbase script to toolset. adj. Makefile


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2007-01-06 19:19:41 UTC (rev 22871)
+++ lunar-iso/trunk/Makefile	2007-01-06 19:26:56 UTC (rev 22872)
@@ -65,15 +65,15 @@
 	@echo "Starting rebuild process"
 	@scripts/rebuild
 
-etc: moonbase unpack $(ISO_TARGET)/.etcf
+etc: toolset unpack $(ISO_TARGET)/.etcf
 $(ISO_TARGET)/.etcf:
 	@echo "Copying miscfiles"
 	@scripts/etc
 
-moonbase: $(ISO_SOURCE)/template/moonbase.tar.bz2
-$(ISO_SOURCE)/template/moonbase.tar.bz2:
+toolset: $(ISO_SOURCE)/template/moonbase.tar.bz2 $(ISO_SOURCE)/template/$(ISO_LUNAR_MODULE).tar.bz2
+$(ISO_SOURCE)/template/moonbase.tar.bz2 $(ISO_SOURCE)/template/$(ISO_LUNAR_MODULE).tar.bz2:
 	@echo "Getting a proper moonbase"
-	@scripts/moonbase
+	@scripts/toolset
 
 unpack: cachefill dirs $(ISO_TARGET)/.unpack
 $(ISO_TARGET)/.unpack:

Modified: lunar-iso/trunk/scripts/aaa_base
===================================================================
--- lunar-iso/trunk/scripts/aaa_base	2007-01-06 19:19:41 UTC (rev 22871)
+++ lunar-iso/trunk/scripts/aaa_base	2007-01-06 19:26:56 UTC (rev 22872)
@@ -6,10 +6,6 @@
 . /etc/lunar/config
 unset VERBOSE
 
-# backup core tools
-echo "+ backing up \"$ISO_LUNAR_MODULE-$(chroot $ISO_TARGET lsh installed_version $ISO_LUNAR_MODULE)-$ISO_BUILD.tar.bz2\""
-cp $ISO_TARGET/var/cache/lunar/$ISO_LUNAR_MODULE-$(chroot $ISO_TARGET lsh installed_version $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 -f $ISO_TARGET/etc/rc*/*nfslock
 rm -f $ISO_TARGET/etc/rc*/*nfs
@@ -34,8 +30,9 @@
 for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) kernel-headers-${ISO_KSUFFIX} ; do
   grep "^$mod:" $ISO_TARGET/var/state/lunar/packages >> $ISO_SOURCE/aaa_base/packages
 done
+
 # add core tools to the list:
-echo "$ISO_LUNAR_MODULE:$ISO_DATE:installed:$ISO_DATE:" >> $ISO_SOURCE/aaa_base/packages
+echo "$ISO_LUNAR_MODULE:$(lsh module_version ${ISO_LUNAR_MODULE}):installed:$ISO_DATE:" >> $ISO_SOURCE/aaa_base/packages
 
 # delete .svn dirs from templates
 find $ISO_TARGET -type d -name ".svn" -exec rm -rf {} \; &> /dev/null

Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs	2007-01-06 19:19:41 UTC (rev 22871)
+++ lunar-iso/trunk/scripts/isofs	2007-01-06 19:26:56 UTC (rev 22872)
@@ -17,7 +17,7 @@
 cp $ISO_SOURCE/kernels/conf/$ISO_KSUFFIX/modules $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/
+cp $ISO_SOURCE/aaa_base/$ISO_LUNAR_MODULE-$(lsh module_version ${ISO_LUNAR_MODULE})-$ISO_BUILD.tar.bz2 $ISO_TARGET/var/cache/lunar/
 
 # copy the installed code over:
 echo "+ copying installer program"

Deleted: lunar-iso/trunk/scripts/moonbase

Modified: lunar-iso/trunk/scripts/proper
===================================================================
--- lunar-iso/trunk/scripts/proper	2007-01-06 19:19:41 UTC (rev 22871)
+++ lunar-iso/trunk/scripts/proper	2007-01-06 19:26:56 UTC (rev 22872)
@@ -80,10 +80,6 @@
   rm -rf moonbase
 ); fi
 
-# core toolset
-echo "+ archiving core tools"
-cp $ISO_SOURCE/cache/${ISO_LUNAR_MODULE}-${ISO_DATE}-*.tar.bz2 $ISO_TARGET/var/cache/lunar/
-
 # more more more!
 rm -rf $ISO_TARGET/usr/src $ISO_TARGET/var/build
 mkdir -p $ISO_TARGET/usr/src $ISO_TARGET/var/build

Modified: lunar-iso/trunk/scripts/rebuild
===================================================================
--- lunar-iso/trunk/scripts/rebuild	2007-01-06 19:19:41 UTC (rev 22871)
+++ lunar-iso/trunk/scripts/rebuild	2007-01-06 19:26:56 UTC (rev 22872)
@@ -45,6 +45,9 @@
 
 chroot $ISO_TARGET lin kernel-headers-${ISO_KSUFFIX}
 
+# install core tools manually, since we can't download
+
+
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "+          STARTING COMPILE PHASE OF ALL MODULES       +"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

Copied: lunar-iso/trunk/scripts/toolset (from rev 22833, lunar-iso/trunk/scripts/moonbase)
===================================================================
--- lunar-iso/trunk/scripts/toolset	                        (rev 0)
+++ lunar-iso/trunk/scripts/toolset	2007-01-06 19:26:56 UTC (rev 22872)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd $ISO_SOURCE/template
+wget http://lunar-linux.org/lunar/moonbase.tar.bz2
+wget http://lunar-linux.org/lunar/${ISO_LUNAR_MODULE}.tar.bz2
+lin moonbase
+ARCHIVE=on lin ${ISO_LUNAR_MODULE}
+cp /var/cache/lunar/${ISO_LUNAR_MODULE}-$(lsh echo module_version ${ISO_LUNAR_MODULE})-${ISO_BUILD}.tar.bz2 .
+