Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Drop bootprog_maker (formerly enabled by -M) and bootpro...



details:   https://anonhg.NetBSD.org/src/rev/87ee3f49485f
branches:  trunk
changeset: 761278:87ee3f49485f
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jan 22 19:19:14 2011 +0000

description:
Drop bootprog_maker (formerly enabled by -M) and bootprog_date (formerly
disabled by -D) from the output of newvers_stand.sh.  Change -D to the
inverted logic, so that it adds the date to bootprog_rev in ().

Change all platforms accordingly. -D is added if MKREPRO is not yes and
wasn't present before. Platforms that didn't use -D don't depend on
MKREPRO now either.

diffstat:

 sys/arch/acorn26/stand/Makefile.buildboot          |   7 +++-
 sys/arch/acorn26/stand/boot26/boot26.c             |   5 +--
 sys/arch/acorn32/stand/Makefile.buildboot          |   7 +++-
 sys/arch/acorn32/stand/boot32/boot32.c             |   6 +---
 sys/arch/alpha/stand/Makefile.bootprogs            |   6 ++-
 sys/arch/alpha/stand/common/boot.c                 |   3 +-
 sys/arch/alpha/stand/common/common.h               |   4 +--
 sys/arch/alpha/stand/standtest/test.c              |   3 +-
 sys/arch/amiga/stand/bootblock/boot/Makefile       |   6 ++-
 sys/arch/amiga/stand/bootblock/boot/main.c         |   5 +--
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile |   5 ++-
 sys/arch/arc/stand/boot/Makefile                   |   5 ++-
 sys/arch/arc/stand/boot/boot.c                     |   3 +-
 sys/arch/arc/stand/boot/common.h                   |   4 +--
 sys/arch/bebox/stand/boot/Makefile                 |   6 ++--
 sys/arch/bebox/stand/boot/boot.c                   |   5 +--
 sys/arch/cobalt/stand/boot/Makefile                |   5 ++-
 sys/arch/cobalt/stand/boot/boot.c                  |   3 +-
 sys/arch/cobalt/stand/boot/common.h                |   4 +--
 sys/arch/evbarm/stand/gzboot/Makefile.gzboot       |   6 ++--
 sys/arch/evbarm/stand/gzboot/gzboot.c              |   6 +--
 sys/arch/ews4800mips/stand/boot/Makefile           |   4 +-
 sys/arch/hp300/stand/Makefile.buildboot            |   4 +-
 sys/arch/hp700/stand/Makefile.buildboot            |   8 +++--
 sys/arch/hp700/stand/boot/boot.c                   |   3 +-
 sys/arch/hp700/stand/common/libsa.h                |   5 +--
 sys/arch/hpcmips/stand/lcboot/Makefile             |   5 ++-
 sys/arch/hpcmips/stand/lcboot/main.c               |   7 +---
 sys/arch/i386/stand/Makefile.booters               |   4 +-
 sys/arch/i386/stand/boot/Makefile.boot             |   4 +-
 sys/arch/ia64/stand/common/newvers.sh              |   5 +--
 sys/arch/ia64/stand/ia64/efi/Makefile              |   5 ++-
 sys/arch/ia64/stand/ia64/efi/main.c                |   5 +--
 sys/arch/ia64/stand/ia64/ski/Makefile              |   5 ++-
 sys/arch/ia64/stand/ia64/ski/main.c                |   6 +---
 sys/arch/landisk/stand/boot/Makefile.boot          |   5 ++-
 sys/arch/landisk/stand/boot/boot2.c                |   5 +--
 sys/arch/macppc/stand/ofwboot/Makefile             |   7 ++--
 sys/arch/macppc/stand/ofwboot/boot.c               |   6 +--
 sys/arch/mipsco/stand/Makefile.booters             |   5 ++-
 sys/arch/mipsco/stand/common/boot.c                |   3 +-
 sys/arch/mipsco/stand/common/common.h              |   4 +--
 sys/arch/mvme68k/stand/Makefile.booters            |   4 +-
 sys/arch/mvmeppc/stand/Makefile.booters            |   4 +-
 sys/arch/news68k/stand/Makefile.inc                |   4 +-
 sys/arch/newsmips/stand/Makefile.inc               |   5 ++-
 sys/arch/newsmips/stand/boot/boot.c                |   5 +--
 sys/arch/next68k/stand/boot/Makefile               |   4 +-
 sys/arch/ofppc/stand/ofwboot/Makefile              |   7 +++-
 sys/arch/ofppc/stand/ofwboot/boot.c                |   6 +--
 sys/arch/pmax/stand/Makefile.booters               |   8 ++--
 sys/arch/pmax/stand/common/boot.c                  |   3 +-
 sys/arch/pmax/stand/common/common.h                |   4 +--
 sys/arch/pmax/stand/smallnet/smallnet.c            |   3 +-
 sys/arch/prep/stand/boot/Makefile                  |   5 ++-
 sys/arch/prep/stand/boot/boot.c                    |   5 +--
 sys/arch/rs6000/stand/boot/Makefile                |   5 ++-
 sys/arch/rs6000/stand/boot/boot.c                  |   5 +--
 sys/arch/sandpoint/stand/netboot/main.c            |   5 +--
 sys/arch/sandpoint/stand/netboot/newvers.sh        |   5 ---
 sys/arch/sbmips/stand/Makefile.bootprogs           |   6 ++-
 sys/arch/sbmips/stand/common/boot.c                |   3 +-
 sys/arch/sbmips/stand/common/common.h              |   5 +--
 sys/arch/sgimips/stand/Makefile.booters            |   6 ++-
 sys/arch/sgimips/stand/boot64/Makefile             |   6 ++-
 sys/arch/sgimips/stand/common/boot.c               |   3 +-
 sys/arch/sgimips/stand/common/common.h             |   4 +--
 sys/arch/shark/stand/ofwboot/Makefile              |   7 +++-
 sys/arch/shark/stand/ofwboot/boot.c                |   6 +--
 sys/arch/sparc/stand/boot/Makefile                 |   5 ++-
 sys/arch/sparc/stand/boot/boot.c                   |   5 +--
 sys/arch/sparc/stand/ofwboot/Makefile              |   7 +++-
 sys/arch/sparc/stand/ofwboot/boot.c                |   3 +-
 sys/arch/sparc/stand/ofwboot/boot.h                |   4 +--
 sys/arch/sun68k/stand/libsa/Makefile.inc           |   6 ++--
 sys/arch/vax/boot/boot/Makefile                    |   5 ++-
 sys/arch/vax/boot/boot/boot.c                      |   7 ++--
 sys/arch/x68k/stand/boot/Makefile                  |   5 ++-
 sys/arch/x68k/stand/boot/boot.c                    |   8 +----
 sys/arch/x68k/stand/boot_ufs/Makefile              |   5 ++-
 sys/arch/x68k/stand/boot_ustar/Makefile            |   5 ++-
 sys/arch/zaurus/stand/zboot/Makefile               |   7 +++-
 sys/arch/zaurus/stand/zboot/boot.c                 |   5 +--
 sys/conf/newvers_stand.sh                          |  32 ++++++++-------------
 84 files changed, 203 insertions(+), 248 deletions(-)

