[src/netbsd-1-4]: src/distrib/alpha pull up from trunk: adjust for changes in...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-1-4]: src/distrib/alpha pull up from trunk: adjust for changes in...
From: cgd <cgd%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 05:32:50 +0000

details:   https://anonhg.NetBSD.org/src/rev/7a99bfa4dbda
branches:  netbsd-1-4
changeset: 468099:7a99bfa4dbda
user:      cgd <cgd%NetBSD.org@localhost>
date:      Wed Apr 07 06:51:26 1999 +0000

description:
pull up from trunk: adjust for changes in alpha /usr/mdec files.

diffstat:

 distrib/alpha/floppy-GENERIC/Makefile        |  8 ++++----
 distrib/alpha/instkernel/cd-hd-tape/Makefile |  6 +++---
 distrib/alpha/instkernel/fdset/Makefile      |  6 +++---
 distrib/alpha/instkernel/ramdisk/list        |  4 ++--
 distrib/alpha/instkernel/src/install.sh      |  4 ++--
 distrib/alpha/instkernel/src/upgrade.sh      |  4 ++--
 distrib/alpha/rz25dist/Makefile              |  6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diffs (161 lines):

diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/floppy-GENERIC/Makefile
--- a/distrib/alpha/floppy-GENERIC/Makefile     Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/floppy-GENERIC/Makefile     Wed Apr 07 06:51:26 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 1999/02/25 12:31:30 ross Exp $
+#      $NetBSD: Makefile,v 1.4.2.1 1999/04/07 06:51:26 cgd Exp $
 
 MOUNT_POINT?=  /mnt
 VND?=          vnd0
@@ -25,7 +25,7 @@
 
 all: GENERIC.fs
 
-GENERIC.fs: ${GZKERNEL} ${MDEC}/boot ${MDEC}/bootxx
+GENERIC.fs: ${GZKERNEL} ${MDEC}/boot ${MDEC}/bootxx.old
        @echo Creating tar image
        tar cvf ustar.tmp ${MDEC}/boot ${GZKERNEL}
        @echo Creating vn image
@@ -33,8 +33,8 @@
        vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${.TARGET}.tmp
        dd bs=8k seek=1 if=ustar.tmp of=${VND_CDEV}
        disklabel -rw ${VND_CDEV} ${DISKTYPE}
-       ${MDEC}/installboot -b 17 -v    \
-               ${MDEC}/boot ${MDEC}/bootxx ${VND_CRDEV}
+       ${MDEC}/installboot.old -b 17 -v        \
+               ${MDEC}/boot ${MDEC}/bootxx.old ${VND_CRDEV}
        vnconfig -u ${VND_CDEV}
        mv ${.TARGET}.tmp ${.TARGET}
 
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/instkernel/cd-hd-tape/Makefile
--- a/distrib/alpha/instkernel/cd-hd-tape/Makefile      Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/instkernel/cd-hd-tape/Makefile      Wed Apr 07 06:51:26 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 1999/03/22 08:44:57 ross Exp $
+#      $NetBSD: Makefile,v 1.3.2.1 1999/04/07 06:51:27 cgd Exp $
 
 IMAGE=         cdhdtape
 IMAGESIZE=     5760
@@ -18,7 +18,7 @@
 MDEC=          ${DESTDIR}/usr/mdec
 FSTMP=         ustar.tmp
 
-PRIMARYBOOT=   ${DESTDIR}/usr/mdec/bootxx
+PRIMARYBOOT=   ${DESTDIR}/usr/mdec/bootxx.old
 SECONDARYBOOT= ${DESTDIR}/usr/mdec/boot
 
 DISKTYPE=      floppy
@@ -45,7 +45,7 @@
        @echo not really doing rm ${FSTMP}
        disklabel -rw ${VND_CDEV} ${DISKTYPE}
        @echo "installing new bootblocks"
-       ${MDEC}/installboot -b 17 -v    \
+       ${MDEC}/installboot.old -b 17 -v        \
                ${SECONDARYBOOT} ${PRIMARYBOOT} ${VND_CRDEV}
        vnconfig -u ${VND_CDEV}
 
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/instkernel/fdset/Makefile
--- a/distrib/alpha/instkernel/fdset/Makefile   Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/instkernel/fdset/Makefile   Wed Apr 07 06:51:26 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 1998/10/29 00:37:07 ross Exp $
+#      $NetBSD: Makefile,v 1.2.2.1 1999/04/07 06:51:27 cgd Exp $
 
 IMAGE1=                disk1of2
 IMAGE2=                disk2of2
@@ -17,7 +17,7 @@
 MDEC=          ${DESTDIR}/usr/mdec
 FSTMP=         ustar.tmp
 
-PRIMARYBOOT=   ${DESTDIR}/usr/mdec/bootxx
+PRIMARYBOOT=   ${DESTDIR}/usr/mdec/bootxx.old
 SECONDARYBOOT= ${DESTDIR}/usr/mdec/boot
 
 DISKTYPE=      floppy
