Changeset 600


Ignore:
Timestamp:
May 31, 2006, 12:22:14 AM (13 years ago)
Author:
bcornec
Message:

merge -r 591:599 $SVN_M/branches/stable

Location:
trunk
Files:
7 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/mindi/distributions/rpm/mindi.spec

    r588 r600  
    5252
    5353%files
    54 %config(noreplace) %{_sysconfdir}/mindi
    5554%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    5655%config(noreplace) %{_sysconfdir}/mindi/deplist.d/*
  • trunk/mondo-doc/distributions/rpm/mondo-doc.spec

    r588 r600  
    33#
    44
    5 # if mandriva official build (rpm --with is_official)
    6 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    7 %define rel     RRR
     5%define mrel    RRR
    86%define tag     TTT
    97
     
    1311Name:       mondo-doc
    1412Version:    VVV
    15 Release:    %{rel}
     13Release:    %{mrel}
    1614License:    GPL
    1715Group:      GRP
  • trunk/tools/build2pkg

    r588 r600  
    7777        echo "Generating $p RPMS"
    7878        cd SPECS
    79         tar xfz $src $pv/distributions/$ddir/$p.spec
    80         mv $pv/distributions/$ddir/$p.spec .
     79        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
     80        mv $pv/distributions/${ddir}-$dver/$p.spec .
    8181        rm -rf $pv
    8282
     
    8686            status=-1
    8787        fi
     88        egrep '^Wrote:' $log
     89        rm -rf ${TOPBUILDDIR}/BUILD/*
    8890        cd ..
    8991    elif [  _"$dtype" = _"ebuild" ]; then
    9092        log=/tmp/$p-gentoo.log
    9193        ln -sf $src .
    92         tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
     94        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
    9395        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9496            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    9799
    98100        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    99         mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     101        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    100102        rm -rf $pv
    101103
  • trunk/tools/build2qemu

    r592 r600  
    3939if [ _"$1" == _"" ]; then
    4040    export VMS=`cat ${TOOLHOME}/DISTROS`
     41    single=0
    4142else
    42     export VMS="$1"
     43    export VMS="$*"
     44    single=1
    4345fi
    4446
     
    5254export TOOLHOME=$TOOLHOME
    5355
    54 $TOOLHOME/build2pkg $LAST
    55 $TOOLHOME/pkg2ftp
     56$TOOLHOME/build2pkg $LAST < /dev/null
     57$TOOLHOME/pkg2ftp $LAST
    5658EOF
    5759chmod 755 $TMP/mkmondo
    5860
    59 $TOOLHOME/files2ftp
     61if [ $single -eq 0 ]; then
     62    $TOOLHOME/file2ftp
     63fi
    6064cd $TOOLHOME/..
    6165tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
     
    6872            exit -1
    6973    fi
     74    export sp=2222
    7075    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
    71     export sp=2222
    7276    if [ $? -ne 0 ]; then
    7377        # Virtual machine alreday started
     
    7781    fi
    7882    scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
    79     ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
     83    rdate=`date "+%m%d%H%M"`
     84    ssh -p $sp root@localhost "date $rdate"
     85    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
    8086    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
    8187    if [ $vmp -eq 1 ]; then
    8288        ssh -p $sp root@localhost "halt -p"
    8389        sleep 300
    84         proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu | awk '{print $2}'`
     90        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`
    8591        if [ "$proces" != "" ]; then
    8692            kill $proces
  • trunk/tools/distro-env

    r592 r600  
    8787    dfam="redhat"
    8888    dtype="rpm"
    89     dver=`echo ${dver} | sed "s/\.//"`
     89    dver1=`echo ${dver} | sed "s/\.//"`
    9090    if [ $ddir = "fedora" ]; then
    91         suf=".fc${dver}"
     91        suf=".fc${dver1}"
    9292    elif [ $ddir = "redhat" ]; then
    93         suf=".rh${dver}"
     93        suf=".rh${dver1}"
    9494    else
    95         suf=".rhel${dver}"
     95        suf=".rhel${dver1}"
    9696    fi
    9797    BUILDDIR=${TOPDIR}/SPECS
  • trunk/tools/qemu-vm.txt

    r588 r600  
    4040
    4141Créer compte bruno avec répertoires nécéssaires + env necessaire
    42 useradd bruno
     42mkdir /users
     43useradd bruno -d /users/bruno
    4344passwd bruno
    4445
  • trunk/tools/svn2build

    r588 r600  
    6262EOF
    6363
    64         mkdir -p $dest/distributions/$ddir
     64        mkdir -p $dest/distributions/$ddir $dest/distributions/${ddir}-$dver
    6565        if [ "$dtype" = "rpm" ]; then
    6666            if [ -f $dest/distributions/$ddir/spec.m4 ]; then
     
    7373            fi
    7474            echo "Using $inc customization to build SPEC file"
    75             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/$ddir/$p.spec
     75            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7676
    7777            if [ -f $dest/distributions/$ddir/changelog ]; then
     
    8686            echo "Using $log customization to build changelog file"
    8787            ddate=`LANG=C ; date "+%a %b %d %Y"`
    88             cat > $dest/distributions/$ddir/$p.changelog.new << EOF
     88            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
    8989* $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
    9090- Updated to VVV-r${REVISION}
    9191
    9292EOF
    93             cat $log >> $dest/distributions/$ddir/$p.changelog.new
    94             m4 /tmp/mondorescue.mc $dest/distributions/$ddir/$p.changelog.new > $dest/distributions/$ddir/$p.changelog
    95             rm -f $dest/distributions/$ddir/$p.changelog.new
     93            cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
     94            m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
     95            rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
    9696
    9797        elif [ "$dtype" = "ebuild" ]; then
    98             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/$ddir/$p-$v-r$TAG.ebuild
     98            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
    9999        elif [ "$dtype" = "deb" ]; then
    100100            # To be developped
Note: See TracChangeset for help on using the changeset viewer.