Changeset 238


Ignore:
Timestamp:
Dec 19, 2005, 8:25:31 PM (13 years ago)
Author:
bcornec
Message:

merge -r235:237 $SVN_M/branches/2.05

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/install.sh

    r236 r238  
    2727fi
    2828
    29 echo "mindi will be installed under $local"
     29MINDIVER=`cat VERSION`
     30echo "mindi $MINDIVER will be installed under $local"
    3031
    3132echo "Creating target directories ..."
    32 install -g root -o root -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/doc/mindi
     33install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/share/doc/mindi-$MINDIVER
    3334
    3435echo "Copying files ..."
    35 install -g root -o root -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
    36 install -g root -o root -m 644 deplist.txt $conf
     36install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
     37install -m 644 deplist.txt $conf
    3738
    3839cp -af rootfs aux-tools Mindi $local/lib/mindi
     
    4041chmod 755 $local/lib/mindi/rootfs/sbin/*
    4142chmod 755 $local/lib/mindi/aux-tools/sbin/*
    42 chown -R root:root $local/lib/mindi
    4343
    4444if [ "$RPMBUILDMINDI" = "true" ]; then
     
    4848fi
    4949chmod 755 $local/sbin/mindi
    50 chown root:root $local/sbin/mindi
    51 install -g root -o root -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
     50install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
    5251
    53 install -g root -o root -m 644 mindi.8 $local/share/man/man8
    54 install -g root -o root -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/doc/mindi
     52install -m 644 mindi.8 $local/share/man/man8
     53install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/share/doc/mindi-$MINDIVER
    5554
    5655ARCH=`/bin/arch`
     
    6362if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH ]; then
    6463        echo "Installing busybox ..."
    65         install -s -g root -o root -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
     64        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
    6665else
    6766        echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
     
    7069    if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
    7170        echo "Installing busybox.net ..."
    72         install -s -g root -o root -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
     71        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
    7372    else
    7473        echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
     
    8483    if [ -f $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
    8584        echo "Installing parted2fdisk ..."
    86         install -s -g root -o root -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
    87         install -s -g root -o root -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
     85        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
     86        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
    8887    else
    8988        echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
     
    9897rm -f $local/lib/mindi/rootfs/sbin/parted2fdisk-*
    9998
     99if [ "$RPMBUILDMINDI" != "true" ]; then
     100    chown -R root:root $local/lib/mindi $conf/mindi $conf $local/share/doc/mindi-$MINDIVER
     101    chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
     102    if [ "$ARCH" = "ia64" ] ; then
     103        chown root:root $local/sbin/parted2fdisk
     104    fi
     105fi
     106
    100107exit 0
  • trunk/mindi/mindi

    r236 r238  
    2727
    2828MINDI_REV=`echo '$Rev$' | awk '{print $2}'`
    29 
    30 MINDI_VERSION=1.05-r$MINDI_REV
     29MINDI_VER=`cat VERSION`
     30
     31MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
    3132MINDI_PREFIX=XXX
    3233MINDI_CONF=YYY
  • trunk/mindi/mindi.spec

    r236 r238  
    99
    1010%define name    mindi
    11 %define version 1.04_berlios
     11%define version VVV
    1212%define mrel    1
    1313
  • trunk/mondo/configure.in

    r219 r238  
    77dnl $Id$
    88dnl
    9 define(MONDO_VER,2.05)
    10 define(MONDO_REV,m4_normalize(esyscmd(echo '$Rev$' | awk '{print r$2}')))
     9define(MONDO_VER,m4_normalize(esyscmd(cat VERSION)))
     10define(MONDO_REV,m4_normalize(esyscmd(cat REVISION | awk '{print r$1}')))
    1111define(MONDO_TAG,MONDO_VER-MONDO_REV)
    1212AC_INIT([Mondo Rescue],MONDO_TAG,[mondo-devel@lists.sourceforge.net])
  • trunk/mondo/mondo.spec

    r236 r238  
    99
    1010%define name    mondo
    11 %define version 2.04_berlios
     11%define version VVV
    1212%define mrel    1
    1313
  • trunk/mondo/mondo/common/my-stuff.h

    r171 r238  
    11/* $Id$ */
    22
    3 #define AUX_VER "2.11"
    43#define HAVE_MALLOC 1
    54
  • trunk/tools/comp

    r30 r238  
    1 ./configure --without-x11
     1./configure
    22make
  • trunk/tools/mkrpm

    r219 r238  
    5151    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    5252    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
    53     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     53    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    5454    rm -f ${TMP}/mindi-*-root
    5555    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     
    7171    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    7272    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
    73     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     73    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    7474    rm -f ${TMP}/mondo-*-root
    7575    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
  • trunk/tools/mksvnversion

    r36 r238  
    2020#
    2121rel=`svnversion $TOOLHOME/..`
    22 cat > $TOOLHOME/../mondo/svn_version.c << EOF
    23 const char* svn_version(void) {
    24     const char* SVN_Version = "${rel}";
    25     return SVN_Version;
    26 }"
     22cat > $TOOLHOME/../mondo/revision.h << EOF
     23#define REVISION "${rel}"
     24EOF
     25cat > $TOOLHOME/../mondo/REVISION << EOF
     26${rel}
     27EOF
     28cat > $TOOLHOME/../mindi/REVISION << EOF
     29${rel}
    2730EOF
    2831
  • trunk/tools/rpm-env

    r236 r238  
    3030mkdir -p RPMS SRPMS SPECS SOURCES BUILD
    3131
    32 export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
    33 export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
     32export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/VERSION`
     33export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/VERSION`
    3434
    3535if [ -e /etc/mandriva-release ]; then
Note: See TracChangeset for help on using the changeset viewer.