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


Ignore:
Timestamp:
Aug 2, 2007, 12:26:40 AM (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/tools/build2pkg

    r1570 r1591  
    103103        cd ..
    104104    elif [  _"$dtype" = _"ebuild" ]; then
    105         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
     105        if [ _"$p" = _"mondo" ]; then
     106            eb="mondo-rescue"
     107        else
     108            eb=$p
     109        fi
     110        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild
    106111        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    107112            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    109114        fi
    110115
    111         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    112         mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
     116        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$eb
     117        mv $p-${PVER}/distributions/${ddir}-$dver/$eb-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$eb-${PVER}.ebuild
    113118        rm -rf $p-${PVER}
    114119
    115         cd ${TOPBUILDDIR}/portage/sys-apps/$p
    116         ebuild $p-${PVER}.ebuild digest
     120        cd ${TOPBUILDDIR}/portage/sys-apps/$eb
     121        ebuild $eb-${PVER}.ebuild digest
    117122        if [ $? != 0 ]; then
    118123            status=-1
    119124        fi
    120         ebuild $p-${PVER}.ebuild package
     125        ebuild $eb-${PVER}.ebuild package
    121126        if [ $? != 0 ]; then
    122127            status=-1
    123128        fi
    124         export pkg="$pkg $p-${PVER}.ebuild"
     129        export pkg="$pkg $eb-${PVER}.ebuild"
    125130    elif [  _"$dtype" = _"deb" ]; then
    126131        cd $TOPBUILDDIR
Note: See TracChangeset for help on using the changeset viewer.