Changeset 1032 in MondoRescue

Timestamp:

Jan 4, 2007, 12:54:24 AM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix gentoo mindi-busybox ebuild

Location:

branches/2.2.1

Files:

• mindi-busybox/distributions/gentoo/mindi-busybox.ebuild (modified) (1 diff)
• tools/pkg2mdv (modified) (2 diffs)

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

@@ -28 +28 @@
 src_install() {
     # bundle up the symlink files for use later
-    emake PREFIX="/usr/share/mindi/rootfs/bin" install || die
+    emake PREFIX="${D}/usr/share/mindi/rootfs" install || die
     rm _install/bin/busybox
     tar cf busybox-links.tar -C _install . || die

branches/2.2.1/tools/pkg2mdv

@@ -44 +44 @@
     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 +56 @@
     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/mindi >= ..*,/mindi/' SPECS/$p.spec
     $TOOLHOME/mdv-changelog.pl SPECS/$p.spec