Changeset 782


Ignore:
Timestamp:
Aug 12, 2006, 11:32:32 AM (11 years ago)
Author:
bruno
Message:

merge -r763:781 $SVN_M/branches/stable

Location:
trunk
Files:
14 edited
2 copied

Legend:

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

    r588 r782  
    2323
    2424src_unpack() {
    25     unpack ${A} || die "Failed to unpack ${A}"
     25    unpack "${A}" || die "Failed to unpack ${A}"
    2626}
    2727
  • trunk/mindi/distributions/gentoo/mindi.ebuild

    r764 r782  
    2626
    2727src_install() {
    28     export PREFIX="/usr"
    29     export CONFDIR="/etc"
     28    export PREFIX="${D}/usr"
     29    export CONFDIR="${D}/etc"
    3030    export DONT_RELINK=1
    3131    export RPMBUILDMINDI="true"
    32     ${WORKDIR}/${P}/install.sh
     32    "${WORKDIR}"/"${P}"/install.sh
    3333}
    3434
  • trunk/mindi/mindi

    r764 r782  
    131131USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    132132CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
    133 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
     133NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    134134EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
    135135LOGFILE=/var/log/mindi.log
  • trunk/mondo/distributions/gentoo/mondo.ebuild

    r764 r782  
    2929    >=sys-boot/syslinux-1.52"
    3030
    31 S=${WORKDIR}/${PN/-rescue/}-${PV}
     31S="${WORKDIR}/${PN/-rescue/}-${PV}"
    3232
    3333src_unpack() {
    3434    unpack ${A}
    35     cd ${S}
     35    cd "${S}"
    3636    chmod 750 configure
    3737}
     
    4444
    4545src_install() {
    46     make install DESTDIR=${D} || die "make install failed"
    47     #einstall || die "Install failed"
     46    make install DESTDIR="${D}" || die "make install failed"
    4847    exeinto /usr/share/mondo
    4948    doexe mondo/autorun
  • trunk/tools/build2pkg

    r764 r782  
    6363            ar=$ARCH
    6464        fi
    65         pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
     65        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
    6666        #rm -f $pkg1
    6767
     
    7272        if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
    7373            echo "Using bzip2 files ($dfam)"
    74             ln -sf $pv.tar.bz2 SOURCES/
     74            ln -sf ${TOPDIR}/${VER}-$TAG/$pv.tar.bz2 SOURCES/
    7575        else
    7676            echo "Using gzip files ($dfam)"
     
    9696        cd ..
    9797    elif [  _"$dtype" = _"ebuild" ]; then
    98         log=$TMP/$p-gentoo.log
    9998        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
    10099        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
     
    108107
    109108        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    110         ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
     109        ebuild $p-${PVER}.ebuild digest
    111110        if [ $? != 0 ]; then
    112             cat $log
    113111            status=-1
    114112        fi
    115         ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
     113        ebuild $p-${PVER}.ebuild package
    116114        if [ $? != 0 ]; then
    117             cat $log
    118115            status=-1
    119116        fi
    120117    elif [  _"$dtype" = _"deb" ]; then
    121         log=$TMP/$p-deb.log
    122118        export TMPDIR=/tmp
    123119        cd $TOPBUILDDIR
  • trunk/tools/mkchangelog.pl

    r729 r782  
    2323my $tmp = "";
    2424my $ver = "";
     25my $ver2 = "";
    2526my $date = "";
    2627
     
    5758    }
    5859}
    59 print "Using $chglog as input ChangeLog file for $pkg\n";
     60#print "Using $chglog as input ChangeLog file for $pkg\n";
    6061
    6162open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
    6263open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
     64
    6365# Skip first 4 lines
    6466$tmp = <INPUT>;
     
    7375}
    7476
     77my $first=1;
     78
    7579# Handle each block separated by newline
    7680while (<INPUT>) {
    7781    ($ver, $date) = split(/ /);
     82    $ver =~ s/^v//;
    7883    chomp($date);
    7984    $date =~ s/\(([0-9-]+)\)/$1/;
     
    8388    #print "**$ndate**\n";
    8489    if ($dtype eq "rpm") {
    85         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
     90        if ($ver !~ /-/) {
     91            if ($first eq 1) {
     92                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
     93                $first=0;
     94            } else {
     95                $ver2 = "$ver-1"."$ENV{suf}";
     96            }
     97        } else {
     98            $ver2 = "$ver"."$ENV{suf}";
     99        }
     100        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
    86101        print OUTPUT "- Updated to $ver\n";
    87102        }
  • trunk/tools/mknewshtml.pl

    r672 r782  
    115115close(NEWS);
    116116
    117 my $cpt = 3;
     117my $cpt = 4;
    118118open(NEWS,"> $lastnews") || die "Unable to open $lastnews (write)";
    119119$all = $dbh->selectall_arrayref("SELECT id,date,announce FROM announces ORDER BY date DESC");
  • trunk/tools/mknewtag

    r652 r782  
    3535if [ $nb -gt 0 ]; then
    3636    echo "You'll have to check in before updating the TAG"
    37     echo "$TAG" > $TOOLHOME/TAG
     37    exit -1
    3838else
    3939    for p in mindi mondo; do
    4040        v=`cat $TOOLHOME/../$p/VERSION`
    41         grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
     41        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
    4242        if [ $? -ne 0 ]; then
    43             echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
     43            echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
    4444            exit -1
    4545        fi
  • trunk/tools/pkg2ftp

    r764 r782  
    6363        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
    6464        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
     65    elif [  _"$dtype" = "_ebuild" ]; then
     66        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
     67        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
    6568    fi
    6669done
  • trunk/tools/pkg2mdv

    r764 r782  
    5151    src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    5252    pv=`basename $src .tar.gz`
    53     spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
    54     ppkg="$ppkg $pv${suf}.src.rpm"
     53    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
     54    ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
    5555done
    5656
  • trunk/tools/svn-env

    r561 r782  
    66#
    77
    8 export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
     8export SVNBRANCH="`cat ${TOOLHOME}/../mondo/VERSION`"
    99export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
    1010
  • trunk/tools/svn2build

    r764 r782  
    3737for p in $c; do
    3838    v=`cat ${SVNBRANCH}/$p/VERSION`
    39     echo "Management of $p $v-$REVISION"
     39    echo "Management of $p $v-$TAG (rev $REVISION)"
    4040    dest="$p-$v"
    4141    rm -fr $dest
     
    136136
    137137    # Finally creates the tar files
    138     echo "Creating $p tar files"
     138    echo -n "Creating $p tar files (gzip... "
    139139    tar cfphz ${DEST}/$p-$v.tar.gz $dest
    140     tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
     140    echo -n " bzip2..."
     141    tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
     142    echo " )"
    141143done
    142144
  • trunk/website/downloads.shtml

    r729 r782  
    8484        <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a> and <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>.</li>
    8585        <li>RedHat Enterprise Linux <!--<a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, --><a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>.</li>
    86         <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/9.3">9.3</a>, <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details. <a href="http://packman.links2linux.org/">Packman</a> may have some useful additional packages.
    87         <li>SuSE Linux Enterprise Server <a href="ftp://ftp.mondorescue.org/sles/9">9</a>.</li>
     86        <li>Mandriva <a href="ftp://ftp.mondorescue.org/mandrake/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/mandrake/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2006.0">2006.0</a>.</li>
     87        <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/9.3">9.3</a>, <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>, <a href="ftp://ftp.mondorescue.org/suse/10.1">10.1</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details. <a href="http://packman.links2linux.org/">Packman</a> may have some useful additional packages.
     88        <li>SuSE Linux Enterprise Server <a href="ftp://ftp.mondorescue.org/sles/9">9</a>, <a href="ftp://ftp.mondorescue.org/sles/10">10</a>.</li>
    8889        <li>Debian <a href="ftp://ftp.mondorescue.org/debian/3.1">3.1</a>. Look also at <a href="http://www.desknow.com/desknow/directfiles/aleidenfrost/mr-debs-unofficial/index.html">this</a> web page for Debian details.</li>
    89         <li>Mandriva <a href="ftp://ftp.mondorescue.org/mandrake/10.1">10.1</a>, <a href="ftp://ftp.mondorescue.org/mandrake/10.2">10.2</a>, <a href="ftp://ftp.mondorescue.org/mandriva/2006.0">2006.0</a>.</li>
     90        <li>Gentoo <a href="ftp://ftp.mondorescue.org/gentoo/1.6">1.6</a>.
    9091</ul>
    9192
Note: See TracChangeset for help on using the changeset viewer.