Changeset 729 for trunk/tools/build2pkg


Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/build2pkg

    r672 r729  
    6969        log=$TMP/$p-rpm.log
    7070
    71         if [ "$dfam" = "mandriva" ]; then
    72             echo "Generating bzip2 files (mandriva)"
     71        if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then
     72            echo "Generating bzip2 files ($dfam)"
    7373            gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
    7474        else
     
    7777        echo "Generating $p RPMS"
    7878        cd SPECS
    79         tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
    80         mv $pv/distributions/${ddir}-$dver/$p.spec .
    81         rm -rf $pv
     79        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
     80        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
     81        rm -rf $p-${VER}
    8282
    8383        rpmbuild -ba $p.spec 2> $log 1> $log
     
    8585            cat $log
    8686            status=-1
     87        else
     88            egrep '^Wrote:' $log
     89            rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
    8790        fi
    88         egrep '^Wrote:' $log
    8991        rm -rf ${TOPBUILDDIR}/BUILD/*
    9092        cd ..
     
    9294        log=$TMP/$p-gentoo.log
    9395        ln -sf $src .
    94         tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
     96        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
    9597        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9698            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    99101
    100102        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    101         mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    102         rm -rf $pv
     103        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     104        rm -rf $p-${VER}
    103105
    104106        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    105         ebuild $p-${VER}-r$TAG.ebuild digest 2> $log 1> $log
     107        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
    106108        if [ $? != 0 ]; then
    107109            cat $log
    108110            status=-1
    109111        fi
    110         ebuild $p-${VER}-r$TAG.ebuild unpack 2>> $log 1>> $log
     112        ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
    111113        if [ $? != 0 ]; then
    112114            cat $log
    113115            status=-1
    114116        fi
    115         ebuild $p-${VER}-r$TAG.ebuild compile 2>> $log 1>> $log
     117        ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
    116118        if [ $? != 0 ]; then
    117119            cat $log
    118120            status=-1
    119121        fi
    120         #ebuild $p-${VER}-r$TAG.ebuild install 2>> $log 1>> $log
     122        #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
    121123        if [ $? != 0 ]; then
    122124            cat $log
     
    125127    elif [  _"$dtype" = _"deb" ]; then
    126128        log=$TMP/$p-deb.log
     129        export TMPDIR=/tmp
    127130        cd $TOPBUILDDIR
    128131        tar xfz $src
    129         cd ${pv}*
     132        cd ${p}-${VER}
    130133        # point to the right debian conf
    131134        ln -s distributions/${ddir}-$dver debian
Note: See TracChangeset for help on using the changeset viewer.