Changeset 317 for trunk/tools


Ignore:
Timestamp:
Jan 13, 2006, 8:46:06 PM (14 years ago)
Author:
bcornec
Message:

merge -r309:316 $SVN_M/branches/2.06

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkrpm

    r304 r317  
    1717. $TOOLHOME/rpm-env
    1818
     19# To be safe for SVN commands
     20cd $TOOLHOME/..
    1921rev=`$TOOLHOME/mksvnversion`
     22
     23echo "Generating SVN log file ..."
     24svn log -v > /tmp/mondorescue-svn.log
    2025
    2126if [ "$1" = "" ]; then
     
    3540    tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
    3641    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    37     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     42    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    3843    rm -f ${TMP}/mindi-kernel*-root
    39     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     44    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    4045fi
    4146if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     
    4449    rm -fr mindi-${MINDI_VER}
    4550    cp -a ${VER}/mindi mindi-${MINDI_VER}
    46     svn log -v > mindi-${MINDI_VER}/svn.log
     51    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    4752    find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
    4853    find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
     
    5257    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    5358    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
    54     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     59    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    5560    rm -f ${TMP}/mindi-*-root
    56     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     61    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    5762    # ATTENTION: This could be dangerous for your setup
    5863    opt="rm -rf /usr/lib/mindi ;"
     
    6368    rm -rf mondo-${MONDO_VER}
    6469    cp -a ${VER}/mondo mondo-${MONDO_VER}
    65     svn log -v > mondo-${MONDO_VER}/svn.log
     70    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    6671    cd mondo-${MONDO_VER}
    6772    echo "Bootstraping mondo ... "
     
    7378    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    7479    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
    75     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     80    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    7681    rm -f ${TMP}/mondo-*-root
    77     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
     82    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    7883fi
    7984cd ${TOPDIR}/SPECS
  • trunk/tools/rpm-env

    r276 r317  
    3636    export ddir="mandriva"
    3737    export dver=`awk '{print $4}' /etc/mandriva-release`
    38     export suf="${dver}mdk"
     38    export suf=".`echo $dver | sed 's/\.//'`mdk"
    3939elif [ -e /etc/mandrake-release ]; then
    4040    export ddir="mandrake"
    4141    export dver=`awk '{print $3}' /etc/mandrake-release`
    42     export suf="${dver}mdk"
     42    export suf=".`echo $dver | sed 's/\.//'`mdk"
    4343elif [ -e /etc/redhat-release ]; then
    4444    grep -q Enterprise /etc/redhat-release
     
    4949        export ddir="fedora"
    5050        export dver=`awk '{print $4}' /etc/redhat-release`
    51         export suf="fc${dver}"
     51        export suf=".fc${dver}"
    5252    else
    5353        export ddir="redhat"
    5454        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
    55         export suf="rh${dver}"
     55        export suf=".rh${dver}"
    5656    fi
    5757elif [ -e /etc/SuSE-release ]; then
     
    7070
    7171if [ _"$suf" = _"" ]; then
    72     export suf="${ddir}${dver}"
     72    export suf=".${ddir}${dver}"
    7373fi
Note: See TracChangeset for help on using the changeset viewer.