[src/trunk]: src/sys/arch/x68k/stand Use newvers_stand.sh to record the version.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/x68k/stand Use newvers_stand.sh to record the version.
From: minoura <minoura%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:50:59 +0000
details:   https://anonhg.NetBSD.org/src/rev/85f90fb491ba
branches:  trunk
changeset: 516089:85f90fb491ba
user:      minoura <minoura%NetBSD.org@localhost>
date:      Mon Oct 15 16:23:00 2001 +0000

description:
Use newvers_stand.sh to record the version.

diffstat:

 sys/arch/x68k/stand/boot/Makefile       |  25 ++++++++++++++++---------
 sys/arch/x68k/stand/boot/boot.c         |  11 +++++++++--
 sys/arch/x68k/stand/boot/version        |   8 ++++++++
 sys/arch/x68k/stand/boot_ufs/Makefile   |  19 ++++++++++++++-----
 sys/arch/x68k/stand/boot_ufs/bootmain.c |   7 ++++++-
 sys/arch/x68k/stand/boot_ufs/version    |  10 ++++++++++
 sys/arch/x68k/stand/boot_ustar/Makefile |  19 +++++++++++++------
 sys/arch/x68k/stand/boot_ustar/version  |   7 +++++++
 8 files changed, 83 insertions(+), 23 deletions(-)

diffs (231 lines):

diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot/Makefile
--- a/sys/arch/x68k/stand/boot/Makefile Mon Oct 15 16:22:50 2001 +0000
+++ b/sys/arch/x68k/stand/boot/Makefile Mon Oct 15 16:23:00 2001 +0000
@@ -1,14 +1,16 @@
-#      $NetBSD: Makefile,v 1.4 2001/09/29 01:42:09 minoura Exp $
+#      $NetBSD: Makefile,v 1.5 2001/10/15 16:23:00 minoura Exp $
 
 .include <bsd.own.mk>
 
-BOOT=          boot
-VERSION=       1.0
+BOOT=          Multi-boot
+VERSIONFILE=   ${.CURDIR}/version
+VERSION!=      awk -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } END { print it }' ${VERSIONFILE}
+NEWVERSWHAT=   "${BOOT}"
 
 # text address
 TEXT=          006000
 
-PROG=          ${BOOT}
+PROG=          boot
 BINDIR=                /usr/mdec
 BINMODE=       444
 MKMAN=         no
@@ -24,9 +26,14 @@
 COMMONDIR=     $M/stand/common
 .PATH:         ${COMMONDIR}
 
+SRCS+=         vers.c
+CLEANFILES+=   vers.c
+vers.c:        ${VERSIONFILE}
+       sh ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+
 CPPFLAGS+=     -nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
 CPPFLAGS+=     -I$M/stand/libiocs -I${COMMONDIR}
-CPPFLAGS+=     -D_STANDALONE
+CPPFLAGS+=     -D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=     -DTEXTADDR="0x${TEXT}" 
 CPPFLAGS+=     -DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
 CFLAGS=                -Wno-main -Os -m68020-60
@@ -49,10 +56,10 @@
 CLEANFILES+=   machine ${MACHINE_ARCH}
 
 realall: machine-links ${PROG}
