Changeset 1513 in MondoRescue


Ignore:
Timestamp:
Jun 25, 2007, 12:42:59 AM (17 years ago)
Author:
Bruno Cornec
Message:
  • Fix a memory allocation bug where strings were freed to early (Nick Hajek <Nick.Hajek_at_Vishay.com>)
  • Removal of acpi=off causing more problems nowadays than solving issues.
  • RPMBUILDMINDI => PKGBUILDMINDI
  • /var/cache/mindi added to the build process + pkgs
  • Prepare the delivery of the yum conf file from SVN (instead of having static files in ftp server) (inputs from Mark Nienberg)
Location:
branches/stable
Files:
14 edited
1 copied

Legend:

Unmodified
Added
Removed

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

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

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

    r555 r1513  
    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/stable/mindi/distributions/conf/mindi.conf.dist

    r1508 r1513  
    9393#
    9494# Additional Boot Parameters
    95 # You may want to remove acpi=off if you're unable to reboot on mindi's CD
    96 # You may want to add ramdisk_size=1024 if on Fedora Core 5/6
     95# You may want to add acpi=off if you're unable to reboot on mindi's CD
     96# You may want to add ramdisk_blocksize=1024 if on Fedora Core 5/6, opensuse 10.2 ...
    9797#
    98 mindi_boot_params="acpi=off apm=off devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
     98mindi_boot_params="devfs=nomount exec-shield=0 noresume selinux=0 barrier=off"
    9999
    100100# 

  • branches/stable/mindi/distributions/debian/dirs

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

  • branches/stable/mindi/distributions/debian/rules

    r1411 r1513  
    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/stable/mindi/distributions/gentoo/mindi.ebuild

    r1464 r1513  
    3030    export PREFIX="/usr"
    3131    export CONFDIR="/etc"
     32    export CACHEDIR="/var/cache/mindi"
    3233    export MANDIR="${PREFIX}/share/man"
    3334    export DOCDIR="${PREFIX}/share/doc"
    3435    export LIBDIR="${PREFIX}/lib"
    3536    export DONT_RELINK=1
    36     export RPMBUILDMINDI="true"
     37    export PKGBUILDMINDI="true"
    3738    "${WORKDIR}"/"${P}"/install.sh
    3839}

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

    r1464 r1513  
    3838export DOCDIR=%{_docdir}
    3939export LIBDIR=%{_libdir}
    40 export RPMBUILDMINDI="true"
     40export CACHEDIR=%{_var}/cache/%{name}
     41export PKGBUILDMINDI="true"
    4142
    4243./install.sh
    … …  
    5253%{_libdir}/%{name}
    5354%{_sbindir}/*
     55%{_var}/cache/%{name}
    5456
    5557%changelog

  • branches/stable/mindi/install.sh

    r1500 r1513  
    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 $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $DOCDIR
     71install -m 755 -d $conf $conf/deplist.d $locallib/mindi $MANDIR $local/sbin $DOCDIR $CACHEDIR
    6772
    6873echo "Copying files ..."
    … …  
    154159rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
    155160
    156 if [ "$RPMBUILDMINDI" != "true" ]; then
     161if [ "$PKGBUILDMINDI" != "true" ]; then
    157162    chown -R root:root $locallib/mindi $conf $DOCDIR
    158163    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl

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

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

  • branches/stable/mondo/distributions/debian/rules

    r580 r1513  
    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/stable/mondo/distributions/gentoo/mondo.ebuild

    r1464 r1513  
    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/stable/mondo/distributions/rpm/mondo.spec

    r1464 r1513  
    6464%{__rm} -rf $RPM_BUILD_ROOT
    6565make DESTDIR=$RPM_BUILD_ROOT install
     66mkdir -p $RPM_BUILD_ROOT/%{_var}/cache/%{name}
    6667
    6768%clean
    … …  
    7980%{_datadir}/%{name}
    8081%{_mandir}/man8/*
     82%{_var}/cache/%{name}
    8183
    8284%changelog

  • branches/stable/tools/build2pkg

    r1306 r1513  
    162162            export DOCDIR=/usr/doc
    163163            export LIBDIR=/usr/lib
    164             export RPMBUILDMINDI="true"
     164            export CACHEDIR=/var/cache/mindi
     165            export PKGBUILDMINDI="true"
    165166            ./install.sh
    166167        elif [ _"$p" = _"mondo" ]; then
    … …  
    168169            make VERSION=$PVER
    169170            make DESTDIR=$TOPBUILDDIR/build-${p} install
     171            mkdir -p $DESTDIR/var/cache/mondo
    170172        elif [ _"$p" = _"mondo-doc" ]; then
    171173            make -f Makefile.man VERSION=$PVER

  • branches/stable/tools/qemu-vm.txt

    r1489 r1513  
    3030
    3131# Slack: put loadkeys fr in /etc/rc.d/rc.keymap
     32# Gentoo: edit /etc/conf.d/keymaps
    3233
    3334#Clé SSH:
Note: See TracChangeset for help on using the changeset viewer.