[src/trunk]: src/distrib/sgimips The bootloader names appeared in many more p...

[sekiya <sekiya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e663ac70548
branches:  trunk
changeset: 555294:2e663ac70548
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Thu Nov 13 14:07:38 2003 +0000

description:
The bootloader names appeared in many more places than I originally
thought.  This commit should, finally, take care of all instances.

diffstat:

 distrib/sgimips/miniroot/Makefile.inc.xxx |  8 ++++----
 distrib/sgimips/miniroot/list             |  8 ++++----
 distrib/sgimips/ramdisk/Makefile          |  6 +++---
 distrib/sgimips/ramdisk/list              |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (85 lines):

diff -r c8d4715ae6fa -r 2e663ac70548 distrib/sgimips/miniroot/Makefile.inc.xxx
--- a/distrib/sgimips/miniroot/Makefile.inc.xxx Thu Nov 13 14:07:01 2003 +0000
+++ b/distrib/sgimips/miniroot/Makefile.inc.xxx Thu Nov 13 14:07:38 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc.xxx,v 1.3 2003/11/13 02:33:39 sekiya Exp $
+#      $NetBSD: Makefile.inc.xxx,v 1.4 2003/11/13 14:07:38 sekiya Exp $
 
 DBG=           -Os -Wa,-xgot # XXX -xgot workaround for objcopy-crunchide
 
@@ -18,8 +18,8 @@
 # Write preliminary Label so that newfs succeeds when updating label.
 PRELABEL=${DESTDIR}/sbin/disklabel -w ${VND} ${DISKTYPE} ; \
        ${DESTDIR}/usr/mdec/sgivol -if ${VND} ;\
-       ${DESTDIR}/usr/mdec/sgivol -wf boot /usr/mdec/boot ${VND} ; \
-       ${DESTDIR}/usr/mdec/sgivol -wf boot.elf /usr/mdec/boot.elf ${VND} ; \
-       ${DESTDIR}/usr/mdec/sgivol -wf boot.ip32 /usr/mdec/boot.ip32 ${VND}
+       ${DESTDIR}/usr/mdec/sgivol -wf aoutboot /usr/mdec/aoutboot ${VND} ; \
+       ${DESTDIR}/usr/mdec/sgivol -wf ip2xboot /usr/mdec/ip2xboot ${VND} ; \
+       ${DESTDIR}/usr/mdec/sgivol -wf ip3xboot /usr/mdec/ip3xboot ${VND}
 
 image_md_post:
diff -r c8d4715ae6fa -r 2e663ac70548 distrib/sgimips/miniroot/list
--- a/distrib/sgimips/miniroot/list     Thu Nov 13 14:07:01 2003 +0000
+++ b/distrib/sgimips/miniroot/list     Thu Nov 13 14:07:38 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.3 2002/12/30 14:55:28 pooka Exp $
+#      $NetBSD: list,v 1.4 2003/11/13 14:07:38 sekiya Exp $
 
 # extras in bin
 PROG   bin/csh
@@ -29,9 +29,9 @@
 SYMLINK        /tmp    var/tmp
 
 # we need the contents of /usr/mdec
-COPY   ${DESTDIR}/usr/mdec/boot        usr/mdec/boot
-COPY   ${DESTDIR}/usr/mdec/boot.elf    usr/mdec/boot.elf
-COPY   ${DESTDIR}/usr/mdec/boot.ip32   usr/mdec/boot.ip32
+COPY   ${DESTDIR}/usr/mdec/aoutboot    usr/mdec/aoutboot
+COPY   ${DESTDIR}/usr/mdec/ip2xboot    usr/mdec/ip2xboot
+COPY   ${DESTDIR}/usr/mdec/ip3xboot    usr/mdec/ip3xboot
 
 # the zoneinfo (dont use)
 #COPYDIR       ${DESTDIR}/usr/share/zoneinfo   usr/share/zoneinfo
diff -r c8d4715ae6fa -r 2e663ac70548 distrib/sgimips/ramdisk/Makefile
--- a/distrib/sgimips/ramdisk/Makefile  Thu Nov 13 14:07:01 2003 +0000
+++ b/distrib/sgimips/ramdisk/Makefile  Thu Nov 13 14:07:38 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2003/11/13 13:18:56 sekiya Exp $
+#      $NetBSD: Makefile,v 1.6 2003/11/13 14:07:38 sekiya Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,8 +20,8 @@
 IMAGEDEPENDS=  ${CRUNCHBIN} \
                disktab.preinstall dot.hdprofile dot.profile \
                ${.CURDIR}/../miniroot/termcap.iris-ansi \
-               ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/boot.elf \
-               ${DESTDIR}/usr/mdec/boot.ip32 \
+               ${DESTDIR}/usr/mdec/aoutboot ${DESTDIR}/usr/mdec/ip2xboot \
+               ${DESTDIR}/usr/mdec/ip3xboot \
                ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
                ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \
                ${NETBSDSRCDIR}/etc/services
diff -r c8d4715ae6fa -r 2e663ac70548 distrib/sgimips/ramdisk/list
--- a/distrib/sgimips/ramdisk/list      Thu Nov 13 14:07:01 2003 +0000
+++ b/distrib/sgimips/ramdisk/list      Thu Nov 13 14:07:38 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.3 2002/12/30 14:55:29 pooka Exp $
+#      $NetBSD: list,v 1.4 2003/11/13 14:07:38 sekiya Exp $
 
 SRCDIRS        bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand
 
@@ -61,9 +61,9 @@
 LIBS   -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm
 
 # we need the boot blocks /usr/mdec
-COPY   ${DESTDIR}/usr/mdec/boot                usr/mdec/boot
-COPY   ${DESTDIR}/usr/mdec/boot.elf            usr/mdec/boot.elf
-COPY   ${DESTDIR}/usr/mdec/boot.ip32           usr/mdec/boot.ip32
+COPY   ${DESTDIR}/usr/mdec/aoutboot            usr/mdec/aoutboot
+COPY   ${DESTDIR}/usr/mdec/ip2xboot            usr/mdec/ip2xboot
+COPY   ${DESTDIR}/usr/mdec/ip3xboot            usr/mdec/ip3xboot
 
 # various files that we need in /etc for the install
 COPY   ${NETBSDSRCDIR}/etc/group               etc/group