Changeset 600 in MondoRescue for trunk/tools/build2pkg

Timestamp:

May 31, 2006, 12:22:14 AM (18 years ago)

Author:

bcornec

Message:

merge -r 591:599 $SVN_M/branches/stable

File:

• trunk/tools/build2pkg (modified) (3 diffs)

trunk/tools/build2pkg

@@ -77 +77 @@
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $pv/distributions/$ddir/$p.spec
-        mv $pv/distributions/$ddir/$p.spec .
+        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
+        mv $pv/distributions/${ddir}-$dver/$p.spec .
         rm -rf $pv
 
@@ -86 +86 @@
             status=-1
         fi
+        egrep '^Wrote:' $log
+        rm -rf ${TOPBUILDDIR}/BUILD/*
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
         log=/tmp/$p-gentoo.log
         ln -sf $src .
-        tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
+        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -97 +99 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
+        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
         rm -rf $pv