Changeset 599 in MondoRescue

Timestamp:

May 31, 2006, 12:19:51 AM (19 years ago)

Author:

bcornec

Message:

Again some building process bugs removed

Location:

branches/stable/tools

Files:

• build2pkg (modified) (1 diff)
• build2qemu (modified) (1 diff)

branches/stable/tools/build2pkg

@@ -80 +80 @@
         mv $pv/distributions/${ddir}-$dver/$p.spec .
         rm -rf $pv
-        rm -rf ${TOPBUILDDIR}/RPMS/${ar}/*
-        rm -rf ${TOPBUILDDIR}/SRPMS/*
 
         rpmbuild -ba $p.spec 2> $log 1> $log
-        egrep '^Wrote:' $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
+        egrep '^Wrote:' $log
         rm -rf ${TOPBUILDDIR}/BUILD/*
         cd ..

branches/stable/tools/build2qemu

@@ -81 +81 @@
     fi
     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
+    rdate=`date "+%m%d%H%M"`
+    ssh -p $sp root@localhost "date $rdate"
+    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /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