Changeset 541 in MondoRescue for branches/stable/tools


Ignore:
Timestamp:
May 13, 2006, 8:47:23 PM (18 years ago)
Author:
bcornec
Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

Location:
branches/stable/tools
Files:
5 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/tools/deb-env

    r530 r541  
    1919dname=`dirname $0`
    2020
    21 
    2221# TBD
    2322export TOPDIR=${BASE}/debs
    2423mkdir -p ${TOPDIR}
    25 export opt=""
    26 export pkg=""
    27 export ARCH=""
    2824
    2925if [ -e /etc/debian-release ]; then
    30     export dfam="debian"
    3126    export ddir="debian"
    3227    export dver=`awk '{print $4}' /etc/debian-release`

  • branches/stable/tools/livwww

    r509 r541  
    1616TESTDIR=/mondo/www/html/test
    1717
    18 force=1
     18force=0
    1919nodoc=0
    2020
    21 if [ "$1" = "--keep" ]; then
    22         force=0
     21if [ "$1" = "-f" ]; then
     22        force=1
    2323        optsvn=""
    2424        shift
    … …  
    3535    DESTMACH=mondo.hpintelco.org
    3636else
    37     DESTMACH=www.mondorescue.org
     37    DESTMACH=www1.mondorescue.org
    3838fi
    3939

  • branches/stable/tools/mkcommon

    r530 r541  
    22#
    33# Prepare build env common for all packages build process from SVN repository
    4 # Also prepare the documentation which is common
    54#
    65# $Id$
    … …  
    98umask 022
    109
     10echo "Generating SVN log file ..."
    1111cd $TOOLHOME/..
    12 echo "Generating SVN log file ..."
    1312svn log -v > /tmp/mondorescue-svn.log
    1413
    1514if [ "$1" = "" ]; then
    16         c="mondo-doc mindi mondo"
     15    c="mindi mondo"
    1716else
    18     if [ "$1" = "all" ]; then
    19             c="mindi-kernel mondo-doc mindi mondo"
    20     else
    21         c=$1
    22     fi
     17    c=$1
    2318fi
    2419if [ "`echo $c | grep mindi-kernel`" != "" ]; then
    … …  
    3328    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    3429fi
    35 
    36 #
    37 # Should be done before mindi
    38 #
    39 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    40     cd ${BASE}/svn
    41     echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
    42     rm -rf mondo-doc-${MONDO_VER}
    43     svn export ${VER}/documentation mondo-doc-${MONDO_VER}
    44     svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
    45     echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
    46     cd mondo-doc-${MONDO_VER}
    47     $TOOLHOME/expandver mondorescue-howto.sgml *8
    48     make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
    49     if [ $? != 0 ]; then
    50         exit -1
    51     fi
    52     make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
    53     if [ $? != 0 ]; then
    54         exit -1
    55     fi
    56     cd ..
    57 
    58     echo "Creating mondo-doc tar files"
    59     tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
    60     tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
    61 fi
    6230if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    6331    cd ${BASE}/svn
    … …  
    6634    svn export ${VER}/mindi mindi-${MINDI_VER}
    6735    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    68     (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
     36    cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
     37    rm -rf documentation-${MONDO_VER}
     38    svn export ${VER}/documentation documentation-${MONDO_VER}
     39    cd documentation-${MONDO_VER}
     40    $TOOLHOME/expandver mindi*8
     41    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
     42    cd ..
    6943    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    7044    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    … …  
    7549    rm -f ${TMP}/mindi-*-root
    7650fi
    77 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     51if [ "`echo $c | grep mondo`" != "" ]; then
    7852    cd ${BASE}/svn
    7953    echo "Management of mondo ${MONDO_VER}-$REVISION"
    … …  
    8256    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    8357    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    84     (cd mondo-doc-${MONDO_VER} ; make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en ; make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man)
    85     (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
     58    rm -rf documentation-${MONDO_VER}
     59    svn export ${VER}/documentation documentation-${MONDO_VER}
     60    cd documentation-${MONDO_VER}
     61    $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
     62    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
     63    if [ $? != 0 ]; then
     64        exit -1
     65    fi
     66    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
     67    if [ $? != 0 ]; then
     68        exit -1
     69    fi
     70    cd ../mondo-${MONDO_VER}
     71    echo "Bootstraping mondo ... "
     72    ./bootstrap
     73    cd ..
    8674
    8775    echo "Creating mondo tar files"

  • branches/stable/tools/mkdeb

    r530 r541  
    2828    cd ${BASE}/svn
    2929    mkdir -p ${TOPDIR}/SOURCES
    30     $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    31     chmod 644 ${TOPDIR}/SPECS/mindi-kernel.spec
    32     pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    33     pkg="$pkg $pkg1"
    34     rm -f $pkg1
     30    sed "s/^%define mrel..*RRR/%define mrel ${REVISION}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     31    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    3532fi
    3633if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3734    cd ${BASE}/svn
    38     $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    39     cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
    40     chmod 644 ${TOPDIR}/SPECS/mindi.spec
     35    if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
     36        specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
     37    else
     38        specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
     39    fi
     40    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
    4141    rm -rf mindi-${MINDI_VER}/distributions
    4242    mkdir -p ${TOPDIR}/SOURCES
    4343
    44     pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    45     pkg="$pkg $pkg1"
    46     rm -f $pkg1
     44    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     45    # ATTENTION: This could be dangerous for your setup
     46    opt="rm -rf /usr/lib/mindi ;"
    4747fi
    4848if [ "`echo $c | grep  mondo`" != "" ]; then
    4949    cd ${BASE}/svn
    50     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    51     cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
    52     chmod 644 ${TOPDIR}/SPECS/mondo.spec
     50    if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
     51        specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
     52    else
     53        specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
     54    fi
     55    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
    5356    rm -rf mondo-${MONDO_VER}/distributions
    5457
    55     pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    56     pkg="$pkg $pkg1"
    57     rm -f $pkg1
     58    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    5859fi
    5960
    6061cd ${TOPDIR}/SPECS
    6162status=0
    62 for p in "$c"; do
    63     echo "Generating $p deb"
    64     log=/tmp/$p-deb.log
    65     #rpmbuild -ba $p.spec 2> $log 1> $log
     63if [ "`echo $c | grep kernel`" != "" ]; then
     64    echo "Generating mindi-kernel RPMS"
     65    log=/tmp/mindi-kernel-rpm.log
     66    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
     67    if [ $? != 0 ]; then
     68        cat $log
     69        status=-1
     70    fi
     71fi
     72if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     73    echo "Generating mindi RPMS"
     74    log=/tmp/mindi-rpm.log
     75    rpmbuild -ba mindi.spec 2> $log 1> $log
     76    if [ $? != 0 ]; then
     77        cat $log
     78        status=-1
     79    fi
     80fi
     81if [ "`echo $c | grep mondo`" != "" ]; then
     82    echo "Generating mondo RPMS"
     83    log=/tmp/mondo-rpm.log
     84    rpmbuild -ba mondo.spec 2> $log 1> $log
    6685    if [ $? != 0 ]; then
    6786        cat $log
    … …  
    7089fi
    7190if [ $status = 0 ]; then
    72     echo "Installing deb as root ($pkg)"
     91    echo "Installing RPMS as root ($pkg)"
    7392    su - -c "$opt rpm -Uvh --force $pkg"
    7493fi

  • branches/stable/tools/mkdeliv

    r530 r541  
    88# BerliOS FTP/SSH setup
    99ACCOUNT=bruno@ftp.mondorescue.org
    10 DSTDIR=/mondo/ftp
     10DSTDIR=/
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
    … …  
    2828
    2929if [ "$1" = "" ]; then
    30         c="mondo-doc mindi mondo"
     30    c="mindi mondo"
    3131else
    3232    c=$1
    … …  
    3939    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
    4040fi
    41 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    42     cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz
    43     cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2
    44     tgz="$tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2"
    45     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    46     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
    47 fi
    48 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     41if [ "`echo $c | grep  mondo`" != "" ]; then
    4942    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
    5043    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2

  • branches/stable/tools/mkrpm

    r532 r541  
    1818
    1919if [ "$1" = "" ]; then
    20     c="mondo-doc mindi mondo"
     20    c="mindi mondo"
    2121else
    22     if [ "$1" = "all" ]; then
    23         c="mindi-kernel mondo-doc mindi mondo"
    24     else
    25         c=$1
    26     fi
     22    c=$1
    2723fi
    2824
    … …  
    5248    opt="rm -rf /usr/lib/mindi ;"
    5349fi
    54 if [ "`echo $c | grep mondo-doc`" != "" ]; then
    55     cd ${BASE}/svn
    56     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo-doc.spec > ${TOPDIR}/SPECS/mondo-doc.spec
    57     cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo-doc.spec
    58     chmod 644 ${TOPDIR}/SPECS/mondo-doc.spec
    59 
    60     pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
    61     pkg="$pkg $pkg1"
    62     rm -f $pkg1
    63 fi
    64 
    65 if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
     50if [ "`echo $c | grep  mondo`" != "" ]; then
    6651    cd ${BASE}/svn
    6752    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    … …  
    7762cd ${TOPDIR}/SPECS
    7863status=0
    79 
    80 for p in $c; do
    81     echo "Generating $p RPMS"
    82     log=/tmp/$p-rpm.log
    83     rpmbuild -ba $p.spec 2> $log 1> $log
     64if [ "`echo $c | grep kernel`" != "" ]; then
     65    echo "Generating mindi-kernel RPMS"
     66    log=/tmp/mindi-kernel-rpm.log
     67    rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
    8468    if [ $? != 0 ]; then
    8569        cat $log
    8670        status=-1
    8771    fi
    88 done
     72fi
     73if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     74    echo "Generating mindi RPMS"
     75    log=/tmp/mindi-rpm.log
     76    rpmbuild -ba mindi.spec 2> $log 1> $log
     77    if [ $? != 0 ]; then
     78        cat $log
     79        status=-1
     80    fi
     81fi
     82if [ "`echo $c | grep mondo`" != "" ]; then
     83    echo "Generating mondo RPMS"
     84    log=/tmp/mondo-rpm.log
     85    rpmbuild -ba mondo.spec 2> $log 1> $log
     86    if [ $? != 0 ]; then
     87        cat $log
     88        status=-1
     89    fi
     90fi
    8991if [ $status = 0 ]; then
    9092    echo "Installing RPMS as root ($pkg)"

  • branches/stable/tools/mkspec

    r460 r541  
    1212if [ -f ${dir}/../$ddir/spec.m4 ]; then
    1313    inc=${dir}/../$ddir/spec.m4
    14 elif [ -f ${dir}/../$dfam/spec.m4 ]; then
    15     inc=${dir}/../$dfam/spec.m4
     14elif [ -f ${dir}/../$ddmir/spec.m4 ]; then
     15    inc=${dir}/../$ddmir/spec.m4
    1616else
    1717    echo "Unable to build RPM for this distro. Please report to authors"
    … …  
    2525cat >> /tmp/mondorescue.mc << EOF
    2626define(\`RRR', ${REVISION}${suf})dnl
    27 define(\`EEE', ${REVISION})dnl
    2827define(\`VVV', ${1})dnl
    2928EOF

  • branches/stable/tools/rpm-env

    r530 r541  
    99prem=`echo $dname |cut -c1`
    1010if [ ${prem} == "/" ]; then
    11     export TOOLHOME=$dname
     11        export TOOLHOME=$dname
    1212else
    1313    export TOOLHOME=${PWD}/$dname
    … …  
    5656        export ddir="redhat"
    5757        dver=`awk '{print $5}' /etc/redhat-release`
     58        export suf=".rh${dver}"
    5859        export dver=`echo ${dver} | sed "s/\.//"`
    59         export suf=".rh${dver}"
    6060    fi
    6161elif [ -e /etc/SuSE-release ]; then
Note: See TracChangeset for help on using the changeset viewer.