Changeset 900 in MondoRescue for trunk/tools/build2pkg

Timestamp:

Oct 24, 2006, 8:49:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

File:

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

trunk/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        #rm -f $pkg1
 
-        pkg="$pkg $pkg1"
-
-        log=$TMP/$p-rpm.log
+        log=$MONDOTMP/$p-rpm.log
 
         if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
@@ -87 +83 @@
             status=-1
         else
+            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
             if [ -f /usr/bin/rpmlint ]; then
-                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+                /usr/bin/rpmlint $pkg1
             else
                 echo "No rpmlint found, please install it"
             fi
+            export pkg="$pkg `ls $pkg1 | grep -v src.rpm`"
         fi
         rm -rf ${TOPBUILDDIR}/BUILD/*
@@ -116 +114 @@
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        export TMPDIR=/tmp
         cd $TOPBUILDDIR
         tar xfz $src
@@ -130 +127 @@
 echo "Packages handled : $pkg"
 
-rm -rf $TMP
+rm -rf $MONDOTMP
 
 if [ $status = 0 ]; then