Changeset 732


Ignore:
Timestamp:
Jul 31, 2006, 2:20:43 AM (13 years ago)
Author:
bruno
Message:
  • More tests on gentoo packaging. Still not there but much better
  • Fix a pb on debian mondo-doc
Location:
branches/stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r572 r732  
    77DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
    88HOMEPAGE="http://www.mondorescue.org"
    9 SRC_URI="ftp://ftp.mondorescue.org/src/${PVR}.tar.gz"
     9SRC_URI="ftp://ftp.mondorescue.org/src/${P}.tar.gz"
    1010
    1111LICENSE="GPL-2"
     
    3030    export DONT_RELINK=1
    3131    export RPMBUILDMINDI="true"
    32     ./install.sh
     32    ${WORKDIR}/${P}/install.sh
    3333}
    3434
  • branches/stable/mondo-doc/distributions/debian/rules

    r731 r732  
    2323
    2424# Build architecture independent
    25 build-indep: build-indep-stamp
     25build-indep:
    2626    $(MAKE) -f Makefile.man VERSION=VVV
    2727    $(MAKE) -f Makefile.howto VERSION=VVV
  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r572 r732  
    99DESCRIPTION="The premier GPL disaster recovery solution."
    1010HOMEPAGE="http://www.mondorescue.org"
    11 SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}-${PR}.tgz"
     11SRC_URI="ftp://ftp.mondorecue.org/src/${PN/-rescue/}-${PV}.tar.gz"
    1212
    1313LICENSE="GPL-2"
     
    2929    >=sys-boot/syslinux-1.52"
    3030
    31 S=${WORKDIR}/${PN/-rescue/}-${PV}-${PR}
     31S=${WORKDIR}/${PN/-rescue/}-${PV}
    3232
    3333src_unpack() {
  • branches/stable/tools/build2pkg

    r724 r732  
    9393    elif [  _"$dtype" = _"ebuild" ]; then
    9494        log=$TMP/$p-gentoo.log
    95         ln -sf $src .
    9695        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
    9796        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
     
    101100
    102101        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    103         mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     102        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${VER}.ebuild
    104103        rm -rf $p-${VER}
    105104
     
    110109            status=-1
    111110        fi
    112         ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
    113         if [ $? != 0 ]; then
    114             cat $log
    115             status=-1
    116         fi
    117         ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
    118         if [ $? != 0 ]; then
    119             cat $log
    120             status=-1
    121         fi
    122         #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
     111        ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
    123112        if [ $? != 0 ]; then
    124113            cat $log
  • branches/stable/tools/distro-env

    r659 r732  
    7272    dfam="gentoo"
    7373    dtype="ebuild"
    74     suf=".${ddir}${dver}"
     74    dver1=`echo ${dver} | sed "s/\.//"`
     75    suf=".${ddir}${dver1}"
    7576    BUILDDIR=${TOPDIR}/ebuild
    7677elif [ $ddir = "slackware" ]; then
Note: See TracChangeset for help on using the changeset viewer.