Changeset 426 for trunk/tools


Ignore:
Timestamp:
Feb 23, 2006, 4:09:24 PM (13 years ago)
Author:
bcornec
Message:

merge -r421:425 $SVN_M/branches/stable

Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkcommon

    r404 r426  
    5555    svn export ${VER}/mondo mondo-${MONDO_VER}
    5656    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    57     mkdir -p mondo-${MONDO_VER}/docs/man
    58     cp -a ${VER}/documentation/mondo*.8 mondo-${MONDO_VER}/docs/man
    5957    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    6058    rm -rf documentation-${MONDO_VER}
  • trunk/tools/mkrpm

    r394 r426  
    2929    mkdir -p ${TOPDIR}/SOURCES
    3030    $TOOLHOME/mkspec ${MINDI_VER} 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"
     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
    3538    $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
    3641    rm -rf mindi-${MINDI_VER}/distributions
    3742    mkdir -p ${TOPDIR}/SOURCES
    3843
    39     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     44    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     45    pkg="$pkg $pkg1"
     46    rm -f $pkg1
    4047    # ATTENTION: This could be dangerous for your setup
    4148    opt="rm -rf /usr/lib/mindi ;"
     
    4451    cd ${BASE}/svn
    4552    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     53    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
     54    chmod 644 ${TOPDIR}/SPECS/mondo.spec
    4655    rm -rf mondo-${MONDO_VER}/distributions
    4756
    48     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     57    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     58    pkg="$pkg $pkg1"
     59    rm -f $pkg1
    4960fi
    5061
Note: See TracChangeset for help on using the changeset viewer.