Changeset 729 in MondoRescue for trunk/tools/build2pkg

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

File:

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

trunk/tools/build2pkg

@@ -69 +69 @@
         log=$TMP/$p-rpm.log
 
-        if [ "$dfam" = "mandriva" ]; then
-            echo "Generating bzip2 files (mandriva)"
+        if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then
+            echo "Generating bzip2 files ($dfam)"
             gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
         else
@@ -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
@@ -85 +85 @@
             cat $log
             status=-1
+        else
+            egrep '^Wrote:' $log
+            rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
         fi
-        egrep '^Wrote:' $log
         rm -rf ${TOPBUILDDIR}/BUILD/*
         cd ..
@@ -92 +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"
@@ -99 +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
@@ -125 +127 @@
     elif [  _"$dtype" = _"deb" ]; then
         log=$TMP/$p-deb.log
+        export TMPDIR=/tmp
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${pv}*
+        cd ${p}-${VER}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian