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

[Auke Kok]

Author: sofar
Date: 2007-01-11 04:04:26 +0100 (Thu, 11 Jan 2007)
New Revision: 22897

Modified:
   lunar-iso/trunk/TODO
   lunar-iso/trunk/scripts/test
   lunar-iso/trunk/scripts/toolset
Log:
Fix "missing" lunar - the packages file had the wrong version number. ugh. Added test target to make sure it works.


Modified: lunar-iso/trunk/TODO
===================================================================
--- lunar-iso/trunk/TODO	2007-01-11 00:18:31 UTC (rev 22896)
+++ lunar-iso/trunk/TODO	2007-01-11 03:04:26 UTC (rev 22897)
@@ -1,3 +1,2 @@
 * man lfirsttime bugs?
-* lunar module is mossing?
 * make oldconfig fails

Modified: lunar-iso/trunk/scripts/test
===================================================================
--- lunar-iso/trunk/scripts/test	2007-01-11 00:18:31 UTC (rev 22896)
+++ lunar-iso/trunk/scripts/test	2007-01-11 03:04:26 UTC (rev 22897)
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 [ ! -f $ISO_TARGET/var/lib/lunar/moonbase.tar.bz2 ] && echo "FAIL: missing moonbase" && exit 1
-[ ! -f $ISO_TARGET/var/cache/lunar/$ISO_LUNAR_MODULE-$ISO_DATE-$ISO_BUILD.tar.bz2 ] && echo "FAIL: missing $ISO_LUNAR_MODULE" && exit 1
-grep -q "^$ISO_LUNAR_MODULE:$ISO_DATE:" $ISO_TARGET/.packages || ( echo "FAIL: missing $ISO_LUNAR_MODULE in package list" && exit 1)
+[ ! -f $ISO_TARGET/var/cache/lunar/$ISO_LUNAR_MODULE-$(lsh module_version $ISO_LUNAR_MODULE)-$ISO_BUILD.tar.bz2 ] && echo "FAIL: missing $ISO_LUNAR_MODULE" && exit 1
+grep -q "^$ISO_LUNAR_MODULE:$(lsh module_version $ISO_LUNAR_MODULE):" $ISO_TARGET/.packages || ( echo "FAIL: missing $ISO_LUNAR_MODULE in package list" && exit 1)
 
 if [ -f $ISO_TARGET/.rebuild ]; then
 	# first define the tests:
@@ -39,6 +39,13 @@
 			RESULT=1
 		fi
 	done
+	for M in $(cat conf/base.list conf/extended.list conf/base.list-$ISO_KSUFFIX); do
+		V=$(grep "^$M:" $ISO_TARGET/.packages | cut -d: -f4 | tail -n 1)
+		if [ ! -f "$ISO_TARGET/var/cache/lunar/$M-$V-$ISO_BUILD.tar.bz2" ]; then
+			echo "FAILED: Cache is missing: $M-$V-$ISO_BUILD.tar.bz2"
+			RESULT=1
+		fi
+	done
 	exit ${RESULT:-0}
 else
 	echo "Can't run tests now!"

Modified: lunar-iso/trunk/scripts/toolset
===================================================================
--- lunar-iso/trunk/scripts/toolset	2007-01-11 00:18:31 UTC (rev 22896)
+++ lunar-iso/trunk/scripts/toolset	2007-01-11 03:04:26 UTC (rev 22897)
@@ -1,9 +1,13 @@
 #!/bin/bash
 
 cd $ISO_SOURCE/template
+
+rm -f moonbase.tar.bz2
 wget http://lunar-linux.org/lunar/moonbase.tar.bz2
+rm -f ${ISO_LUNAR_MODULE}.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 .
+cp /var/cache/lunar/${ISO_LUNAR_MODULE}-$(lsh module_version ${ISO_LUNAR_MODULE})-${ISO_BUILD}.tar.bz2 .