Changeset 723 in MondoRescue for branches/stable/tools/build2pkg

Timestamp:

Jul 29, 2006, 2:33:04 AM (18 years ago)

Author:

Bruno Cornec

Message:

Build RPMS modified again for TAG

File:

• branches/stable/tools/build2pkg (modified) (4 diffs)

branches/stable/tools/build2pkg

@@ -77 +77 @@
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
-        mv $pv/distributions/${ddir}-$dver/$p.spec .
-        rm -rf $pv
+        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
+        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
+        rm -rf $p-${VER}
 
         rpmbuild -ba $p.spec 2> $log 1> $log
@@ -94 +94 @@
         log=$TMP/$p-gentoo.log
         ln -sf $src .
-        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
+        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -101 +101 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
-        rm -rf $pv
+        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
+        rm -rf $p-${VER}
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${VER}-r$TAG.ebuild digest 2> $log 1> $log
+        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        ebuild $p-${VER}-r$TAG.ebuild unpack 2>> $log 1>> $log
+        ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        ebuild $p-${VER}-r$TAG.ebuild compile 2>> $log 1>> $log
+        ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        #ebuild $p-${VER}-r$TAG.ebuild install 2>> $log 1>> $log
+        #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
@@ -130 +130 @@
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${pv}
+        cd ${p}-${VER}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian