move mount /boot to pkg_preinst

5 files changed, 12 insertions, 100 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 30495c51b830..19b767deddc7 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for sys-apps/memtest86
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.10 2002/12/13 11:00:32 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.11 2003/01/25 01:50:00 woodchip Exp $
+
+  24 Jan 2003; <woodchip@gentoo.org> : add lilo example snip.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.0 b/sys-apps/memtest86/files/digest-memtest86-3.0
deleted file mode 100644
index 4fb55f53126a..000000000000
--- a/sys-apps/memtest86/files/digest-memtest86-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fade21758538a5468ad9b8509edfde0d memtest86-3.0.tar.gz 104794
diff --git a/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch b/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch
deleted file mode 100644
index 902d4f415804..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.0-gcc3-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- memtest86-3.0/config.c~	2002-07-06 13:33:00.000000000 +0200
-+++ memtest86-3.0/config.c	2002-07-06 13:33:00.000000000 +0200
-@@ -10,7 +10,7 @@
- 
- extern int bail;
- extern struct tseq tseq[];
--extern struct vars *v;
-+//extern struct vars *v;
- extern short e820_nr;
- extern char memsz_mode;
- 
---- memtest86-3.0/init.c~	2002-07-06 13:32:18.000000000 +0200
-+++ memtest86-3.0/init.c	2002-07-06 13:32:18.000000000 +0200
-@@ -11,7 +11,7 @@
- #include "pci.h"
- #include "io.h"
- 
--extern struct vars *v;
-+//extern struct vars *v;
- extern short memsz_mode;
- extern short firmware;
- 
---- memtest86-3.0/lib.c~	2002-07-06 13:32:31.000000000 +0200
-+++ memtest86-3.0/lib.c	2002-07-06 13:32:31.000000000 +0200
-@@ -9,7 +9,7 @@
- #include "config.h"
- #include "screen_buffer.h"
- 
--extern struct vars *v;
-+//extern struct vars *v;
- 
- int slock = 0, lsr = 0;
- short serial_cons = SERIAL_CONSOLE_DEFAULT;
---- memtest86-3.0/patn.c~	2002-07-06 13:32:50.000000000 +0200
-+++ memtest86-3.0/patn.c	2002-07-06 13:32:50.000000000 +0200
-@@ -18,7 +18,7 @@
- #define DEFAULT_MASK ((~0L) << 2)
- 
- 
--extern struct vars *v;
-+//extern struct vars *v;
- 
- 
- /* What it does:
---- memtest86-3.0/test.c~	2002-07-06 13:32:05.000000000 +0200
-+++ memtest86-3.0/test.c	2002-07-06 13:32:05.000000000 +0200
-@@ -9,7 +9,7 @@
- extern int segs, bail;
- extern volatile ulong *p;
- extern ulong p1, p2;
--extern struct vars *v;
-+//extern struct vars *v;
- extern int test_ticks, nticks;
- extern struct tseq tseq[];
- void poll_errors();
diff --git a/sys-apps/memtest86/memtest86-3.0-r1.ebuild b/sys-apps/memtest86/memtest86-3.0-r1.ebuild
index a8bd6e8073f9..039eb8f45942 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-2002 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.3 2002/12/09 04:37:26 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r1.ebuild,v 1.4 2003/01/25 01:50:00 woodchip Exp $
 
 inherit mount-boot
 
@@ -21,10 +21,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo '*** memtest.bin has been installed in /boot/memtest86, please remember to'
-	einfo '*** update your boot loader. For example grub :'
-	einfo "*** edit /boot/grub/menu.lst and add the following lines "
+	einfo
+	einfo "*** memtest.bin has been installed in /boot/memtest86."
+	einfo "*** You may wish to update your bootloader configs,"
+	einfo "*** by adding these lines.  For grub:"
 	einfo "***   > title=Memtest86"
 	einfo "***   > root (hd0,0)"
 	einfo "***   > kernel /boot/memtest86/memtest.bin"
+	einfo "*** For lilo:"
+	einfo "***   > image  = /boot/memtest86/memtest.bin"
+	einfo "***   > label  = Memtest86"
+	einfo
 }
diff --git a/sys-apps/memtest86/memtest86-3.0.ebuild b/sys-apps/memtest86/memtest86-3.0.ebuild
deleted file mode 100644
index 0be2d91f4d5d..000000000000
--- a/sys-apps/memtest86/memtest86-3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2002 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.ebuild,v 1.11 2002/12/09 04:37:26 manson Exp $
-
-inherit mount-boot
-
-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 -ppc -sparc "
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	patch -p1 <${FILESDIR}/memtest86-3.0-gcc3-gentoo.patch || die
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dodir /boot/memtest86
-	cp memtest.bin ${D}/boot/memtest86
-	dodoc README README.build-process
-}
-
-pkg_postinst() {
-	einfo '*** memtest.bin has been installed in /boot/memtest86, please remember to'
-	einfo '*** update your boot loader. For example grub :'
-	einfo "*** edit /boot/grub/menu.lst and add the following lines "
-	einfo "***   > title=Memtest86"
-	einfo "***   > root (hd0,0)"
-	einfo "***   > kernel /boot/memtest86/memtest.bin"
-}