[src/netbsd-9]: src/distrib Pull up following revision(s) (requested by tsuts...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9e638c84d52
branches:  netbsd-9
changeset: 984170:f9e638c84d52
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jun 25 19:08:46 2021 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1310):

        distrib/sun3/miniroot/Makefile: revision 1.50
        distrib/miniroot/install.sub: revision 1.61
        distrib/miniroot/install.sub: revision 1.62
        distrib/sun2/miniroot/Makefile: revision 1.40

Replace RELEASE and VERSION strings proplery.
sun2 and sun3 don't use MI src/distrib/miniroot/list so this should
have been sync'ed with it.

http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.36
> 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).

Should be pulled up to netbsd-9.

Remove netstat(1) calls to print resolver info on upgrade using miniroot.
netstat(1) was removed from miniroot 25 years ago.
 http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.5

The modules and rescue sets are also required on upgrade.
Should be pulled up to netbsd-9 and netbsd-8.

diffstat:

 distrib/miniroot/install.sub   |  8 ++------
 distrib/sun2/miniroot/Makefile |  6 ++++--
 distrib/sun3/miniroot/Makefile |  6 ++++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r 424eeb10ad65 -r f9e638c84d52 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Tue Jun 22 05:12:27 2021 +0000
+++ b/distrib/miniroot/install.sub      Fri Jun 25 19:08:46 2021 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: install.sub,v 1.48.2.5 2021/06/05 10:40:08 martin Exp $
+#      $NetBSD: install.sub,v 1.48.2.6 2021/06/25 19:08:46 martin Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,7 +40,7 @@
 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
+UPGRSETS="base comp games man misc modules rescue text"                # default upgrade sets
 THESETS=                                               # one of the above
 
 local_sets_dir=""                      # Path searched for sets by install_sets
@@ -606,12 +606,8 @@
        echo    ""
 
        if [ "${_resolver_enabled:-FALSE}" = "TRUE" ]; then
-               netstat -r
-               echo    ""
                echo    "Resolver enabled."
        else
-               netstat -rn
-               echo    ""
                echo    "Resolver not enabled."
        fi
 
diff -r 424eeb10ad65 -r f9e638c84d52 distrib/sun2/miniroot/Makefile
--- a/distrib/sun2/miniroot/Makefile    Tue Jun 22 05:12:27 2021 +0000
+++ b/distrib/sun2/miniroot/Makefile    Fri Jun 25 19:08:46 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.36 2017/01/24 18:04:05 christos Exp $
+#      $NetBSD: Makefile,v 1.36.14.1 2021/06/25 19:08:46 martin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -50,7 +50,9 @@
 ${CRUNCHBIN}:  libhack.o
 
 install.sub: ${DISTRIBDIR}/miniroot/install.sub
-       ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+       ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+                   -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+                   -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
 
 CLEANFILES+= install.sub
 
diff -r 424eeb10ad65 -r f9e638c84d52 distrib/sun3/miniroot/Makefile
--- a/distrib/sun3/miniroot/Makefile    Tue Jun 22 05:12:27 2021 +0000
+++ b/distrib/sun3/miniroot/Makefile    Fri Jun 25 19:08:46 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.47 2019/07/28 10:29:49 martin Exp $
+#      $NetBSD: Makefile,v 1.47.2.1 2021/06/25 19:08:46 martin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -53,7 +53,9 @@
 ${CRUNCHBIN}:  libhack.o
 
 install.sub: ${DISTRIBDIR}/miniroot/install.sub
-       ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+       ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+                   -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+                   -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
 
 CLEANFILES+= install.sub