Changeset 464 for branches/stable


Ignore:
Timestamp:
Apr 5, 2006, 12:09:35 AM (14 years ago)
Author:
bcornec
Message:

Addition of changelog for rpms
qemu usage is now more precise
qemu script now kill vm after a certain amount of time (mandrake needs that)

Location:
branches/stable
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/tools/mkdeb

    r319 r464  
    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
  • branches/stable/tools/mkqemu

    r452 r464  
    1212
    1313if [ _"$2" == _"" ]; then
    14     export SVN_VM="mdk101 mdk102 mdv2006 rhel3 rhel4 rh73 fc4 sles9"
     14    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 sles9 debian31"
    1515else
    1616    export SVN_VM="$2"
     
    4343    fi
    4444fi
    45 \$SVN_HOME/$1/tools/mkrpm < /dev/null
     45echo \$SVN_VM | grep -q "debian"
     46if [ \$? -eq 0 ]; then
     47    \$SVN_HOME/$1/tools/mkdeb < /dev/null
     48else
     49    \$SVN_HOME/$1/tools/mkrpm < /dev/null
     50fi
    4651\$SVN_HOME/$1/tools/mkdeliv
    4752EOF
    4853
    4954ipvm=10.0.2.15
     55
    5056
    5157for m in $SVN_VM; do
     
    6066        # Virtual machine alreday started
    6167        vmp=1
    62         qemu -m 256 -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
    63         sleep 240
     68        qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
     69        sleep 300
    6470    fi
    6571    scp -P $sp /tmp/mkmondo bruno@localhost:
     
    6773    if [ $vmp -eq 1 ]; then
    6874        ssh -p $sp root@localhost "halt -p"
     75        sleep 300
     76        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
     77        if [ "$proces" != "" ]; then
     78            kill $proces
     79        fi
    6980    fi
    7081done
Note: See TracChangeset for help on using the changeset viewer.