Changeset 781


Ignore:
Timestamp:
Aug 12, 2006, 11:31:16 AM (13 years ago)
Author:
bruno
Message:
  • Gentoo build now correct
  • 4 articles kept on frontpage
  • New announces made
  • Build process optimized agin and again :-)
Location:
branches/stable
Files:
8 edited

Legend:

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

    r770 r781  
    2222
    2323src_unpack() {
    24     unpack "${A}" || die "Failed to unpack ${A}"
     24    unpack ${A} || die "Failed to unpack ${A}"
    2525}
    2626
     
    3030    export DONT_RELINK=1
    3131    export RPMBUILDMINDI="true"
    32     ${WORKDIR}/${P}/install.sh
     32    "${WORKDIR}"/"${P}"/install.sh
    3333}
    3434
  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r770 r781  
    2929    >=sys-boot/syslinux-1.52"
    3030
    31 S=${WORKDIR}/${PN/-rescue/}-${PV}
     31S="${WORKDIR}/${PN/-rescue/}-${PV}"
    3232
    3333src_unpack() {
    34     unpack "${A}"
     34    unpack ${A}
    3535    cd "${S}"
    3636    chmod 750 configure
  • branches/stable/tools/build2pkg

    r765 r781  
    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)"
  • branches/stable/tools/mkchangelog.pl

    r774 r781  
    5858    }
    5959}
    60 print "Using $chglog as input ChangeLog file for $pkg\n";
     60#print "Using $chglog as input ChangeLog file for $pkg\n";
    6161
    6262open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
    6363open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
    64 open(TAG, "$ENV{TOPDIR}/LAST") || die "Unable to open $ENV{TOPDIR}/LAST";
    6564
    66 $tmp = <TAG>;
    67 chomp($tmp);
    68 my ($tmp2, $tag) = split(/-/, $tmp);
    6965# Skip first 4 lines
    7066$tmp = <INPUT>;
     
    7874    print OUTPUT $tmp;
    7975}
     76
     77my $first=1;
    8078
    8179# Handle each block separated by newline
     
    9189    if ($dtype eq "rpm") {
    9290        if ($ver !~ /-/) {
    93             $ver2 = "$ver-$tag";
     91            if ($first eq 1) {
     92                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
     93                $first=0;
     94            } else {
     95                $ver2 = "$ver-1"."$ENV{suf}";
     96            }
    9497        } else {
    95             $ver2 = $ver;
     98            $ver2 = "$ver"."$ENV{suf}";
    9699        }
    97100        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
  • branches/stable/tools/mknewshtml.pl

    r660 r781  
    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");
  • branches/stable/tools/svn2build

    r763 r781  
    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
  • branches/stable/website/downloads.shtml

    r726 r781  
    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.