Dates in boot loaders on !x86

To: tech-kern%NetBSD.org@localhost
Subject: Dates in boot loaders on !x86
From: Joerg Sonnenberger <joerg%britannica.bec.de@localhost>
Date: Sun, 16 Jan 2011 20:29:12 +0100

Hi all,
i386 and amd64 dropped the date in the boot loaders a while ago to
ensure that builds are reproducable. Some platforms are currently not
including the date as well, but many remain in the old ways. This makes
it harder to compare consecutive builds with patches for unexpected
output changes, so either the various platforms should honour MKREPRO or
drop the output completely. Attached is an untested mechanical patch to
do the former, but I wonder if there is any point in keeping the date.

Joerg

Index: src/sys/arch/acorn26/stand/Makefile.buildboot
===================================================================
--- src/sys/arch/acorn26/stand/Makefile.buildboot
+++ src/sys/arch/acorn26/stand/Makefile.buildboot
@@ -16,15 +16,21 @@
 LIBCRTBEGIN=
 LIBCRTEND=
 
 RISCOSTYPE ?= ff8
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
${MACHINE} ${NEWVERSWHAT}
 
 CPPFLAGS+=     -D_STANDALONE -DHIMEM=0x28000
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CPPFLAGS+=     -I${.CURDIR}/../lib
 CFLAGS=                -O2

Index: src/sys/arch/acorn26/stand/boot26/boot26.c
===================================================================
--- src/sys/arch/acorn26/stand/boot26/boot26.c
+++ src/sys/arch/acorn26/stand/boot26/boot26.c
@@ -66,11 +66,12 @@
        struct bootconfig bootconfig;
        int crow;
        int ret;
 
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        os_read_mem_map_info(&nbpp, &npages);
        if (debug)
                printf("Machine has %d pages of %d KB each.  "
                    "Total RAM: %d MB\n", npages, nbpp >> 10,

Index: src/sys/arch/acorn32/stand/Makefile.buildboot
===================================================================
--- src/sys/arch/acorn32/stand/Makefile.buildboot
+++ src/sys/arch/acorn32/stand/Makefile.buildboot
@@ -26,16 +26,21 @@
 RELOC=8000
 # -N (OMAGIC) since we don't need a gap between text and data.
 LINKFLAGS+=-N -Ttext ${RELOC}
 .endif
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE} 
${NEWVERSWHAT}
-
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
${MACHINE} ${NEWVERSWHAT}
 CPPFLAGS+=     -D_STANDALONE 
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CPPFLAGS+=     -I${.CURDIR}/../lib
 CFLAGS=                -O2
 CFLAGS+=       -ffreestanding

Index: src/sys/arch/acorn32/stand/boot32/boot32.c
===================================================================
--- src/sys/arch/acorn32/stand/boot32/boot32.c
+++ src/sys/arch/acorn32/stand/boot32/boot32.c
@@ -772,11 +772,12 @@
        int howto, start_args, ret;
        int class;
 
        printf("\n\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf(">> Booting NetBSD/acorn32 on a RiscPC/A7000/NC\n");
        printf("\n");
 
        process_args(argc, argv, &howto, booted_file, &start_args);
 

Index: src/sys/arch/alpha/stand/Makefile.bootprogs
===================================================================
--- src/sys/arch/alpha/stand/Makefile.bootprogs
+++ src/sys/arch/alpha/stand/Makefile.bootprogs
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.bootprogs,v 1.30 2009/04/20 13:15:12 tsutsui Exp $
+# $NetBSD: src/sys/arch/alpha/stand/Makefile.bootprogs,v 1.30 2009-04-20 
13:15:12 tsutsui Exp $
 
 .include <bsd.sys.mk>          # for HOST_SH
 
 S=     ${.CURDIR}/../../../..
 
@@ -29,16 +29,22 @@
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 
 CWARNFLAGS+=   -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CFLAGS+=       -Werror ${CWARNFLAGS}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "alpha"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} -N ${.CURDIR}/version 
"alpha"
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
 .endif
 

Index: src/sys/arch/alpha/stand/common/boot.c
===================================================================
--- src/sys/arch/alpha/stand/common/boot.c
+++ src/sys/arch/alpha/stand/common/boot.c
@@ -89,11 +89,11 @@
 
        /* print a banner */
        printf("\n");
        printf("NetBSD/alpha " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, 
Revision %s\n",
            bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "", 
bootprog_date);
        printf("\n");
 
        /* set up the booted device descriptor */
 #if defined(UNIFIED_BOOTBLOCK)
         if (!booted_dev_open()) {

Index: src/sys/arch/alpha/stand/standtest/test.c
===================================================================
--- src/sys/arch/alpha/stand/standtest/test.c
+++ src/sys/arch/alpha/stand/standtest/test.c
@@ -100,11 +100,11 @@
        };
 
        printf("\n");
        printf("NetBSD/alpha " NETBSD_VERS
            " Standalone Test Program, Revision %s\n", bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "", 
bootprog_date);
        printf("\n");
 
        arg_pfn = pfn;
        arg_ptb = ptb;
        arg_bim = bim;

Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
===================================================================
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile
@@ -109,13 +109,19 @@
                -o $@ -c $>
 
 libboot.a: ${OBJS}
        ${AR} r $@ $> && ${RANLIB} $@
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.o: vers.c
 vers.c:        ${.CURDIR}/version
