Changeset 657


Ignore:
Timestamp:
Jun 9, 2006, 1:06:23 AM (13 years ago)
Author:
bcornec
Message:

Debian more and more !

Location:
branches/2.0.8/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.8/tools/build2pkg

    r655 r657  
    6767        pkg="$pkg $pkg1"
    6868
    69         log=/tmp/$p-rpm.log
     69        log=$TMP/$p-rpm.log
    7070
    7171        if [ "$dfam" = "mandriva" ]; then
     
    9090        cd ..
    9191    elif [  _"$dtype" = _"ebuild" ]; then
    92         log=/tmp/$p-gentoo.log
     92        log=$TMP/$p-gentoo.log
    9393        ln -sf $src .
    9494        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
     
    124124        fi
    125125    elif [  _"$dtype" = _"deb" ]; then
    126         log=/tmp/$p-deb.log
     126        log=$TMP/$p-deb.log
    127127        cd $TOPBUILDDIR
    128128        tar xfz $src
    129129        cd ${pv}*
    130         ln -s distributions/debian debian
    131         # update debian/changelog
     130        # point to the right debian conf
     131        ln -s distributions/${ddir}-$dver debian
    132132        dpkg-buildpackage -us -uc -rfakeroot
    133133        # Et voila !
  • branches/2.0.8/tools/svn2build

    r642 r657  
    5454
    5555        ddd=`LANG=C ; date '+%Y-%m-%d'`
    56         cat > /tmp/mondorescue.mc << EOF
     56        cat > $TMP/mondorescue.mc << EOF
    5757define(\`TTT', ${TAG})dnl
    5858define(\`RRR', ${TAG}${suf})dnl
     
    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
     74            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7575
    76             $TOOLHOME/mkchangelog.pl $dtype $p /tmp/$p.spec
     76            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
    7777            if [ $? -ne 0 ]; then
    7878                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    7979                exit -1
    8080            fi
    81             cat /tmp/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
    82             rm -f /tmp/$p.spec
     81            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     82            rm -f $TMP/$p.spec
    8383        elif [ "$dtype" = "ebuild" ]; then
    84             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
     84            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
    8585        elif [ "$dtype" = "deb" ]; then
    8686            # To be developped
    87             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
     87            #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
     88            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.chg
     89            if [ $? -ne 0 ]; then
     90                echo "Unable to create changelog for ${ddir}-$dver/$p.chg"
     91                exit -1
     92            fi
     93            mv $TMP/$p.chg $dest/distributions/${ddir}-$dver/changelog
    8894        else
    8995            echo "Unknown Build"
     
    94100        cd $dest
    95101        for f in mondorescue-howto.sgml *8; do
    96             m4 /tmp/mondorescue.mc $f > ${f}.new
     102            m4 $TMP/mondorescue.mc $f > ${f}.new
    97103            mv ${f}.new $f
    98104        done
     
    134140done
    135141
    136 rm -f /tmp/mondorescue.mc
     142rm -f $TMP/mondorescue.mc
    137143
    138144echo "Version delivered :"
Note: See TracChangeset for help on using the changeset viewer.