Changeset 1043 in MondoRescue for trunk/tools


Ignore:
Timestamp:
Jan 8, 2007, 11:31:22 PM (17 years ago)
Author:
Bruno Cornec
Message:

merge -r978:1042 $SVN_M/branches/stable

Location:
trunk/tools
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/DISTROS

    r839 r1043  
    77fedora_4
    88fedora_5
     9fedora_6
    910rhel_3
    1011rhel_4
    1112suse_10.0
    1213suse_10.1
     14suse_10.2
    1315sles_9
    1416sles_10
    … …  
    1618gentoo_1.6
    1719slackware_10.2
     20slackware_11.0
     21freebsd_5.5

  • trunk/tools/build2pkg

    r932 r1043  
    1111dname=`dirname $0`
    1212prem=`echo $dname |cut -c1`
    13 if [ ${prem} == "/" ]; then
     13if [ _${prem} = _"/" ]; then
    1414    export TOOLHOME=$dname
    1515else
    … …  
    115115            status=-1
    116116        fi
     117        export pkg="$pkg $p-${PVER}.ebuild"
    117118    elif [  _"$dtype" = _"deb" ]; then
    118119        cd $TOPBUILDDIR
    … …  
    122123        ln -s distributions/${ddir}-$dver debian
    123124        dpkg-buildpackage -us -uc -rfakeroot
     125        export pkg="$pkg $p-${PVER}.deb"
    124126        # Et voila !
     127    elif [  _"$dtype" = _"port" ]; then
     128        cd $TOPBUILDDIR
     129        tar xfz $src
     130        cd ${p}-${PVER}
     131        mv distributions/${ddir}-$dver/* $TOPBUILDDIR
     132        cd ..
     133        rm -rf ${p}-${PVER}
     134        make DISTDIR=$TOPBUILDDIR
     135    elif [  _"$dfam" = _"slackware" ]; then
     136        mkdir -p $TOPBUILDDIR/build-${p}/install
     137        cd $TOPBUILDDIR
     138        tar xfz $src
     139        cd ${p}-${PVER}
     140        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/build-${p}/install
     141        if [ -e distributions/${ddir}-$dver/doinst.sh ]; then
     142            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/build-${p}/install
     143        fi
     144        if [ _"$p" = _"mindi-busybox" ]; then
     145            make oldconfig
     146            make busybox
     147            DESTDIR=$TOPBUILDDIR/build-${p}/usr/lib/mindi/rootfs
     148            make PREFIX=$DESTDIR install
     149        elif [ _"$p" = _"mindi" ]; then
     150            export DONT_RELINK=1
     151            export HEAD=$TOPBUILDDIR/build-${p}
     152            export PREFIX=/usr
     153            export CONFDIR=/etc
     154            export MANDIR=/usr/man
     155            export DOCDIR=/usr/doc
     156            export LIBDIR=/usr/lib
     157            export RPMBUILDMINDI="true"
     158            ./install.sh
     159        elif [ _"$p" = _"mondo" ]; then
     160            ./configure --prefix=/usr
     161            make VERSION=$PVER
     162            make DESTDIR=$TOPBUILDDIR/build-${p} install
     163        elif [ _"$p" = _"mondo-doc" ]; then
     164            make -f Makefile.man VERSION=$PVER
     165            make -f Makefile.howto VERSION=$PVER
     166            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
     167            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
     168        else
     169            echo "Package $p not configured for $dfam"
     170        fi
     171        cd $TOPBUILDDIR/build-${p}
     172        ar=`arch`
     173        pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
     174        echo "Running sudo /sbin/makepkg -p -l y -c y $pkg1"
     175        sudo /sbin/makepkg -p -l y -c y $pkg1
     176        export pkg="$pkg $pkg1"
    125177    else
    126178        echo "Unknown"

  • trunk/tools/build2qemu

    r932 r1043  
    66#
    77
    8 #if [ _"$1" == _"" ]; then
     8#if [ _"$1" = _"" ]; then
    99    #echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
    1010    #exit -1
    1111#fi
    1212
    13 # Syntax: build2qemu [version-tag [vm1]..|vmx]]
     13# Syntax: build2qemu [version-tag [--pkg "pkg1...pkgn"] [vm1]..|vmx]]
    1414
    1515(
    1616dname=`dirname $0`
    1717prem=`echo $dname |cut -c1`
    18 if [ ${prem} == "/" ]; then
     18if [ _${prem} = _"/" ]; then
    1919    export TOOLHOME=$dname
    2020else
    … …  
    3636echo "Working on ${VER}-$TAG"
    3737
    38 if [ _"$1" == _"" ]; then
     38if [ _"$1" = _"--pkg" ]; then
     39    shift
     40    c=$1
     41    shift
     42fi
     43
     44if [ _"$1" = _"" ]; then
    3945    export VMS=`cat ${TOOLHOME}/DISTROS`
    4046    single=0
    … …  
    5258export TOOLHOME=$TOOLHOME
    5359
    54 $TOOLHOME/build2pkg $LAST < /dev/null
    55 $TOOLHOME/pkg2ftp $LAST
     60$TOOLHOME/build2pkg $LAST $c < /dev/null
     61$TOOLHOME/pkg2ftp $LAST $c
    5662EOF
    5763chmod 755 $MONDOTMP/mkmondo
    … …  
    6874
    6975for m in $VMS; do
     76    echo "Working on $m"
    7077    vmp=0
    7178    if [ ! -f /users/qemu/$m.qemu ]; then
    … …  
    8693    scp -P $sp $MONDOTMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
    8794    rdate=`date "+%m%d%H%M"`
    88     ssh -p $sp root@localhost "date $rdate"
    89     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
     95    ssh -q -p $sp root@localhost "date $rdate"
     96    ssh -q -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
    9097    if [ $vmp -eq 1 ]; then
    91         ssh -p $sp root@localhost "halt -p"
     98        ssh -q -p $sp root@localhost "halt -p"
    9299        sleep 300
    93100        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`

  • trunk/tools/distro-env

    r932 r1043  
    3939            export ddir="sles"
    4040            export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
     41        elif grep -q openSUSE /etc/SuSE-release ; then
     42            export ddir="suse"
     43            export dver=`head -1 /etc/SuSE-release | awk '{print $2}'`
    4144        else
    4245            export ddir="suse"
    4346            export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
    4447        fi
     48    elif [ -e /etc/slackware-version ]; then
     49        export ddir="slackware"
     50        export dver=`awk '{print $2}' /etc/slackware-version | cut -d. -f1-2`
    4551    elif [ -e /etc/gentoo-release ]; then
    4652        export ddir="gentoo"
    … …  
    5763        if [ $dver = "testing/unstable" ]; then
    5864            export dver = "sid"
     65        fi
     66    elif [ -e /etc/motd ]; then
     67        head -1 /etc/motd | grep -q FreeBSD
     68        if [ $? -eq 0 ]; then
     69            export ddir="freebsd"
     70            export dver=`head -1 /etc/motd | awk '{print $2}' /etc/motd | cut -d- -f1`
     71        else
     72            export ddir="unknown"
     73            export dver=""
    5974        fi
    6075    else
    … …  
    7792    suf=".${ddir}${dver1}"
    7893elif [ $ddir = "slackware" ]; then
    79     dfam="slack"
     94    dfam="slackware"
    8095    dtype="tgz"
    8196    suf=".${dfam}${dver}"
    … …  
    106121    dtype="rpm"
    107122    suf=".`echo $dver | sed 's/\.//'`mdv"
     123elif [ $ddir = "freebsd" ]; then
     124    dfam="freebsd"
     125    dtype="port"
     126    suf=".`echo $dver | sed 's/\.//'`fbsd"
    108127else
    109128    dfam="unknown"
    … …  
    124143
    125144if [ _"$dtype" = _"rpm" ]; then
    126     export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
     145    export TOPBUILDDIR=`rpmquery --eval '%{_topdir}' 2> /dev/null`
    127146    export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
    128147    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
    … …  
    135154elif [ _"$dtype" = _"deb" ]; then
    136155    mkdir -p ${TOPBUILDDIR}
     156elif [ _"$dtype" = _"port" ]; then
     157    mkdir -p ${TOPBUILDDIR}
     158elif [ _"$dfam" = _"slackware" ]; then
     159    mkdir -p ${TOPBUILDDIR}/install
    137160elif [ _"$dtype" = _"ebuild" ]; then
    138161    mkdir -p ${TOPBUILDDIR}/portage

  • trunk/tools/file2ftp

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else

  • trunk/tools/livwww

    r932 r1043  
    3333dname=`dirname $0`
    3434prem=`echo $dname |cut -c1`
    35 if [ ${prem} == "/" ]; then
     35if [ ${prem} = "/" ]; then
    3636        export TOOLHOME=$dname
    3737else
    … …  
    9191$TOOLHOME/mknewshtml.pl $LOCALDIR
    9292
    93 if [ _"$1" == _"" ]; then
     93if [ _"$1" = _"" ]; then
    9494        exit 0
    9595else
    96     if [ _"$1" == _"test" ]; then
     96    if [ _"$1" = _"test" ]; then
    9797        DESTDIR=$TESTDIR
    9898    else
    … …  
    104104scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
    105105rm -f /tmp/mondo-www.tgz
    106 ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
     106ssh -q ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"

  • trunk/tools/mkannounce

    r900 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else
    … …  
    3636MondoRescue $VER is now available</p>
    3737
    38 <p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
     38<p>I'm happy to announce the availability of a newest version of mondorescue $VER. Enjoy it as usual!</p>
    3939<p>
    4040Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/
    … …  
    4343<p>
    4444EOF
    45 ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
     45ssh -q ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
    4646cat >> $MONDOTMP/announce.tmp << EOF
    4747</p>
    … …  
    5757$TOOLHOME/mkchangelog.pl announce mindi $MONDOTMP/mindi.ann
    5858$TOOLHOME/mkchangelog.pl announce mondo $MONDOTMP/mondo.ann
     59$TOOLHOME/mkchangelog.pl announce mindi-busybox $MONDOTMP/mindi-busybox.ann
    5960echo "<p>" >> $MONDOTMP/announce.tmp
    6061sed 's/$/<br>/' $MONDOTMP/mindi.ann >> $MONDOTMP/announce.tmp
    6162echo "</p><p>" >> $MONDOTMP/announce.tmp
    6263sed 's/$/<br>/' $MONDOTMP/mondo.ann >> $MONDOTMP/announce.tmp
     64echo "</p><p>" >> $MONDOTMP/announce.tmp
     65sed 's/$/<br>/' $MONDOTMP/mindi-busybox.ann >> $MONDOTMP/announce.tmp
    6366echo "</p>" >> $MONDOTMP/announce.tmp
    6467rm -f $MONDOTMP/mindi.ann $MONDOTMP/mondo.ann
    … …  
    8588cat $MONDOTMP/announce.hdr $MONDOTMP/announce.tmp $MONDOTMP/announce.ftr | w3m -dump -T text/html > $MONDOTMP/mondo.ann.txt
    8689export EMAIL="bruno@mondorescue.org"
    87 cat $MONDOTMP/mondo.ann.txt | mutt -s "`head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
     90cat $MONDOTMP/mondo.ann.txt | mutt -s "ANNOUNCE: `head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
    8891rm -rf $MONDOTMP

  • trunk/tools/mknewtag

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else

  • trunk/tools/mknewversion

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else
    … …  
    3737fi
    3838
    39 svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
     39echo "Copying the stable version to ${VER}"
     40svn copy $SVN_M/branches/stable $SVN_M/branches/${VER} -m "Creation of mondo ${VER} from stable"
    4041cd $TOOLHOME/../..
    4142svn co $SVN_M/branches/${VER} ${VER}
    … …  
    5354    echo "$v" > $p/VERSION
    5455done
    55 svn ci -m "Creation of mondo ${VER}-$TAG"
     56svn ci -m "VERSION and TAG update"
    5657svn up

  • trunk/tools/mkqemu

    r904 r1043  
    66#
    77
    8 if [ _"$1" == _"" ]; then
     8if [ _"$1" = _"" ]; then
    99    echo "Syntax: qemu vm"
    1010    exit -1
    … …  
    2020
    2121ARCH=`/bin/arch`
    22 if [ $ARCH == "x86_64" ]; then
     22if [ $ARCH = "x86_64" ]; then
    2323    qemucmd32=/usr//bin/qemu-system-i386
    2424    qemucmd64=/usr//bin/qemu

  • trunk/tools/pkg2fc

    r932 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    7878scp -p /tmp/mkmondo ${ACCOUNT}:
    7979echo "Packages rebuild on ${DSTNODE}"
    80 ssh ${ACCOUNT} ${DSTNODE} "./mkmondo"
     80ssh -q ${ACCOUNT} ${DSTNODE} "./mkmondo"
    8181) 2>&1 | tee /tmp/pk2mdv.log

  • trunk/tools/pkg2ftp

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313        export TOOLHOME=$dname
    1414else
    … …  
    5252    src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    5353    pv=`basename $src .tar.gz`
    54     tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
     54    tar -xz -C $MONDOTMP -f $src $pv/TAG
     55    tag=`cat $MONDOTMP/$pv/TAG`
    5556    if [  _"$dtype" = _"rpm" ]; then
    5657        if [ _"$p" = _"mondo-doc" ]; then
    … …  
    6768        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
    6869        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     70    elif [  _"$dfam" = _"slackware" ]; then
     71        pkg="$pkg ${TOPBUILDDIR}/build-$p/$pv-*-${tag}mr.tgz"
    6972    fi
    7073done
    7174
     75rm -rf $MONDOTMP
    7276echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
    73 ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     77ssh -q ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver} ; cd ${DSTDIR}/${ddir}/${dver} ; rm -f ${pkg} ${spkg}"
    7478scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
    7579) 2>&1 | tee /tmp/pkg2ftp.log

  • trunk/tools/pkg2mdv

    r932 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    1818. $TOOLHOME/distro-env
    1919. $TOOLHOME/mdv-env
     20
     21export LANGUAGE="C"
    2022
    2123# We need to get $VER and $TAG
    … …  
    4446    src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
    4547    s=`basename $src`
    46     oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
    47     newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     48    if [ _"$p" = _"mindi-busybox" ]; then
     49        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     50        newver=$oldver
     51    else
     52        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     53        newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     54    fi
    4855    distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
    4956    spec=${distro}/$p.spec
    … …  
    5158    cd $SVNMDV/$p
    5259    mkdir -p SOURCES SPECS
    53     echo "Modifying $oldver => $newver"
    5460    svn del --force SOURCES/$p-*.tar.bz2
    5561    cp -a $src SOURCES/$p-$newver.tar.bz2
    56     tar xfj SOURCES/$p-$newver.tar.bz2
    57     mv $p-$oldver $p-$newver
    58     perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
    59     tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
    60     rm -rf $p-$newver
     62    cp -a $spec SPECS
     63
     64    # Case when there is a version change
     65    if [ _"$oldver" != _"$newver" ]; then
     66        echo "Modifying $oldver => $newver"
     67        tar xfj SOURCES/$p-$newver.tar.bz2
     68        mv $p-$oldver $p-$newver
     69        perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
     70        tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
     71        rm -rf $p-$newver
     72        perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     73    fi
    6174    svn add SOURCES/$p-$newver.tar.bz2
    62     cp -a $spec SPECS
    6375    # Use mkrel for mdv
    64     perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $tag/" SPECS/$p.spec
    65     perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     76    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
     77    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec\@mandriva.org>\nRelease:/" SPECS/$p.spec
    6678    perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
    6779    $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
    … …  
    7789            rm -f $MONDOTMP/cmt.spec
    7890            echo "Building on Mandriva's cluster"
    79             ssh $ACCOUNT $DSTNODE "yr $p"
     91            rev=`svn info | egrep "^Revision:" | cut -d: -f2`
     92            repsys submit svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
    8093        fi
    8194    fi

  • trunk/tools/qemu-vm.txt

    r932 r1043  
    22qemu-img create -f qcow image.qemu 3G
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
     4
     5# Recent SUSE acpi=off
    46
    57# RPM based : urpmi, yum install, yast2
    … …  
    1416#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
    1517emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue
     18
     19# Slackware
     20# Cf: http://www.linuxpackages.net/howto.php?page=package&title=Package+Howto
    1621
    1722#Changing CD during install:
    … …  
    6873rpmbuild -ba build/SPECS/buffer.spec
    6974chmod 644 build/RPMS/i386/*
    70 scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
     75scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
    7176
    7277
    7378root:
    7479rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
    75 # In case
    76 scp bruno@10.0.2.2:/usr/bin/man2dvi /usr/local/bin
    7780
    7881#for gentoo
    7982chown bruno /etc/make.conf
    8083bruno in portage group
     84
     85# for FreeBSD
     86ln -sf /usr/local/bin/bash /bin/bash

  • trunk/tools/svn2build

    r977 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    9292        elif [ "$dtype" = "ebuild" ]; then
    9393            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
     94        elif [ "$dtype" = "tgz" ]; then
     95            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
     96        elif [ "$dtype" = "port" ]; then
     97            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
    9498        elif [ "$dtype" = "deb" ]; then
    9599            cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
    … …  
    121125            exit -1
    122126        fi
     127        cd ..
     128    fi
     129    if [ _"`echo $p | grep 'busybox'`" != _"" ]; then
     130        cd $dest
     131        mv Rules.mak Rules.mak.orig
     132        cat Rules.mak.orig | sed "s/^EXTRAVERSION\([\t ]*\):=/EXTRAVERSION\1:=-$tag-r$REVISION/" > Rules.mak
    123133        cd ..
    124134    fi
Note: See TracChangeset for help on using the changeset viewer.