Changeset 779


Ignore:
Timestamp:
Aug 9, 2006, 1:51:09 AM (13 years ago)
Author:
bruno
Message:

Build process updated from stable.

Location:
branches/2.0.9/tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.9/tools/build2pkg

    r762 r779  
    7171
    7272        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
    73             echo "Generating bzip2 files ($dfam)"
    74             gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
     73            echo "Using bzip2 files ($dfam)"
     74            ln -sf $pv.tar.bz2 SOURCES/
    7575        else
     76            echo "Using gzip files ($dfam)"
    7677            ln -sf $src SOURCES/
    7778        fi
     
    9596        cd ..
    9697    elif [  _"$dtype" = _"ebuild" ]; then
    97         log=$TMP/$p-gentoo.log
    9898        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
    9999        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
     
    107107
    108108        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    109         ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
     109        ebuild $p-${PVER}.ebuild digest
    110110        if [ $? != 0 ]; then
    111             cat $log
    112111            status=-1
    113112        fi
    114         ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
     113        ebuild $p-${PVER}.ebuild package
    115114        if [ $? != 0 ]; then
    116             cat $log
    117115            status=-1
    118116        fi
    119117    elif [  _"$dtype" = _"deb" ]; then
    120         log=$TMP/$p-deb.log
    121118        export TMPDIR=/tmp
    122119        cd $TOPBUILDDIR
  • branches/2.0.9/tools/file2ftp

    r758 r779  
    4646
    4747for p in $c; do
    48     src="$src ${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
     48    src1="${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
     49    src2=`echo $src1 | sed 's/\.tar\.gz//'`
     50    src="$src $src1 $src2.tar.bz2"
    4951done
     52
    5053
    5154echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"
  • branches/2.0.9/tools/mkannounce

    r659 r779  
    3030TAG=`echo $LAST | cut -d- -f2`
    3131
    32 SEARCH=`echo $LAST | cut -c2-`
     32SEARCH=`echo $VER | cut -c2-`
    3333
    3434rm -f $TMP/announce.tmp
    3535cat > $TMP/announce.tmp << EOF
    36 MondoRescue $LAST is now available</p>
     36MondoRescue $VER is now available</p>
    3737
    38 <p>I'm happy to announce the availability of a newest version of mondoescue $LAST. Enjoy it as usual!</p>
     38<p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
    3939<p>
    4040Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/
  • branches/2.0.9/tools/mkchangelog.pl

    r778 r779  
    8989    if ($dtype eq "rpm") {
    9090        if ($ver !~ /-/) {
    91             if ($first -eq 1) {
     91            if ($first eq 1) {
    9292                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
    9393            } else {
  • branches/2.0.9/tools/pkg2ftp

    r771 r779  
    6363        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
    6464        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
     65    elif [  _"$dtype" = "_ebuild" ]; then
     66        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
     67        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
    6568    fi
    6669done
  • branches/2.0.9/tools/svn2build

    r758 r779  
    138138    echo "Creating $p tar files"
    139139    tar cfphz ${DEST}/$p-$v.tar.gz $dest
    140     #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
    141     #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
     140    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
    142141done
    143142
Note: See TracChangeset for help on using the changeset viewer.