summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2009-11-23 23:37:04 +0000
committerMichael Januszewski <spock@gentoo.org>2009-11-23 23:37:04 +0000
commit012216d9757df8f47ccfd72d0101a7dc1ec6f375 (patch)
tree5a79f75aea70a0eef94e7fdbb634e8ee404b7db5 /sys-apps
parentFix build with latest jack, bug #294226 (diff)
downloadgentoo-2-012216d9757df8f47ccfd72d0101a7dc1ec6f375.tar.gz
gentoo-2-012216d9757df8f47ccfd72d0101a7dc1ec6f375.tar.bz2
gentoo-2-012216d9757df8f47ccfd72d0101a7dc1ec6f375.zip
Install the ELF binary along with the Linux kernel one (bug #291729).
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/memtest86+/ChangeLog6
-rw-r--r--sys-apps/memtest86+/memtest86+-4.00.ebuild11
2 files changed, 13 insertions, 4 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index bfdea05650de..34bc83d2774c 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.55 2009/11/22 16:49:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.56 2009/11/23 23:37:04 spock Exp $
+
+ 23 Nov 2009; Michał Januszewski <spock@gentoo.org>
+ memtest86+-4.00.ebuild:
+ Install the ELF binary along with the Linux kernel one (bug #291729).
22 Nov 2009; Michał Januszewski <spock@gentoo.org>
memtest86+-4.00.ebuild:
diff --git a/sys-apps/memtest86+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
index d6bf7f4d15db..31905e7621e5 100644
--- a/sys-apps/memtest86+/memtest86+-4.00.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.00.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+-4.00.ebuild,v 1.5 2009/11/22 16:49:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.00.ebuild,v 1.6 2009/11/23 23:37:04 spock Exp $
QA_PRESTRIPPED=/boot/memtest86plus/memtest
@@ -28,6 +28,7 @@ src_unpack() {
# Merged upstream
#epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
+ sed -i -e's/$(LD) -s /$(LD) /' Makefile
sed -i -e's,0x10000,0x100000,' memtest.lds
if use serial ; then
@@ -42,6 +43,7 @@ src_compile() {
src_install() {
insinto /boot/memtest86plus
newins memtest.bin memtest || die
+ newins memtest memtest.netbsd || die
dosym memtest /boot/memtest86plus/memtest.bin
dodoc README README.build-process
@@ -56,12 +58,15 @@ pkg_postinst() {
einfo "memtest has been installed in /boot/memtest86plus/"
einfo "You may wish to update your bootloader configs"
einfo "by adding these lines:"
-
einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
einfo " > title=Memtest86Plus"
einfo " > root (hd?,?)"
einfo " > kernel /boot/memtest86plus/memtest"
-
+ einfo " or try this if you get grub error 28:"
+ einfo " > title=Memtest86Plus"
+ einfo " > root (hd?,?)"
+ einfo " > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
+ einfo
einfo " - For lilo:"
einfo " > image = /boot/memtest86plus/memtest"
einfo " > label = Memtest86Plus"