Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk mk: Allow setting MKDHCPD=no to build base without ...
details: https://anonhg.NetBSD.org/src/rev/7e1919d877f6
branches: trunk
changeset: 366404:7e1919d877f6
user: nia <nia%NetBSD.org@localhost>
date: Wed May 25 20:44:01 2022 +0000
description:
mk: Allow setting MKDHCPD=no to build base without the ISC DHCP server,
useful for embedded images that don't need to act as one.
diffstat:
distrib/sets/lists/base/mi | 14 +++++++-------
distrib/sets/lists/debug/mi | 8 ++++----
distrib/sets/lists/man/mi | 44 ++++++++++++++++++++++----------------------
distrib/sets/lists/misc/mi | 4 ++--
etc/mtree/Makefile | 6 +++++-
etc/mtree/NetBSD.dist.base | 4 +---
etc/mtree/NetBSD.dist.dhcpd | 3 +++
etc/mtree/special | 6 +++---
external/mpl/Makefile | 8 ++++++--
share/man/man5/mk.conf.5 | 9 ++++++++-
share/mk/bsd.README | 5 ++++-
share/mk/bsd.own.mk | 3 ++-
12 files changed, 67 insertions(+), 47 deletions(-)
diffs (truncated from 361 to 300 lines):
diff -r 59e7ba4e41d6 -r 7e1919d877f6 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Wed May 25 15:52:25 2022 +0000
+++ b/distrib/sets/lists/base/mi Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1299 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: mi,v 1.1300 2022/05/25 20:44:01 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1457,8 +1457,8 @@
./usr/sbin/dbsym base-sysutil-bin binutils
./usr/sbin/ddns-confgen base-bind-bin
./usr/sbin/dev_mkdb base-sysutil-bin
-./usr/sbin/dhcpd base-dhcpd-bin
-./usr/sbin/dhcrelay base-dhcpd-bin
+./usr/sbin/dhcpd base-dhcpd-bin dhcpd
+./usr/sbin/dhcrelay base-dhcpd-bin dhcpd
./usr/sbin/dig base-obsolete obsolete
./usr/sbin/diskpart base-sysutil-bin
./usr/sbin/dnsquery base-obsolete obsolete
@@ -1635,7 +1635,7 @@
./usr/sbin/ntptimeset base-obsolete obsolete
./usr/sbin/ntptrace base-ntp-bin
./usr/sbin/nvmmctl base-sysutil-bin nvmm
-./usr/sbin/omshell base-dhcpd-bin
+./usr/sbin/omshell base-dhcpd-bin dhcpd
./usr/sbin/opensnoop base-debug-bin dtrace
./usr/sbin/pac base-sysutil-bin
./usr/sbin/paxctl base-sysutil-bin
@@ -1867,8 +1867,8 @@
./usr/share/calendar/calendar.music base-calendar-share share
./usr/share/calendar/calendar.netbsd base-calendar-share share
./usr/share/calendar/calendar.usholiday base-calendar-share share
-./usr/share/dhcpd base-dhcpd-bin
-./usr/share/dhcpd/pxe.defs base-dhcpd-bin share
+./usr/share/dhcpd base-dhcpd-bin dhcpd
+./usr/share/dhcpd/pxe.defs base-dhcpd-bin dhcpd,share
./usr/share/dict base-reference-share
./usr/share/dict/papers base-reference-share
./usr/share/dict/special base-reference-share
@@ -2015,7 +2015,7 @@
./usr/share/examples/blocklist base-sys-examples
./usr/share/examples/blocklist/blocklistd.conf base-sys-examples
./usr/share/examples/blocklist/npf.conf base-sys-examples
-./usr/share/examples/dhcp base-dhcpd-examples
+./usr/share/examples/dhcp base-dhcpd-examples dhcpd
./usr/share/examples/dhcpcd base-dhcpcd-examples
./usr/share/examples/dhcpcd/hooks base-dhcpcd-examples
./usr/share/examples/disktab base-sys-examples
diff -r 59e7ba4e41d6 -r 7e1919d877f6 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Wed May 25 15:52:25 2022 +0000
+++ b/distrib/sets/lists/debug/mi Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.378 2022/05/25 12:47:40 nia Exp $
+# $NetBSD: mi,v 1.379 2022/05/25 20:44:01 nia Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1088,8 +1088,8 @@
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
-./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
+./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug dhcpd,debug
+./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug dhcpd,debug
./usr/libdata/debug/usr/sbin/diskpart.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dnssec-dsfromkey.debug comp-bind-debug debug
./usr/libdata/debug/usr/sbin/dnssec-importkey.debug comp-bind-debug debug
@@ -1223,7 +1223,7 @@
./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug,nvmm
-./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug
+./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug,dhcpd
./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug
diff -r 59e7ba4e41d6 -r 7e1919d877f6 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed May 25 15:52:25 2022 +0000
+++ b/distrib/sets/lists/man/mi Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1740 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: mi,v 1.1741 2022/05/25 20:44:01 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -374,7 +374,7 @@
./usr/share/man/cat1/nvi.0 man-obsolete obsolete
./usr/share/man/cat1/nview.0 man-obsolete obsolete
./usr/share/man/cat1/od.0 man-util-catman .cat
-./usr/share/man/cat1/omshell.0 man-dhcpd-catman .cat
+./usr/share/man/cat1/omshell.0 man-dhcpd-catman dhcpd,.cat
./usr/share/man/cat1/openpgp.0 man-obsolete obsolete
./usr/share/man/cat1/openssl.0 man-crypto-catman .cat
./usr/share/man/cat1/openssl_CA.pl.0 man-crypto-catman .cat
@@ -2173,11 +2173,11 @@
./usr/share/man/cat5/daily.conf.0 man-sys-catman .cat
./usr/share/man/cat5/dhclient.conf.0 man-obsolete obsolete
./usr/share/man/cat5/dhclient.leases.0 man-obsolete obsolete
-./usr/share/man/cat5/dhcp-eval.0 man-dhcpd-catman .cat
-./usr/share/man/cat5/dhcp-options.0 man-dhcpd-catman .cat
+./usr/share/man/cat5/dhcp-eval.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat5/dhcp-options.0 man-dhcpd-catman dhcpd,.cat
./usr/share/man/cat5/dhcpcd.conf.0 man-dhcpcd-catman .cat
-./usr/share/man/cat5/dhcpd.conf.0 man-dhcpd-catman .cat
-./usr/share/man/cat5/dhcpd.leases.0 man-dhcpd-catman .cat
+./usr/share/man/cat5/dhcpd.conf.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat5/dhcpd.leases.0 man-dhcpd-catman dhcpd,.cat
./usr/share/man/cat5/dir.0 man-obsolete obsolete
./usr/share/man/cat5/dirent.0 man-obsolete obsolete
./usr/share/man/cat5/disklabel.0 man-sys-catman .cat
@@ -2556,8 +2556,8 @@
./usr/share/man/cat8/dhclient.0 man-obsolete obsolete
./usr/share/man/cat8/dhcpcd-run-hooks.0 man-dhcpcd-catman .cat
./usr/share/man/cat8/dhcpcd.0 man-dhcpcd-catman .cat
-./usr/share/man/cat8/dhcpd.0 man-dhcpd-catman .cat
-./usr/share/man/cat8/dhcrelay.0 man-dhcpd-catman .cat
+./usr/share/man/cat8/dhcpd.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat8/dhcrelay.0 man-dhcpd-catman dhcpd,.cat
./usr/share/man/cat8/discard.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/disklabel.0 man-sysutil-catman .cat
./usr/share/man/cat8/diskless.0 man-sysutil-catman .cat
@@ -3696,7 +3696,7 @@
./usr/share/man/html1/nvi.html man-obsolete obsolete
./usr/share/man/html1/nview.html man-obsolete obsolete
./usr/share/man/html1/od.html man-util-htmlman html
-./usr/share/man/html1/omshell.html man-dhcpd-htmlman html
+./usr/share/man/html1/omshell.html man-dhcpd-htmlman dhcpd,html
./usr/share/man/html1/openpgp.html man-obsolete obsolete
./usr/share/man/html1/openssl.html man-crypto-htmlman html
./usr/share/man/html1/openssl_CA.pl.html man-crypto-htmlman html
@@ -5349,11 +5349,11 @@
./usr/share/man/html5/daily.html man-sys-htmlman html
./usr/share/man/html5/dhclient.conf.html man-obsolete obsolete
./usr/share/man/html5/dhclient.leases.html man-obsolete obsolete
-./usr/share/man/html5/dhcp-eval.html man-dhcpd-htmlman html
-./usr/share/man/html5/dhcp-options.html man-dhcpd-htmlman html
+./usr/share/man/html5/dhcp-eval.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html5/dhcp-options.html man-dhcpd-htmlman dhcpd,html
./usr/share/man/html5/dhcpcd.conf.html man-dhcpcd-htmlman html
-./usr/share/man/html5/dhcpd.conf.html man-dhcpd-htmlman html
-./usr/share/man/html5/dhcpd.leases.html man-dhcpd-htmlman html
+./usr/share/man/html5/dhcpd.conf.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html5/dhcpd.leases.html man-dhcpd-htmlman dhcpd,html
./usr/share/man/html5/dir.html man-obsolete obsolete
./usr/share/man/html5/dirent.html man-obsolete obsolete
./usr/share/man/html5/disklabel.html man-sys-htmlman html
@@ -5672,8 +5672,8 @@
./usr/share/man/html8/dhclient.html man-obsolete obsolete
./usr/share/man/html8/dhcpcd-run-hooks.html man-dhcpcd-htmlman html
./usr/share/man/html8/dhcpcd.html man-dhcpcd-htmlman html
-./usr/share/man/html8/dhcpd.html man-dhcpd-htmlman html
-./usr/share/man/html8/dhcrelay.html man-dhcpd-htmlman html
+./usr/share/man/html8/dhcpd.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html8/dhcrelay.html man-dhcpd-htmlman dhcpd,html
./usr/share/man/html8/discard.html man-postfix-htmlman postfix,html
./usr/share/man/html8/disklabel.html man-sysutil-htmlman html
./usr/share/man/html8/diskless.html man-sysutil-htmlman html
@@ -6660,7 +6660,7 @@
./usr/share/man/man1/nvi.1 man-obsolete obsolete
./usr/share/man/man1/nview.1 man-obsolete obsolete
./usr/share/man/man1/od.1 man-util-man .man
-./usr/share/man/man1/omshell.1 man-dhcpd-man .man
+./usr/share/man/man1/omshell.1 man-dhcpd-man dhcpd,.man
./usr/share/man/man1/openpgp.1 man-obsolete obsolete
./usr/share/man/man1/openssl.1 man-crypto-man .man
./usr/share/man/man1/openssl_CA.pl.1 man-crypto-man .man
@@ -8459,11 +8459,11 @@
./usr/share/man/man5/daily.conf.5 man-sys-man .man
./usr/share/man/man5/dhclient.conf.5 man-obsolete obsolete
./usr/share/man/man5/dhclient.leases.5 man-obsolete obsolete
-./usr/share/man/man5/dhcp-eval.5 man-dhcpd-man .man
-./usr/share/man/man5/dhcp-options.5 man-dhcpd-man .man
+./usr/share/man/man5/dhcp-eval.5 man-dhcpd-man dhcpd,.man
+./usr/share/man/man5/dhcp-options.5 man-dhcpd-man dhcpd,.man
./usr/share/man/man5/dhcpcd.conf.5 man-dhcpcd-man .man
-./usr/share/man/man5/dhcpd.conf.5 man-dhcpd-man .man
-./usr/share/man/man5/dhcpd.leases.5 man-dhcpd-man .man
+./usr/share/man/man5/dhcpd.conf.5 man-dhcpd-man dhcpd,.man
+./usr/share/man/man5/dhcpd.leases.5 man-dhcpd-man dhcpd,.man
./usr/share/man/man5/dir.5 man-obsolete obsolete
./usr/share/man/man5/dirent.5 man-obsolete obsolete
./usr/share/man/man5/disklabel.5 man-sys-man .man
@@ -8841,8 +8841,8 @@
./usr/share/man/man8/dhclient.8 man-obsolete obsolete
./usr/share/man/man8/dhcpcd-run-hooks.8 man-dhcpcd-man .man
./usr/share/man/man8/dhcpcd.8 man-dhcpcd-man .man
-./usr/share/man/man8/dhcpd.8 man-dhcpd-man .man
-./usr/share/man/man8/dhcrelay.8 man-dhcpd-man .man
+./usr/share/man/man8/dhcpd.8 man-dhcpd-man dhcpd,.man
+./usr/share/man/man8/dhcrelay.8 man-dhcpd-man dhcpd,.man
./usr/share/man/man8/discard.8 man-postfix-man postfix,.man
./usr/share/man/man8/disklabel.8 man-sysutil-man .man
./usr/share/man/man8/diskless.8 man-sysutil-man .man
diff -r 59e7ba4e41d6 -r 7e1919d877f6 distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi Wed May 25 15:52:25 2022 +0000
+++ b/distrib/sets/lists/misc/mi Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.219 2020/08/03 17:26:13 christos Exp $
+# $NetBSD: mi,v 1.220 2022/05/25 20:44:01 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1362,7 +1362,7 @@
./usr/share/examples/atf/atf-run.hooks misc-obsolete share,kyua,obsolete
./usr/share/examples/atf/tests-results.css misc-atf-examples share,atf,!kyua
./usr/share/examples/atf/tests-results.css misc-obsolete share,kyua,obsolete
-./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share
+./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share,dhcpd
./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/15-timezone misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/29-lookup-hostname misc-dhcpcd-examples share
diff -r 59e7ba4e41d6 -r 7e1919d877f6 etc/mtree/Makefile
--- a/etc/mtree/Makefile Wed May 25 15:52:25 2022 +0000
+++ b/etc/mtree/Makefile Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2021/04/25 23:40:52 christos Exp $
+# $NetBSD: Makefile,v 1.46 2022/05/25 20:44:01 nia Exp $
.include <bsd.own.mk>
@@ -57,6 +57,10 @@
.endif
.endif
+.if ${MKDHCPD} != "no"
+EXTRA_DIST_FILES+= NetBSD.dist.dhcpd
+.endif
+
.if ${MKDTB} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.dtb
.endif
diff -r 59e7ba4e41d6 -r 7e1919d877f6 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Wed May 25 15:52:25 2022 +0000
+++ b/etc/mtree/NetBSD.dist.base Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.243 2022/05/15 21:41:56 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.244 2022/05/25 20:44:01 nia Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -395,7 +395,6 @@
./usr/share
./usr/share/atf
./usr/share/calendar
-./usr/share/dhcpd
./usr/share/dict
./usr/share/dict/papers
./usr/share/dict/special
@@ -469,7 +468,6 @@
./usr/share/examples/asm/hello
./usr/share/examples/atf
./usr/share/examples/blocklist
-./usr/share/examples/dhcp
./usr/share/examples/dhcpcd
./usr/share/examples/dhcpcd/hooks
./usr/share/examples/disktab
diff -r 59e7ba4e41d6 -r 7e1919d877f6 etc/mtree/NetBSD.dist.dhcpd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.dist.dhcpd Wed May 25 20:44:01 2022 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.dhcpd,v 1.1 2022/05/25 20:44:01 nia Exp $
+./usr/share/dhcpd
+./usr/share/examples/dhcp
diff -r 59e7ba4e41d6 -r 7e1919d877f6 etc/mtree/special
--- a/etc/mtree/special Wed May 25 15:52:25 2022 +0000
+++ b/etc/mtree/special Wed May 25 20:44:01 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.173 2022/05/25 10:18:29 nia Exp $
+# $NetBSD: special,v 1.174 2022/05/25 20:44:01 nia Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -207,8 +207,8 @@
./etc/rc.d/cron type=file mode=0555
./etc/rc.d/devpubd type=file mode=0555
./etc/rc.d/dhcpcd type=file mode=0555
-./etc/rc.d/dhcpd type=file mode=0555
-./etc/rc.d/dhcpd6 type=file mode=0555
+./etc/rc.d/dhcpd type=file mode=0555 optional
+./etc/rc.d/dhcpd6 type=file mode=0555 optional
./etc/rc.d/dhcrelay type=file mode=0555
./etc/rc.d/dmesg type=file mode=0555
./etc/rc.d/downinterfaces type=file mode=0555
diff -r 59e7ba4e41d6 -r 7e1919d877f6 external/mpl/Makefile
--- a/external/mpl/Makefile Wed May 25 15:52:25 2022 +0000
+++ b/external/mpl/Makefile Wed May 25 20:44:01 2022 +0000
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2018/08/12 13:03:08 christos Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/25 20:44:01 nia Exp $
.include <bsd.own.mk>
-SUBDIR= bind dhcp
+SUBDIR= bind
+
+.if ${MKDHCPD} != "no"
+SUBDIR+= dhcp
+.endif
Home |
Main Index |
Thread Index |
Old Index