--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Thu, Jan 09, 2003 at 12:45:51PM +1100, Luke Mewburn wrote:

> This would only work if the first stage boot block doesn't contain
> a list of hard-coded disks blocks for "/boot" (or "/boot.amiga").

No, it uses filesystem reading code.

Please comment on the appended patch.

Regards,
	-is


Index: distrib/amiga/miniroot/Makefile.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/distrib/amiga/miniroot/Makefile.inc,v
retrieving revision 1.12
diff -u -r1.12 Makefile.inc
--- distrib/amiga/miniroot/Makefile.inc	2002/05/29 04:11:01	1.12
+++ distrib/amiga/miniroot/Makefile.inc	2003/01/10 21:06:15
@@ -6,7 +6,7 @@
 MAKEDEVTARGETS=3D	floppy
 IMAGEDEPENDS+=3D	${ARCHDIR}/disktab.shadow ${ARCHDIR}/dot.profile \
 		${ARCHDIR}/install.md ${ARCHDIR}/termcap.vt \
-		${DESTDIR}/usr/mdec/boot.amiga \
+		${DESTDIR}/boot.amiga \
 		${KERNOBJDIR}/INSTALL/netbsd
=20
 IMAGEPOSTBUILD=3D	dd if=3D${DESTDIR}/usr/mdec/bootxx_ffs of=3D${IMAGE} bs=
=3D8192 conv=3Dnotrunc
Index: distrib/amiga/miniroot/list
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/distrib/amiga/miniroot/list,v
retrieving revision 1.17
diff -u -r1.17 list
--- distrib/amiga/miniroot/list	2002/07/23 03:52:02	1.17
+++ distrib/amiga/miniroot/list	2003/01/10 21:06:17
@@ -42,7 +42,7 @@
 COPYDIR	${DESTDIR}/usr/share/keymaps/amiga	usr/share/keymaps/amiga
=20
 # boot loader
-COPY	${DESTDIR}/usr/mdec/boot.amiga		boot.amiga
+COPY	${DESTDIR}/boot.amiga		boot.amiga
=20
 # install kernel
 COPY	${KERNOBJDIR}/INSTALL/netbsd	netbsd
Index: distrib/sets/lists/base/md.amiga
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/distrib/sets/lists/base/md.amiga,v
retrieving revision 1.49
diff -u -r1.49 md.amiga
--- distrib/sets/lists/base/md.amiga	2002/04/15 02:50:30	1.49
+++ distrib/sets/lists/base/md.amiga	2003/01/10 21:06:30
@@ -1,6 +1,6 @@
 # $NetBSD: md.amiga,v 1.49 2002/04/15 02:50:30 mhitch Exp $
+./boot.amiga				base-sysutil-root
 ./sbin/binpatch				base-sysutil-root
-./usr/mdec/boot.amiga			base-sysutil-bin
 ./usr/mdec/bootxx_fd			base-sysutil-bin
 ./usr/mdec/bootxx_ffs			base-sysutil-bin
 ./usr/mdec/installboot			base-sysutil-bin
Index: distrib/sets/lists/base/obsolete.amiga
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/distrib/sets/lists/base/obsolete.amiga,v
retrieving revision 1.4
diff -u -r1.4 obsolete.amiga
--- distrib/sets/lists/base/obsolete.amiga	2002/11/17 02:54:50	1.4
+++ distrib/sets/lists/base/obsolete.amiga	2003/01/10 21:06:30
@@ -1,3 +1,4 @@
 # $NetBSD: obsolete.amiga,v 1.4 2002/11/17 02:54:50 lukem Exp $
+./usr/mdec/boot.amiga
 ./usr/mdec/fdboot
 ./usr/mdec/xxboot
Index: sys/arch/amiga/stand/bootblock/boot/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/sys/arch/amiga/stand/bootblock/boot/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- sys/arch/amiga/stand/bootblock/boot/Makefile	2002/05/31 20:57:41	1.29
+++ sys/arch/amiga/stand/bootblock/boot/Makefile	2003/01/10 21:07:19
@@ -16,7 +16,7 @@
 .SUFFIXES: .out .o .po .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
=20
 FILES=3D boot.amiga
-BINDIR=3D/usr/mdec
+BINDIR=3D/
=20
 COBJS =3D main.o console.o xd.o twiddle.o bzero.o gets.o
 COBJS+=3D  lseek.o open.o read.o close.o dev.o errno.o

--=20
seal your e-mail: http://www.gnupg.org/

--qMm9M+Fa2AknHoGS
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (NetBSD)

iD8DBQE+HzbsPCRcZ/VMtk4RAuQ7AJ9SzRV/Fu9QSsziJQiQn71M6TvWVACfV8yo
yr4rw8cLfaQrIzhIsKtWBnE=
=SCsJ
-----END PGP SIGNATURE-----

--qMm9M+Fa2AknHoGS--