-${BOOT}:       ${OBJS}
-       ${LD} ${LDFLAGS} -o ${BOOT}.sym ${OBJS} ${LDLIBS}
-       ${STRIP} -F ${BFDNAME} -o ${BOOT} ${BOOT}.sym
+${PROG}:       ${OBJS}
+       ${LD} ${LDFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
+       ${STRIP} -F ${BFDNAME} -o ${PROG} ${PROG}.sym
 
-CLEANFILES+=   ${BOOT}.sym
+CLEANFILES+=   ${PROG}.sym
 
 .include <bsd.prog.mk>
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot/boot.c
--- a/sys/arch/x68k/stand/boot/boot.c   Mon Oct 15 16:22:50 2001 +0000
+++ b/sys/arch/x68k/stand/boot/boot.c   Mon Oct 15 16:23:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.6 2001/10/15 16:13:39 minoura Exp $ */
+/*     $NetBSD: boot.c,v 1.7 2001/10/15 16:23:00 minoura Exp $ */
 
 /*
  * Copyright (c) 2001 Minoura Makoto
@@ -266,6 +266,11 @@
 }
 
 
+extern const char bootprog_rev[];
+extern const char bootprog_name[];
+extern const char bootprog_date[];
+extern const char bootprog_maker[];
+
 /*
  * Arguments from the boot block:
  *   bootdev - specifies the device from which /boot was read, in 
@@ -309,6 +314,8 @@
        default:
                printf("Warning: unknown boot device: %x\n", bootdev);
        }
-       print_title("NetBSD/x68k bootstrap loader version %s", BOOT_VERS);
+       print_title("%s, Revision %s\n(%s, %s)",
+                   bootprog_name, bootprog_rev,
+                   bootprog_maker, bootprog_date);
        bootmenu();
 }
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot/version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x68k/stand/boot/version  Mon Oct 15 16:23:00 2001 +0000
@@ -0,0 +1,8 @@
+$ NetBSD $
+
+NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
+file is important - make sure the entries are appended on end, last item
+is taken as the current.
+
+0.3:   xxboot, ancient monolithic bootstrap program.
+1.0:   Initial version of the libsa-based bootstrap loader.
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot_ufs/Makefile
--- a/sys/arch/x68k/stand/boot_ufs/Makefile     Mon Oct 15 16:22:50 2001 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/Makefile     Mon Oct 15 16:23:00 2001 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 2001/10/01 17:03:38 minoura Exp $
+#      $NetBSD: Makefile,v 1.6 2001/10/15 16:23:01 minoura Exp $
 
 .include <bsd.own.mk>
 
 BOOT=  boot_ufs
-VERSION=1.0
+VERSIONFILE=   ${.CURDIR}/version
+VERSION!=      awk -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } END { print it }' ${VERSIONFILE}
+NEWVERSWHAT=   "${BOOT}"
 
 # text and bss addresses in hex
 TEXT=          0f0000          # Primary (me)
@@ -19,13 +21,20 @@
 
 OBJCOPY?=      objcopy
 
-LIBKERN=       ${.CURDIR}/../../../../lib/libkern/arch/${MACHINE_ARCH}
-COMMONDIR=     ${.CURDIR}/../common
-LIBIOCS=       ${.CURDIR}/../libiocs
+S=             ${.CURDIR}/../../../..
+M=             $S/arch/${MACHINE}
+LIBKERN=       $S/lib/libkern/arch/${MACHINE_ARCH}
+COMMONDIR=     $M/stand/common
+LIBIOCS=       $M/stand/libiocs
 .PATH:         ${LIBKERN} ${COMMONDIR}
 SRCS=  boot.S bootmain.c readufs.c readufs_ffs.c #readufs_lfs.c
 SRCS+= exec_image.S memset.S strcmp.S
 
+SRCS+=         vers.c
+CLEANFILES+=   vers.c
+vers.c:        ${VERSIONFILE}
+       sh ${S}/conf/newvers_stand.sh -DM ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+
 CFLAGS=        -Os -fomit-frame-pointer
 CFLAGS+= -W -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot_ufs/bootmain.c
--- a/sys/arch/x68k/stand/boot_ufs/bootmain.c   Mon Oct 15 16:22:50 2001 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/bootmain.c   Mon Oct 15 16:23:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootmain.c,v 1.2 2001/10/15 16:13:40 minoura Exp $     */
+/*     $NetBSD: bootmain.c,v 1.3 2001/10/15 16:23:01 minoura Exp $     */
 
 /*-
  * Copyright (c) 1993, 1994 Takumi Nakamura.
@@ -258,6 +258,7 @@
 #endif
        struct exec header;
        int size;
+       extern const char bootprog_name[], bootprog_rev[];
 
 #ifdef BOOT_DEBUG
        /* for debug; ¥ì¥¸¥¹¥¿¤Î¾õÂÖ¤ò¥×¥ê¥ó¥È¤¹¤ë */
@@ -267,6 +268,10 @@
        }
 #endif
 
+       B_PRINT(bootprog_name);
+       B_PRINT(" rev.");       B_PRINT(bootprog_rev);
+       B_PRINT("\r\n");
+
        /*
         * get boot device
         */
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot_ufs/version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/version      Mon Oct 15 16:23:00 2001 +0000
@@ -0,0 +1,10 @@
+$ NetBSD $
+
+NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
+file is important - make sure the entries are appended on end, last item
+is taken as the current.
+
+0.3:   xxboot, ancient monolithic bootstrap program.
+1.0:   Remove the deflate routine, which is not required to load
+       /boot.
+       Add LFS support (not tested yet).
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot_ustar/Makefile
--- a/sys/arch/x68k/stand/boot_ustar/Makefile   Mon Oct 15 16:22:50 2001 +0000
+++ b/sys/arch/x68k/stand/boot_ustar/Makefile   Mon Oct 15 16:23:00 2001 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2001/10/01 17:03:38 minoura Exp $
+#      $NetBSD: Makefile,v 1.4 2001/10/15 16:23:01 minoura Exp $
 
 .include <bsd.own.mk>
 
 BOOT=  boot_ustar
-VERSION=1.0
+VERSIONFILE=   ${.CURDIR}/version
+VERSION!=      awk -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } END { print it }' ${VERSIONFILE}
+NEWVERSWHAT=   "${BOOT}"
 
 # text and bss addresses in hex
 TEXT=          002000          # Primary (me)
@@ -17,12 +19,17 @@
 
 OBJCOPY?=      objcopy
 
-COMMONDIR=     ${.CURDIR}/../common
-LIBIOCS=       ${.CURDIR}/../libiocs
-#.PATH:                ${COMMONDIR}
-#SRCS= boot_ustar.S exec_image.S
+S=             ${.CURDIR}/../../../..
+M=             $S/arch/x68k
+COMMONDIR=     $M/stand/common
+LIBIOCS=       $M/stand/libiocs
 SRCS=  boot_ustar.S
 
+SRCS+=         vers.c
+CLEANFILES+=   vers.c
+vers.c:        ${VERSIONFILE}
+       sh ${S}/conf/newvers_stand.sh -DM ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
 CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS}
diff -r c63319ff823b -r 85f90fb491ba sys/arch/x68k/stand/boot_ustar/version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x68k/stand/boot_ustar/version    Mon Oct 15 16:23:00 2001 +0000
@@ -0,0 +1,7 @@
+$ NetBSD $
+
+NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
+file is important - make sure the entries are appended on end, last item
+is taken as the current.
+
+1.0:   Initial revision.
Prev by Date: [src/trunk]: src/sys/sys Make this capable of being included without pre-requ...
Next by Date: [src/trunk]: src/sys/arch/sh3/sh3 s/BYTE_ORDER/_BYTE_ORDER/g
Previous by Thread: [src/trunk]: src/sys/sys Make this capable of being included without pre-requ...
Next by Thread: [src/trunk]: src/sys/arch/sh3/sh3 s/BYTE_ORDER/_BYTE_ORDER/g
Indexes:
Home | Main Index | Thread Index | Old Index