Module Name: src
Committed By: nia
Date: Wed May 25 10:18:30 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/etc: Makefile
src/etc/mtree: special
src/etc/rc.d: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/usr.sbin: Makefile
Log Message:
mk: Allow building base without the MBONE applications by setting
MKMBONE=no in mk.conf
To generate a diff of this commit:
cvs rdiff -u -r1.1298 -r1.1299 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1739 -r1.1740 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.458 -r1.459 src/etc/Makefile
cvs rdiff -u -r1.172 -r1.173 src/etc/mtree/special
cvs rdiff -u -r1.111 -r1.112 src/etc/rc.d/Makefile
cvs rdiff -u -r1.85 -r1.86 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.429 -r1.430 src/share/mk/bsd.README
cvs rdiff -u -r1.1276 -r1.1277 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.286 -r1.287 src/usr.sbin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1298 src/distrib/sets/lists/base/mi:1.1299
--- src/distrib/sets/lists/base/mi:1.1298 Sun May 15 00:24:14 2022
+++ src/distrib/sets/lists/base/mi Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1298 2022/05/15 00:24:14 mrg Exp $
+# $NetBSD: mi,v 1.1299 2022/05/25 10:18:29 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1570,7 +1570,7 @@
./usr/sbin/makefs base-sysutil-bin
./usr/sbin/makemandb base-man-bin makemandb
./usr/sbin/makemap base-obsolete obsolete
-./usr/sbin/map-mbone base-netutil-bin
+./usr/sbin/map-mbone base-netutil-bin mbone
./usr/sbin/mbrlabel base-obsolete obsolete
./usr/sbin/mdconfig base-sysutil-bin
./usr/sbin/mdnsd base-mdns-bin mdns
@@ -1593,10 +1593,10 @@
./usr/sbin/mount_sysctlfs base-puffs-bin
./usr/sbin/mountd base-nfsserver-bin
./usr/sbin/moused base-sysutil-bin
-./usr/sbin/mrinfo base-router-bin
-./usr/sbin/mrouted base-router-bin
+./usr/sbin/mrinfo base-router-bin mbone
+./usr/sbin/mrouted base-router-bin mbone
./usr/sbin/mscdlabel base-sysutil-bin
-./usr/sbin/mtrace base-netutil-bin
+./usr/sbin/mtrace base-netutil-bin mbone
./usr/sbin/mtrace6 base-obsolete obsolete
./usr/sbin/mtree base-sysutil-bin
./usr/sbin/named base-bind-bin
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.265 src/distrib/sets/lists/etc/mi:1.266
--- src/distrib/sets/lists/etc/mi:1.265 Tue Jan 26 13:31:19 2021
+++ src/distrib/sets/lists/etc/mi Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.265 2021/01/26 13:31:19 martin Exp $
+# $NetBSD: mi,v 1.266 2022/05/25 10:18:29 nia Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -97,7 +97,7 @@
./etc/monthly etc-sys-etc
./etc/monthly.conf etc-sys-etc
./etc/motd etc-sys-etc
-./etc/mrouted.conf etc-router-etc
+./etc/mrouted.conf etc-router-etc mbone
./etc/mtree/NetBSD.dist etc-sys-etc
./etc/mtree/set.etc etc-sys-etc
./etc/mtree/special etc-sys-etc
@@ -263,7 +263,7 @@
./etc/rc.d/mountcritremote etc-sys-rc
./etc/rc.d/mountd etc-nfsserver-rc
./etc/rc.d/moused etc-sysutil-rc
-./etc/rc.d/mrouted etc-router-rc
+./etc/rc.d/mrouted etc-router-rc mbone
./etc/rc.d/named etc-bind-rc
./etc/rc.d/ndbootd etc-bootserver-rc
./etc/rc.d/network etc-net-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1739 src/distrib/sets/lists/man/mi:1.1740
--- src/distrib/sets/lists/man/mi:1.1739 Fri May 13 16:39:33 2022
+++ src/distrib/sets/lists/man/mi Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1739 2022/05/13 16:39:33 brad Exp $
+# $NetBSD: mi,v 1.1740 2022/05/25 10:18:29 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2811,7 +2811,7 @@
./usr/share/man/cat8/makemandb.0 man-man-catman makemandb,.cat
./usr/share/man/cat8/makemap.0 man-obsolete obsolete
./usr/share/man/cat8/makewhatis.0 man-man-catman !makemandb,.cat
-./usr/share/man/cat8/map-mbone.0 man-netutil-catman .cat
+./usr/share/man/cat8/map-mbone.0 man-netutil-catman mbone,.cat
./usr/share/man/cat8/master.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/mbr.0 man-obsolete obsolete
./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat
@@ -2874,10 +2874,10 @@
./usr/share/man/cat8/mount_zfs.0 man-sysutil-catman zfs,.cat
./usr/share/man/cat8/mountd.0 man-nfsserver-catman .cat
./usr/share/man/cat8/moused.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mrinfo.0 man-netutil-catman .cat
-./usr/share/man/cat8/mrouted.0 man-router-catman .cat
+./usr/share/man/cat8/mrinfo.0 man-netutil-catman mbone,.cat
+./usr/share/man/cat8/mrouted.0 man-router-catman mbone,.cat
./usr/share/man/cat8/mscdlabel.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mtrace.0 man-netutil-catman .cat
+./usr/share/man/cat8/mtrace.0 man-netutil-catman mbone,.cat
./usr/share/man/cat8/mtrace6.0 man-obsolete obsolete
./usr/share/man/cat8/mtree.0 man-sysutil-catman .cat
./usr/share/man/cat8/mvme68k/MAKEDEV.0 man-obsolete obsolete
@@ -5869,7 +5869,7 @@
./usr/share/man/html8/makekey.html man-crypto-htmlman html
./usr/share/man/html8/makemandb.html man-man-htmlman makemandb,html
./usr/share/man/html8/makewhatis.html man-man-htmlman !makemandb,html
-./usr/share/man/html8/map-mbone.html man-netutil-htmlman html
+./usr/share/man/html8/map-mbone.html man-netutil-htmlman mbone,html
./usr/share/man/html8/master.html man-postfix-htmlman postfix,html
./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html
./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html
@@ -5926,10 +5926,10 @@
./usr/share/man/html8/mount_zfs.html man-sysutil-htmlman zfs,html
./usr/share/man/html8/mountd.html man-nfsserver-htmlman html
./usr/share/man/html8/moused.html man-sysutil-htmlman html
-./usr/share/man/html8/mrinfo.html man-netutil-htmlman html
-./usr/share/man/html8/mrouted.html man-router-htmlman html
+./usr/share/man/html8/mrinfo.html man-netutil-htmlman mbone,html
+./usr/share/man/html8/mrouted.html man-router-htmlman mbone,html
./usr/share/man/html8/mscdlabel.html man-sysutil-htmlman html
-./usr/share/man/html8/mtrace.html man-netutil-htmlman html
+./usr/share/man/html8/mtrace.html man-netutil-htmlman mbone,html
./usr/share/man/html8/mtree.html man-sysutil-htmlman html
./usr/share/man/html8/mvme68k/boot.html man-sys-htmlman html
./usr/share/man/html8/mvme68k/installboot.html man-sysutil-htmlman html
@@ -9097,7 +9097,7 @@
./usr/share/man/man8/makemandb.8 man-man-man makemandb,.man
./usr/share/man/man8/makemap.8 man-obsolete obsolete
./usr/share/man/man8/makewhatis.8 man-man-man !makemandb,.man
-./usr/share/man/man8/map-mbone.8 man-netutil-man .man
+./usr/share/man/man8/map-mbone.8 man-netutil-man mbone,.man
./usr/share/man/man8/master.8 man-postfix-man postfix,.man
./usr/share/man/man8/mbr.8 man-obsolete obsolete
./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man
@@ -9160,10 +9160,10 @@
./usr/share/man/man8/mount_zfs.8 man-sysutil-man zfs,.man
./usr/share/man/man8/mountd.8 man-nfsserver-man .man
./usr/share/man/man8/moused.8 man-sysutil-man .man
-./usr/share/man/man8/mrinfo.8 man-netutil-man .man
-./usr/share/man/man8/mrouted.8 man-router-man .man
+./usr/share/man/man8/mrinfo.8 man-netutil-man mbone,.man
+./usr/share/man/man8/mrouted.8 man-router-man mbone,.man
./usr/share/man/man8/mscdlabel.8 man-sysutil-man .man
-./usr/share/man/man8/mtrace.8 man-netutil-man .man
+./usr/share/man/man8/mtrace.8 man-netutil-man mbone,.man
./usr/share/man/man8/mtrace6.8 man-obsolete obsolete
./usr/share/man/man8/mtree.8 man-sysutil-man .man
./usr/share/man/man8/mvme68k/MAKEDEV.8 man-obsolete obsolete
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.458 src/etc/Makefile:1.459
--- src/etc/Makefile:1.458 Wed Jan 5 01:46:28 2022
+++ src/etc/Makefile Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.458 2022/01/05 01:46:28 kre Exp $
+# $NetBSD: Makefile,v 1.459 2022/05/25 10:18:29 nia Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -105,12 +105,16 @@ BIN1+= auto_master bootptab changelist c
csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
ftpusers gettytab gpio.conf group hosts hosts.lpd inetd.conf \
locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
- mrouted.conf named.conf netconfig networks newsyslog.conf \
+ named.conf netconfig networks newsyslog.conf \
nsswitch.conf ntp.conf passwd.conf pkgpath.conf phones printcap \
profile protocols rbootd.conf rc rc.conf rc.local rc.subr \
rc.shutdown remote rpc security security.conf services shells \
shrc sysctl.conf syslog.conf weekly weekly.conf wscons.conf
+.if ${MKMBONE} != "no"
+BIN1+= mrouted.conf
+.endif
+
# Use machine-specific disktab if it exists, or the MI one otherwise
.if exists(etc.${MACHINE}/disktab)
BIN1+= etc.${MACHINE}/disktab
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.172 src/etc/mtree/special:1.173
--- src/etc/mtree/special:1.172 Tue Nov 30 06:21:58 2021
+++ src/etc/mtree/special Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.172 2021/11/30 06:21:58 simonb Exp $
+# $NetBSD: special,v 1.173 2022/05/25 10:18:29 nia Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -116,7 +116,7 @@
./etc/monthly type=file mode=0644
./etc/monthly.conf type=file mode=0644
./etc/monthly.local type=file mode=0644 optional
-./etc/mrouted.conf type=file mode=0644
+./etc/mrouted.conf type=file mode=0644 optional
./etc/mtree type=dir mode=0755
./etc/mtree/special type=file mode=0444
./etc/mtree/special.local type=file mode=0644 optional
@@ -249,7 +249,7 @@
./etc/rc.d/mountcritremote type=file mode=0555
./etc/rc.d/mountd type=file mode=0555
./etc/rc.d/moused type=file mode=0555
-./etc/rc.d/mrouted type=file mode=0555
+./etc/rc.d/mrouted type=file mode=0555 optional
./etc/rc.d/named type=file mode=0555
./etc/rc.d/ndbootd type=file mode=0555
./etc/rc.d/network type=file mode=0555
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.111 src/etc/rc.d/Makefile:1.112
--- src/etc/rc.d/Makefile:1.111 Tue Jan 26 15:08:02 2021
+++ src/etc/rc.d/Makefile Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2021/01/26 15:08:02 martin Exp $
+# $NetBSD: Makefile,v 1.112 2022/05/25 10:18:29 nia Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@ CONFIGFILES=\
kdc \
ldconfig ldpd lvmlockdir local lpd lvm \
makemandb mdnsd mixerctl modules mopd motd mountall \
- mountcritlocal mountcritremote mountd moused mrouted \
+ mountcritlocal mountcritremote mountd moused \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
npfd ntpd ntpdate \
perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
@@ -44,6 +44,10 @@ CONFIGFILES=\
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
+.if ${MKMBONE} != "no"
+CONFIGFILES+= mrouted
+.endif
+
.if ${MKYP} != "no"
CONFIGFILES+= ypbind yppasswdd ypserv
.endif
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.85 src/share/man/man5/mk.conf.5:1.86
--- src/share/man/man5/mk.conf.5:1.85 Mon Dec 20 20:33:20 2021
+++ src/share/man/man5/mk.conf.5 Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.85 2021/12/20 20:33:20 christos Exp $
+.\" $NetBSD: mk.conf.5,v 1.86 2022/05/25 10:18:29 nia Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 20, 2021
+.Dd May 23, 2022
.Dt MK.CONF 5
.Os
.\" turn off hyphenation
@@ -627,6 +627,17 @@ Indicates whether manual pages should be
at installation time.
.DFLTn
.
+.It Sy MKMBONE
+.YorN
+Indicates whether Multicast Backbone applications will be built and
+installed, i.e.
+.Xr map-mbone 8 ,
+.Xr mrinfo 8 ,
+.Xr mrouted 8 ,
+and
+.Xr mtrace 8 .
+.DFLTy
+.
.It Sy MKMDNS
.YorN
Indicates whether the mDNS (Multicast DNS) infrastructure
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.429 src/share/mk/bsd.README:1.430
--- src/share/mk/bsd.README:1.429 Fri May 20 21:31:24 2022
+++ src/share/mk/bsd.README Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.429 2022/05/20 21:31:24 andvar Exp $
+# $NetBSD: bsd.README,v 1.430 2022/05/25 10:18:29 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -369,6 +369,10 @@ MKMANDOC If "yes", mandoc is built as to
MKMANZ If not "no", compress manual pages at installation time.
Default: no
+MKMBONE If "no", don't build or install Multicast Backbone
+ applications.
+ Default: yes
+
MKMDNS If "no", disables building of mDNS infrastructure
(libraries and support programs).
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1276 src/share/mk/bsd.own.mk:1.1277
--- src/share/mk/bsd.own.mk:1.1276 Tue Mar 29 22:48:04 2022
+++ src/share/mk/bsd.own.mk Wed May 25 10:18:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1276 2022/03/29 22:48:04 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1277 2022/05/25 10:18:29 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1159,6 +1159,7 @@ _MKVARS.yes= \
MKKMOD \
MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
MKMAN MKMANDOC \
+ MKMBONE \
MKMDNS \
MKMAKEMANDB \
MKNLS \
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.286 src/usr.sbin/Makefile:1.287
--- src/usr.sbin/Makefile:1.286 Sun Jan 23 14:35:44 2022
+++ src/usr.sbin/Makefile Wed May 25 10:18:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.286 2022/01/23 14:35:44 christos Exp $
+# $NetBSD: Makefile,v 1.287 2022/05/25 10:18:28 nia Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -15,8 +15,8 @@ SUBDIR= ac accton acpitools altq apm apm
isibootd iteconfig iwictl \
kgmon \
lastlogin ldpd link lockstat lpr \
- mailwrapper makefs map-mbone mdconfig memswitch mlxctl mmcformat \
- mopd mountd moused mrinfo mrouted mscdlabel mtrace mtree \
+ mailwrapper makefs mdconfig memswitch mlxctl mmcformat \
+ mopd mountd moused mscdlabel mtree \
ndbootd netgroup_mkdb nfsd \
ofctl \
paxctl pcictl perfused psrset pstat pwd_mkdb postinstall \
@@ -38,6 +38,10 @@ SUBDIR= ac accton acpitools altq apm apm
SUBDIR+= makemandb
.endif
+.if ${MKMBONE} != "no"
+SUBDIR+= map-mbone mrinfo mrouted mtrace
+.endif
+
.if (${MKYP} != "no")
SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
.endif