-       ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N ${.CURDIR}/version 
"amiga"
+       ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh ${_NVFLAGS} -N 
${.CURDIR}/version "amiga"
 
 .if !make(obj) && !make(clean) && !make(cleandir)
 .NOPATH: machine m68k
 .BEGIN: machine m68k
 

Index: src/sys/arch/amiga/stand/bootblock/boot/main.c
===================================================================
--- src/sys/arch/amiga/stand/bootblock/boot/main.c
+++ src/sys/arch/amiga/stand/bootblock/boot/main.c
@@ -160,11 +160,12 @@
            bootprog_rev);
 #else
        printf("\nNetBSD/Amiga " NETBSD_VERS " Bootstrap, Revision %s\n",
            bootprog_rev);
 #endif
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf("\n");
        printf("Boot: [%s] ", kernel_name);
 
        gets(linebuf);
 

Index: src/sys/arch/arc/stand/boot/Makefile
===================================================================
--- src/sys/arch/arc/stand/boot/Makefile
+++ src/sys/arch/arc/stand/boot/Makefile
@@ -31,16 +31,22 @@
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 #CPPFLAGS+= -DBOOT_DEBUG
 LDSCRIPT=  ${S}/arch/mips/conf/stand.ldscript
 TEXTADDR=  0x80f00000
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
${MACHINE}
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
 .endif
 

Index: src/sys/arch/arc/stand/boot/boot.c
===================================================================
--- src/sys/arch/arc/stand/boot/boot.c
+++ src/sys/arch/arc/stand/boot/boot.c
@@ -141,11 +141,12 @@
        int             ch;
 
        /* print a banner */
        printf("\n");
        printf("%s Bootstrap, Revision %s\n", bootprog_name, bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        memset(marks, 0, sizeof marks);
 
        /* initialise bootinfo structure early */
        bi_init(bootinfo);

Index: src/sys/arch/bebox/stand/boot/Makefile
===================================================================
--- src/sys/arch/bebox/stand/boot/Makefile
+++ src/sys/arch/bebox/stand/boot/Makefile
@@ -71,15 +71,21 @@
 powerpc::
        -rm -f $@
        ln -s ${S}/arch/powerpc/include $@
 .endif
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${.CURDIR}/../boot/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version \
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} 
${.CURDIR}/../boot/version \
                "bebox" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBS}
        ${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
                -Ttext ${RELOC} ${OBJS} ${LIBS}
        ${STRIP} -o ${PROG} ${PROG}.elf
 
 .include <bsd.prog.mk>

Index: src/sys/arch/bebox/stand/boot/boot.c
===================================================================
--- src/sys/arch/bebox/stand/boot/boot.c
+++ src/sys/arch/bebox/stand/boot/boot.c
@@ -117,11 +117,12 @@
 
        runCPU1((void *)start_CPU1);
        wait_for(&CPU1_alive);
 
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf(">> Memory: %d k\n", btinfo_memory.memsize / 1024);
 
        /*
         * attached kernel check and copy.
         */

Index: src/sys/arch/cobalt/stand/boot/Makefile
===================================================================
--- src/sys/arch/cobalt/stand/boot/Makefile
+++ src/sys/arch/cobalt/stand/boot/Makefile
@@ -93,13 +93,19 @@
 SAMISCMAKEFLAGS+=SA_USE_LOADFILE=yes SA_USE_CREAD=yes
 .include "${S}/lib/libsa/Makefile.inc"
 
 LIBS=          ${SALIB} ${ZLIB} ${KERNLIB}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "cobalt"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"cobalt"
 
 ${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
        ${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            -T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
        gzip -c9 ${PROG} > ${PROG}.gz

Index: src/sys/arch/cobalt/stand/boot/boot.c
===================================================================
--- src/sys/arch/cobalt/stand/boot/boot.c
+++ src/sys/arch/cobalt/stand/boot/boot.c
@@ -375,11 +375,12 @@
        lcd_banner();
 
        printf("\n");
        printf(">> %s " NETBSD_VERS " Bootloader, Revision %s [@%p]\n",
                        bootprog_name, bootprog_rev, (void*)&start);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf(">> Model:\t\t%s\n", cobalt_model[cobalt_id]);
        printf(">> Memory:\t\t%lu k\n", (memsize - MIPS_KSEG0_START) / 1024);
        printf(">> PROM boot string:\t%s\n", bootstring);
 }
 

Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
===================================================================
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
@@ -92,13 +92,19 @@
 
 LDFLAGS= -M -T ${LDSCRIPT}
 
 LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: ${VERSIONFILE}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} '${PLATFORM}' \
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.ALLSRC} 
'${PLATFORM}' \
            ${NEWVERSWHAT}
 
 ${PROG}: ${PROGSYM}
        ${OBJCOPY} -O binary ${PROGSYM} ${.TARGET}
 

