Changeset 764 in MondoRescue for trunk/tools/build2pkg

Timestamp:

Aug 8, 2006, 12:34:37 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r728:763 $SVN_M/branches/stable

File:

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

trunk/tools/build2pkg

@@ -8 +8 @@
 #
 
-umask 022
+(
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -55 +55 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
+    PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
 
     if [  _"$dtype" = _"rpm" ]; then
@@ -69 +70 @@
         log=$TMP/$p-rpm.log
 
-        if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then
-            echo "Generating bzip2 files ($dfam)"
-            gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
+        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
+            echo "Using bzip2 files ($dfam)"
+            ln -sf $pv.tar.bz2 SOURCES/
         else
+            echo "Using gzip files ($dfam)"
             ln -sf $src SOURCES/
         fi
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
-        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
-        rm -rf $p-${VER}
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p.spec
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p.spec .
+        rm -rf $p-${PVER}
 
-        rpmbuild -ba $p.spec 2> $log 1> $log
+        rpmbuild -ba $p.spec 2>&1 | tee $log
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         else
-            egrep '^Wrote:' $log
-            rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+            if [ -f /usr/bin/rpmlint ]; then
+                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+            else
+                echo "No rpmlint found, please install it"
+            fi
         fi
         rm -rf ${TOPBUILDDIR}/BUILD/*
@@ -93 +97 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        ln -sf $src .
-        tar xfz $src $p-${VER}/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"
@@ -101 +104 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
-        rm -rf $p-${VER}
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        rm -rf $p-${PVER}
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
-        if [ $? != 0 ]; then 
-            cat $log
-            status=-1
-        fi
-        ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
-        if [ $? != 0 ]; then 
-            cat $log
-            status=-1
-        fi
-        #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
@@ -130 +123 @@
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${p}-${VER}
+        cd ${p}-${PVER}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian
@@ -149 +142 @@
     fi
 fi
+) 2>&1 | tee /tmp/build2pkg.log