add ELF binary that can be loaded by NetBSD bootstrap

instead of a kernel.

5 files changed, 26 insertions, 4 deletions

diff --git a/sysutils/memtestplus/MESSAGE b/sysutils/memtestplus/MESSAGE
index 98b1afc501d..67a477ca00e 100644
--- a/sysutils/memtestplus/MESSAGE
+++ b/sysutils/memtestplus/MESSAGE
@@ -1,11 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/10/24 18:00:05 smb Exp $
+$NetBSD: MESSAGE,v 1.2 2006/11/01 15:38:15 mlelstv Exp $
 
 Memtest86+ is a standalone program, it does not run within an operating
 system.  It has been designed to boot from a PC floppy disk.  To install
 Memtest86 on a floppy, insert a disk then type:
 	dd if=${PREFIX}/mdec/memtestplus.bin of=/dev/rfd0a conv=osync
 
+The package also includes the ELF binary ${PREFIX}/mdec/memtestplus
+that the NetBSD bootstrap can load instead of a kernel. Please see
+boot(8) for details. If your ${PREFIX}/mdec directory is not on the
+root filesystem you need to copy the ELF binary there first.
+
 If you have built the optional .iso file, you can use cdrtools to
 burn it to a CD.
 
diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile
index e1709db3adf..46600adcccb 100644
--- a/sysutils/memtestplus/Makefile
+++ b/sysutils/memtestplus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/10/24 18:00:05 smb Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/01 15:38:15 mlelstv Exp $
 #
 
 DISTNAME=		memtest86+-1.65
 PKGNAME=		memtestplus-1.65
+PKGREVISION=            2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.memtest.org/download/1.65/
 
@@ -25,6 +26,7 @@ SUBST_SED.delcr=	-e 's/.$$//g'
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/mdec
 	${INSTALL_DATA} ${WRKSRC}/memtest.bin ${PREFIX}/mdec/memtestplus.bin
+	${INSTALL_DATA} ${WRKSRC}/memtest ${PREFIX}/mdec/memtestplus
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/memtestplus
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/memtestplus
 	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/memtestplus
diff --git a/sysutils/memtestplus/PLIST b/sysutils/memtestplus/PLIST
index 2936023f932..53cc38fe6bc 100644
--- a/sysutils/memtestplus/PLIST
+++ b/sysutils/memtestplus/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2006/10/24 18:00:05 smb Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/11/01 15:38:15 mlelstv Exp $
 mdec/memtestplus.bin
+mdec/memtestplus
 ${HAVE_ISO}mdec/memtestplus.iso
 share/doc/memtestplus/README
 share/doc/memtestplus/FAQ
diff --git a/sysutils/memtestplus/distinfo b/sysutils/memtestplus/distinfo
index 070ded28e8d..e690afb3d7b 100644
--- a/sysutils/memtestplus/distinfo
+++ b/sysutils/memtestplus/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2006/10/24 18:00:05 smb Exp $
+$NetBSD: distinfo,v 1.2 2006/11/01 15:38:15 mlelstv Exp $
 
 SHA1 (memtest86+-1.65.tar.gz) = f9c27f813cc9ada7efe98e6dc587ab6d2c496ba1
 RMD160 (memtest86+-1.65.tar.gz) = 629379f7660dbc6ab071a9d9839ce0528752dda8
 Size (memtest86+-1.65.tar.gz) = 146203 bytes
 SHA1 (patch-aa) = db53250c1c2cef5b3dd369f55ea91981272d8530
 SHA1 (patch-ab) = defa256b698c32a40e4274597f3de79c1ea8eb10
+SHA1 (patch-ac) = 9bc3afa1bc7fe59cc2875fcdc90c6660593d8b89
diff --git a/sysutils/memtestplus/patches/patch-ac b/sysutils/memtestplus/patches/patch-ac
new file mode 100644
index 00000000000..52a86d21dfb
--- /dev/null
+++ b/sysutils/memtestplus/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/11/01 15:38:15 mlelstv Exp $
+
+--- memtest.lds.orig	2005-09-11 20:17:15.000000000 +0200
++++ memtest.lds
+@@ -3,7 +3,7 @@ OUTPUT_ARCH(i386);

+ 

+ ENTRY(_start); 

+ SECTIONS {

+-	. = 0x10000;

++	. = 0x80000;

+ 	_start = . ;

+ 	.data : {

+ 		*(.data)