A new revision of the build, closes bugs #35717 and #28078.

5 files changed, 111 insertions, 4 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 1094e665cb89..b7c7fdd92029 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.12 2003/02/12 09:02:53 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.13 2004/02/01 20:57:14 spock Exp $
+
+*memtest86-3.0-r2 (01 Feb 2004)
+
+  01 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86-3.0-r1.ebuild,
+  memtest86-3.0-r2.ebuild, files/memtest86-3.0.patch:
+  A new revision which: makes memtest86 compile from source and not use the
+  precompiled bin image, adds support for the local ''serial' USE flag and
+  closes bugs #35717 and #28078.
 
   24 Jan 2003; <woodchip@gentoo.org> : add lilo example snip.
 
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.0-r2 b/sys-apps/memtest86/files/digest-memtest86-3.0-r2
new file mode 100644
index 000000000000..4fb55f53126a
--- /dev/null
+++ b/sys-apps/memtest86/files/digest-memtest86-3.0-r2
@@ -0,0 +1 @@
+MD5 fade21758538a5468ad9b8509edfde0d memtest86-3.0.tar.gz 104794
diff --git a/sys-apps/memtest86/files/memtest86-3.0.patch b/sys-apps/memtest86/files/memtest86-3.0.patch
new file mode 100644
index 000000000000..5b2cb66fba74
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-3.0.patch
@@ -0,0 +1,22 @@
+diff -Naur memtest86-3.0-orig/memsize.c memtest86-3.0/memsize.c
+--- memtest86-3.0-orig/memsize.c	2002-05-21 23:07:01.000000000 +0200
++++ memtest86-3.0/memsize.c	2004-02-01 20:19:08.779217664 +0100
+@@ -18,6 +18,7 @@
+ 
+ extern ulong p1, p2;
+ extern volatile ulong *p;
++extern struct vars * const v;
+ 
+ static void sort_pmap(void);
+ static int check_ram(void);
+diff -Naur memtest86-3.0-orig/test.h memtest86-3.0/test.h
+--- memtest86-3.0-orig/test.h	2002-05-21 23:06:16.000000000 +0200
++++ memtest86-3.0/test.h	2004-02-01 20:19:00.885417704 +0100
+@@ -277,7 +277,6 @@
+ #define FIRMWARE_PCBIOS    1
+ #define FIRMWARE_LINUXBIOS 2
+ 
+-extern struct vars * const v;
+ extern unsigned char _start[], _end[], startup_32[];
+ extern unsigned char _size, _pages;
+ 
diff --git a/sys-apps/memtest86/memtest86-3.0-r1.ebuild b/sys-apps/memtest86/memtest86-3.0-r1.ebuild
index 1f77a02b1038..ecee592d445f 100644
--- a/sys-apps/memtest86/memtest86-3.0-r1.ebuild
+++ b/sys-apps/memtest86/memtest86-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r1.ebuild,v 1.6 2003/06/21 21:19:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r1.ebuild,v 1.7 2004/02/01 20:57:14 spock Exp $
 
 inherit mount-boot
 
diff --git a/sys-apps/memtest86/memtest86-3.0-r2.ebuild b/sys-apps/memtest86/memtest86-3.0-r2.ebuild
new file mode 100644
index 000000000000..56d10ddf3a8f
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-3.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r2.ebuild,v 1.1 2004/02/01 20:57:14 spock Exp $
+
+inherit mount-boot
+
+IUSE="serial"
+S=${WORKDIR}/${P}
+DESCRIPTION="A stand alone memory test for x86 computers"
+SRC_URI="http://www.memtest86.com/${P}.tar.gz"
+HOMEPAGE="http://www.memtest86.com/"
+KEYWORDS="~x86 ~amd64 -ppc -sparc "
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# a little fix to make gcc-3.3.x happy
+	epatch ${FILESDIR}/memtest86-3.0.patch
+	sed -e '/DISCARD/d' -i memtest_shared.lds
+
+	if [ `use serial` ] ; then
+		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+
+	dodir /boot/memtest86
+	cp memtest.bin ${D}/boot/memtest86/memtest.bin
+	dodoc README README.build-process
+}
+
+pkg_postinst() {
+	einfo
+	einfo "memtest.bin has been installed in /boot/memtest86/"
+	einfo "You may wish to update your bootloader configs"
+	einfo "by adding these lines:"
+	einfo " - For grub:"
+	einfo "    > title=Memtest86"
+
+	# a little magic to make users' life as easy as possible ;)
+	bootpart=0
+	root="(hd0,0)"
+	res=`cat /etc/fstab | grep /boot | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
+	if [ -n "${res}" ] ; then
+		bootpart=1
+	else
+		res=`cat /etc/fstab | grep -v '^#' | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
+	fi
+
+	if [ -n "${res}" ] ; then
+		root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
+	fi
+
+	einfo "    > root ${root}"
+	if [ "${bootpart}" -eq 1 ] ; then
+		einfo "    > kernel /memtest86/memtest.bin"
+	else
+		einfo "    > kernel /boot/memtest86/memtest.bin"
+	fi
+
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86/memtest.bin"
+	einfo "    > label  = Memtest86"
+	einfo
+}
+