Changeset 1591 in MondoRescue for branches/stable/tools/build2pkg

Timestamp:

Aug 2, 2007, 12:26:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Improve tape support doc (Tilman Schmidt <tilman_at_imap.cc>)
• mdadm.conf files added to deplist
• Fix gentoo issues again (Francesco Talamona ti.liame_at_email.it)
• Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

(merge -r1579:1590 $SVN_M/branches/2.2.5)

File:

• branches/stable/tools/build2pkg (modified) (2 diffs)

branches/stable/tools/build2pkg

@@ -103 +103 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
+        if [ _"$p" = _"mondo" ]; then
+            eb="mondo-rescue"
+        else
+            eb=$p
+        fi
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -109 +114 @@
         fi
 
-        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$eb
+        mv $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$eb-${PVER}.ebuild
         rm -rf $p-${PVER}
 
-        cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest
+        cd ${TOPBUILDDIR}/portage/sys-apps/$eb
+        ebuild $eb-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild package
+        ebuild $eb-${PVER}.ebuild package
         if [ $? != 0 ]; then 
             status=-1
         fi
-        export pkg="$pkg $p-${PVER}.ebuild"
+        export pkg="$pkg $eb-${PVER}.ebuild"
     elif [  _"$dtype" = _"deb" ]; then
         cd $TOPBUILDDIR