Changeset 572 for branches/stable


Ignore:
Timestamp:
May 24, 2006, 12:20:19 AM (13 years ago)
Author:
bcornec
Message:

gentoo build continued
mindi bug found due to a previous bug corrected (5.6 MB disks generated systematically):

  • when a disk less than 2.8 MB can be built, not enough modules are put on it to support SCSI cds (use of FLOPPY_MODS only). I added most CDROMs modules in order to support them.
Location:
branches/stable
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-kernel/distributions/gentoo/mindi.ebuild

    r543 r572  
    1 # Copyright 1999-2005 Gentoo Foundation
     1# Copyright 1999-2004 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
     3# $Header: $
     4
    35# $Id$
    46
  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r556 r572  
    1 # Copyright 1999-2005 Gentoo Foundation
     1# Copyright 1999-2004 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
     3# $Header: $
     4
    35# $Id$
    4 # $Header$
    56
    67DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
  • branches/stable/mindi/mindi

    r543 r572  
    702702    pwd=`pwd`
    703703    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    704     cd $TMP_ROOT
    705     else
    706     cd /
     704        cd $TMP_ROOT
     705    else
     706        cd /
    707707    fi
    708708    if [ ! -e "$1" ] ; then
    709     LogIt "Warning - cannot search specific path '$1'\n"
    710     return 1
     709        LogIt "Warning - cannot search specific path '$1'\n"
     710        return 1
    711711    fi
    712712    modpaths=`find $1 -name $2.*o -type f`
     
    12221222    echo "echo -en \"Loading your modules...\"" >> $outfile
    12231223    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    1224     kver=$FAILSAFE_KVER
    1225     cd $TMP_ROOT
    1226     searchpath=lib/modules/$kver
     1224        kver=$FAILSAFE_KVER
     1225        cd $TMP_ROOT
     1226        searchpath=lib/modules/$kver
    12271227    else
    12281228###
     
    12391239### Sq-Modification end
    12401240###
    1241     searchpath=/lib/modules/$kver
     1241        searchpath=/lib/modules/$kver
    12421242    fi
    12431243   
     
    27802780    old_pwd=`pwd`
    27812781    if [ "$YOUR_KERNEL_SUCKS" ] ; then
    2782     cd $TMP_ROOT
    2783     floppy_modules_path=lib/modules/$FAILSAFE_KVER
    2784     else
    2785     cd /
     2782        cd $TMP_ROOT
     2783        floppy_modules_path=lib/modules/$FAILSAFE_KVER
     2784    else
     2785        cd /
    27862786###
    27872787### Sq-Modification... Use kernel name in module path if specified.
     
    27902790        if [ "${kernelname}" != "" ]
    27912791        then
    2792           floppy_modules_path=lib/modules/${kernelname}
     2792            floppy_modules_path=lib/modules/${kernelname}
    27932793        else
    2794           floppy_modules_path=lib/modules/`uname -r`
     2794            floppy_modules_path=lib/modules/`uname -r`
    27952795        fi
    27962796###
     
    28002800    floppy_modules=""
    28012801    if [ "$disksize" -lt "2880" ] ; then
    2802         list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2802        list_of_groovy_mods="$FLOPPY_MODS $IDE_MODS ide-scsi sr_mod `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    28032803    else
    28042804        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     
    28152815    [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
    28162816    for i in $list_of_groovy_mods ; do
    2817     floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     2817        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
    28182818    done
    28192819    for i in $floppy_modules ; do
    28202820        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
    2821     [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
    2822     echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2823     cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
    2824     [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     2821        [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
     2822        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
     2823        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
     2824        [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
    28252825    done
    28262826#    if [ -e "/dev/.devfsd" ] ; then
  • branches/stable/mondo-doc/distributions/gentoo/mondo.ebuild

    r543 r572  
    1 # Copyright 1999-2005 Gentoo Foundation
     1# Copyright 1999-2004 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
     3# $Header: $
     4
    35# $Id$
    46
  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r556 r572  
    1 # Copyright 1999-2005 Gentoo Foundation
     1# Copyright 1999-2004 Gentoo Foundation
    22# Distributed under the terms of the GNU General Public License v2
     3# $Header: $
     4
    35# $Id$
    46
  • branches/stable/tools/build2pkg

    r568 r572  
    4848
    4949export pkg=""
     50echo "Working under $TOPBUILDDIR"
    5051cd $TOPBUILDDIR
    5152
     
    8687        fi
    8788        cd ..
    88     elif [  _"$dtype" = _"gentoo" ]; then
    89         echo "Gentoo"
     89    elif [  _"$dtype" = _"ebuild" ]; then
    9090        log=/tmp/$p-gentoo.log
    9191        ln -sf $src .
    92         tar xfz $src $pv/distributions/$ddir/$pv-r$TAG.ebuild
     92        tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
     93        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
     94            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     95            echo "PORTDIR_OVERLAY=\"$TOPBUILDDIR/portage\"" >> /etc/make.conf
     96        fi
    9397
    94         ebuild $pv/distributions/$ddir/$pv-r$TAG.ebuild
     98        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
     99        mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     100        rm -rf $pv
     101
     102        cd ${TOPBUILDDIR}/portage/sys-apps/$p
     103        ebuild $p-${VER}-r$TAG.ebuild digest 2> $log 1> $log
    95104        if [ $? != 0 ]; then
    96105            cat $log
    97106            status=-1
    98107        fi
    99         rm -rf $pv
     108        ebuild $p-${VER}-r$TAG.ebuild unpack 2>> $log 1>> $log
     109        if [ $? != 0 ]; then
     110            cat $log
     111            status=-1
     112        fi
     113        ebuild $p-${VER}-r$TAG.ebuild compile 2>> $log 1>> $log
     114        if [ $? != 0 ]; then
     115            cat $log
     116            status=-1
     117        fi
     118        #ebuild $p-${VER}-r$TAG.ebuild install 2>> $log 1>> $log
     119        if [ $? != 0 ]; then
     120            cat $log
     121            status=-1
     122        fi
    100123    else
    101124        echo "Unknown"
  • branches/stable/tools/build2qemu

    r556 r572  
    66#
    77
    8 if [ _"$1" == _"" ]; then
    9     echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
    10     exit -1
     8#if [ _"$1" == _"" ]; then
     9    #echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
     10    #exit -1
     11#fi
     12
     13# Syntax: build2qemu [version-tag [vm1]..|vmx]]
     14
     15umask 022
     16dname=`dirname $0`
     17prem=`echo $dname |cut -c1`
     18if [ ${prem} == "/" ]; then
     19    export TOOLHOME=$dname
     20else
     21    export TOOLHOME=${PWD}/$dname
    1122fi
     23
    1224
    1325. $TOOLHOME/common-env
     
    3143fi
    3244
    33 
     45mkdir -p $TMP
    3446cat > $TMP/mkmondo << EOF
    3547#!/bin/bash
     
    4052export TOOLHOME=$TOOLHOME
    4153
    42 \$TOOLHOME/build2pkg
    43 \$TOOLHOME/mkdeliv
     54$TOOLHOME/build2pkg $LAST
     55#$TOOLHOME/mkdeliv
    4456EOF
    4557chmod 755 $TMP/mkmondo
    4658
    4759cd $TOOLHOME/..
    48 tar cvfz $TMP/mkmondo.tar.gz $TOOLHOME/tools $TMP/mkmondo $TOPDIR/${VER}-$TAG
     60tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
    4961
    5062for m in $VMS; do
     
    5264    if [ ! -f /users/qemu/$m.qemu ]; then
    5365            echo "VM unaccessible. Verify NFS mount"
     66            rm -rf $TMP
    5467            exit -1
    5568    fi
    5669    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
     70    export sp=2222
    5771    if [ $? -ne 0 ]; then
    5872        # Virtual machine alreday started
     
    6276    fi
    6377    scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
    64     ssh -p $sp bruno@localhost "cd / ; tar xvfz $TMP/mkmondo.tar.gz ; $TMP/mkmondo" | tee $TMP/mkvm.log
     78    ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
     79    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
    6580    if [ $vmp -eq 1 ]; then
    6681        ssh -p $sp root@localhost "halt -p"
     
    7287    fi
    7388done
     89
     90# Should be removed at the end
     91rm -rf $TMP
  • branches/stable/tools/common-env

    r550 r572  
    1010export TOPDIR=${BASE}/build
    1111mkdir -p ${TOPDIR}
    12 export TMP=${BASE}/tmp
    13 mkdir -p ${TMP}
     12export TMPDIR=
     13export TMP=`mktemp -d -p /tmp`
  • branches/stable/tools/distro-env

    r556 r572  
    112112    fi
    113113    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
     114elif [ _"$dtype" = _"ebuild" ]; then
     115    export TOPBUILDDIR=${BASE}/build
     116    mkdir -p ${TOPBUILDDIR}/portage
    114117fi
  • branches/stable/tools/mkqemu

    r556 r572  
    1414
    1515ipvm=10.0.2.15
    16 sp=2222
    1716
    1817qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
  • branches/stable/tools/qemu-vm.txt

    r543 r572  
    4444
    4545su - bruno
    46 mkdir -p mondo/tmp RPMS/BUILD RPMS/RPMS/i386 RPMS/RPMS/noarch RPMS/SOURCES RPMS/SPECS RPMS/SRPMS RPMS/tmp SRPMS tmp
     46mkdir -p mondo/tmp build
    4747cat > ~bruno/.rpmmacros << EOF
    48 %_topdir    /home/bruno/RPMS
     48%_topdir    /home/bruno/build
    4949%_tmppath   %{_topdir}/tmp
    50 %packager   Bruno Cornec <bruno@HyPer-Linux.org>
     50%packager   Bruno Cornec <bruno@mondorescue.org>
    5151EOF
    5252cat > ~bruno/.rpmrc << EOF
     
    6666svn.berlios.de,195.37.77.137 ssh-dss AAAAB3NzaC1kc3MAAACBAKouB77l1f4FgdP6DjLOgq5RKuGYm3zMJlM4WHcKzWnPuErZW4Omxk1CO0JojDNj/bjxz/95blWbdonEcAo0v71GcZbECFDsJdgVbZM+yxLHKOF4S5uHkiJ+LMawFcRoCGAochowoP9jUfLVAzyT1q3dbvmL43YO3FDvD+mCKTbZAAAAFQCWs/2nOqvitE/CyOCa81sadnzsPQAAAIBrgWRs2VN6jAtX1eUxPwtkJWX886DkiBwdEgtUwDW8RJJCFU6+zjNwFZ8VcjeA7OCFKmZqoD8ABojMMtB53VoXXRzp5PtWgJEMpCLOhHbAA6nLR+Zu9zV8rFHsrjvR17ZgmA8q1dZRqqvZSyzsoP4KdW7f9nD2SjFEVhjHfIsQmwAAAIEAoDlEoGO/lc8XkvNW7G8/rybzETG0cepONVKThYufP5Z2FdGj9a1TYc2Gaw2DygM20Ohwj1RW8aeRE/jYbEm4unM6IFYeLvCbDeeCCHCiCJmw/Pj2ityB5uPTat4Yn28FCd4eP5LyQq2EHz6bPA0LzpNJKwto4naIMsDpET1GNH0=
    6767EOF
    68 cat >> ~/.bash_profile << EOF
    69 export SVN_SSH="ssh -l bcornec"
    70 export SVN_M=svn+ssh://bcornec@svn.berlios.de/svnroot/repos/mondorescue/
    71 export SVN_EDITOR=vim
    72 EOF
    73 source ~/.bash_profile
    7468
    7569rebuild paquets necessaires mondo:
     
    8579root:
    8680rpm -ivh ~bruno/RPMS/RPMS/i386/afio-[0-9]* ~bruno/RPMS/RPMS/i386/buffer-[0-9]*
     81
     82pour gentoo
     83chown bruno /etc/make.conf
     84bruno in portage group
Note: See TracChangeset for help on using the changeset viewer.