Changeset 543 in MondoRescue for branches/stable/tools


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

stable is now at same level as 2.0.8 (r538)

Location:
branches/stable/tools
Files:
7 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/stable/tools/deb-env

    r541 r543  
    1919dname=`dirname $0`
    2020
     21
    2122# TBD
    2223export TOPDIR=${BASE}/debs
    2324mkdir -p ${TOPDIR}
     25export opt=""
     26export pkg=""
     27export ARCH=""
    2428
    2529if [ -e /etc/debian-release ]; then
     30    export dfam="debian"
    2631    export ddir="debian"
    2732    export dver=`awk '{print $4}' /etc/debian-release`

  • branches/stable/tools/livwww

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

  • branches/stable/tools/mkcommon

    r541 r543  
    22#
    33# Prepare build env common for all packages build process from SVN repository
     4# Also prepare the documentation which is common
    45#
    56# $Id$
    … …  
    89umask 022
    910
     11cd $TOOLHOME/..
    1012echo "Generating SVN log file ..."
    11 cd $TOOLHOME/..
    1213svn log -v > /tmp/mondorescue-svn.log
    1314
    1415if [ "$1" = "" ]; then
    15     c="mindi mondo"
     16        c="mondo-doc mindi mondo"
    1617else
    17     c=$1
     18    if [ "$1" = "all" ]; then
     19            c="mindi-kernel mondo-doc mindi mondo"
     20    else
     21        c=$1
     22    fi
    1823fi
    1924if [ "`echo $c | grep mindi-kernel`" != "" ]; then
    … …  
    2833    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    2934fi
     35
     36#
     37# Should be done before mindi
     38#
     39if [ "`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}
     61fi
    3062if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3163    cd ${BASE}/svn
    … …  
    3466    svn export ${VER}/mindi mindi-${MINDI_VER}
    3567    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    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 ..
     68    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
    4369    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    4470    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    … …  
    4975    rm -f ${TMP}/mindi-*-root
    5076fi
    51 if [ "`echo $c | grep mondo`" != "" ]; then
     77if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    5278    cd ${BASE}/svn
    5379    echo "Management of mondo ${MONDO_VER}-$REVISION"
    … …  
    5682    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    5783    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    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 ..
     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)
    7486
    7587    echo "Creating mondo tar files"

  • branches/stable/tools/mkdeb

    r541 r543  
    2828    cd ${BASE}/svn
    2929    mkdir -p ${TOPDIR}/SOURCES
    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"
     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
    3235fi
    3336if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3437    cd ${BASE}/svn
    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
     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
    4141    rm -rf mindi-${MINDI_VER}/distributions
    4242    mkdir -p ${TOPDIR}/SOURCES
    4343
    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 ;"
     44    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     45    pkg="$pkg $pkg1"
     46    rm -f $pkg1
    4747fi
    4848if [ "`echo $c | grep  mondo`" != "" ]; then
    4949    cd ${BASE}/svn
    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
     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
    5653    rm -rf mondo-${MONDO_VER}/distributions
    5754
    58     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     55    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     56    pkg="$pkg $pkg1"
     57    rm -f $pkg1
    5958fi
    6059
    6160cd ${TOPDIR}/SPECS
    6261status=0
    63 if [ "`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
    71 fi
    72 if [ "`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
    80 fi
    81 if [ "`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
     62for p in "$c"; do
     63    echo "Generating $p deb"
     64    log=/tmp/$p-deb.log
     65    #rpmbuild -ba $p.spec 2> $log 1> $log
    8566    if [ $? != 0 ]; then
    8667        cat $log
    … …  
    8970fi
    9071if [ $status = 0 ]; then
    91     echo "Installing RPMS as root ($pkg)"
     72    echo "Installing deb as root ($pkg)"
    9273    su - -c "$opt rpm -Uvh --force $pkg"
    9374fi

  • branches/stable/tools/mkdeliv

    r542 r543  
    2828
    2929if [ "$1" = "" ]; then
    30     c="mindi mondo"
     30        c="mondo-doc 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`" != "" ]; then
     41if [ "`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"
     47fi
     48if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    4249    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
    4350    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2

  • branches/stable/tools/mkrpm

    r541 r543  
    1818
    1919if [ "$1" = "" ]; then
    20     c="mindi mondo"
     20    c="mondo-doc mindi mondo"
    2121else
    22     c=$1
     22    if [ "$1" = "all" ]; then
     23        c="mindi-kernel mondo-doc mindi mondo"
     24    else
     25        c=$1
     26    fi
    2327fi
    2428
    … …  
    4852    opt="rm -rf /usr/lib/mindi ;"
    4953fi
    50 if [ "`echo $c | grep  mondo`" != "" ]; then
     54if [ "`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
     63fi
     64
     65if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    5166    cd ${BASE}/svn
    5267    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    … …  
    6277cd ${TOPDIR}/SPECS
    6378status=0
    64 if [ "`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
     79
     80for p in $c; do
     81    echo "Generating $p RPMS"
     82    log=/tmp/$p-rpm.log
     83    rpmbuild -ba $p.spec 2> $log 1> $log
    6884    if [ $? != 0 ]; then
    6985        cat $log
    7086        status=-1
    7187    fi
    72 fi
    73 if [ "`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
    81 fi
    82 if [ "`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
    90 fi
     88done
    9189if [ $status = 0 ]; then
    9290    echo "Installing RPMS as root ($pkg)"

  • branches/stable/tools/rpm-env

    r542 r543  
    99prem=`echo $dname |cut -c1`
    1010if [ ${prem} == "/" ]; then
    11         export TOOLHOME=$dname
     11    export TOOLHOME=$dname
    1212else
    1313    export TOOLHOME=${PWD}/$dname
Note: See TracChangeset for help on using the changeset viewer.