From: Ian Jackson <iwj@woking.cam.xci-test.com>
Date: Tue, 16 Oct 2012 17:43:50 +0000 (+0100)
Subject: wip reorg make installer massage work
X-Git-Tag: wip.xsm-13-actual.base~476^2~89^2~33
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d39c99e4105fb1bff00c39eba41119930978581d;p=people%2Fiwj%2Fosstest.git

wip reorg make installer massage work
---

diff --git a/mg-debian-installer-update b/mg-debian-installer-update
index 9657a23f..916620c7 100755
--- a/mg-debian-installer-update
+++ b/mg-debian-installer-update
@@ -27,7 +27,7 @@ mkdir -p $dst
 cd $dst
 
 for f in $files; do
-        echo "fetching $f"
+        echo >&2 "fetching $f"
         curl -s $src/$f >$f.new
 done
 
@@ -35,7 +35,7 @@ curl -s $pfile >Packages.bz2
 
 for p in $packages; do
         set +e
-        echo "collecting $p"
+        echo >&2 "collecting $p"
         pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX $p -nsFilename`
         rc=$?
         set -e
@@ -60,4 +60,5 @@ rm Packages.bz2
 #ln -s $date current.new
 #mv -Tf current.new current
 
-echo "downloaded $dstroot/$arch/$date"
+echo $date
+echo >&2 "downloaded $dstroot/$arch/$date"
diff --git a/standalone-reset b/standalone-reset
index b98fea8d..a42f0951 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -72,7 +72,9 @@ if [ "x$diver" = xcurrent ]; then
 		if test -d "$tftp/$dibase/$arch/$diver"; then continue; fi
 		mkdir -p "$tftp/$dibase/$arch"
 		echo "** need to generate d-i with firmware for $arch"
-		./mg-debian-installer-update $suite $arch $firmware
+		div=`./mg-debian-installer-update $suite $arch $firmware`
+		rm -f "$tftp/$dibase/$arch/current"
+		ln -s $div "$tftp/$dibase/$arch/current"
 	done
 fi