Changeset 721 in MondoRescue

Timestamp:

Jul 29, 2006, 1:22:31 AM (19 years ago)

Author:

Bruno Cornec

Message:

TAG removed from source tar ball (was an error)
Debian build working for the first time. Needs probably more work but is encouraging

Location:

branches/stable/tools

Files:

• build2pkg (modified) (1 diff)
• build2qemu (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• svn2build (modified) (2 diffs)

branches/stable/tools/build2pkg

@@ -127 +127 @@
     elif [  _"$dtype" = _"deb" ]; then
         log=$TMP/$p-deb.log
+        export TMPDIR=/tmp
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${pv}*
+        cd ${pv}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian

branches/stable/tools/build2qemu

@@ -72 +72 @@
             exit -1
     fi
-    export sp=2222
+    if [ _"$sp" = _"" ]; then
+        export sp=2222
+    fi
     ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
     if [ $? -ne 0 ]; then

branches/stable/tools/pkg2ftp

@@ -58 +58 @@
         pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
+    elif [  _"$dtype" = "_deb" ]; then
+        pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
+        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
     fi
 done

branches/stable/tools/svn2build

@@ -37 +37 @@
     v=`cat ${SVNBRANCH}/$p/VERSION`
     echo "Management of $p $v-$REVISION"
-    dest="$p-$v-$TAG"
+    dest="$p-$v"
     rm -fr $dest
     svn export ${SVNBRANCH}/$p $dest
@@ -116 +116 @@
     if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1-$TAG ]; then
+        if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1-$TAG ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
+        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
         rm -f $dest/rootfs/sbin/parted2fdisk-ia64 
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1-$TAG ]; then
+        if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1-$TAG ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
+        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
         (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
     fi