Changeset 588 in MondoRescue for trunk/tools/build2pkg

Timestamp:

May 29, 2006, 11:47:20 AM (18 years ago)

Author:

bcornec

Message:

merge -r 560:587 $SVN_M/branches/stable

File:

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

trunk/tools/build2pkg

@@ -48 +48 @@
 
 export pkg=""
+echo "Working under $TOPBUILDDIR"
 cd $TOPBUILDDIR
 
@@ -66 +67 @@
         pkg="$pkg $pkg1"
 
-        echo "Generating $p RPMS"
         log=/tmp/$p-rpm.log
 
@@ -75 +75 @@
             ln -sf $src SOURCES/
         fi
+        echo "Generating $p RPMS"
         cd SPECS
         tar xfz $src $pv/distributions/$ddir/$p.spec
@@ -86 +87 @@
         fi
         cd ..
-    elif [  _"$dtype" = _"gentoo" ]; then
-        echo "Gentoo"
+    elif [  _"$dtype" = _"ebuild" ]; then
         log=/tmp/$p-gentoo.log
         ln -sf $src .
-        tar xfz $src $pv/distributions/$ddir/$pv-r$TAG.ebuild
+        tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
+        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
+            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
+            echo "PORTDIR_OVERLAY=\"$TOPBUILDDIR/portage\"" >> /etc/make.conf
+        fi
 
-        ebuild $pv/distributions/$ddir/$pv-r$TAG.ebuild
+        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
+        mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
+        rm -rf $pv
+
+        cd ${TOPBUILDDIR}/portage/sys-apps/$p
+        ebuild $p-${VER}-r$TAG.ebuild digest 2> $log 1> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        rm -rf $pv
+        ebuild $p-${VER}-r$TAG.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
+        if [ $? != 0 ]; then 
+            cat $log
+            status=-1
+        fi
+        #ebuild $p-${VER}-r$TAG.ebuild install 2>> $log 1>> $log
+        if [ $? != 0 ]; then 
+            cat $log
+            status=-1
+        fi
+    elif [  _"$dtype" = _"deb" ]; then
+        log=/tmp/$p-deb.log
+        cd $TOPBUILDDIR
+        tar xfz $src
+        cd ${pv}*
+        ln -s distributions/debian debian
+        # update debian/changelog
+        pkg-buildpackage -us -uc -rfakeroot
+        # Et voila !
     else
         echo "Unknown"