Changeset 885 for branches


Ignore:
Timestamp:
Oct 8, 2006, 12:11:38 PM (13 years ago)
Author:
bruno
Message:

merge -r881:884 $SVN_M/branches/stable

Location:
branches/2.2.0
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.0/mindi/VERSION

    r881 r885  
    1 2.2.0
     11.2.0
  • branches/2.2.0/mindi/mindi

    r862 r885  
    11411141    fi
    11421142    output=""
     1143    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib /usr/local/lib64 /usr/X11R6/lib /usr/X11R6/lib64 `find /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d` ; do
    11431144    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
    11441145        [ ! -d "$path" ] && continue
  • branches/2.2.0/mondo/mondo/common/newt-specific.c

    r877 r885  
    928928
    929929        strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
    930         prompt[MAX_NEWT_COMMENT_LEN] = '\0';
     930        prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
    931931        text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
    932932        b_1 =
  • branches/2.2.0/tools/build2pkg

    r825 r885  
    6868        pkg="$pkg $pkg1"
    6969
    70         log=$TMP/$p-rpm.log
     70        log=$MONDOTMP/$p-rpm.log
    7171
    7272        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
     
    116116        fi
    117117    elif [  _"$dtype" = _"deb" ]; then
    118         export TMPDIR=/tmp
    119118        cd $TOPBUILDDIR
    120119        tar xfz $src
     
    130129echo "Packages handled : $pkg"
    131130
    132 rm -rf $TMP
     131rm -rf $MONDOTMP
    133132
    134133if [ $status = 0 ]; then
  • branches/2.2.0/tools/build2qemu

    r757 r885  
    4545fi
    4646
    47 mkdir -p $TMP
    48 cat > $TMP/mkmondo << EOF
     47cat > $MONDOTMP/mkmondo << EOF
    4948#!/bin/bash
    5049
     
    5756$TOOLHOME/pkg2ftp $LAST
    5857EOF
    59 chmod 755 $TMP/mkmondo
     58chmod 755 $MONDOTMP/mkmondo
    6059
    6160if [ $single -eq 0 ]; then
     
    6362fi
    6463cd $TOOLHOME/..
    65 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
     64tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $TOPDIR/${VER}-$TAG
    6665
    6766for m in $VMS; do
     
    6968    if [ ! -f /users/qemu/$m.qemu ]; then
    7069            echo "VM unaccessible. Verify NFS mount"
    71             rm -rf $TMP
     70            rm -rf $MONDOTMP
    7271            exit -1
    7372    fi
     
    8281        sleep 300
    8382    fi
    84     scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
     83    scp -P $sp $MONDOTMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
    8584    rdate=`date "+%m%d%H%M"`
    8685    ssh -p $sp root@localhost "date $rdate"
    87     ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
    88     #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
     86    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
     87    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo ; rm -f $MONDOTMP" | tee $MONDOTMP/mkvm.log
    8988    if [ $vmp -eq 1 ]; then
    9089        ssh -p $sp root@localhost "halt -p"
     
    9998
    10099# Should be removed at the end
    101 rm -rf $TMP
     100rm -rf $MONDOTMP
    102101) 2>&1 | tee /tmp/build2qemu.log
  • branches/2.2.0/tools/common-env

    r872 r885  
    1515export TOPDIR=${BASE}/delivery
    1616mkdir -p ${TOPDIR}
     17
    1718export TMPDIR=/tmp
    18 export TMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
     19export MONDOTMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
     20mkdir -p $MONDOTMP
    1921
    2022umask 022
  • branches/2.2.0/tools/distro-env

    r872 r885  
    77# Input parameters : $ddir (distro name) and $dver (distro version)
    88# If they do not exist then deduce from current distro
    9 # Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) BUILDDIR (dir to build packages)
     9# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) TOPBUILDDIR (dir to build packages)
    1010
    1111#
     
    6868    dtype="deb"
    6969    suf=".${dfam}${dver}"
    70     BUILDDIR=${TOPDIR}/debian
    7170elif [ $ddir = "gentoo" ]; then
    7271    dfam="gentoo"
     
    7473    dver1=`echo ${dver} | sed "s/\.//"`
    7574    suf=".${ddir}${dver1}"
    76     BUILDDIR=${TOPDIR}/ebuild
    7775elif [ $ddir = "slackware" ]; then
    7876    dfam="slack"
    7977    dtype="tgz"
    8078    suf=".${dfam}${dver}"
    81     BUILDDIR=${TOPDIR}/slack
    8279elif [ $ddir = "sles" -o $ddir = "suse" ]; then
    8380    dfam="suse"
    8481    dtype="rpm"
    8582    suf=".${ddir}${dver}"
    86     BUILDDIR=${TOPDIR}/SPECS
    8783elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
    8884    dfam="redhat"
     
    9692        suf=".rhel${dver1}"
    9793    fi
    98     BUILDDIR=${TOPDIR}/SPECS
    99 elif [ $ddir = "mandrake" -o $ddir = "mandriva" ]; then
     94elif [ $ddir = "mandrake" ]; then
    10095    dfam="mandriva"
    10196    dtype="rpm"
    10297    suf=".`echo $dver | sed 's/\.//'`mdk"
    103     BUILDDIR=${TOPDIR}/SPECS
     98elif [ $ddir = "mandriva" ]; then
     99    dfam="mandriva"
     100    dtype="rpm"
     101    suf=".`echo $dver | sed 's/\.//'`mdv"
    104102else
    105103    dfam="unknown"
    106104    dtype="unknown"
    107     BUILDDIR=${TOPDIR}/SPECS
    108105    suf="unknown"
    109106fi
     
    111108export dfam
    112109export dtype
    113 export BUILDDIR
    114110export suf
    115111
  • branches/2.2.0/tools/mkannounce

    r763 r885  
    3232SEARCH=`echo $VER | cut -c2-`
    3333
    34 rm -f $TMP/announce.tmp
    35 cat > $TMP/announce.tmp << EOF
     34rm -f $MONDOTMP/announce.tmp
     35cat > $MONDOTMP/announce.tmp << EOF
    3636MondoRescue $VER is now available</p>
    3737
     
    4343<p>
    4444EOF
    45 ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $TMP/announce.tmp
    46 cat >> $TMP/announce.tmp << EOF
     45ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
     46cat >> $MONDOTMP/announce.tmp << EOF
    4747</p>
    4848
     
    5555
    5656# Generating log files
    57 $TOOLHOME/mkchangelog.pl announce mindi $TMP/mindi.ann
    58 $TOOLHOME/mkchangelog.pl announce mondo $TMP/mondo.ann
    59 echo "<p>" >> $TMP/announce.tmp
    60 sed 's/$/<br>/' $TMP/mindi.ann >> $TMP/announce.tmp
    61 echo "</p><p>" >> $TMP/announce.tmp
    62 sed 's/$/<br>/' $TMP/mondo.ann >> $TMP/announce.tmp
    63 echo "</p>" >> $TMP/announce.tmp
    64 rm -f $TMP/mindi.ann $TMP/mondo.ann
     57$TOOLHOME/mkchangelog.pl announce mindi $MONDOTMP/mindi.ann
     58$TOOLHOME/mkchangelog.pl announce mondo $MONDOTMP/mondo.ann
     59echo "<p>" >> $MONDOTMP/announce.tmp
     60sed 's/$/<br>/' $MONDOTMP/mindi.ann >> $MONDOTMP/announce.tmp
     61echo "</p><p>" >> $MONDOTMP/announce.tmp
     62sed 's/$/<br>/' $MONDOTMP/mondo.ann >> $MONDOTMP/announce.tmp
     63echo "</p>" >> $MONDOTMP/announce.tmp
     64rm -f $MONDOTMP/mindi.ann $MONDOTMP/mondo.ann
    6565
    66 vi $TMP/announce.tmp
     66vi $MONDOTMP/announce.tmp
    6767# Store it in DB for Web pages generation
    68 $TOOLHOME/mkannounce.pl $TMP/announce.tmp
     68$TOOLHOME/mkannounce.pl $MONDOTMP/announce.tmp
    6969# Then deliver it on the Web
    7070$TOOLHOME/livwww www
    71 cat > $TMP/announce.hdr << EOF
     71cat > $MONDOTMP/announce.hdr << EOF
    7272<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/x html1/DTD/xhtml1-strict.dtd">
    7373
     
    7878  <p>
    7979EOF
    80 cat > $TMP/announce.ftr << EOF
     80cat > $MONDOTMP/announce.ftr << EOF
    8181</body>
    8282</html>
    8383EOF
    8484# Mail it to mr ML
    85 cat $TMP/announce.hdr $TMP/announce.tmp $TMP/announce.ftr | w3m -dump -T text/html > $TMP/mondo.ann.txt
     85cat $MONDOTMP/announce.hdr $MONDOTMP/announce.tmp $MONDOTMP/announce.ftr | w3m -dump -T text/html > $MONDOTMP/mondo.ann.txt
    8686export EMAIL="bruno@mondorescue.org"
    87 export TMPDIR=$TMP
    88 cat $TMP/mondo.ann.txt | mutt -s "`head -1 $TMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
    89 rm -rf $TMP
     87cat $MONDOTMP/mondo.ann.txt | mutt -s "`head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
     88rm -rf $MONDOTMP
  • branches/2.2.0/tools/svn2build

    r872 r885  
    3838    v=`cat ${TOOLHOME}/../$p/VERSION`
    3939    echo "Management of $p $v-$TAG (rev $REVISION)"
    40     dest="$p-$v"
     40    dest="$DEST/$p-$v"
    4141    rm -fr $dest
    4242    svn export ${TOOLHOME}/../$p $dest
     
    5151        . $TOOLHOME/distro-env
    5252
    53         # Create conf file dir
    54         mkdir -p ${BUILDDIR}
    55 
    5653        ddd=`LANG=C ; date '+%Y-%m-%d'`
    57         cat > $TMP/mondorescue.mc << EOF
     54        cat > $MONDOTMP/mondorescue.mc << EOF
    5855define(\`TTT', ${TAG})dnl
    5956define(\`RRR', ${TAG}${suf})dnl
     
    7471            echo "Using $inc customization to build SPEC file"
    7572
    76             $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
     73            $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec
    7774            if [ $? -ne 0 ]; then
    7875                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    7976                exit -1
    8077            fi
    81             m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     78            m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    8279
    83             rm -f $TMP/$p.spec
     80            rm -f $MONDOTMP/$p.spec
    8481        elif [ "$dtype" = "ebuild" ]; then
    85             m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
     82            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
    8683        elif [ "$dtype" = "deb" ]; then
    87             # To be developped
    88             #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
    8984            cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
    90             m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
     85            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
    9186            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
    9287            if [ $? -ne 0 ]; then
     
    9994    done
    10095
     96    # The rest is done there
     97    cd $DEST
    10198    if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
    10299        cd $dest
    103100        for f in mondorescue-howto.sgml *8; do
    104             m4 $TMP/mondorescue.mc $f > ${f}.new
     101            m4 $MONDOTMP/mondorescue.mc $f > ${f}.new
    105102            mv ${f}.new $f
    106103        done
     
    122119            exit -1
    123120        fi
    124         (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
     121        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
    125122        rm -f $dest/rootfs/sbin/parted2fdisk-ia64
    126123    fi
     
    131128            exit -1
    132129        fi
    133         (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
     130        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
    134131        (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
    135132    fi
     
    137134    # Finally creates the tar files
    138135    echo -n "Creating $p tar files (gzip... "
    139     tar cfphz ${DEST}/$p-$v.tar.gz $dest
     136    tar cfphz ${DEST}/$p-$v.tar.gz $p-$v
    140137    echo -n " bzip2..."
    141     tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
     138    tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
    142139    echo " )"
    143140done
    144141
    145 rm -rf $TMP
     142rm -rf $MONDOTMP
    146143
    147144echo "Version delivered :"
Note: See TracChangeset for help on using the changeset viewer.