Changeset 1034 in MondoRescue

Timestamp:

Jan 4, 2007, 4:50:32 PM (18 years ago)

Author:

Bruno Cornec

Message:

Integrate changes from 2.2.1 on gentoo build (now correct for mindi-busybox) and mandriva official packages (now generated correctly)

Location:

branches/stable

Files:

• mindi-busybox/distributions/gentoo/mindi-busybox.ebuild (modified) (1 diff)
• tools/DISTROS (modified) (1 diff)
• tools/pkg2mdv (modified) (4 diffs)
• tools/qemu-vm.txt (modified) (1 diff)
• website/announces3.sql (modified) ( previous)

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

@@ -27 +27 @@
 src_install() {
     # bundle up the symlink files for use later
-    emake PREFIX="/usr/share/mindi/rootfs/bin" install || die
-    rm _install/bin/busybox
-    tar cf busybox-links.tar -C _install . || die
-    insinto /usr/share/mindi
-    doins busybox-links.tar || die
+    emake PREFIX="${D}/usr/share/mindi/rootfs" install || die
 }
-
-pkg_preinst() {
-    mv "${D}"/usr/share/mindi/busybox-links.tar "${T}"/ || die
-}
-
-pkg_postinst() {
-    cd "${T}" || die
-    mkdir _install
-    tar xf busybox-links.tar -C _install || die
-    cp -vpPR _install/* /usr/share/mindi/rootfs/bin || die "copying links for ${x} failed"
-
-    echo
-}

branches/stable/tools/DISTROS

@@ -18 +18 @@
 gentoo_1.6
 slackware_10.2
+slackware_11.0

branches/stable/tools/pkg2mdv

@@ -18 +18 @@
 . $TOOLHOME/distro-env
 . $TOOLHOME/mdv-env
+
+export LANGUAGE="C"
 
 # We need to get $VER and $TAG
@@ -44 +46 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
     s=`basename $src`
-    oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
-    newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
+    if [ _"$p" = _"mindi-busybox" ]; then
+        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
+        newver=$oldver
+    else
+        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
+        newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
+    fi
     distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
     spec=${distro}/$p.spec
@@ -51 +58 @@
     cd $SVNMDV/$p
     mkdir -p SOURCES SPECS
-    echo "Modifying $oldver => $newver"
     svn del --force SOURCES/$p-*.tar.bz2 
     cp -a $src SOURCES/$p-$newver.tar.bz2
-    tar xfj SOURCES/$p-$newver.tar.bz2
-    mv $p-$oldver $p-$newver
-    perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
-    tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
-    rm -rf $p-$newver
+    cp -a $spec SPECS
+
+    # Case when there is a version change
+    if [ _"$oldver" != _"$newver" ]; then
+        echo "Modifying $oldver => $newver"
+        tar xfj SOURCES/$p-$newver.tar.bz2
+        mv $p-$oldver $p-$newver
+        perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
+        tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
+        rm -rf $p-$newver
+        perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
+    fi
     svn add SOURCES/$p-$newver.tar.bz2
-    cp -a $spec SPECS
     # Use mkrel for mdv
-    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $tag/" SPECS/$p.spec
-    perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
+    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
+    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec@mandriva.org>\nRelease:/" SPECS/$p.spec
     perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
     $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
@@ -77 +89 @@
             rm -f $MONDOTMP/cmt.spec
             echo "Building on Mandriva's cluster"
-            ssh -q $ACCOUNT $DSTNODE "yr $p"
+            rev=`svn info | egrep "^Revision:" | cut -d: -f2`
+            repsys submit svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
         fi
     fi

branches/stable/tools/qemu-vm.txt

@@ -82 +82 @@
 chown bruno /etc/make.conf
 bruno in portage group
+
+# for FreeBSD
+ln -sf /usr/local/bin/bash /bin/bash