Changeset 781 in MondoRescue for branches/stable

Timestamp:

Aug 12, 2006, 11:31:16 AM (19 years ago)

Author:

Bruno Cornec

Message:

• Gentoo build now correct
• 4 articles kept on frontpage
• New announces made
• Build process optimized agin and again :-)

Location:

branches/stable

Files:

• mindi/distributions/gentoo/mindi.ebuild (modified) (2 diffs)
• mondo/distributions/gentoo/mondo.ebuild (modified) (1 diff)
• tools/build2pkg (modified) (2 diffs)
• tools/mkchangelog.pl (modified) (3 diffs)
• tools/mknewshtml.pl (modified) (1 diff)
• tools/svn2build (modified) (2 diffs)
• website/announces3.sql (modified) ( previous)
• website/downloads.shtml (modified) (1 diff)

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

@@ -22 +22 @@
 
 src_unpack() {
-    unpack "${A}" || die "Failed to unpack ${A}"
+    unpack ${A} || die "Failed to unpack ${A}"
 }
 
@@ -30 +30 @@
     export DONT_RELINK=1
     export RPMBUILDMINDI="true"
-    ${WORKDIR}/${P}/install.sh
+    "${WORKDIR}"/"${P}"/install.sh
 }
 

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

@@ -29 +29 @@
     >=sys-boot/syslinux-1.52"
 
-S=${WORKDIR}/${PN/-rescue/}-${PV}
+S="${WORKDIR}/${PN/-rescue/}-${PV}"
 
 src_unpack() {
-    unpack "${A}"
+    unpack ${A}
     cd "${S}"
     chmod 750 configure

branches/stable/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
+        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
         #rm -f $pkg1
 
@@ -72 +72 @@
         if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
             echo "Using bzip2 files ($dfam)"
-            ln -sf $pv.tar.bz2 SOURCES/
+            ln -sf ${TOPDIR}/${VER}-$TAG/$pv.tar.bz2 SOURCES/
         else
             echo "Using gzip files ($dfam)"

branches/stable/tools/mkchangelog.pl

@@ -58 +58 @@
     }
 }
-print "Using $chglog as input ChangeLog file for $pkg\n";
+#print "Using $chglog as input ChangeLog file for $pkg\n";
 
 open(INPUT,"$chglog") || die "Unable to open $chglog (read)";
 open(OUTPUT,"> $outfile") || die "Unable to open $outfile (write)";
-open(TAG, "$ENV{TOPDIR}/LAST") || die "Unable to open $ENV{TOPDIR}/LAST";
 
-$tmp = <TAG>;
-chomp($tmp);
-my ($tmp2, $tag) = split(/-/, $tmp);
 # Skip first 4 lines
 $tmp = <INPUT>;
@@ -78 +74 @@
     print OUTPUT $tmp;
 }
+
+my $first=1;
 
 # Handle each block separated by newline
@@ -91 +89 @@
     if ($dtype eq "rpm") {
         if ($ver !~ /-/) {
-            $ver2 = "$ver-$tag";
+            if ($first eq 1) {
+                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
+                $first=0;
+            } else {
+                $ver2 = "$ver-1"."$ENV{suf}";
+            }
         } else {
-            $ver2 = $ver;
+            $ver2 = "$ver"."$ENV{suf}";
         }
         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";

branches/stable/tools/mknewshtml.pl

@@ -115 +115 @@
 close(NEWS);
 
-my $cpt = 3;
+my $cpt = 4;
 open(NEWS,"> $lastnews") || die "Unable to open $lastnews (write)";
 $all = $dbh->selectall_arrayref("SELECT id,date,announce FROM announces ORDER BY date DESC");

branches/stable/tools/svn2build

@@ -37 +37 @@
 for p in $c; do
     v=`cat ${SVNBRANCH}/$p/VERSION`
-    echo "Management of $p $v-$REVISION"
+    echo "Management of $p $v-$TAG (rev $REVISION)"
     dest="$p-$v"
     rm -fr $dest
@@ -136 +136 @@
 
     # Finally creates the tar files
-    echo "Creating $p tar files"
+    echo -n "Creating $p tar files (gzip... "
     tar cfphz ${DEST}/$p-$v.tar.gz $dest
-    tar cfphj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
+    echo -n " bzip2..."
+    tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
+    echo " )"
 done
 

branches/stable/website/downloads.shtml

@@ -84 +84 @@
         <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>
         <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>
-        <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.
-        <li>SuSE Linux Enterprise Server <a href="ftp://ftp.mondorescue.org/sles/9">9</a>.</li>
+        <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>
+        <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.
+        <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>
         <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>
-        <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>
+        <li>Gentoo <a href="ftp://ftp.mondorescue.org/gentoo/1.6">1.6</a>.
 </ul>