Changeset 600 in MondoRescue for trunk/tools/build2pkg


Ignore:
Timestamp:
May 31, 2006, 12:22:14 AM (14 years ago)
Author:
bcornec
Message:

merge -r 591:599 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/build2pkg

    r588 r600  
    7777        echo "Generating $p RPMS"
    7878        cd SPECS
    79         tar xfz $src $pv/distributions/$ddir/$p.spec
    80         mv $pv/distributions/$ddir/$p.spec .
     79        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
     80        mv $pv/distributions/${ddir}-$dver/$p.spec .
    8181        rm -rf $pv
    8282
     
    8686            status=-1
    8787        fi
     88        egrep '^Wrote:' $log
     89        rm -rf ${TOPBUILDDIR}/BUILD/*
    8890        cd ..
    8991    elif [  _"$dtype" = _"ebuild" ]; then
    9092        log=/tmp/$p-gentoo.log
    9193        ln -sf $src .
    92         tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
     94        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
    9395        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9496            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    9799
    98100        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    99         mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     101        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    100102        rm -rf $pv
    101103
Note: See TracChangeset for help on using the changeset viewer.