Changeset 597 in MondoRescue for branches/2.0.8/tools/build2qemu

Timestamp:

May 30, 2006, 10:51:12 PM (18 years ago)

Author:

bcornec

Message:

Build process fixes following first attempt to deliver 2.0.8

File:

• branches/2.0.8/tools/build2qemu (modified) (4 diffs)

branches/2.0.8/tools/build2qemu

@@ -39 +39 @@
 if [ _"$1" == _"" ]; then
     export VMS=`cat ${TOOLHOME}/DISTROS` 
+    single=0
 else
-    export VMS="$1"
+    export VMS="$*"
+    single=1
 fi
 
@@ -52 +54 @@
 export TOOLHOME=$TOOLHOME
 
-$TOOLHOME/build2pkg $LAST
-$TOOLHOME/pkg2ftp
+$TOOLHOME/build2pkg $LAST < /dev/null
+$TOOLHOME/pkg2ftp $LAST
 EOF
 chmod 755 $TMP/mkmondo
 
-$TOOLHOME/files2ftp
+if [ $single -eq 0 ]; then
+    $TOOLHOME/file2ftp
+fi
 cd $TOOLHOME/..
 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
@@ -68 +72 @@
             exit -1
     fi
+    export sp=2222
     ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
-    export sp=2222
     if [ $? -ne 0 ]; then
         # Virtual machine alreday started
@@ -76 +80 @@
         sleep 300
     fi
+    ssh -p $sp root@localhost "perl -pi -e 's|/home/bruno|/users/bruno|' /etc/passwd /home/bruno/.rpmmacros ; mv /home /users; rpm -e tetex tetex-latex passivetex jadetex texinfo xmltex linuxdoc-tools xmlto docbook-utils-pdf subversion tetex-context tetex-dvips docbook-utils"
     scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
-    ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
+    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
     #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"
         sleep 300
-        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu | awk '{print $2}'`
+        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`
         if [ "$proces" != "" ]; then
             kill $proces