@@ -38,7 +38,7 @@
        dd bs=8k seek=1 count=179 if=${FSTMP} of=${VND_CDEV}
        disklabel -rw ${VND_CDEV} ${DISKTYPE}
        @echo "installing new bootblocks"
-       ${MDEC}/installboot -b 17 -v    \
+       ${MDEC}/installboot.old -b 17 -v        \
                ${SECONDARYBOOT} ${PRIMARYBOOT} ${VND_CRDEV}
        vnconfig -u ${VND_CDEV}
        @echo Making disk number two.
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/instkernel/ramdisk/list
--- a/distrib/alpha/instkernel/ramdisk/list     Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/instkernel/ramdisk/list     Wed Apr 07 06:51:26 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.6 1999/03/22 08:52:21 ross Exp $
+#      $NetBSD: list,v 1.6.2.1 1999/04/07 06:51:27 cgd Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/ramdiskbin            ramdiskbin
@@ -71,7 +71,7 @@
 
 # we need the boot blocks /usr/mdec
 COPY   ${DESTDIR}/usr/mdec/boot                usr/mdec/boot
-COPY   ${DESTDIR}/usr/mdec/bootxx              usr/mdec/bootxx
+COPY   ${DESTDIR}/usr/mdec/bootxx_ffs          usr/mdec/bootxx_ffs
 
 # various files that we need in /etc for the install
 COPY   ${CURDIR}/../../../../etc/group         etc/group
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/instkernel/src/install.sh
--- a/distrib/alpha/instkernel/src/install.sh   Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/instkernel/src/install.sh   Wed Apr 07 06:51:26 1999 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: install.sh,v 1.2 1999/01/25 23:34:20 garbled Exp $
+#      $NetBSD: install.sh,v 1.2.2.1 1999/04/07 06:51:28 cgd Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # Copyright (c) 1997 Perry E. Metzger
@@ -503,7 +503,7 @@
 echo -n        "Installing boot blocks on $drivename..."
 $DONTDOIT rm -f /mnt/boot
 $DONTDOIT cp /usr/mdec/boot /mnt/boot
-$DONTDOIT /usr/mdec/installboot /mnt/boot /usr/mdec/bootxx /dev/r${drivename}c
+$DONTDOIT /usr/mdec/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
 echo   " done."
 
 
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/instkernel/src/upgrade.sh
--- a/distrib/alpha/instkernel/src/upgrade.sh   Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/instkernel/src/upgrade.sh   Wed Apr 07 06:51:26 1999 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: upgrade.sh,v 1.2 1999/01/25 23:34:20 garbled Exp $
+#      $NetBSD: upgrade.sh,v 1.2.2.1 1999/04/07 06:51:28 cgd Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # Copyright (c) 1997 Perry E. Metzger
@@ -227,7 +227,7 @@
 # shouldn't be needed, but...
 $DONTDOIT rm -f /mnt/boot
 $DONTDOIT cp /usr/mdec/boot /mnt/boot
-$DONTDOIT /usr/mdec/installboot /mnt/boot /usr/mdec/bootxx /dev/r${drivename}c
+$DONTDOIT /usr/mdec/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
 if [ $? != 0 ]; then
        echo    "FATAL ERROR: UPDATE OF DISK LABEL FAILED."
        echo    "It in unclear why this error would occur.  It looks"
diff -r 4433c030504b -r 7a99bfa4dbda distrib/alpha/rz25dist/Makefile
--- a/distrib/alpha/rz25dist/Makefile   Wed Apr 07 06:30:35 1999 +0000
+++ b/distrib/alpha/rz25dist/Makefile   Wed Apr 07 06:51:26 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/03/04 20:32:19 wrstuden Exp $
+# $NetBSD: Makefile,v 1.22.2.1 1999/04/07 06:51:28 cgd Exp $
 
 # Make a distribution for the alpha, on a spare disk.
 # This creates a large, gzipped disk image in ${.OBJDIR}
@@ -56,8 +56,8 @@
        ln -s ../local/bin/strip ${DESTDIR}/usr/bin
        cp -p ${DESTDIR}/usr/mdec/boot ${DESTDIR}/
        sync; sleep 1; sync; sleep 1
-       ${DESTDIR}/usr/mdec/installboot -v ${DESTDIR}/boot \
-           ${DESTDIR}/usr/mdec/bootxx /dev/r${DESTDISK}c
+       ${DESTDIR}/usr/mdec/installboot -v /dev/r${DESTDISK}c \
+           ${DESTDIR}/usr/mdec/bootxx_ffs
 
 unmount-fs:
        umount ${DESTDIR}/usr ${DESTDIR}

Prev by Date: [src/netbsd-1-4]: src/sys/arch/sun3/sun3 That last commit left pagemove() ent...
Next by Date: [src/netbsd-1-4]: src/sys/dev/scsipi Pull up rev 1.21: fix timeout for SSS_ST...
Previous by Thread: [src/netbsd-1-4]: src/sys/arch/sun3/sun3 That last commit left pagemove() ent...
Next by Thread: [src/netbsd-1-4]: src/sys/dev/scsipi Pull up rev 1.21: fix timeout for SSS_ST...
Indexes:

Home | Main Index | Thread Index | Old Index