diffs (truncated from 1825 to 300 lines):

diff -r e4762704814c -r 87ee3f49485f sys/arch/acorn26/stand/Makefile.buildboot
--- a/sys/arch/acorn26/stand/Makefile.buildboot Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/acorn26/stand/Makefile.buildboot Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.buildboot,v 1.11 2009/04/03 10:38:12 tsutsui Exp $
+#      $NetBSD: Makefile.buildboot,v 1.12 2011/01/22 19:19:14 joerg Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -18,11 +18,14 @@
 
 RISCOSTYPE ?= ff8
 
+.include <bsd.own.mk>
+
 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 ${${MKREPRO} == "yes" :?:-D} \
+           ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
 
 CPPFLAGS+=     -D_STANDALONE -DHIMEM=0x28000
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
diff -r e4762704814c -r 87ee3f49485f sys/arch/acorn26/stand/boot26/boot26.c
--- a/sys/arch/acorn26/stand/boot26/boot26.c    Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/acorn26/stand/boot26/boot26.c    Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot26.c,v 1.5 2007/03/04 05:59:04 christos Exp $      */
+/*     $NetBSD: boot26.c,v 1.6 2011/01/22 19:19:14 joerg Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 Ben Harris
@@ -37,8 +37,6 @@
 
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
 
 int debug = 1;
 
@@ -68,7 +66,6 @@
        int ret;
 
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 
        os_read_mem_map_info(&nbpp, &npages);
        if (debug)
diff -r e4762704814c -r 87ee3f49485f sys/arch/acorn32/stand/Makefile.buildboot
--- a/sys/arch/acorn32/stand/Makefile.buildboot Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/acorn32/stand/Makefile.buildboot Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.buildboot,v 1.13 2009/04/03 10:38:12 tsutsui Exp $
+#      $NetBSD: Makefile.buildboot,v 1.14 2011/01/22 19:19:14 joerg Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -28,11 +28,14 @@
 LINKFLAGS+=-N -Ttext ${RELOC}
 .endif
 
+.include <bsd.own.mk>
+
 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 ${${MKREPRO} == "yes" :?:-D} \
+           ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
 
 CPPFLAGS+=     -D_STANDALONE 
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
diff -r e4762704814c -r 87ee3f49485f sys/arch/acorn32/stand/boot32/boot32.c
--- a/sys/arch/acorn32/stand/boot32/boot32.c    Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/acorn32/stand/boot32/boot32.c    Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot32.c,v 1.37 2009/08/02 11:20:37 gavan Exp $        */
+/*     $NetBSD: boot32.c,v 1.38 2011/01/22 19:19:15 joerg Exp $        */
 
 /*-
  * Copyright (c) 2002 Reinoud Zandijk
@@ -130,9 +130,6 @@
 /* bootprogram identifiers */
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
-
 
 /* predefines / prototypes */
 void    init_datastructures(void);
