Changeset 732 in MondoRescue for branches/stable/tools

Timestamp:

Jul 31, 2006, 2:20:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

• More tests on gentoo packaging. Still not there but much better
• Fix a pb on debian mondo-doc

Location:

branches/stable/tools

Files:

• build2pkg (modified) (3 diffs)
• distro-env (modified) (1 diff)

branches/stable/tools/build2pkg

@@ -93 +93 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        ln -sf $src .
         tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
@@ -101 +100 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
+        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${VER}.ebuild
         rm -rf $p-${VER}
 
@@ -110 +109 @@
             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-${VER}.ebuild install 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log

branches/stable/tools/distro-env

@@ -72 +72 @@
     dfam="gentoo"
     dtype="ebuild"
-    suf=".${ddir}${dver}"
+    dver1=`echo ${dver} | sed "s/\.//"`
+    suf=".${ddir}${dver1}"
     BUILDDIR=${TOPDIR}/ebuild 
 elif [ $ddir = "slackware" ]; then