Source-Changes-HG archive

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

[src/trunk]: src/distrib Use proper release version strings ("9.1" rather tha...



details:   https://anonhg.NetBSD.org/src/rev/dc4cfb976b96
branches:  trunk
changeset: 957619:dc4cfb976b96
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Dec 05 18:52:06 2020 +0000

description:
Use proper release version strings ("9.1" rather than "91") in banners.

Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).

I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.

Worth to pullup to netbsd-9.

diffstat:

 distrib/amiga/miniroot/install.md   |  6 +++---
 distrib/hp300/miniroot/install.md   |  4 ++--
 distrib/mac68k/miniroot/install.md  |  4 ++--
 distrib/miniroot/install.sub        |  8 ++++++--
 distrib/miniroot/list               |  4 ++--
 distrib/mvme68k/miniroot/install.md |  4 ++--
 distrib/sun2/miniroot/install.md    |  6 +++---
 distrib/sun3/miniroot/install.md    |  6 +++---
 8 files changed, 23 insertions(+), 19 deletions(-)

diffs (181 lines):

diff -r 510035d746b7 -r dc4cfb976b96 distrib/amiga/miniroot/install.md
--- a/distrib/amiga/miniroot/install.md Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/amiga/miniroot/install.md Sat Dec 05 18:52:06 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.30 2019/04/10 14:52:53 christos Exp $
+#      $NetBSD: install.md,v 1.31 2020/12/05 18:52:06 tsutsui Exp $
 #
 #
 # Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
 md_welcome_banner() {
        if [ "$MODE" = "install" ]; then
                echo ""
-               echo "Welcome to the NetBSD/amiga ${VERSION} installation program."
+               echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
                cat << \__welcome_banner_1
 
 This program is designed to help you put NetBSD on your disk,
@@ -151,7 +151,7 @@
 
        else
                echo ""
-               echo "Welcome to the NetBSD/amiga ${VERSION} upgrade program."
+               echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} upgrade program."
                cat << \__welcome_banner_2
 
 This program is designed to help you upgrade your NetBSD system in a
