Changeset 1510 in MondoRescue


Ignore:
Timestamp:
Jun 20, 2007, 12:12:34 PM (18 years ago)
Author:
Bruno Cornec
Message:
  • RPMBUILDMINDI => PKGBUILDMINDI
  • /var/cache/mindi added to the build process + pkgs
Location:
branches/2.2.4
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/2.2.4/mindi-kernel/distributions/gentoo/mindi.ebuild

    r770 r1510  
    2929    export PREFIX="/usr"
    3030    export CONFDIR="/etc"
    31     export RPMBUILDMINDI="true"
     31    export PKGBUILDMINDI="true"
    3232    ./install.sh
    3333}

  • branches/2.2.4/mindi-kernel/distributions/rpm/mindi.spec

    r555 r1510  
    3939export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    4040export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
    41 export RPMBUILDMINDI="true"
     41export PKGBUILDMINDI="true"
    4242
    4343./install.sh

  • branches/2.2.4/mindi/distributions/debian/dirs

    r581 r1510  
    33usr/sbin
    44etc/mindi
     5var/cache/mindi

  • branches/2.2.4/mindi/distributions/debian/rules

    r1410 r1510  
    2929    dh_installdirs
    3030    # Build the installation tree:
    31     (export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
     31    (export PKGBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && export CACHEDIR=/var/cache/$(PACKAGE_NAME) && ./install.sh )
    3232
    3333# Build architecture-independent files here.

  • branches/2.2.4/mindi/distributions/gentoo/mindi.ebuild

    r1461 r1510  
    3131    export PREFIX="/usr"
    3232    export CONFDIR="/etc"
     33    export CACHEDIR="/var/cache/mindi"
    3334    export MANDIR="${PREFIX}/share/man"
    3435    export DOCDIR="${PREFIX}/share/doc"
    3536    export LIBDIR="${PREFIX}/lib"
    3637    export DONT_RELINK=1
    37     export RPMBUILDMINDI="true"
     38    export PKGBUILDMINDI="true"
    3839    "${WORKDIR}"/"${P}"/install.sh
    3940}

  • branches/2.2.4/mindi/distributions/rpm/mindi.spec

    r1477 r1510  
    4242export DOCDIR=%{_docdir}
    4343export LIBDIR=%{_libdir}
    44 export RPMBUILDMINDI="true"
     44export CACHEDIR=%{_var}/cache/%{name}
     45export PKGBUILDMINDI="true"
    4546
    4647./install.sh
    … …  
    5657%{_libdir}/%{name}
    5758%{_sbindir}/*
     59%{_var}/cache/%{name}
    5860
    5961%changelog

  • branches/2.2.4/mindi/install.sh

    r1490 r1510  
    4242echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
    4343
     44if [ _"$CACHEDIR" = _"" ]; then
     45    CACHEDIR=$local/var/cache/mindi
     46else
     47    CACHEDIR=${HEAD}$CACHEDIR
     48fi
    4449if [ _"$MANDIR" = _"" ]; then
    4550    MANDIR=$local/share/man/man8
    … …  
    6469
    6570echo "Creating target directories ..."
    66 install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR
     71install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR $CACHEDIR
    6772
    6873echo "Copying files ..."
    … …  
    110115rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
    111116
    112 if [ "$RPMBUILDMINDI" != "true" ]; then
     117if [ "$PKGBUILDMINDI" != "true" ]; then
    113118    chown -R root:root $locallib/mindi $conf $DOCDIR
    114119    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl

  • branches/2.2.4/mondo/distributions/debian/mondo.dirs

    r580 r1510  
    44usr/share/mondo
    55usr/share/pixmaps
     6var/cache/mondo

  • branches/2.2.4/mondo/distributions/debian/rules

    r580 r1510  
    9090    # - copy html manual to temporary location for renaming
    9191    mkdir -p debian/doc-temp
     92    mkdir -p $(CURDIR)/debian/$(PACKAGE_NAME)/var/cache/mondo
    9293    cp -a docs/en/mondorescue-howto debian/doc-temp/html
    9394

  • branches/2.2.4/mondo/distributions/gentoo/mondo.ebuild

    r1462 r1510  
    4545src_install() {
    4646    make install DESTDIR="${D}" || die "make install failed"
     47    mkdir -p "${D}/var/cache/mondo"
    4748    exeinto /usr/share/mondo
    4849    doexe mondo/autorun

  • branches/2.2.4/mondo/distributions/rpm/mondo.spec

    r1462 r1510  
    6464%{__rm} -rf $RPM_BUILD_ROOT
    6565make DESTDIR=$RPM_BUILD_ROOT install
     66mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/%{name}
    6667
    6768%clean
    … …  
    7778%{_datadir}/%{name}
    7879%{_mandir}/man8/*
     80%{_var}/cache/%{name}
    7981
    8082%changelog

  • branches/2.2.4/tools/build2pkg

    r1236 r1510  
    155155            export DOCDIR=/usr/doc
    156156            export LIBDIR=/usr/lib
    157             export RPMBUILDMINDI="true"
     157            export CACHEDIR=/var/cache/mindi
     158            export PKGBUILDMINDI="true"
    158159            ./install.sh
    159160        elif [ _"$p" = _"mondo" ]; then
    … …  
    161162            make VERSION=$PVER
    162163            make DESTDIR=$TOPBUILDDIR/build-${p} install
     164            mkdir -p $DESTDIR/var/cache/mondo
    163165        elif [ _"$p" = _"mondo-doc" ]; then
    164166            make -f Makefile.man VERSION=$PVER
Note: See TracChangeset for help on using the changeset viewer.