Changeset 729 for trunk/tools


Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (13 years ago)
Author:
bruno
Message:

merge -r686:728 $SVN_M/branches/stable

Location:
trunk/tools
Files:
1 added
6 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
  • trunk/tools/build2qemu

    r618 r729  
    7272            exit -1
    7373    fi
    74     export sp=2222
     74    if [ _"$sp" = _"" ]; then
     75        export sp=2222
     76    fi
    7577    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
    7678    if [ $? -ne 0 ]; then
  • trunk/tools/common-env

    r649 r729  
    1010export TOPDIR=${BASE}/build
    1111mkdir -p ${TOPDIR}
    12 export TMPDIR=
    13 export TMP=`mktemp -d -p /tmp`
     12export TMPDIR=/tmp
     13export TMP=`mktemp -d`
    1414
    1515umask 022
  • trunk/tools/mkchangelog.pl

    r672 r729  
    8383    #print "**$ndate**\n";
    8484    if ($dtype eq "rpm") {
    85         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
     85        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
    8686        print OUTPUT "- Updated to $ver\n";
    8787        }
  • trunk/tools/pkg2ftp

    r592 r729  
    5858        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
    5959        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     60    elif [  _"$dtype" = "_deb" ]; then
     61        pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
     62        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
    6063    fi
    6164done
  • trunk/tools/svn2build

    r672 r729  
    3737    v=`cat ${SVNBRANCH}/$p/VERSION`
    3838    echo "Management of $p $v-$REVISION"
    39     dest="$p-$v-$TAG"
     39    dest="$p-$v"
    4040    rm -fr $dest
    4141    svn export ${SVNBRANCH}/$p $dest
     
    7272            fi
    7373            echo "Using $inc customization to build SPEC file"
    74             m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7574
    7675            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
     
    7978                exit -1
    8079            fi
    81             cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     80            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     81
    8282            rm -f $TMP/$p.spec
    8383        elif [ "$dtype" = "ebuild" ]; then
     
    116116    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
    117117        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    118         if [ ! -d mondo-doc-$v1-$TAG ]; then
     118        if [ ! -d mondo-doc-$v1 ]; then
    119119            echo "mondo-doc should be created before $p"
    120120            exit -1
    121121        fi
    122         (cd mondo-doc-$v1-$TAG ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
     122        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
    123123        rm -f $dest/rootfs/sbin/parted2fdisk-ia64
    124124    fi
    125125    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    126126        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    127         if [ ! -d mondo-doc-$v1-$TAG ]; then
     127        if [ ! -d mondo-doc-$v1 ]; then
    128128            echo "mondo-doc should be created before $p"
    129129            exit -1
    130130        fi
    131         (cd mondo-doc-$v1-$TAG ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
     131        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
    132132        (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
    133133    fi
Note: See TracChangeset for help on using the changeset viewer.