Index: src/sys/arch/evbarm/stand/gzboot/gzboot.c
===================================================================
--- src/sys/arch/evbarm/stand/gzboot/gzboot.c
+++ src/sys/arch/evbarm/stand/gzboot/gzboot.c
@@ -120,11 +120,12 @@
 
        cons_init();
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        board_init();
 
        printf(">> Load address: 0x%x\n", md_root_loadaddr);
 

Index: src/sys/arch/ews4800mips/stand/boot/Makefile
===================================================================
--- src/sys/arch/ews4800mips/stand/boot/Makefile
+++ src/sys/arch/ews4800mips/stand/boot/Makefile
@@ -46,10 +46,16 @@
 SRCS           += bfs.c
 # ../../dev
 SRCS           += ga.c
 # ../../ews4800mips
 SRCS           += pdinfo.c vtoc.c
+
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
 
 .PHONY: vers.c
 vers.c: version
        ${_MKTARGET_CREATE}
        ${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version ${MACHINE}

Index: src/sys/arch/hp700/stand/Makefile.buildboot
===================================================================
--- src/sys/arch/hp700/stand/Makefile.buildboot
+++ src/sys/arch/hp700/stand/Makefile.buildboot
@@ -31,12 +31,18 @@
 CFLAGS+=       -mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0
 
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version \
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version \
                hp700 ${NEWVERSWHAT}
 
 CPPFLAGS+=             -D_STANDALONE -Dhp700 ${DEBUGFLAGS}
 CPPFLAGS+=             -DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
 CPPFLAGS+=             -DNO_NET

Index: src/sys/arch/hp700/stand/boot/boot.c
===================================================================
--- src/sys/arch/hp700/stand/boot/boot.c
+++ src/sys/arch/hp700/stand/boot/boot.c
@@ -130,11 +130,12 @@
        int currname = 0;
        char *filename, filename_buffer[MAXLEN];
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf(">> Enter \"reset\" to reset system.\n");
 
        for (;;) {
                size_t size;
 

Index: src/sys/arch/hpcmips/stand/lcboot/Makefile
===================================================================
--- src/sys/arch/hpcmips/stand/lcboot/Makefile
+++ src/sys/arch/hpcmips/stand/lcboot/Makefile
@@ -61,18 +61,24 @@
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}
 
 LIBLIST=       ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists (${VERSIONFILE})
 SRCS+= vers.c
 CLEANFILES+=   vers.c
 .PHONY: vers.c
 vers.c: ${VERSIONFILE}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} 'hpcmips' 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.ALLSRC} 'hpcmips' 
${NEWVERSWHAT}
 .endif
 
 CLEANFILES+=   ${PROG}
 ${PROG}: ${OBJS} ${LIBKERN} ${LIBSA} ${LIBZ}
        ${LD} -o ${PROG} -T ${LD_SCRIPT} ${OBJS} ${LIBLIST}

Index: src/sys/arch/hpcmips/stand/lcboot/main.c
===================================================================
--- src/sys/arch/hpcmips/stand/lcboot/main.c
+++ src/sys/arch/hpcmips/stand/lcboot/main.c
@@ -176,11 +176,12 @@
 static void
 print_banner(void)
 {
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 #if 0
        printf(">> Memory: %d/%d k\n", getbasemem(), getextmem());
 #endif
 }
 

Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
===================================================================
--- src/sys/arch/ia64/stand/ia64/efi/Makefile
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile
@@ -44,12 +44,18 @@
 
 CLEANFILES+=   vers.c loader.efi ${OBJS}
 
 NEWVERSWHAT=   "EFI boot" ${MACHINE_ARCH}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${VERSIONFILE} ${SOURCES}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
 
 loader.efi: ${PROG}
        if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
                ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
                exit 1; \

