Changeset 556 in MondoRescue for branches


Ignore:
Timestamp:
May 19, 2006, 12:37:53 AM (19 years ago)
Author:
bcornec
Message:

mondo-doc should now generate

Location:
branches/stable
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r543 r556  
    22# Distributed under the terms of the GNU General Public License v2
    33# $Id$
     4# $Header$
    45
    56DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
    67HOMEPAGE="http://www.mondorescue.org"
    7 SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tgz"
     8SRC_URI="ftp://ftp.mondorescue.org/src/${PVR}.tar.gz"
    89
    910LICENSE="GPL-2"
    … …  
    1415DEPEND="virtual/libc"
    1516RDEPEND=">=app-arch/bzip2-0.9
    16         >=sys-apps/mindi-kernel-1.0-r1
    1717        sys-libs/ncurses
    1818        sys-devel/binutils
    … …  
    2727    export PREFIX="/usr"
    2828    export CONFDIR="/etc"
     29    export DONT_RELINK=1
    2930    export RPMBUILDMINDI="true"
    3031    ./install.sh

  • branches/stable/mondo-doc/distributions/rpm/mondo-doc.spec

    r555 r556  
    2020BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    2121BuildRequires:  docbook-utils
     22BuildArch: noarch
    2223
    2324%description
    … …  
    3132
    3233%build
    33 %{__make} VERSION=%{version}
     34%{__make} -f Makefile.man VERSION=%{version}
     35%{__make} -f Makefile.howto VERSION=%{version}
    3436
    3537%install
    3638%{__rm} -rf $RPM_BUILD_ROOT
    37 %make -f Makefile.man install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
    38 %make -f Makefile.howto install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
     39%{__make} -f Makefile.man install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
     40%{__make} -f Makefile.howto install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
    3941
    4042%clean

  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r543 r556  
    77DESCRIPTION="The premier GPL disaster recovery solution."
    88HOMEPAGE="http://www.mondorescue.org"
    9 SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tgz"
     9SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}-${PR}.tgz"
    1010
    1111LICENSE="GPL-2"
    … …  
    2727    >=sys-boot/syslinux-1.52"
    2828
    29 S=${WORKDIR}/${PN/-rescue/}-${PV}
     29S=${WORKDIR}/${PN/-rescue/}-${PV}-${PR}
    3030
    3131src_unpack() {
    … …  
    3838    elibtoolize
    3939    econf || die "Configuration failed"
    40     emake || die "Make failed"
    41     #make VERSION=VVV CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
     40    emake VERSION=VVV || die "Make failed"
    4241}
    4342
    4443src_install() {
    45     #make install DESTDIR=${D} || die "make install failed"
    46     einstall || die "Install failed"
     44    make install DESTDIR=${D} || die "make install failed"
     45    #einstall || die "Install failed"
    4746    exeinto /usr/share/mondo
    4847    doexe mondo/autorun
    … …  
    5453    einfo "Or visit the website @ ${HOMEPAGE}"
    5554    echo
    56     ewarn "This package is still in unstable."
     55    ewarn "This package is a new version after a long gap."
    5756    ewarn "Please report bugs to http://bugs.gentoo.org/"
    5857    ewarn "However, please do an advanced query to search for bugs"

  • branches/stable/tools/build2pkg

    r553 r556  
    5656
    5757    if [  _"$dtype" = _"rpm" ]; then
    58         pkg1="${TOPBUILDDIR}/RPMS/${ARCH}/$pv${suf}.${ARCH}.rpm"
     58        if [ _"$p" = _"mondo-doc" ]; then
     59            ar="noarch"
     60        else
     61            ar=$ARCH
     62        fi
     63        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
    5964        #rm -f $pkg1
    6065
    … …  
    8186        fi
    8287        cd ..
     88    elif [  _"$dtype" = _"gentoo" ]; then
     89        echo "Gentoo"
     90        log=/tmp/$p-gentoo.log
     91        ln -sf $src .
     92        tar xfz $src $pv/distributions/$ddir/$pv-r$TAG.ebuild
     93
     94        ebuild $pv/distributions/$ddir/$pv-r$TAG.ebuild
     95        if [ $? != 0 ]; then
     96            cat $log
     97            status=-1
     98        fi
     99        rm -rf $pv
     100    else
     101        echo "Unknown"
    83102    fi
    84103done
     104echo "Packages handled : $pkg"
    85105
    86106if [ $status = 0 ]; then
    87107    if [  _"$dtype" = _"rpm" ]; then
    88         echo "Installing RPMS as root ($pkg)"
     108        echo "Installing RPMS as root"
    89109        su - -c "$opt rpm -Uvh --force $pkg"
    90110    fi

  • branches/stable/tools/build2qemu

    r555 r556  
    2626
    2727if [ _"$1" == _"" ]; then
    28     VM=`cat ${TOOLHOME}/DISTROS`
    29     VMS=""
    30     for $v in $VM; do
    31         VMS="$VMS `echo $VM | cut -d_ -f1`"
    32     done
     28    export VMS=`cat ${TOOLHOME}/DISTROS`
    3329else
    3430    export VMS="$1"
    … …  
    4945chmod 755 $TMP/mkmondo
    5046
    51 ipvm=10.0.2.15
    52 sp=2222
    53 
    5447cd $TOOLHOME/..
    5548tar cvfz $TMP/mkmondo.tar.gz $TOOLHOME/tools $TMP/mkmondo $TOPDIR/${VER}-$TAG
    … …  
    5750for m in $VMS; do
    5851    vmp=0
    59     if [ ! -f /users/vmplayer/$m.qemu ]; then
     52    if [ ! -f /users/qemu/$m.qemu ]; then
    6053            echo "VM unaccessible. Verify NFS mount"
    6154            exit -1
    6255    fi
    63     ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu
     56    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
    6457    if [ $? -ne 0 ]; then
    6558        # Virtual machine alreday started
    6659        vmp=1
    67         qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
     60        $TOOLHOME/mkqemu $m &
    6861        sleep 300
    6962    fi
    … …  
    7366        ssh -p $sp root@localhost "halt -p"
    7467        sleep 300
    75         proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
     68        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu | awk '{print $2}'`
    7669        if [ "$proces" != "" ]; then
    7770            kill $proces

  • branches/stable/tools/distro-env

    r553 r556  
    2929        else
    3030            export ddir="redhat"
    31             dver=`awk '{print $5}' /etc/redhat-release`
    32             export dver=`echo ${dver} | sed "s/\.//"`
     31            export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
    3332        fi
    3433    elif [ -e /etc/SuSE-release ]; then
    … …  
    4140            export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
    4241        fi
     42    elif [ -e /etc/gentoo-release ]; then
     43        export ddir="gentoo"
     44        export dver=`awk '{print $5}' /etc/gentoo-release | cut -d. -f1-2`
    4345    else
    4446        export ddir="unknown"

  • branches/stable/tools/mkqemu

    r553 r556  
    33# $Id$
    44#
    5 # Script build packages on various distributions with qemu
     5# Call virtual machine with qemu
    66#
    77
    88if [ _"$1" == _"" ]; then
    9     echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
     9    echo "Syntax: qemu vm"
    1010    exit -1
     11else
     12    m=$1
    1113fi
    12 
    13 . $TOOLHOME/common-env
    14 . $TOOLHOME/distro-env
    15 
    16 # We need to get $VER and $TAG
    17 if [ "$1" = "" ]; then
    18     LAST=`cat ${TOPDIR}/LAST`
    19 else
    20     LAST=$1
    21     shift
    22 fi
    23 VER=`echo $LAST | cut -d- -f1`
    24 TAG=`echo $LAST | cut -d- -f2`
    25 echo "Working on ${VER}-$TAG"
    26 
    27 if [ _"$1" == _"" ]; then
    28     VM=`cat ${TOOLHOME}/DISTROS`
    29     VMS=""
    30     for $v in $VM; do
    31         VMS="$VMS `echo $VM | cut -d_ -f1`"
    32     done
    33 else
    34     export VMS="$1"
    35 fi
    36 
    37 
    38 cat > $TMP/mkmondo << EOF
    39 #!/bin/bash
    40 
    41 export LANG="C"
    42 export LANGUAGE="C"
    43 export LC_ALL="C"
    44 export TOOLHOME=$TOOLHOME
    45 
    46 \$TOOLHOME/build2pkg
    47 \$TOOLHOME/mkdeliv
    48 EOF
    49 chmod 755 $TMP/mkmondo
    5014
    5115ipvm=10.0.2.15
    5216sp=2222
    5317
    54 cd $TOOLHOME/..
    55 tar cvfz $TMP/mkmondo.tar.gz $TOOLHOME/tools $TMP/mkmondo $TOPDIR/${VER}-$TAG
    56 
    57 for m in $VMS; do
    58     vmp=0
    59     if [ ! -f /users/vmplayer/$m.qemu ]; then
    60             echo "VM unaccessible. Verify NFS mount"
    61             exit -1
    62     fi
    63     ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu
    64     if [ $? -ne 0 ]; then
    65         # Virtual machine alreday started
    66         vmp=1
    67         qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
    68         sleep 300
    69     fi
    70     scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
    71     ssh -p $sp bruno@localhost "cd / ; tar xvfz $TMP/mkmondo.tar.gz ; $TMP/mkmondo" | tee $TMP/mkvm.log
    72     if [ $vmp -eq 1 ]; then
    73         ssh -p $sp root@localhost "halt -p"
    74         sleep 300
    75         proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
    76         if [ "$proces" != "" ]; then
    77             kill $proces
    78         fi
    79     fi
    80 done
     18qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu

  • branches/stable/tools/svn2build

    r554 r556  
    9696
    9797        elif [ "$dtype" = "ebuild" ]; then
    98             echo "Gentoo Build"
     98            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/$ddir/$p-$v-r$TAG.ebuild
    9999        else
    100100            echo "Unknown Build"
Note: See TracChangeset for help on using the changeset viewer.