@@ -774,7 +771,6 @@
 
        printf("\n\n");
        printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
        printf(">> Booting NetBSD/acorn32 on a RiscPC/A7000/NC\n");
        printf("\n");
 
diff -r e4762704814c -r 87ee3f49485f sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Sat Jan 22 19:19:14 2011 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.bootprogs,v 1.30 2009/04/20 13:15:12 tsutsui Exp $
+# $NetBSD: Makefile.bootprogs,v 1.31 2011/01/22 19:19:15 joerg Exp $
 
+.include <bsd.own.mk>
 .include <bsd.sys.mk>          # for HOST_SH
 
 S=     ${.CURDIR}/../../../..
@@ -36,7 +37,8 @@
 .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 ${${MKREPRO} == "yes" :?:-D} \
+           -N ${.CURDIR}/version "alpha"
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
diff -r e4762704814c -r 87ee3f49485f sys/arch/alpha/stand/common/boot.c
--- a/sys/arch/alpha/stand/common/boot.c        Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/alpha/stand/common/boot.c        Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.31 2010/08/25 16:30:44 christos Exp $ */
+/* $NetBSD: boot.c,v 1.32 2011/01/22 19:19:15 joerg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -91,7 +91,6 @@
        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("\n");
 
        /* set up the booted device descriptor */
