diff options
| author | martin <martin@NetBSD.org> | 2021-06-25 19:08:46 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2021-06-25 19:08:46 +0000 |
| commit | 6add30a850a0cb32e1bcbf8d0cab37c52efa5a31 (patch) | |
| tree | da7ef5850ba35bec9fbacedbb590eec79829e09b /distrib | |
| parent | c0251fe6c5008dbc7fc03280be09440980f98633 (diff) | |
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 (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 8 | ||||
| -rw-r--r-- | distrib/sun2/miniroot/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sun3/miniroot/Makefile | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index ad7c4a1fe12..63c1c4fef33 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -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 @@ 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 +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 @@ fi echo "" if [ "${_resolver_enabled:-FALSE}" = "TRUE" ]; then - netstat -r - echo "" echo "Resolver enabled." else - netstat -rn - echo "" echo "Resolver not enabled." fi diff --git a/distrib/sun2/miniroot/Makefile b/distrib/sun2/miniroot/Makefile index db3a17768f7..844cfbd40c1 100644 --- a/distrib/sun2/miniroot/Makefile +++ b/distrib/sun2/miniroot/Makefile @@ -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 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${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 --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile index a6aaf8a33c4..3d17779c1c7 100644 --- a/distrib/sun3/miniroot/Makefile +++ b/distrib/sun3/miniroot/Makefile @@ -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 @@ HACK_CURSES=yes ${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 |
