Changeset 782 in MondoRescue

Timestamp:

Aug 12, 2006, 11:32:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r763:781 $SVN_M/branches/stable

Location:

trunk

Files:

• mindi-kernel/distributions/gentoo/mindi.ebuild (modified) (1 diff)
• mindi/distributions/gentoo/mindi.ebuild (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/distributions/gentoo/mondo.ebuild (modified) (2 diffs)
• tools/build2pkg (modified) (4 diffs)
• tools/mkchangelog.pl (modified) (4 diffs)
• tools/mknewshtml.pl (modified) (1 diff)
• tools/mknewtag (modified) (1 diff)
• tools/pkg2ftp (modified) (1 diff)
• tools/pkg2mdv (modified) (1 diff)
• tools/svn-env (modified) (1 diff)
• tools/svn2build (modified) (2 diffs)
• trac (copied) (copied from branches/stable/trac )
• website/announces3.sql (modified) ( previous)
• website/downloads.shtml (modified) (1 diff)
• website/images/trac-logo.png (copied) (copied from branches/stable/website/images/trac-logo.png )

trunk/mindi-kernel/distributions/gentoo/mindi.ebuild

@@ -23 +23 @@
 
 src_unpack() {
-    unpack ${A} || die "Failed to unpack ${A}"
+    unpack "${A}" || die "Failed to unpack ${A}"
 }
 

trunk/mindi/distributions/gentoo/mindi.ebuild

@@ -26 +26 @@
 
 src_install() {
-    export PREFIX="/usr"
-    export CONFDIR="/etc"
+    export PREFIX="${D}/usr"
+    export CONFDIR="${D}/etc"
     export DONT_RELINK=1
     export RPMBUILDMINDI="true"
-    ${WORKDIR}/${P}/install.sh
+    "${WORKDIR}"/"${P}"/install.sh
 }
 

trunk/mindi/mindi

@@ -131 +131 @@
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
 CDROM_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"
-NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
+NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
 EXTRA_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"
 LOGFILE=/var/log/mindi.log

trunk/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}
-    cd ${S}
+    cd "${S}"
     chmod 750 configure
 }
@@ -44 +44 @@
 
 src_install() {
-    make install DESTDIR=${D} || die "make install failed"
-    #einstall || die "Install failed"
+    make install DESTDIR="${D}" || die "make install failed"
     exeinto /usr/share/mondo
     doexe mondo/autorun

trunk/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)"
@@ -96 +96 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        log=$TMP/$p-gentoo.log
         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
@@ -108 +107 @@
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
-        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild package
         if [ $? != 0 ]; then 
-            cat $log
             status=-1
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        log=$TMP/$p-deb.log
         export TMPDIR=/tmp
         cd $TOPBUILDDIR

trunk/tools/mkchangelog.pl

@@ -23 +23 @@
 my $tmp = "";
 my $ver = "";
+my $ver2 = "";
 my $date = "";
 
@@ -57 +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)";
+
 # Skip first 4 lines
 $tmp = <INPUT>;
@@ -73 +75 @@
 }
 
+my $first=1;
+
 # Handle each block separated by newline
 while (<INPUT>) {
     ($ver, $date) = split(/ /);
+    $ver =~ s/^v//;
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
@@ -83 +88 @@
     #print "**$ndate**\n";
     if ($dtype eq "rpm") {
-        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
+        if ($ver !~ /-/) {
+            if ($first eq 1) {
+                $ver2 = "$ver-$ENV{TAG}"."$ENV{suf}";
+                $first=0;
+            } else {
+                $ver2 = "$ver-1"."$ENV{suf}";
+            }
+        } else {
+            $ver2 = "$ver"."$ENV{suf}";
+        }
+        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver2\n";
         print OUTPUT "- Updated to $ver\n";
         }

trunk/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");

trunk/tools/mknewtag

@@ -35 +35 @@
 if [ $nb -gt 0 ]; then
     echo "You'll have to check in before updating the TAG"
-    echo "$TAG" > $TOOLHOME/TAG
+    exit -1
 else
     for p in mindi mondo; do
         v=`cat $TOOLHOME/../$p/VERSION`
-        grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
+        grep -q "${v}" $TOOLHOME/../$p/ChangeLog
         if [ $? -ne 0 ]; then
-            echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
+            echo "You'll have to document in ${p}'s ChangeLog for ${v} related modifications"
             exit -1
         fi

trunk/tools/pkg2ftp

@@ -63 +63 @@
         pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
         spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
+    elif [  _"$dtype" = "_ebuild" ]; then
+        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
+        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     fi
 done

trunk/tools/pkg2mdv

@@ -51 +51 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
-    ppkg="$ppkg $pv${suf}.src.rpm"
+    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${TAG}${suf}.src.rpm"
+    ppkg="$ppkg $pv-${TAG}${suf}.src.rpm"
 done
 

trunk/tools/svn-env

@@ -6 +6 @@
 #
 
-export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
+export SVNBRANCH="`cat ${TOOLHOME}/../mondo/VERSION`"
 export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
 

trunk/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
 

trunk/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>