Changeset 782 for trunk/tools/build2pkg


Ignore:
Timestamp:
Aug 12, 2006, 11:32:32 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r763:781 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/build2pkg

    r764 r782  
    6363            ar=$ARCH
    6464        fi
    65         pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
     65        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
    6666        #rm -f $pkg1
    6767
     
    7272        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
    7373            echo "Using bzip2 files ($dfam)"
    74             ln -sf $pv.tar.bz2 SOURCES/
     74            ln -sf ${TOPDIR}/${VER}-$TAG/$pv.tar.bz2 SOURCES/
    7575        else
    7676            echo "Using gzip files ($dfam)"
     
    9696        cd ..
    9797    elif [  _"$dtype" = _"ebuild" ]; then
    98         log=$TMP/$p-gentoo.log
    9998        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
    10099        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
     
    108107
    109108        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    110         ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
     109        ebuild $p-${PVER}.ebuild digest
    111110        if [ $? != 0 ]; then
    112             cat $log
    113111            status=-1
    114112        fi
    115         ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
     113        ebuild $p-${PVER}.ebuild package
    116114        if [ $? != 0 ]; then
    117             cat $log
    118115            status=-1
    119116        fi
    120117    elif [  _"$dtype" = _"deb" ]; then
    121         log=$TMP/$p-deb.log
    122118        export TMPDIR=/tmp
    123119        cd $TOPBUILDDIR
Note: See TracChangeset for help on using the changeset viewer.