Index: src/sys/arch/ia64/stand/ia64/efi/main.c
===================================================================
--- src/sys/arch/ia64/stand/ia64/efi/main.c
+++ src/sys/arch/ia64/stand/ia64/efi/main.c
@@ -133,11 +133,12 @@
 
        printf("Image base: 0x%lx\n", (u_long)img->ImageBase);
 
        printf("\n");
        printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        i = efifs_get_unit(img->DeviceHandle);
        if (i >= 0) {
                currdev.d_dev = &devsw[0];              /* XXX disk */
                currdev.d_kind.efidisk.unit = i;

Index: src/sys/arch/ia64/stand/ia64/ski/Makefile
===================================================================
--- src/sys/arch/ia64/stand/ia64/ski/Makefile
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile
@@ -33,14 +33,20 @@
 
 CLEANFILES+=   vers.c skiload ${OBJS}
 
 NEWVERSWHAT=   "ia64 SKI boot" ${MACHINE_ARCH}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${VERSIONFILE} ${SOURCES}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
 
 DPADD=         ${LIBLIST}
 
 # Cross dependencies between LIB(SA|KERN). Need to elaborate below.
 LDADD=         ${LIBLIST} ${LIBLIST}
 
 .include <bsd.prog.mk>

Index: src/sys/arch/landisk/stand/boot/Makefile.boot
===================================================================
--- src/sys/arch/landisk/stand/boot/Makefile.boot
+++ src/sys/arch/landisk/stand/boot/Makefile.boot
@@ -31,14 +31,20 @@
 
 LIBLIST=       ${LIBSA} ${LIBZ} ${LIBKERN}
 
 CLEANFILES+=   ${PROG}.sym ${PROG}.map vers.c
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${VERSIONFILE} ${SOURCES} ${.CURDIR}/../Makefile.boot
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${VERSIONFILE} 
${MACHINE} ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBLIST}
        ${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \
                -Map ${PROG}.map -cref ${OBJS} ${LIBLIST}
        ${OBJCOPY} -O binary ${PROG}.sym ${PROG}
 
 .include <bsd.prog.mk>

Index: src/sys/arch/landisk/stand/boot/boot2.c
===================================================================
--- src/sys/arch/landisk/stand/boot/boot2.c
+++ src/sys/arch/landisk/stand/boot/boot2.c
@@ -216,11 +216,12 @@
        extern const char bootprog_date[];
        extern const char bootprog_maker[];
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 }
 
 void
 boot2(uint32_t boot_biossector)
 {

Index: src/sys/arch/macppc/stand/ofwboot/Makefile
===================================================================
--- src/sys/arch/macppc/stand/ofwboot/Makefile
+++ src/sys/arch/macppc/stand/ofwboot/Makefile
@@ -73,13 +73,19 @@
 cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "macppc" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"macppc" ${NEWVERSWHAT}
 
 all realall: ${PROG} ${PROG}.xcf ${PROG}.elf
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 
        ${_MKTARGET_LINK}

Index: src/sys/arch/macppc/stand/ofwboot/boot.c
===================================================================
--- src/sys/arch/macppc/stand/ofwboot/boot.c
+++ src/sys/arch/macppc/stand/ofwboot/boot.c
@@ -217,11 +217,12 @@
        u_int32_t entry;
        void *ssym, *esym;
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        /*
         * Figure out what version of Open Firmware...
         */
        if ((openprom = OF_finddevice("/openprom")) != -1) {

Index: src/sys/arch/mipsco/stand/Makefile.booters
===================================================================
--- src/sys/arch/mipsco/stand/Makefile.booters
+++ src/sys/arch/mipsco/stand/Makefile.booters
@@ -117,13 +117,19 @@
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=         ${SALIB}
 
 LIBS=          ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "mipsco"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} -N ${.CURDIR}/version 
"mipsco"
 
 ${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS}
        ${LD} ${OFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            -T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
        @${SIZE} ${PROG}

Index: src/sys/arch/mipsco/stand/common/boot.c
===================================================================
--- src/sys/arch/mipsco/stand/common/boot.c
+++ src/sys/arch/mipsco/stand/common/boot.c
@@ -116,11 +116,12 @@
 
        /* print a banner */
        printf("\n");
        printf("NetBSD/mipsco " NETBSD_VERS " " BOOT_TYPE_NAME 
               " Bootstrap, Revision %s\n", bootprog_rev);
-       printf("(%s, %s)\n\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        /* initialise bootinfo structure early */
        bi_init(BOOTINFO_ADDR);
 
        dev = name = NULL;

Index: src/sys/arch/mvme68k/stand/Makefile.booters
===================================================================
--- src/sys/arch/mvme68k/stand/Makefile.booters
+++ src/sys/arch/mvme68k/stand/Makefile.booters
@@ -31,10 +31,16 @@
 LIBCRTEND=
 
 .if exists(${.CURDIR}/version)
 SRCS+= vers.c
 CLEANFILES+= vers.c
+
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
 
 vers.c: version
        ${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version "mvme68k"
 .endif
 

Index: src/sys/arch/newsmips/stand/Makefile.inc
===================================================================
--- src/sys/arch/newsmips/stand/Makefile.inc
+++ src/sys/arch/newsmips/stand/Makefile.inc
@@ -1,20 +1,26 @@
 #      $NetBSD: Makefile.inc,v 1.6 2006/06/29 01:45:03 lukem Exp $
 
 BINDIR= /usr/mdec
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: version
        ${_MKTARGET_CREATE}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
${MACHINE}
 SRCS+=  vers.c
 CLEANFILES+= vers.c
 .endif
 
 # XXX SHOULD NOT NEED TO DEFINE THESE!
 LIBCRT0=
 LIBC=
 LIBCRTBEGIN=
 LIBCRTEND=

Index: src/sys/arch/newsmips/stand/boot/boot.c
===================================================================
--- src/sys/arch/newsmips/stand/boot/boot.c
+++ src/sys/arch/newsmips/stand/boot/boot.c
@@ -91,11 +91,12 @@
        if (apbus)
                _sip = (void *)a4;
 
        printf("%s Secondary Boot, Revision %s\n",
            bootprog_name, bootprog_rev);
-        printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        if (apbus) {
                char *bootdev = (char *)a1;
                int argc = a2;
                char **argv = (char **)a3;

Index: src/sys/arch/ofppc/stand/ofwboot/Makefile
===================================================================
--- src/sys/arch/ofppc/stand/ofwboot/Makefile
+++ src/sys/arch/ofppc/stand/ofwboot/Makefile
@@ -67,13 +67,13 @@
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=         ${SALIB}
 
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "ofppc" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"ofppc" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${LD} -s -N -T ${.CURDIR}/ldscript -Ttext ${RELOC} -Bstatic \
            -e ${ENTRY} -o ${PROG}.X ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        mv -f ${PROG}.X ${PROG}
 
 .include <bsd.prog.mk>

Index: src/sys/arch/ofppc/stand/ofwboot/boot.c
===================================================================
--- src/sys/arch/ofppc/stand/ofwboot/boot.c
+++ src/sys/arch/ofppc/stand/ofwboot/boot.c
@@ -197,11 +197,12 @@
        u_int32_t entry;
        void *ssym, *esym;
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
 #ifdef OFWDUMP
        chosen = OF_finddevice("/");
        dump_ofwtree(chosen);
 #endif

Index: src/sys/arch/pmax/stand/Makefile.booters
===================================================================
--- src/sys/arch/pmax/stand/Makefile.booters
+++ src/sys/arch/pmax/stand/Makefile.booters
@@ -97,12 +97,18 @@
 
 LIBS=          ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
 
 .include <bsd.own.mk>
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "pmax"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} -N ${.CURDIR}/version 
"pmax"
 
 ${PROG}: ${OBJS} ${LIBS}
        ${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            ${LDBUG} -e start -o ${PROG} ${OBJS} ${LIBS}
        @${SIZE} ${PROG}

Index: src/sys/arch/pmax/stand/common/boot.c
===================================================================
--- src/sys/arch/pmax/stand/common/boot.c
+++ src/sys/arch/pmax/stand/common/boot.c
@@ -119,11 +119,12 @@
 
        /* print a banner */
        printf("\n");
        printf("NetBSD/pmax " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, 
Revision %s\n",
            bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf("\n");
 
        /* initialise bootinfo structure early */
        bi_init(BOOTINFO_ADDR);
 

Index: src/sys/arch/pmax/stand/smallnet/smallnet.c
===================================================================
--- src/sys/arch/pmax/stand/smallnet/smallnet.c
+++ src/sys/arch/pmax/stand/smallnet/smallnet.c
@@ -75,11 +75,12 @@
        uLongf destlen;
        struct btinfo_bootpath bi_bpath;
 
        printf("NetBSD/pmax " NETBSD_VERS " " BOOT_TYPE_NAME
            " Bootstrap, Revision %s\n", bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        /* initialise bootinfo structure early */
        bi_init(BOOTINFO_ADDR);
 
        /* check for DS5000 boot */

Index: src/sys/arch/prep/stand/boot/Makefile
===================================================================
--- src/sys/arch/prep/stand/boot/Makefile
+++ src/sys/arch/prep/stand/boot/Makefile
@@ -66,14 +66,20 @@
 powerpc::
        -rm -f $@
        ln -s ${S}/arch/powerpc/include $@
 .endif
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${.CURDIR}/../boot/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version "prep" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} 
${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBS}
        ${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
                -Ttext ${RELOC} ${OBJS} ${LIBS}
        ${STRIP} -o ${PROG} ${PROG}.elf
 
 .include <bsd.prog.mk>

Index: src/sys/arch/prep/stand/boot/boot.c
===================================================================
--- src/sys/arch/prep/stand/boot/boot.c
+++ src/sys/arch/prep/stand/boot/boot.c
@@ -136,11 +136,12 @@
         */
        init_in(loadaddr);
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        for (;;) {
                name = names[n++];
                if (n >= NUMNAMES)
                        n = 0;

Index: src/sys/arch/rs6000/stand/boot/Makefile
===================================================================
--- src/sys/arch/rs6000/stand/boot/Makefile
+++ src/sys/arch/rs6000/stand/boot/Makefile
@@ -61,13 +61,19 @@
 powerpc::
        -rm -f $@
        ln -s ${S}/arch/powerpc/include $@
 .endif
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: ${.CURDIR}/../boot/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version 
"rs6000" ${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} 
${.CURDIR}/../boot/version "rs6000" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBS}
        ${LD} -o ${PROG} -s -N -T ${.CURDIR}/../boot/ld.script \
                -Ttext ${RELOC} ${OBJS} ${LIBS}
 
 .include <bsd.prog.mk>

Index: src/sys/arch/rs6000/stand/boot/boot.c
===================================================================
--- src/sys/arch/rs6000/stand/boot/boot.c
+++ src/sys/arch/rs6000/stand/boot/boot.c
@@ -211,11 +211,12 @@
        init_in(RELOC);
 
        setled(0x38000000); /* attempting boot */
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        for (;;) {
                name = names[n++];
                if (n >= NUMNAMES)
                        n = 0;

Index: src/sys/arch/sandpoint/stand/netboot/main.c
===================================================================
--- src/sys/arch/sandpoint/stand/netboot/main.c
+++ src/sys/arch/sandpoint/stand/netboot/main.c
@@ -108,11 +108,12 @@
        char *bname;
        void *dev;
 
        printf("\n");
        printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        brdprop = brd_lookup(brdtype);
        printf("%s, cpu %u MHz, bus %u MHz, %dMB SDRAM\n", brdprop->verbose,
            cpuclock / 1000000, busclock / 1000000, bi_mem.memsize >> 20);
 

Index: src/sys/arch/sbmips/stand/Makefile.bootprogs
===================================================================
--- src/sys/arch/sbmips/stand/Makefile.bootprogs
+++ src/sys/arch/sbmips/stand/Makefile.bootprogs
@@ -40,18 +40,25 @@
 NETBSD_VERS!=${HOST_SH} ${.CURDIR}/../../../../conf/osrelease.sh
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 
 CWARNFLAGS+=   -Wno-main 
 CWARNFLAGS+=   -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
+
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 CWARNFLAGS+=   -Wno-pointer-sign
 
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "sbmips"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} -N ${.CURDIR}/version 
"sbmips"
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
 .endif
 

Index: src/sys/arch/sbmips/stand/common/boot.c
===================================================================
--- src/sys/arch/sbmips/stand/common/boot.c
+++ src/sys/arch/sbmips/stand/common/boot.c
@@ -90,11 +90,12 @@
 
        /* print a banner */
        printf("\n");
        printf("NetBSD/sbmips " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, 
Revision %s\n",
            bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf("\n");
 
        /* set up the booted device descriptor */
 #if defined(UNIFIED_BOOTBLOCK)
         if (!booted_dev_open()) {

Index: src/sys/arch/sgimips/stand/Makefile.booters
===================================================================
--- src/sys/arch/sgimips/stand/Makefile.booters
+++ src/sys/arch/sgimips/stand/Makefile.booters
@@ -41,16 +41,22 @@
 # the second page of RAM.
 # A warm thank-you to SGI for making load addresses different :)
 LOAD_ADDRESS?=         0x88002000
 LOAD_ADDRESS_IP32?=    0x80002000
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sgimips"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"sgimips"
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
 .endif
 

Index: src/sys/arch/sgimips/stand/boot64/Makefile
===================================================================
--- src/sys/arch/sgimips/stand/boot64/Makefile
+++ src/sys/arch/sgimips/stand/boot64/Makefile
@@ -34,16 +34,22 @@
 # loader plenty of breathing room.  Load the boot loader starting at
 # the second page of RAM.
 
 LOAD_ADDRESS_IP30?=    0xa800000020080000
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sgimips"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"sgimips"
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
 .endif
 

Index: src/sys/arch/sgimips/stand/common/boot.c
===================================================================
--- src/sys/arch/sgimips/stand/common/boot.c
+++ src/sys/arch/sgimips/stand/common/boot.c
@@ -133,11 +133,12 @@
 
        /* print a banner */
        printf("\n");
        printf("%s " NETBSD_VERS " Bootstrap, Revision %s\n",
            bootprog_name, bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("(%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
        printf("\n");
 
        memset(marks, 0, sizeof marks);
 
        /* initialise bootinfo structure early */

Index: src/sys/arch/shark/stand/ofwboot/Makefile
===================================================================
--- src/sys/arch/shark/stand/ofwboot/Makefile
+++ src/sys/arch/shark/stand/ofwboot/Makefile
@@ -60,15 +60,21 @@
 SA_AS=         library
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=         ${SALIB}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "shark" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"shark" ${NEWVERSWHAT}
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${LD} -s -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${.TARGET}.aout \
            ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${OBJCOPY} -O binary ${.TARGET}.aout ${.TARGET}
 
 .include <bsd.prog.mk>

Index: src/sys/arch/shark/stand/ofwboot/boot.c
===================================================================
--- src/sys/arch/shark/stand/ofwboot/boot.c
+++ src/sys/arch/shark/stand/ofwboot/boot.c
@@ -195,11 +195,12 @@
        u_int32_t entry;
        void *ssym, *esym;
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        /*
         * Get the boot arguments from Openfirmware
         */
        if ((chosen = OF_finddevice("/chosen")) == -1 ||

Index: src/sys/arch/sparc/stand/boot/Makefile
===================================================================
--- src/sys/arch/sparc/stand/boot/Makefile
+++ src/sys/arch/sparc/stand/boot/Makefile
@@ -29,13 +29,19 @@
 LINKFLAGS=-N -e start
 
 .MAIN: all
 realall: ${FILES}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sparc" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.CURDIR}/version 
"sparc" ${NEWVERSWHAT}
 
 .for RELOC in ${RELOCS}
 boot.${RELOC}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${LD} -o ${.TARGET}.tmp ${LINKFLAGS} -Ttext ${RELOC} ${OBJS} \
            ${LIBSA} ${LIBZ} ${LIBKERN}

Index: src/sys/arch/sparc/stand/boot/boot.c
===================================================================
--- src/sys/arch/sparc/stand/boot/boot.c
+++ src/sys/arch/sparc/stand/boot/boot.c
@@ -254,11 +254,12 @@
 #endif
        prom_init();
        mmu_init();
 
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 
        /* massage machine prom */
        prom_patch();
 
        /*

Index: src/sys/arch/sparc/stand/ofwboot/Makefile
===================================================================
--- src/sys/arch/sparc/stand/ofwboot/Makefile
+++ src/sys/arch/sparc/stand/ofwboot/Makefile
@@ -90,12 +90,18 @@
 cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 vers.c: version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${CURDIR}/version "sparc64" 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${CURDIR}/version 
"sparc64" ${NEWVERSWHAT}
 
 CLEANFILES+= vers.c
 
 .if CROSS
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}

Index: src/sys/arch/sparc/stand/ofwboot/boot.c
===================================================================
--- src/sys/arch/sparc/stand/ofwboot/boot.c
+++ src/sys/arch/sparc/stand/ofwboot/boot.c
@@ -505,11 +505,12 @@
        /* Initialize OpenFirmware */
        romp = ofw;
        prom_init();
 
        printf("\r>> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       DPRINTF((">> (%s, %s)\n", bootprog_maker, bootprog_date));
+       DPRINTF((">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date));
 
        /* Figure boot arguments */
        strncpy(bootdev, prom_getbootpath(), sizeof(bootdev) - 1);
        boothowto = bootoptions(prom_getbootargs(), bootdev, kernel, bootline);
        isfloppy = bootdev_isfloppy(bootdev);

Index: src/sys/arch/vax/boot/boot/Makefile
===================================================================
--- src/sys/arch/vax/boot/boot/Makefile
+++ src/sys/arch/vax/boot/boot/Makefile
@@ -29,13 +29,19 @@
 
 KERN_AS=library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=${KERNLIB}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-       ${HOST_SH} ${S}/conf/newvers_stand.sh -NM ${.CURDIR}/version 
"${MACHINE}"
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} -NM 
${.CURDIR}/version "${MACHINE}"
 
 ${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
        ${_MKTARGET_LINK}
        ${LD} -N -Ttext ${RELOC} -e nisse -o ${PROG}.sym ${OBJS} \
            ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}

Index: src/sys/arch/vax/boot/boot/boot.c
===================================================================
--- src/sys/arch/vax/boot/boot/boot.c
+++ src/sys/arch/vax/boot/boot/boot.c
@@ -101,12 +101,12 @@
        io = 0;
        skip = 1;
        autoconf();
 
        askname = bootrpb.rpb_bootr5 & RB_ASKNAME;
-       printf("\n\r>> NetBSD/vax boot [%s %s] <<\n", bootprog_rev,
-               bootprog_date);
+       printf("\n\r>> NetBSD/vax boot [%s%s%s] <<\n", bootprog_rev,
+           *bootprog_date ? " " : "", bootprog_date);
        printf(">> Press any key to abort autoboot  ");
        sluttid = getsecs() + 5;
        senast = 0;
        skip = 0;
        setjmp(jbuf);

Index: src/sys/arch/x68k/stand/boot/Makefile
===================================================================
--- src/sys/arch/x68k/stand/boot/Makefile
+++ src/sys/arch/x68k/stand/boot/Makefile
@@ -26,15 +26,21 @@
 S=             ${.CURDIR}/../../../..
 M=             ${.CURDIR}/../..
 COMMONDIR=     $M/stand/common
 .PATH:         ${COMMONDIR}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 SRCS+=         vers.c
 CLEANFILES+=   vers.c
 vers.c:        ${VERSIONFILE}
        ${_MKTARGET_CREATE}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${.ALLSRC} ${MACHINE} 
${NEWVERSWHAT}
 
 CPPFLAGS+=     -nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
 CPPFLAGS+=     -I$M/stand/libiocs -I${COMMONDIR}
 CPPFLAGS+=     -D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=     -DTEXTADDR="0x${TEXT}" 

Index: src/sys/arch/x68k/stand/boot/boot.c
===================================================================
--- src/sys/arch/x68k/stand/boot/boot.c
+++ src/sys/arch/x68k/stand/boot/boot.c
@@ -319,10 +319,10 @@
                default_kernel[3] = 'a';
                break;
        default:
                printf("Warning: unknown boot device: %x\n", bootdev);
        }
-       print_title("%s, Revision %s\n\t(%s, %s)",
+       print_title("%s, Revision %s\n\t(%s%s%s)",
                    bootprog_name, bootprog_rev,
-                   bootprog_maker, bootprog_date);
+                   bootprog_maker, *bootprog_date ? ", " : "", bootprog_date);
        bootmenu();
 }

Index: src/sys/arch/zaurus/stand/zboot/Makefile
===================================================================
--- src/sys/arch/zaurus/stand/zboot/Makefile
+++ src/sys/arch/zaurus/stand/zboot/Makefile
@@ -43,12 +43,18 @@
 SA_AS=         library
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=         ${SALIB}
 
+.if ${MKREPRO} == "yes"
+_NVFLAGS=-D
+.else
+_NVFLAGS=
+.endif
+
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-       ${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} ${MACHINE} 
${NEWVERSWHAT}
+       ${HOST_SH} ${S}/conf/newvers_stand.sh ${_NVFLAGS} ${VERSIONFILE} 
${MACHINE} ${NEWVERSWHAT}
        ${CC} -c vers.c
        ${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
 
 .include <bsd.klinks.mk>
 .include <bsd.prog.mk>

Index: src/sys/arch/zaurus/stand/zboot/boot.c
===================================================================
--- src/sys/arch/zaurus/stand/zboot/boot.c
+++ src/sys/arch/zaurus/stand/zboot/boot.c
@@ -175,11 +175,12 @@
        extern const char bootprog_date[];
        extern const char bootprog_maker[];
 
        printf("\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+       printf(">> (%s%s%s)\n", bootprog_maker, *bootprog_date ? ", " : "",
+           bootprog_date);
 }
 
 void
 boot(dev_t bootdev)
 {

Index: src/sys/conf/newvers_stand.sh
===================================================================
--- src/sys/conf/newvers_stand.sh
+++ src/sys/conf/newvers_stand.sh
@@ -69,10 +69,12 @@
 fi
 
 if [ $add_date = yes ]; then
        t=`LC_ALL=C date`
        echo "const char bootprog_date[] = \"${t}\";" >> vers.c
+else
+       echo "const char bootprog_date[] = \"\";" >> vers.c
 fi
 
 if [ $add_maker = yes ]; then
        u=${USER-root} h=`hostname`
        echo "const char bootprog_maker[] = \"${u}@${h}\";" >> vers.c

Follow-Ups:
- Re: Dates in boot loaders on !x86
  - From: Izumi Tsutsui
- Re: Dates in boot loaders on !x86
  - From: der Mouse

Prev by Date: kernel memory allocators
Next by Date: Re: Dates in boot loaders on !x86
Previous by Thread: kernel memory allocators
Next by Thread: Re: Dates in boot loaders on !x86
Indexes:

Home | Main Index | Thread Index | Old Index