Changeset 1032 for branches/2.2.1


Ignore:
Timestamp:
Jan 4, 2007, 12:54:24 AM (13 years ago)
Author:
bruno
Message:

Attempt to fix gentoo mindi-busybox ebuild

Location:
branches/2.2.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.1/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

    r1029 r1032  
    2828src_install() {
    2929    # bundle up the symlink files for use later
    30     emake PREFIX="/usr/share/mindi/rootfs/bin" install || die
     30    emake PREFIX="${D}/usr/share/mindi/rootfs" install || die
    3131    rm _install/bin/busybox
    3232    tar cf busybox-links.tar -C _install . || die
  • branches/2.2.1/tools/pkg2mdv

    r1011 r1032  
    4444    src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
    4545    s=`basename $src`
    46     oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
    47     newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     46    if [ _"$p" = _"mindi-busybox" ]; then
     47        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     48        newver=$oldver
     49    else
     50        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     51        newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     52    fi
    4853    distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
    4954    spec=${distro}/$p.spec
     
    5156    cd $SVNMDV/$p
    5257    mkdir -p SOURCES SPECS
    53     echo "Modifying $oldver => $newver"
    5458    svn del --force SOURCES/$p-*.tar.bz2
    5559    cp -a $src SOURCES/$p-$newver.tar.bz2
    56     tar xfj SOURCES/$p-$newver.tar.bz2
    57     mv $p-$oldver $p-$newver
    58     perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
    59     tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
    60     rm -rf $p-$newver
     60    cp -a $spec SPECS
     61
     62    # Case when there is a version change
     63    if [ _"$oldver" != _"$newver" ]; then
     64        echo "Modifying $oldver => $newver"
     65        tar xfj SOURCES/$p-$newver.tar.bz2
     66        mv $p-$oldver $p-$newver
     67        perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
     68        tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
     69        rm -rf $p-$newver
     70        perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     71    fi
    6172    svn add SOURCES/$p-$newver.tar.bz2
    62     cp -a $spec SPECS
    6373    # Use mkrel for mdv
    6474    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $tag/" SPECS/$p.spec
    65     perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
    6675    perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
    6776    $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
Note: See TracChangeset for help on using the changeset viewer.