diff -r e4762704814c -r 87ee3f49485f sys/arch/alpha/stand/common/common.h
--- a/sys/arch/alpha/stand/common/common.h      Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/alpha/stand/common/common.h      Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.13 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: common.h,v 1.14 2011/01/22 19:19:15 joerg Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -43,8 +43,6 @@
  * vers.c (generated by newvers.sh)
  */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
 
 
 /*
diff -r e4762704814c -r 87ee3f49485f sys/arch/alpha/stand/standtest/test.c
--- a/sys/arch/alpha/stand/standtest/test.c     Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/alpha/stand/standtest/test.c     Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.4 2009/03/14 21:04:03 dsl Exp $ */
+/* $NetBSD: test.c,v 1.5 2011/01/22 19:19:15 joerg Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -102,7 +102,6 @@
        printf("\n");
        printf("NetBSD/alpha " NETBSD_VERS
            " Standalone Test Program, Revision %s\n", bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
        printf("\n");
 
        arg_pfn = pfn;
diff -r e4762704814c -r 87ee3f49485f sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Sat Jan 22 19:19:14 2011 +0000
@@ -1,5 +1,6 @@
-#      $NetBSD: Makefile,v 1.43 2010/07/06 06:09:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.44 2011/01/22 19:19:15 joerg Exp $
 
+.include <bsd.own.mk>
 .include <bsd.sys.mk>          # for HOST_SH
 
 ### what we need:
@@ -113,7 +114,8 @@
 
 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 \
+           ${${MKREPRO} == "yes" :?:-D} -N ${.CURDIR}/version "amiga"
 
 .if !make(obj) && !make(clean) && !make(cleandir)
 .NOPATH: machine m68k
diff -r e4762704814c -r 87ee3f49485f sys/arch/amiga/stand/bootblock/boot/main.c
--- a/sys/arch/amiga/stand/bootblock/boot/main.c        Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/main.c        Sat Jan 22 19:19:14 2011 +0000
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: main.c,v 1.26 2011/01/13 22:02:06 phx Exp $
+ * $NetBSD: main.c,v 1.27 2011/01/22 19:19:16 joerg Exp $
  *
  *
  * Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -60,8 +60,6 @@
  * vers.c (generated by newvers.sh)
  */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
 
 void startit(void *, u_long, u_long, void *, u_long, u_long, int, void *,
             int, int, u_long, u_long, u_long, int);
@@ -162,7 +160,6 @@
        printf("\nNetBSD/Amiga " NETBSD_VERS " Bootstrap, Revision %s\n",
            bootprog_rev);
 #endif
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
        printf("\n");
        printf("Boot: [%s] ", kernel_name);
 
diff -r e4762704814c -r 87ee3f49485f sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2010/07/06 06:09:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2011/01/22 19:19:16 joerg Exp $
 
 ### what we need:
 
@@ -101,7 +101,8 @@
 
 .PHONY:        vers.c
 vers.c:        ${.CURDIR}/../boot/version
-       ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -NDM ${.CURDIR}/../boot/version "amiga"
+       ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N \
+           ${.CURDIR}/../boot/version "amiga"
 
 .if !make(obj) && !make(clean) && !make(cleandir)
 .NOPATH: machine m68k
diff -r e4762704814c -r 87ee3f49485f sys/arch/arc/stand/boot/Makefile
--- a/sys/arch/arc/stand/boot/Makefile  Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/arc/stand/boot/Makefile  Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:05 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2011/01/22 19:19:16 joerg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>  # for ${HOST_SH}
@@ -38,7 +38,8 @@
 .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 ${${MKREPRO} == "yes" :?:-D} \
+           ${.CURDIR}/version ${MACHINE}
 
 SRCS+= vers.c
 CLEANFILES+= vers.c
diff -r e4762704814c -r 87ee3f49485f sys/arch/arc/stand/boot/boot.c
--- a/sys/arch/arc/stand/boot/boot.c    Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/arc/stand/boot/boot.c    Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.6 2008/04/28 20:23:13 martin Exp $  */
+/*     $NetBSD: boot.c,v 1.7 2011/01/22 19:19:16 joerg Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -143,7 +143,6 @@
        /* print a banner */
        printf("\n");
        printf("%s Bootstrap, Revision %s\n", bootprog_name, bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 
        memset(marks, 0, sizeof marks);
 
diff -r e4762704814c -r 87ee3f49485f sys/arch/arc/stand/boot/common.h
--- a/sys/arch/arc/stand/boot/common.h  Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/arc/stand/boot/common.h  Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: common.h,v 1.3 2008/04/28 20:23:13 martin Exp $        */
+/*     $NetBSD: common.h,v 1.4 2011/01/22 19:19:16 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,5 +34,3 @@
  */
 extern const char bootprog_name[];
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
diff -r e4762704814c -r 87ee3f49485f sys/arch/bebox/stand/boot/Makefile
--- a/sys/arch/bebox/stand/boot/Makefile        Sat Jan 22 19:12:58 2011 +0000
+++ b/sys/arch/bebox/stand/boot/Makefile        Sat Jan 22 19:19:14 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2011/01/21 15:59:05 joerg Exp $
+#      $NetBSD: Makefile,v 1.31 2011/01/22 19:19:16 joerg Exp $



Home | Main Index | Thread Index | Old Index