Changeset 764 for trunk/tools


Ignore:
Timestamp:
Aug 8, 2006, 12:34:37 AM (13 years ago)
Author:
bruno
Message:

merge -r728:763 $SVN_M/branches/stable

Location:
trunk/tools
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/DISTROS

    r649 r764  
    1111suse_10.1
    1212sles_9
    13 gentoo_2006
     13sles_10
     14debian_3.1
     15gentoo_1.6
    1416slackware_10.2
    15 debian_3.1
  • trunk/tools/build2pkg

    r729 r764  
    88#
    99
    10 umask 022
     10(
    1111dname=`dirname $0`
    1212prem=`echo $dname |cut -c1`
     
    5555    src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    5656    pv=`basename $src .tar.gz`
     57    PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
    5758
    5859    if [  _"$dtype" = _"rpm" ]; then
     
    6970        log=$TMP/$p-rpm.log
    7071
    71         if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then
    72             echo "Generating bzip2 files ($dfam)"
    73             gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
     72        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
     73            echo "Using bzip2 files ($dfam)"
     74            ln -sf $pv.tar.bz2 SOURCES/
    7475        else
     76            echo "Using gzip files ($dfam)"
    7577            ln -sf $src SOURCES/
    7678        fi
    7779        echo "Generating $p RPMS"
    7880        cd SPECS
    79         tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
    80         mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
    81         rm -rf $p-${VER}
     81        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p.spec
     82        mv $p-${PVER}/distributions/${ddir}-$dver/$p.spec .
     83        rm -rf $p-${PVER}
    8284
    83         rpmbuild -ba $p.spec 2> $log 1> $log
     85        rpmbuild -ba $p.spec 2>&1 | tee $log
    8486        if [ $? != 0 ]; then
    85             cat $log
    8687            status=-1
    8788        else
    88             egrep '^Wrote:' $log
    89             rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
     89            if [ -f /usr/bin/rpmlint ]; then
     90                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
     91            else
     92                echo "No rpmlint found, please install it"
     93            fi
    9094        fi
    9195        rm -rf ${TOPBUILDDIR}/BUILD/*
     
    9397    elif [  _"$dtype" = _"ebuild" ]; then
    9498        log=$TMP/$p-gentoo.log
    95         ln -sf $src .
    96         tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
     99        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
    97100        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    98101            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    101104
    102105        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    103         mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    104         rm -rf $p-${VER}
     106        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
     107        rm -rf $p-${PVER}
    105108
    106109        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    107         ebuild $p-${VER}.ebuild digest 2> $log 1> $log
     110        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
    108111        if [ $? != 0 ]; then
    109112            cat $log
    110113            status=-1
    111114        fi
    112         ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
    113         if [ $? != 0 ]; then
    114             cat $log
    115             status=-1
    116         fi
    117         ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
    118         if [ $? != 0 ]; then
    119             cat $log
    120             status=-1
    121         fi
    122         #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
     115        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
    123116        if [ $? != 0 ]; then
    124117            cat $log
     
    130123        cd $TOPBUILDDIR
    131124        tar xfz $src
    132         cd ${p}-${VER}
     125        cd ${p}-${PVER}
    133126        # point to the right debian conf
    134127        ln -s distributions/${ddir}-$dver debian
     
    149142    fi
    150143fi
     144) 2>&1 | tee /tmp/build2pkg.log
  • trunk/tools/build2qemu

    r729 r764  
    1313# Syntax: build2qemu [version-tag [vm1]..|vmx]]
    1414
    15 umask 022
     15(
    1616dname=`dirname $0`
    1717prem=`echo $dname |cut -c1`
     
    8282        sleep 300
    8383    fi
    84     scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
     84    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
    8585    rdate=`date "+%m%d%H%M"`
    8686    ssh -p $sp root@localhost "date $rdate"
     
    100100# Should be removed at the end
    101101rm -rf $TMP
     102) 2>&1 | tee /tmp/build2qemu.log
  • trunk/tools/common-env

    r729 r764  
    1111mkdir -p ${TOPDIR}
    1212export TMPDIR=/tmp
    13 export TMP=`mktemp -d`
     13export TMP=`mktemp -d /tmp/mondobuild.XXXXXXXXXX`
    1414
    1515umask 022
  • trunk/tools/distro-env

    r672 r764  
    7272    dfam="gentoo"
    7373    dtype="ebuild"
    74     suf=".${ddir}${dver}"
     74    dver1=`echo ${dver} | sed "s/\.//"`
     75    suf=".${ddir}${dver1}"
    7576    BUILDDIR=${TOPDIR}/ebuild
    7677elif [ $ddir = "slackware" ]; then
  • trunk/tools/file2ftp

    r592 r764  
    55# $Id$
    66#
     7
     8(
    79
    810dname=`dirname $0`
     
    4446
    4547for p in $c; do
    46     src="$src ${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
     48    src1="${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz"
     49    src2=`echo $src1 | sed 's/\.tar\.gz//'`
     50    src="$src $src1 $src2.tar.bz2"
    4751done
     52
    4853
    4954echo "Sources delivery to ${ACCOUNT}:${DSTDIR}/src"
     
    5661    lftp -e "cd ${FTPDIR} ; put ${src} ; quit" ${FTPSERV}
    5762fi
     63) 2>&1 | tee /tmp/file2ftp.log
  • trunk/tools/mkannounce

    r672 r764  
    3030TAG=`echo $LAST | cut -d- -f2`
    3131
    32 SEARCH=`echo $LAST | cut -c2-`
     32SEARCH=`echo $VER | cut -c2-`
    3333
    3434rm -f $TMP/announce.tmp
    3535cat > $TMP/announce.tmp << EOF
    36 MondoRescue $LAST is now available</p>
     36MondoRescue $VER is now available</p>
    3737
    38 <p>I'm happy to announce the availability of a newest version of mondoescue $LAST. Enjoy it as usual!</p>
     38<p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
    3939<p>
    4040Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/
  • trunk/tools/mknewversion

    r652 r764  
    88#
    99
    10 umask 022
    1110dname=`dirname $0`
    1211prem=`echo $dname |cut -c1`
  • trunk/tools/pkg2ftp

    r729 r764  
    66#
    77
     8
     9(
    810dname=`dirname $0`
    911prem=`echo $dname |cut -c1`
     
    5658            ar=$ARCH
    5759        fi
    58         pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
    59         spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     60        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
     61        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
    6062    elif [  _"$dtype" = "_deb" ]; then
    61         pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
     63        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
    6264        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
    6365    fi
     
    6769ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
    6870scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
     71) 2>&1 | tee /tmp/pkg2ftp.log
  • trunk/tools/pkg2mdv

    r649 r764  
    66#
    77
     8(
    89dname=`dirname $0`
    910prem=`echo $dname |cut -c1`
     
    8283echo "Packages rebuild on ${DSTNODE}"
    8384ssh ${ACCOUNT} ${DSTNODE} "./mkmondo"
     85) 2>&1 | tee /tmp/pk2mdv.log
  • trunk/tools/qemu-vm.txt

    r649 r764  
    1 Booting CD
     1#Booting CD
    22qemu-img create -f qcow image.qemu 3G
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
    44
    55# RPM based : urpmi, yum install, yast2
    6     neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch
     6urpmi neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
    77
    88# gentoo
    9 Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
     9#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
    1010emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue
    1111
    12 Changing CD during install:
     12#Changing CD during install:
    1313Ctrl-Alt-2
    1414eject cdrom
     
    1616change cdrom /dev/cdrom
    1717
    18 Boot single user pour change passwd root
    19 Clavier fr:
     18# Slack: put loadkeys fr in /etc/rc.d/rc.keymap
    2019
    21 loadkeys fr
    22 perl -pi -e 's/"us"/"fr"/' /etc/sysconfig/keyboard
    23 perl -pi -e 's/"us"/"fr"/' /etc/X11/XF86Config
    24 perl -pi -e 's/"us"/"fr"/' /etc/X11/xorg.conf
    25 Slack: put loadkeys fr in /etc/rc.d/rc.keymap
    26 
    27 Conf IP:
    28     Ajout machine dans DNS interne (/usr/local/etc/named/etc/db.mondo.*)
    29     Reload named
    30 
    31 Clé SSH:
    32     Ajout clé ssh pour root:
     20#Clé SSH:
     21#   Ajout clé ssh pour root:
    3322mkdir /root/.ssh
    3423chmod 700 /root/.ssh
     
    3625chmod 600 /root/.ssh/authorized_keys
    3726
    38 Install packages manquant pour mondo:
    39     afio buffer
    40 
    41 Créer compte bruno avec répertoires nécéssaires + env necessaire
     27#Créer compte bruno avec répertoires nécéssaires + env necessaire
    4228mkdir /users
    4329useradd bruno -d /users/bruno
     
    6046chmod 700 ~/.ssh
    6147scp -p victoria2.home.musique-ancienne.org:.ssh/id'*' ~/.ssh
     48# Passwd asked above
    6249cp ~/.ssh/id_dsa.pub ~/.ssh/authorized_keys
    6350chmod 600 ~/.ssh/authorized_keys
     
    6855EOF
    6956
    70 rebuild paquets necessaires mondo:
     57#rebuild paquets necessaires mondo:
    7158wget ftp://ftp.mondorescue.org/src/afio-2.4.7-1.src.rpm
    7259wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm
    7360rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
    74 mkdir -p build/BUILD build/RPMS/i386
     61mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
    7562rpmbuild -ba build/SPECS/afio.spec
    7663rpmbuild -ba build/SPECS/buffer.spec
    7764chmod 644 build/RPMS/i386/*
    78 scp -p build/RPMS/i386/afio-[0-9]* build/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
     65scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
    7966
    8067
    8168root:
    82 rpm -ivh ~bruno/RPMS/RPMS/i386/afio-[0-9]* ~bruno/RPMS/RPMS/i386/buffer-[0-9]*
     69rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
     70# In case
     71scp bruno@10.0.2.2:/usr/bin/man2dvi /usr/local/bin
    8372
    84 pour gentoo
     73#for gentoo
    8574chown bruno /etc/make.conf
    8675bruno in portage group
  • trunk/tools/svn2build

    r729 r764  
    66#
    77
     8(
    89dname=`dirname $0`
    910prem=`echo $dname |cut -c1`
     
    8283            rm -f $TMP/$p.spec
    8384        elif [ "$dtype" = "ebuild" ]; then
    84             m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
     85            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
    8586        elif [ "$dtype" = "deb" ]; then
    8687            # To be developped
    8788            #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
    8889            cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
     90            m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
    8991            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
    9092            if [ $? -ne 0 ]; then
     
    135137    # Finally creates the tar files
    136138    echo "Creating $p tar files"
    137     tar cfhz ${DEST}/$p-$v-$TAG.tar.gz $dest
    138     #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
    139     #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
     139    tar cfphz ${DEST}/$p-$v.tar.gz $dest
     140    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
    140141done
    141142
     
    148149echo "${VER}-$TAG" > ${TOPDIR}/LAST
    149150exit 0
     151) 2>&1 | tee /tmp/svn2build.log
Note: See TracChangeset for help on using the changeset viewer.