diff -r 510035d746b7 -r dc4cfb976b96 distrib/hp300/miniroot/install.md
--- a/distrib/hp300/miniroot/install.md Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/hp300/miniroot/install.md Sat Dec 05 18:52:06 2020 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: install.md,v 1.19 2020/12/05 18:27:39 tsutsui Exp $
+#      $NetBSD: install.md,v 1.20 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -475,7 +475,7 @@
 md_welcome_banner() {
 (
        echo    ""
-       echo    "Welcome to the NetBSD/hp300 ${VERSION} installation program."
+       echo    "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
        cat << \__welcome_banner_1
 
 This program is designed to help you install NetBSD on your system in a
diff -r 510035d746b7 -r dc4cfb976b96 distrib/mac68k/miniroot/install.md
--- a/distrib/mac68k/miniroot/install.md        Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/mac68k/miniroot/install.md        Sat Dec 05 18:52:06 2020 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: install.md,v 1.7 2020/12/05 18:27:39 tsutsui Exp $
+#      $NetBSD: install.md,v 1.8 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -127,7 +127,7 @@
 md_welcome_banner() {
 (
        echo    ""
-       echo    "Welcome to the NetBSD/mac68k ${VERSION} installation program."
+       echo    "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
        cat << \__welcome_banner_1
 
 This program is designed to help you install NetBSD on your system in a
diff -r 510035d746b7 -r dc4cfb976b96 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/miniroot/install.sub      Sat Dec 05 18:52:06 2020 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: install.sub,v 1.56 2020/12/05 18:33:47 tsutsui Exp $
+#      $NetBSD: install.sub,v 1.57 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -32,8 +32,12 @@
 #      NetBSD installation/upgrade script - common subroutines.
 
 ROOTDISK=""                            # filled in below
-VERSION=89936
+MACHINE=                               # filled by distrib/miniroot/list
+export MACHINE
+VERSION=100                            # updated by distrib/miniroot/list
 export VERSION
+RELEASE=10.0                           # updated by distrib/miniroot/list
+export RELEASE
 
 ALLSETS="base comp etc games man misc modules rescue text"     # default install sets
 UPGRSETS="base comp games man misc text"               # default upgrade sets
diff -r 510035d746b7 -r dc4cfb976b96 distrib/miniroot/list
--- a/distrib/miniroot/list     Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/miniroot/list     Sat Dec 05 18:52:06 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.35 2011/06/19 06:48:07 tsutsui Exp $
+#      $NetBSD: list,v 1.36 2020/12/05 18:52:06 tsutsui Exp $
 
 SRCDIRS bin sbin usr.bin usr.sbin
 
@@ -71,5 +71,5 @@
 # and the installation scripts
 COPY   ${CURDIR}/install.sh            install         555
 COPY   ${CURDIR}/upgrade.sh            upgrade         555
-CMD    sed "/^VERSION=/s/=.*/=${DISTRIBREV}/" < ${CURDIR}/install.sub > install.sub
+CMD    sed -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" -e "/^MACHINE=/s/=.*/=${MACHINE}/" < ${CURDIR}/install.sub > install.sub
 MTREE  ./install.sub   type=file uname=root gname=wheel mode=0444
diff -r 510035d746b7 -r dc4cfb976b96 distrib/mvme68k/miniroot/install.md
--- a/distrib/mvme68k/miniroot/install.md       Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/mvme68k/miniroot/install.md       Sat Dec 05 18:52:06 2020 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#      $NetBSD: install.md,v 1.9 2020/12/05 18:16:11 tsutsui Exp $
+#      $NetBSD: install.md,v 1.10 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -176,7 +176,7 @@
 }
 
 md_welcome_banner() {
-       echo    "Welcome to the NetBSD/mvme68k ${VERSION} installation program."
+       echo    "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
        cat << \__welcome_banner_1
 
 This program is designed to help you install NetBSD on your system in a simple
diff -r 510035d746b7 -r dc4cfb976b96 distrib/sun2/miniroot/install.md
--- a/distrib/sun2/miniroot/install.md  Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/sun2/miniroot/install.md  Sat Dec 05 18:52:06 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
+#      $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
 md_welcome_banner() {
        if [ "$MODE" = "install" ]; then
                echo ""
-               echo "Welcome to the NetBSD/sun2 ${VERSION} installation program."
+               echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
                cat << \__welcome_banner_1
 
 This program is designed to help you put NetBSD on your disk,
@@ -157,7 +157,7 @@
 
        else
                echo ""
-               echo "Welcome to the NetBSD/sun2 ${VERSION} upgrade program."
+               echo "Welcome to the NetBSD/${MACHINE} ${VERSION} upgrade program."
                cat << \__welcome_banner_2
 
 This program is designed to help you upgrade your NetBSD system in a
diff -r 510035d746b7 -r dc4cfb976b96 distrib/sun3/miniroot/install.md
--- a/distrib/sun3/miniroot/install.md  Sat Dec 05 18:38:02 2020 +0000
+++ b/distrib/sun3/miniroot/install.md  Sat Dec 05 18:52:06 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
+#      $NetBSD: install.md,v 1.7 2020/12/05 18:52:06 tsutsui Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
 md_welcome_banner() {
        if [ "$MODE" = "install" ]; then
                echo ""
-               echo "Welcome to the NetBSD/sun3 ${VERSION} installation program."
+               echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
                cat << \__welcome_banner_1
 
 This program is designed to help you put NetBSD on your disk,
@@ -157,7 +157,7 @@
 
        else
                echo ""
-               echo "Welcome to the NetBSD/sun3 ${VERSION} upgrade program."
+               echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} upgrade program."
                cat << \__welcome_banner_2
 
 This program is designed to help you upgrade your NetBSD system in a



Home | Main Index | Thread Index | Old Index