diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2009-05-05 20:16:29 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2009-05-05 20:16:29 +0000 |
| commit | 08297f13f458c4f230f4ff600fed883e0188fbc3 (patch) | |
| tree | 7adae8a51d15433f21d22e46d2251b325a220f59 /sys-apps | |
| parent | Change ffmpeg dep. to allow live version as well. (diff) | |
| download | gentoo-2-08297f13f458c4f230f4ff600fed883e0188fbc3.tar.gz gentoo-2-08297f13f458c4f230f4ff600fed883e0188fbc3.tar.bz2 gentoo-2-08297f13f458c4f230f4ff600fed883e0188fbc3.zip | |
Fix bug #267592.
(Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/memtest86+/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-2.11.ebuild | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index c3912fe99fc0..29b28f120666 100644 --- a/sys-apps/memtest86+/ChangeLog +++ b/sys-apps/memtest86+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/memtest86+ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.49 2009/03/26 08:42:03 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.50 2009/05/05 20:16:29 spock Exp $ + + 05 May 2009; Michał Januszewski <spock@gentoo.org> + memtest86+-2.11.ebuild: + Fix bug #267592. 26 Mar 2009; Michał Januszewski <spock@gentoo.org> +files/make-memtest86+-boot-floppy, +files/make-memtest86+-boot-floppy.1, diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild index 76eed82aca8a..a5f73f4cbbb8 100644 --- a/sys-apps/memtest86+/memtest86+-2.11.ebuild +++ b/sys-apps/memtest86+/memtest86+-2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.4 2009/03/26 08:42:03 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.5 2009/05/05 20:16:29 spock Exp $ inherit mount-boot eutils @@ -24,8 +24,10 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-2.11-hardcoded_cc.patch epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch + sed -i -e's,0x10000,0x100000,' memtest.lds + if use serial ; then - sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h + sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h fi } @@ -35,7 +37,7 @@ src_compile() { src_install() { insinto /boot/memtest86plus - doins memtest.bin || die + doins memtest || die dodoc README README.build-process if use floppy ; then @@ -53,10 +55,10 @@ pkg_postinst() { einfo " - For grub: (replace '?' with correct numbers for your boot partition)" einfo " > title=Memtest86Plus" einfo " > root (hd?,?)" - einfo " > kernel /boot/memtest86plus/memtest.bin" + einfo " > kernel --type=netbsd /boot/memtest86plus/memtest" einfo " - For lilo:" - einfo " > image = /boot/memtest86plus/memtest.bin" + einfo " > image = /boot/memtest86plus/memtest" einfo " > label = Memtest86Plus" einfo } |