Changeset 537 in MondoRescue


Ignore:
Timestamp:
May 12, 2006, 2:04:55 AM (18 years ago)
Author:
bcornec
Message:

merge -r 526:534 $SVN_M/branches/stable

Location:
trunk
Files:
1 deleted
16 edited
9 copied

Legend:

Unmodified
Added
Removed

  • trunk/mindi/distributions/gentoo/mindi.ebuild

    r308 r537  
    11# Copyright 1999-2005 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
    3 # $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.04.ebuild,v 1.1 2005/01/22 10:29:25 wschlich Exp $
     3# $Id$
    44
    55DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
    66HOMEPAGE="http://www.mondorescue.org"
    7 SRC_URI="ftp://ftp.berlios.de/pub/mondorescue/src/${P}.tgz"
     7SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tgz"
    88
    99LICENSE="GPL-2"
    … …  
    1515RDEPEND=">=app-arch/bzip2-0.9
    1616        >=sys-apps/mindi-kernel-1.0-r1
    17         app-cdr/cdrtools
    1817        sys-libs/ncurses
    1918        sys-devel/binutils
    … …  
    2322src_unpack() {
    2423    unpack ${A} || die "Failed to unpack ${A}"
    25     cd ${S}/rootfs || die
    26     tar xzf symlinks.tgz || die "Failed to unpack symlinks.tgz"
    27 
    28     # This will need to change when IA64 is tested. Obviously.
    29     rm -f bin/busybox-ia64 sbin/parted2fdisk-ia64
    30     mv bin/busybox-i386 bin/busybox
    3124}
    3225
    3326src_install() {
     27    export PREFIX="/usr"
     28    export CONFDIR="/etc"
     29    export RPMBUILDMINDI="true"
    3430    ./install.sh
    3531}

  • trunk/mondo/Makefile.am

    r507 r537  
    11AUTOMAKE_OPTIONS = 1.7
    2 SUBDIRS        = mondo po
     2SUBDIRS        = m4 mondo po
    33man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
    44
    55ACLOCAL_AMFLAGS = -I m4
    66
    7 EXTRA_DIST = config.rpath  config.rpath
     7EXTRA_DIST = config.rpath mkinstalldirs

  • trunk/mondo/configure.in

    r507 r537  
    127127AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr getline asprintf trunc vasprintf])
    128128
    129 AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile])
     129AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile po/Makefile.in m4/Makefile])

  • trunk/mondo/distributions/conf/mondo.conf

    r461 r537  
    3030#
    3131#  ISO Burning CLI command options
    32 iso_burning_options="-eject dev=%s speed=%d fs=24m"
     32iso_burning_options="-eject dev=%s speed=%d fs=24m driveropts=burnfree"
    3333
    3434#
    35 # ISO Burning Speed
     35# ISO Burning Speed (optional)
    3636#
    37 iso_burning_speed=1
     37#iso_burning_speed=1
    3838
    3939#
    … …  
    6262
    6363#
    64 # prefix for ISO names
     64# default prefix for ISO names
    6565#
    6666prefix=mondorescue
    67 
    68 #
    69 # Size of the boot image for ia64
    70 #
    71 ia64_boot_size=8192
    7267
    7368#
    … …  
    141136
    142137#
     138# Paths to include onto the backup
     139# (white space separated list of paths)
     140#
     141include_files=""
     142
     143#
    143144# Activate semi-graphical mode by default (yes|no)
    144145#
    … …  
    147148#
    148149# Activate automatic restore (Use with caution) (yes|no)
     150# (look at -H option in man page)
    149151#
    150152automatic_restore=no
    … …  
    165167# Images creation dir
    166168#
    167 images_dir="/root/images/mindi"
     169images_dir="/var/cache/mondo"

  • trunk/mondo/distributions/gentoo/mondo.ebuild

    r307 r537  
    77DESCRIPTION="The premier GPL disaster recovery solution."
    88HOMEPAGE="http://www.mondorescue.org"
    9 SRC_URI="ftp://ftp.berlios.de/pub/mondorescue/src/${PN/-rescue/}-${PV}.tgz"
     9SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
    1010
    1111LICENSE="GPL-2"
    … …  
    2222    >=app-arch/bzip2-0.9
    2323    app-cdr/cdrtools
    24     >=sys-apps/mindi-1.06
     24    >=sys-apps/mindi-1.0.7
    2525    >=dev-libs/newt-0.50
    2626    >=sys-libs/slang-1.4.1

  • trunk/mondo/distributions/redhat/spec.m4

    r461 r537  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', %{name}-%{version}.tgz)dnl
     4define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', %{addreqb})dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Archiving)dnl
     8define(`GRP', Applications/Archiving)dnl
    99dnl OBS is replaced vy what is being obsoleted
    1010define(`OBS', )dnl

  • trunk/mondo/distributions/rpm/mondo.spec

    r507 r537  
    2323License:    GPL
    2424Group:      %{grp}
    25 Url:        http://mondorescue.berlios.de
     25Url:        http://www.mondorescue.org
    2626Source:     %{src}
    27 BuildRoot:  %{_tmppath}/%{name}-%{version}
     27BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    2828BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    2929Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")

  • trunk/mondo/mondo/mondoarchive/Makefile.am

    r426 r537  
    22## Process with Automake to generate Makefile.in
    33##
     4AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\"
    45
    56## Headers

  • trunk/tools/deb-env

    r320 r537  
    1919dname=`dirname $0`
    2020
     21
    2122# TBD
    2223export TOPDIR=${BASE}/debs
    2324mkdir -p ${TOPDIR}
     25export opt=""
     26export pkg=""
     27export ARCH=""
    2428
    2529if [ -e /etc/debian-release ]; then
     30    export dfam="debian"
    2631    export ddir="debian"
    2732    export dver=`awk '{print $4}' /etc/debian-release`

  • trunk/tools/mkcommon

    r426 r537  
    22#
    33# Prepare build env common for all packages build process from SVN repository
     4# Also prepare the documentation which is common
    45#
    56# $Id$
    … …  
    89umask 022
    910
     11cd $TOOLHOME/..
    1012echo "Generating SVN log file ..."
    11 cd $TOOLHOME/..
    1213svn log -v > /tmp/mondorescue-svn.log
    1314
    1415if [ "$1" = "" ]; then
    15     c="mindi mondo"
     16        c="mondo-doc mindi mondo"
    1617else
    17     c=$1
     18    if [ "$1" = "all" ]; then
     19            c="mindi-kernel mondo-doc mindi mondo"
     20    else
     21        c=$1
     22    fi
    1823fi
    1924if [ "`echo $c | grep mindi-kernel`" != "" ]; then
    … …  
    2833    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    2934fi
     35
     36#
     37# Should be done before mindi
     38#
     39if [ "`echo $c | grep mondo-doc`" != "" ]; then
     40    cd ${BASE}/svn
     41    echo "Management of mondo-doc ${MONDO_VER}-$REVISION"
     42    rm -rf mondo-doc-${MONDO_VER}
     43    svn export ${VER}/documentation mondo-doc-${MONDO_VER}
     44    svn log -v ${VER}/documentation > mondo-doc-${MONDO_VER}/svn.log
     45    echo "$REVISION" > mondo-doc-${MONDO_VER}/REVISION
     46    cd mondo-doc-${MONDO_VER}
     47    $TOOLHOME/expandver mondorescue-howto.sgml *8
     48    make -f Makefile.howto install INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/en
     49    if [ $? != 0 ]; then
     50        exit -1
     51    fi
     52    make -f Makefile.man install-mondo INSTALLDIR=../mondo-docgen-${MONDO_VER}/docs/man
     53    if [ $? != 0 ]; then
     54        exit -1
     55    fi
     56    cd ..
     57
     58    echo "Creating mondo-doc tar files"
     59    tar cfhz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz mondo-doc-${MONDO_VER}
     60    tar cfhj ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 mondo-doc-${MONDO_VER}
     61fi
    3062if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3163    cd ${BASE}/svn
    … …  
    3466    svn export ${VER}/mindi mindi-${MINDI_VER}
    3567    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    36     cp -a ${VER}/documentation/mindi.8 mindi-${MINDI_VER}
    37     rm -rf documentation-${MONDO_VER}
    38     svn export ${VER}/documentation documentation-${MONDO_VER}
    39     cd documentation-${MONDO_VER}
    40     $TOOLHOME/expandver mindi*8
    41     make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
    42     cd ..
     68    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER})
    4369    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    4470    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    … …  
    4975    rm -f ${TMP}/mindi-*-root
    5076fi
    51 if [ "`echo $c | grep mondo`" != "" ]; then
     77if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    5278    cd ${BASE}/svn
    5379    echo "Management of mondo ${MONDO_VER}-$REVISION"
    … …  
    5682    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    5783    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
    58     rm -rf documentation-${MONDO_VER}
    59     svn export ${VER}/documentation documentation-${MONDO_VER}
    60     cd documentation-${MONDO_VER}
    61     $TOOLHOME/expandver mondorescue-howto.sgml mondo*8
    62     make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en
    63     if [ $? != 0 ]; then
    64         exit -1
    65     fi
    66     make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
    67     if [ $? != 0 ]; then
    68         exit -1
    69     fi
    70     cd ../mondo-${MONDO_VER}
    71     echo "Bootstraping mondo ... "
    72     ./bootstrap
    73     cd ..
     84    (cd mondo-doc-${MONDO_VER} ; make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/docs/en ; make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man)
     85    (cd mondo-${MONDO_VER} ; echo "Bootstraping mondo ... " ; ./bootstrap)
    7486
    7587    echo "Creating mondo tar files"

  • trunk/tools/mkdeb

    r489 r537  
    6060cd ${TOPDIR}/SPECS
    6161status=0
    62 if [ "`echo $c | grep kernel`" != "" ]; then
    63     echo "Generating mindi-kernel RPMS"
    64     log=/tmp/mindi-kernel-rpm.log
    65     rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
    66     if [ $? != 0 ]; then
    67         cat $log
    68         status=-1
    69     fi
    70 fi
    71 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    72     echo "Generating mindi RPMS"
    73     log=/tmp/mindi-rpm.log
    74     rpmbuild -ba mindi.spec 2> $log 1> $log
    75     if [ $? != 0 ]; then
    76         cat $log
    77         status=-1
    78     fi
    79 fi
    80 if [ "`echo $c | grep mondo`" != "" ]; then
    81     echo "Generating mondo RPMS"
    82     log=/tmp/mondo-rpm.log
    83     rpmbuild -ba mondo.spec 2> $log 1> $log
     62for p in "$c"; do
     63    echo "Generating $p deb"
     64    log=/tmp/$p-deb.log
     65    #rpmbuild -ba $p.spec 2> $log 1> $log
    8466    if [ $? != 0 ]; then
    8567        cat $log
    … …  
    8870fi
    8971if [ $status = 0 ]; then
    90     echo "Installing RPMS as root ($pkg)"
     72    echo "Installing deb as root ($pkg)"
    9173    su - -c "$opt rpm -Uvh --force $pkg"
    9274fi

  • trunk/tools/mkdeliv

    r448 r537  
    2828
    2929if [ "$1" = "" ]; then
    30     c="mindi mondo"
     30        c="mondo-doc mindi mondo"
    3131else
    3232    c=$1
    … …  
    3939    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}${suf}.src.rpm"
    4040fi
    41 if [ "`echo $c | grep  mondo`" != "" ]; then
     41if [ "`echo $c | grep mondo-doc`" != "" ]; then
     42    cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz
     43    cp -a ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2
     44    tgz="$tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-doc-${MONDO_VER}-r${rev}.tar.bz2"
     45    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
     46    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}${suf}.src.rpm"
     47fi
     48if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    4249    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
    4350    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2

  • trunk/tools/mkqemu

    r489 r537  
    1212
    1313if [ _"$2" == _"" ]; then
    14     export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31"
     14    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31 slackware102 gentoo"
    1515else
    1616    export SVN_VM="$2"
    … …  
    4747    \$SVN_HOME/$1/tools/mkdeb < /dev/null
    4848else
    49     \$SVN_HOME/$1/tools/mkrpm < /dev/null
     49    echo \$SVN_VM | grep -q "slack"
     50    if [ \$? -eq 0 ]; then
     51        \$SVN_HOME/$1/tools/mkslack < /dev/null
     52    else
     53        echo \$SVN_VM | grep -q "gentoo"
     54        if [ \$? -eq 0 ]; then
     55            \$SVN_HOME/$1/tools/mkemerge < /dev/null
     56        else
     57            \$SVN_HOME/$1/tools/mkrpm < /dev/null
     58        fi
     59    fi
    5060fi
    5161\$SVN_HOME/$1/tools/mkdeliv
    … …  
    5363
    5464ipvm=10.0.2.15
    55 
    5665
    5766for m in $SVN_VM; do

  • trunk/tools/mkrpm

    r426 r537  
    1818
    1919if [ "$1" = "" ]; then
    20     c="mindi mondo"
     20    c="mondo-doc mindi mondo"
    2121else
    22     c=$1
     22    if [ "$1" = "all" ]; then
     23        c="mindi-kernel mondo-doc mindi mondo"
     24    else
     25        c=$1
     26    fi
    2327fi
    2428
    … …  
    4852    opt="rm -rf /usr/lib/mindi ;"
    4953fi
    50 if [ "`echo $c | grep  mondo`" != "" ]; then
     54if [ "`echo $c | grep mondo-doc`" != "" ]; then
     55    cd ${BASE}/svn
     56    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo-doc.spec > ${TOPDIR}/SPECS/mondo-doc.spec
     57    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo-doc.spec
     58    chmod 644 ${TOPDIR}/SPECS/mondo-doc.spec
     59
     60    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-doc-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     61    pkg="$pkg $pkg1"
     62    rm -f $pkg1
     63fi
     64
     65if [ "`echo $c | grep -v doc | grep mondo`" != "" ]; then
    5166    cd ${BASE}/svn
    5267    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    … …  
    6277cd ${TOPDIR}/SPECS
    6378status=0
    64 if [ "`echo $c | grep kernel`" != "" ]; then
    65     echo "Generating mindi-kernel RPMS"
    66     log=/tmp/mindi-kernel-rpm.log
    67     rpmbuild -ba mindi-kernel.spec 2> $log 1> $log
     79
     80for p in $c; do
     81    echo "Generating $p RPMS"
     82    log=/tmp/$p-rpm.log
     83    rpmbuild -ba $p.spec 2> $log 1> $log
    6884    if [ $? != 0 ]; then
    6985        cat $log
    7086        status=-1
    7187    fi
    72 fi
    73 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    74     echo "Generating mindi RPMS"
    75     log=/tmp/mindi-rpm.log
    76     rpmbuild -ba mindi.spec 2> $log 1> $log
    77     if [ $? != 0 ]; then
    78         cat $log
    79         status=-1
    80     fi
    81 fi
    82 if [ "`echo $c | grep mondo`" != "" ]; then
    83     echo "Generating mondo RPMS"
    84     log=/tmp/mondo-rpm.log
    85     rpmbuild -ba mondo.spec 2> $log 1> $log
    86     if [ $? != 0 ]; then
    87         cat $log
    88         status=-1
    89     fi
    90 fi
     88done
    9189if [ $status = 0 ]; then
    9290    echo "Installing RPMS as root ($pkg)"

  • trunk/tools/qemu-vm.txt

    r489 r537  
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
    44
     5# RPM based : urpmi, yum install, yast2
    56    neon newt-devel slang-devel autoconf automake subversion libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man docbook-dtd41-sgml groff lynx
     7
     8# gentoo
     9Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
     10emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue
    611
    712Changing CD during install:
    … …  
    1823perl -pi -e 's/"us"/"fr"/' /etc/X11/XF86Config
    1924perl -pi -e 's/"us"/"fr"/' /etc/X11/xorg.conf
     25Slack: put loadkeys fr in /etc/rc.d/rc.keymap
    2026
    2127Conf IP:

  • trunk/tools/rpm-env

    r448 r537  
    99prem=`echo $dname |cut -c1`
    1010if [ ${prem} == "/" ]; then
    11         export TOOLHOME=$dname
     11    export TOOLHOME=$dname
    1212else
    1313    export TOOLHOME=${PWD}/$dname
Note: See TracChangeset for help on using the changeset viewer.