Changeset 61


Ignore:
Timestamp:
Oct 14, 2005, 3:31:54 PM (14 years ago)
Author:
bcornec
Message:

Trunk: Applying patch r60/2.04_berlios on the build env to the trunk branch as well

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkdeliv

    r55 r61  
    4040    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    4141fi
    42 scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/TGZ
    43 scp -p ${rpms} ${SVNAUTH}:${DSTDIR}/RPMS
    44 scp -p ${srpms} ${SVNAUTH}:${DSTDIR}/SRPMS
     42scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/src
     43ssh ${SVNAUTH} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     44scp -p ${rpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
     45scp -p ${srpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
    4546ncftpput ${FTPURL} ${tgz}
  • trunk/tools/rpm-env

    r55 r61  
    3333
    3434if [ -e /etc/mandriva-release ]; then
    35         export suf=mdk
     35    export ddir="mandriva"
     36    export dver=`cat /etc/mandriva-release | awk '{print $4}'`
     37    export suf="${dver}mdk"
    3638elif [ -e /etc/mandrake-release ]; then
    37         export suf=mdk
     39    export ddir="mandrake"
     40    export dver=`cat /etc/mandrake-release | awk '{print $3}'`
     41    export suf="${dver}mdk"
     42elif [ -e /etc/redhat-release ]; then
     43    if [ `grep -q Enterprise /etc/redhat-release` ]; then
     44        export ddir="rhel"
     45        export dver=`cat /etc/redhat-release | awk '{print $7}'`
     46    else
     47        export ddir="redhat"
     48        export dver=`cat /etc/redhat-release | awk '{print $5}'`
     49    fi
     50elif [ -e /etc/SuSE-release ]; then
     51    export ddir="suse"
     52    export dver=`cat /etc/SuSE-release | head -1 | awk '{print $3}'`
    3853else
    39         export suf=""
     54    export dver=""
     55    export ddir="generic"
    4056fi
     57
     58if [ _"$suf" = _"" ]; then
     59    export suf="${ddir}${dver}"
     60fi
Note: See TracChangeset for help on using the changeset viewer.