Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sandpoint/stand/altboot switch to use newvers_stand...



details:   https://anonhg.NetBSD.org/src/rev/999828ac9d3e
branches:  trunk
changeset: 761303:999828ac9d3e
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Sun Jan 23 07:41:38 2011 +0000

description:
switch to use newvers_stand.sh as suggested by joerg@

diffstat:

 sys/arch/sandpoint/stand/altboot/Makefile   |   4 ++--
 sys/arch/sandpoint/stand/altboot/main.c     |   6 +++---
 sys/arch/sandpoint/stand/altboot/newvers.sh |  16 ----------------
 sys/arch/sandpoint/stand/altboot/version    |  12 ++++++------
 4 files changed, 11 insertions(+), 27 deletions(-)

diffs (82 lines):

diff -r f60516496507 -r 999828ac9d3e sys/arch/sandpoint/stand/altboot/Makefile
--- a/sys/arch/sandpoint/stand/altboot/Makefile Sun Jan 23 07:30:07 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/Makefile Sun Jan 23 07:41:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/01/23 01:05:30 nisimura Exp $
+#      $NetBSD: Makefile,v 1.2 2011/01/23 07:41:38 nisimura Exp $
 
 S=             ${.CURDIR}/../../../..
 
@@ -53,7 +53,7 @@
 LIBSA=         ${SALIB}
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-       ${HOST_SH} ${.CURDIR}/newvers.sh ${.CURDIR}/version
+       ${HOST_SH} ${S}/conf/newvers_stand.sh -K ${.CURDIR}/version "sandpoint"
        ${CC} -c vers.c
        ${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
            ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
diff -r f60516496507 -r 999828ac9d3e sys/arch/sandpoint/stand/altboot/main.c
--- a/sys/arch/sandpoint/stand/altboot/main.c   Sun Jan 23 07:30:07 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/main.c   Sun Jan 23 07:41:38 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.2 2011/01/23 07:41:38 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 int module_open(struct boot_module *);
 
 void main(int, char **);
-extern char bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
 
 int brdtype;
 uint32_t busclock, cpuclock;
@@ -109,7 +109,7 @@
        void *dev;
 
        printf("\n");
-       printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev);
+       printf(">> %s altboot, revision %s\n", bootprog_name, bootprog_rev);
        printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 
        brdprop = brd_lookup(brdtype);
diff -r f60516496507 -r 999828ac9d3e sys/arch/sandpoint/stand/altboot/newvers.sh
--- a/sys/arch/sandpoint/stand/altboot/newvers.sh       Sun Jan 23 07:30:07 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#
-# Usage: newvers.sh <historyrecord>
-#
-while read vers comment
-do
-       version=$vers
-done < $1
-developer=${USER:-"releng"}
-[ -f /bin/hostname ] && buildhost=@`/bin/hostname`
-date=`date`
-
-cat <<EoF >vers.c
-const char bootprog_rev[] = "$version";
-const char bootprog_date[] = "$date";
-const char bootprog_maker[] = "$developer$buildhost";
-EoF
diff -r f60516496507 -r 999828ac9d3e sys/arch/sandpoint/stand/altboot/version
--- a/sys/arch/sandpoint/stand/altboot/version  Sun Jan 23 07:30:07 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/version  Sun Jan 23 07:41:38 2011 +0000
@@ -1,7 +1,7 @@
-1.0    initial version
-1.1    PCI autoconf for multiple NIC device drivers
-1.2    Synology-DS support, Marvell-Yukon driver, fixed aligned alloc
-1.3    allow to have boot options, brdsetup.c cleanup to make brdtype
+1.0:   initial version
+1.1:   PCI autoconf for multiple NIC device drivers
+1.2:   Synology-DS support, Marvell-Yukon driver, fixed aligned alloc
+1.3:   allow to have boot options, brdsetup.c cleanup to make brdtype
        maintainance more confortable
-1.4    load kernels from local disk
-1.5    altboot is the new name as this is capable of handling net & dsk.
+1.4:   load kernels from local disk
+1.5:   altboot is the new name as this is capable of handling net & dsk.



Home | Main Index | Thread Index | Old Index