Changeset 756 in MondoRescue for branches/2.0.9/tools

Timestamp:

Aug 7, 2006, 1:16:48 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r754:755 $SVN_M/branches/stable

Location:

branches/2.0.9/tools

Files:

• build2pkg (modified) (2 diffs)
• build2qemu (modified) (2 diffs)
• common-env (modified) (1 diff)
• file2ftp (modified) (1 diff)
• pkg2ftp (modified) (2 diffs)
• pkg2mdv (modified) (1 diff)
• svn2build (modified) (2 diffs)

branches/2.0.9/tools/build2pkg

@@ -8 +8 @@
 #
 
-umask 022
+exec > /tmp/build2pkg.log 2>&1
+
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -98 +99 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"

branches/2.0.9/tools/build2qemu

@@ -13 +13 @@
 # Syntax: build2qemu [version-tag [vm1]..|vmx]]
 
-umask 022
+exec > /tmp/build2qemu.log 2>&1
+
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -82 +83 @@
         sleep 300
     fi
-    scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
+    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
     rdate=`date "+%m%d%H%M"`
     ssh -p $sp root@localhost "date $rdate"

branches/2.0.9/tools/common-env

@@ -11 +11 @@
 mkdir -p ${TOPDIR}
 export TMPDIR=/tmp
-export TMP=`mktemp -d`
+export TMP=`mktemp -d tmp.XXXXXXXXXX`
 
 umask 022

branches/2.0.9/tools/file2ftp

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/file2ftp.log 2>&1
 
 dname=`dirname $0`

branches/2.0.9/tools/pkg2ftp

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/pkg2ftp.log 2>&1
 
 dname=`dirname $0`
@@ -59 +61 @@
         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     elif [  _"$dtype" = "_deb" ]; then
-        pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
+        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
         spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
     fi

branches/2.0.9/tools/pkg2mdv

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/pkg2mdv.log 2>&1
 
 dname=`dirname $0`

branches/2.0.9/tools/svn2build

@@ -5 +5 @@
 # $Id$
 #
+
+exec > /tmp/svn2build.log 2>&1
 
 dname=`dirname $0`
@@ -136 +138 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cfphz ${DEST}/$p-$v-$TAG.tar.gz $dest
+    tar cfphz ${DEST}/$p-$v.tar.gz $dest
     #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
     #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest