Changeset 317 for trunk


Ignore:
Timestamp:
Jan 13, 2006, 8:46:06 PM (13 years ago)
Author:
bcornec
Message:

merge -r309:316 $SVN_M/branches/2.06

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/install.sh

    r309 r317  
    4747install -m 644 deplist.txt $conf
    4848
    49 cp -af rootfs aux-tools Mindi $locallib/mindi
     49cp -af rootfs aux-tools $locallib/mindi
    5050chmod 755 $locallib/mindi/rootfs/bin/*
    5151chmod 755 $locallib/mindi/rootfs/sbin/*
     
    6161
    6262install -m 644 mindi.8 $MANDIR
    63 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
     63install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    6464
    6565# Managing busybox
  • trunk/mindi/mindi

    r309 r317  
    1313#-----------------------------------------------------------------------------
    1414
     15### Which arch are we on (useful for ia64 port)
     16export ARCH=`/bin/arch`
    1517
    1618ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0"
     
    3335MINDI_CONF=YYY
    3436MINDI_SBIN=${MINDI_PREFIX}/sbin
    35 MINDI_LIB=${MINDI_PREFIX}/lib/mindi
     37
     38
     39if [ "$ARCH" = "x86_64" ] ; then
     40    MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
     41else
     42    MINDI_LIB=${MINDI_PREFIX}/lib/mindi
     43fi
    3644
    3745EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
     
    29082916> $LOGFILE
    29092917echo "mindi v$MINDI_VERSION" >> $LOGFILE
    2910 ### BCO
    2911 ### Which arch are we on (useful for ia64 port)
    2912 export ARCH=`/bin/arch`
    29132918echo "$ARCH architecture detected" >> $LOGFILE
    29142919echo "mindi called with the following arguments:" >> $LOGFILE
  • trunk/mindi/mindi.spec

    r262 r317  
    1010%define name    mindi
    1111%define version VVV
    12 %define mrel    1
     12%define mrel    RRR
     13# if mandriva official build (rpm --with is_official)
     14%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    1315%define src     %{name}-%{version}.tgz
     16%define grp     Archiving/Backup
     17%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
    1418
    1519%if %is_redhat
    16 Group:          Applications/Archiving
     20%define grp     Applications/Archiving
     21%define addreq  %{addreqb}, which
    1722Autoreq:    0
    1823%endif
     
    2025%if %is_mandrake
    2126%define src     %{name}-%{version}.tar.bz2
    22 Group:          Archiving/Backup
     27%define addreq  %{addreqb}, which
    2328Autoreqprov: no
    2429%endif
     
    2631%if %is_mandriva
    2732%define src     %{name}-%{version}.tar.bz2
    28 Group:          Archiving/Backup
     33%define addreq  %{addreqb}, which
    2934Autoreqprov: no
    3035%endif
    3136
    3237%if %is_suse
    33 Group:          Archiving/Backup
     38%define addreq  %{addreqb}
     39%endif
     40
     41# define the mkrel macro if it is not already defined if mandriva offical build
     42%if is_official
     43%{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
    3444%endif
    3545
     
    3747Name:       %name
    3848Version:    %version
    39 Release:    %mrel
     49Release:    %rel
    4050License:    GPL
    41 Group:      System/Kernel and hardware
     51Group:      %{grp}
    4252Url:        http://mondorescue.berlios.de
    4353Source:     %{src}
    4454BuildRoot:  %{_tmppath}/%{name}-%{version}
    45 Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio, which
     55Requires:   %{addreq}
    4656# Not on all systems
    4757#Conflicts: bonnie++
     
    93103%defattr(644,root,root,755)
    94104%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    95 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox
     105%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    96106%{_mandir}
    97107%{_libdir}/mindi
  • trunk/mondo/mondo.spec

    r250 r317  
    1010%define name    mondo
    1111%define version VVV
    12 %define mrel    1
     12%define mrel    RRR
     13# if mandriva official build (rpm --with is_official)
     14%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    1315%define src     %{name}-%{version}.tgz
     16%define grp     Archiving/Backup
     17%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    1418
    1519%if %is_redhat
    16 Group:          Applications/Archiving
     20%define grp     Applications/Archiving
     21%define addreq  %{addreqb}
    1722Autoreq:        0
    1823%endif
     
    2025%if %is_mandrake
    2126%define src     %{name}-%{version}.tar.bz2
    22 Group:          Archiving/Backup
     27%define addreq  %{addreqb}
    2328Autoreqprov:    no
    2429%endif
     
    2631%if %is_mandriva
    2732%define src     %{name}-%{version}.tar.bz2
    28 Group:          Archiving/Backup
     33%define addreq  %{addreqb}
    2934Autoreqprov:    no
    3035%endif
    3136
    3237%if %is_suse
    33 Group:          Archiving/Backup
     38%define addreq  %{addreqb}
    3439%endif
    3540
     
    4348Release:    %{mrel}
    4449License:    GPL
     50Group:      %{grp}
    4551Url:        http://mondorescue.berlios.de
    4652Source:     %{src}
     
    4854BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    4955%ifarch ia64
    50 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
     56Requires:   %{addreq}, elilo, parted
    5157%else
    52 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
     58Requires:   %{addreq}, syslinux >= 1.52
    5359%endif
    5460
     
    116122%files
    117123%defattr(644,root,root,755)
    118 %doc ChangeLog mondo/docs/en/1.6x-howto/*
     124%doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
    119125%doc INSTALL COPYING README TODO AUTHORS NEWS
    120126
  • trunk/tools/mkrpm

    r304 r317  
    1717. $TOOLHOME/rpm-env
    1818
     19# To be safe for SVN commands
     20cd $TOOLHOME/..
    1921rev=`$TOOLHOME/mksvnversion`
     22
     23echo "Generating SVN log file ..."
     24svn log -v > /tmp/mondorescue-svn.log
    2025
    2126if [ "$1" = "" ]; then
     
    3540    tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
    3641    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    37     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     42    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    3843    rm -f ${TMP}/mindi-kernel*-root
    39     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     44    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    4045fi
    4146if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     
    4449    rm -fr mindi-${MINDI_VER}
    4550    cp -a ${VER}/mindi mindi-${MINDI_VER}
    46     svn log -v > mindi-${MINDI_VER}/svn.log
     51    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    4752    find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
    4853    find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
     
    5257    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    5358    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
    54     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     59    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    5560    rm -f ${TMP}/mindi-*-root
    56     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     61    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    5762    # ATTENTION: This could be dangerous for your setup
    5863    opt="rm -rf /usr/lib/mindi ;"
     
    6368    rm -rf mondo-${MONDO_VER}
    6469    cp -a ${VER}/mondo mondo-${MONDO_VER}
    65     svn log -v > mondo-${MONDO_VER}/svn.log
     70    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    6671    cd mondo-${MONDO_VER}
    6772    echo "Bootstraping mondo ... "
     
    7378    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    7479    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
    75     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     80    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    7681    rm -f ${TMP}/mondo-*-root
    77     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
     82    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    7883fi
    7984cd ${TOPDIR}/SPECS
  • trunk/tools/rpm-env

    r276 r317  
    3636    export ddir="mandriva"
    3737    export dver=`awk '{print $4}' /etc/mandriva-release`
    38     export suf="${dver}mdk"
     38    export suf=".`echo $dver | sed 's/\.//'`mdk"
    3939elif [ -e /etc/mandrake-release ]; then
    4040    export ddir="mandrake"
    4141    export dver=`awk '{print $3}' /etc/mandrake-release`
    42     export suf="${dver}mdk"
     42    export suf=".`echo $dver | sed 's/\.//'`mdk"
    4343elif [ -e /etc/redhat-release ]; then
    4444    grep -q Enterprise /etc/redhat-release
     
    4949        export ddir="fedora"
    5050        export dver=`awk '{print $4}' /etc/redhat-release`
    51         export suf="fc${dver}"
     51        export suf=".fc${dver}"
    5252    else
    5353        export ddir="redhat"
    5454        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
    55         export suf="rh${dver}"
     55        export suf=".rh${dver}"
    5656    fi
    5757elif [ -e /etc/SuSE-release ]; then
     
    7070
    7171if [ _"$suf" = _"" ]; then
    72     export suf="${ddir}${dver}"
     72    export suf=".${ddir}${dver}"
    7373fi
Note: See TracChangeset for help on using the changeset viewer.