Ignore:
Timestamp:
May 30, 2006, 10:51:12 PM (13 years ago)
Author:
bcornec
Message:

Build process fixes following first attempt to deliver 2.0.8

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.8/tools/build2pkg

    r576 r597  
    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
     82        rm -rf ${TOPBUILDDIR}/RPMS/${ar}/*
     83        rm -rf ${TOPBUILDDIR}/SRPMS/*
    8284
    8385        rpmbuild -ba $p.spec 2> $log 1> $log
     86        egrep '^Wrote:' $log
    8487        if [ $? != 0 ]; then
    8588            cat $log
    8689            status=-1
    8790        fi
     91        rm -rf ${TOPBUILDDIR}/BUILD/*
    8892        cd ..
    8993    elif [  _"$dtype" = _"ebuild" ]; then
    9094        log=/tmp/$p-gentoo.log
    9195        ln -sf $src .
    92         tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
     96        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
    9397        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9498            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    97101
    98102        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    99         mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     103        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    100104        rm -rf $pv
    101105
Note: See TracChangeset for help on using the changeset viewer.