From 8f09f1ecff14a54470048d6e42719adacc0f0c45 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 07:12:32 +0000 Subject: [PATCH 01/53] Don't create symlinks for nls/openssl unless the respective options are set --- etc/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index ff70cc12ad0..92b6629b369 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -376,23 +376,29 @@ distrib-dirs: ${MTREES:N/*} ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/man/en.UTF-8/; \ done +.if ${MK_OPENSSL} != "no" cd ${DESTDIR}/usr/share/openssl/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \ done +.endif set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \ - ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}/usr/share/openssl/man/$$1"; \ - shift; shift; \ + if [ "${MK_OPENSSL}" != "no" ]; then \ + ${INSTALL_SYMLINK} "$$2" \ + "${DESTDIR}/usr/share/openssl/man/$$1"; \ + shift; shift; \ + fi; \ done +.if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \ shift; shift; \ done +.endif etc-examples: cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ From c1479b76dc5a6747f769b8cfd9bf5cc3c4c579be Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 07:14:16 +0000 Subject: [PATCH 02/53] The shift; shift needs to be moved outside the .if ${MK_OPENSSL} conditional --- etc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/Makefile b/etc/Makefile index 92b6629b369..431474b68c5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -389,8 +389,8 @@ distrib-dirs: ${MTREES:N/*} if [ "${MK_OPENSSL}" != "no" ]; then \ ${INSTALL_SYMLINK} "$$2" \ "${DESTDIR}/usr/share/openssl/man/$$1"; \ - shift; shift; \ fi; \ + shift; shift; \ done .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ From 41e0727670a602645137315e07c0357cc282995c Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 07:30:26 +0000 Subject: [PATCH 03/53] Make bsdinstall(8) and sade(8) optional components via MK_BSDINSTALL=yes --- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 33 ++++++++++++++++++++++++ tools/build/options/WITHOUT_BSDINSTALL | 5 ++++ usr.sbin/Makefile | 5 +++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 tools/build/options/WITHOUT_BSDINSTALL diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 87c0f9998cd..af546c725a0 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -57,6 +57,7 @@ __DEFAULT_YES_OPTIONS = \ BLUETOOTH \ BOOT \ BSD_CPIO \ + BSDINSTALL \ BSNMP \ BZIP2 \ CALENDAR \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index fa643a80916..68e85c3851d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -274,6 +274,39 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz # to be filled in #.endif +.if ${MK_BSDINSTALL} == no +OLD_FILES+=usr/libexec/bsdinstall/adduser +OLD_FILES+=usr/libexec/bsdinstall/auto +OLD_FILES+=usr/libexec/bsdinstall/autopart +OLD_FILES+=usr/libexec/bsdinstall/checksum +OLD_FILES+=usr/libexec/bsdinstall/config +OLD_FILES+=usr/libexec/bsdinstall/distextract +OLD_FILES+=usr/libexec/bsdinstall/distfetch +OLD_FILES+=usr/libexec/bsdinstall/docsinstall +OLD_FILES+=usr/libexec/bsdinstall/entropy +OLD_FILES+=usr/libexec/bsdinstall/hostname +OLD_FILES+=usr/libexec/bsdinstall/jail +OLD_FILES+=usr/libexec/bsdinstall/keymap +OLD_FILES+=usr/libexec/bsdinstall/mirrorselect +OLD_FILES+=usr/libexec/bsdinstall/mount +OLD_FILES+=usr/libexec/bsdinstall/netconfig +OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4 +OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6 +OLD_FILES+=usr/libexec/bsdinstall/partedit +OLD_FILES+=usr/libexec/bsdinstall/rootpass +OLD_FILES+=usr/libexec/bsdinstall/script +OLD_FILES+=usr/libexec/bsdinstall/scriptedpart +OLD_FILES+=usr/libexec/bsdinstall/services +OLD_FILES+=usr/libexec/bsdinstall/time +OLD_FILES+=usr/libexec/bsdinstall/umount +OLD_FILES+=usr/libexec/bsdinstall/wlanconfig +OLD_FILES+=usr/libexec/bsdinstall/zfsboot +OLD_FILES+=usr/sbin/bsdinstall +OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz +OLD_FILES+=usr/share/man/man8/sade.8.gz +OLD_DIRS+=usr/libexec/bsdinstall +.endif + .if ${MK_CALENDAR} == no OLD_FILES+=etc/periodic/daily/300.calendar OLD_FILES+=usr/bin/calendar diff --git a/tools/build/options/WITHOUT_BSDINSTALL b/tools/build/options/WITHOUT_BSDINSTALL new file mode 100644 index 00000000000..8aaf2a6544e --- /dev/null +++ b/tools/build/options/WITHOUT_BSDINSTALL @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr bsdinstall 8 , +.Xr sade 8 , +and related programs. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index df9f8674793..1f45385fa52 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -9,7 +9,6 @@ SUBDIR= adduser \ binmiscctl \ bootparamd \ bsdconfig \ - bsdinstall \ cdcontrol \ chkgrp \ chown \ @@ -128,6 +127,10 @@ SUBDIR+= authpf SUBDIR+= bluetooth .endif +.if ${MK_BSDINSTALL} != "no" +SUBDIR+= bsdinstall +.endif + .if ${MK_BSNMP} != "no" SUBDIR+= bsnmpd .endif From 8bbfb3bbe93c1cebc15d26e77f9130960d0e8240 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 08:04:32 +0000 Subject: [PATCH 04/53] Don't install othermta unless MK_MAIL == yes --- etc/rc.d/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index f26c190fe9d..e3a38b03eed 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -107,7 +107,7 @@ FILES= DAEMON \ ntpd \ ntpdate \ ${_opensm} \ - othermta \ + ${_othermta} \ pf \ pflog \ pfsync \ @@ -186,6 +186,10 @@ _kfd= kfd _kpasswdd= kpasswdd .endif +.if ${MK_MAIL} != "no" +_othermta= othermta +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif From 05bc3dd6c00f584ef8a49f8a91eb6adc70d19cd1 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 08:39:46 +0000 Subject: [PATCH 05/53] Make inetd optional via MK_INETD --- etc/Makefile | 5 ++++- etc/rc.d/Makefile | 6 +++++- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 7 +++++++ tools/build/options/WITHOUT_INETD | 3 +++ usr.sbin/Makefile | 5 ++++- 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 tools/build/options/WITHOUT_INETD diff --git a/etc/Makefile b/etc/Makefile index 431474b68c5..d8d1f72b5ad 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -25,7 +25,6 @@ BIN1= auto_master \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -95,6 +94,10 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index e3a38b03eed..d90fc835026 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -56,7 +56,7 @@ FILES= DAEMON \ hostid \ hostid_save \ hostname \ - inetd \ + ${_inetd} \ ip6addrctl \ ipfilter \ ipfs \ @@ -175,6 +175,10 @@ _ubthidhci= ubthidhci _casperd= casperd .endif +.if ${MK_INETD} != "no" +_inetd= inetd +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index af546c725a0..b9b6687dac9 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -95,6 +95,7 @@ __DEFAULT_YES_OPTIONS = \ ICONV \ INET \ INET6 \ + INETD \ IPFILTER \ IPFW \ JAIL \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 68e85c3851d..cefaab22c64 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2013,6 +2013,13 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz OLD_FILES+=rescue/ping6 .endif +.if ${MK_INETD} == no +OLD_FILES+=etc/rc.d/inetd +OLD_FILES+=usr/sbin/inetd +OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz +OLD_FILES+=usr/share/man/man8/inetd.8.gz +.endif + .if ${MK_INFO} == no OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey diff --git a/tools/build/options/WITHOUT_INETD b/tools/build/options/WITHOUT_INETD new file mode 100644 index 00000000000..b4fe5dce7b3 --- /dev/null +++ b/tools/build/options/WITHOUT_INETD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build +.Xr inetd 8 . diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 1f45385fa52..dd29a0d49a2 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -34,7 +34,6 @@ SUBDIR= adduser \ gstat \ i2c \ ifmcstat \ - inetd \ iostat \ iscsid \ kldxref \ @@ -175,6 +174,10 @@ SUBDIR+= rtsold SUBDIR+= traceroute6 .endif +.if ${MK_INETD} != "no" +SUBDIR+= inetd +.endif + .if ${MK_IPFW} != "no" SUBDIR+= ipfwpcap .endif From 1bdede93d8fc7416168c2bd1bae922e34638d23a Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:01:49 +0000 Subject: [PATCH 06/53] Make src.opts.mk the source of truth for whether or not to build hyperv In particular, according to several Makefiles it can only be built/run on amd64 and i386/i386. It isn't supported on i386/pc98 --- share/mk/src.opts.mk | 8 +++++++- usr.sbin/Makefile.i386 | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index b9b6687dac9..0a469280f9d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -91,7 +91,6 @@ __DEFAULT_YES_OPTIONS = \ GPL_DTC \ GROFF \ HTML \ - HYPERV \ ICONV \ INET \ INET6 \ @@ -213,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif +# hyperv is only supported on amd64 and i386/i386 +.if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") +__DEFAULT_YES_OPTIONS+=HYPERV +.else +MK_HYPERV:= no +.endif + .include # diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index 772c11d0205..de7bb464f58 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -9,6 +9,9 @@ SUBDIR+= asf SUBDIR+= btxld .endif SUBDIR+= cpucontrol +.if ${MK_HYPERV} != "no" +SUBDIR+= hyperv +.endif SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol @@ -28,9 +31,6 @@ SUBDIR+= zzz SUBDIR+= acpi .endif SUBDIR+= boot0cfg -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif .if ${MK_WIRELESS} != "no" SUBDIR+= wlconfig .endif From c341279404d2f175b9169d13bcafe6b9bf6e7975 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:17:12 +0000 Subject: [PATCH 07/53] Add an additional src.conf doc snippet for WITH_HYPERV --- tools/build/options/WITH_HYPERV | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tools/build/options/WITH_HYPERV diff --git a/tools/build/options/WITH_HYPERV b/tools/build/options/WITH_HYPERV new file mode 100644 index 00000000000..a6bdf72ff3e --- /dev/null +++ b/tools/build/options/WITH_HYPERV @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build and install HyperV utilities. From 4be1ca354c7cf79c8a9d28f71782c7241332ee9f Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:20:25 +0000 Subject: [PATCH 08/53] Make building/installing bhyve optional via MK_BHYVE on amd64 Disable building/installing bhyve from src.opts.mk on unsupported architectures (!amd64) --- share/examples/Makefile | 7 +++++-- share/man/man4/Makefile | 5 ++++- share/mk/src.opts.mk | 7 +++++++ tools/build/mk/OptionalObsoleteFiles.inc | 8 ++++++++ tools/build/options/WITHOUT_BHYVE | 4 ++++ tools/build/options/WITH_BHYVE | 4 ++++ usr.sbin/Makefile.amd64 | 2 ++ 7 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 tools/build/options/WITHOUT_BHYVE create mode 100644 tools/build/options/WITH_BHYVE diff --git a/share/examples/Makefile b/share/examples/Makefile index 79de48eb312..609344f66e2 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -7,7 +7,6 @@ LDIRS= BSD_daemon \ FreeBSD_version \ IPv6 \ - bhyve \ bootforth \ csh \ diskless \ @@ -42,7 +41,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ FreeBSD_version/Makefile \ FreeBSD_version/README \ IPv6/USAGE \ - bhyve/vmrun.sh \ bootforth/README \ bootforth/boot.4th \ bootforth/frames.4th \ @@ -207,6 +205,11 @@ NO_OBJ= # in environments where it's not possible to keep /sys publicly readable) SHARED?= copies +.if ${MK_BHYVE} != "no" +LDIRS+= bhyve +XFILES+= bhyve/vmrun.sh +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 76b3d55c2c6..1aefe7a4f13 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -835,7 +835,6 @@ _xnb.4= xnb.4 .endif .if ${MACHINE_CPUARCH} == "amd64" -_bhyve.4= bhyve.4 _if_ntb.4= if_ntb.4 _ntb.4= ntb.4 _ntb_hw.4= ntb_hw.4 @@ -858,6 +857,10 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_BHYVE} != "no" +_bhyve.4= bhyve.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0a469280f9d..87af499a12d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -212,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif +# bhyve is only supported on amd64 +.if ${__T} == "amd64" +__DEFAULT_YES_OPTIONS+=BHYVE +.else +MK_BHYVE:= no +.endif + # hyperv is only supported on amd64 and i386/i386 .if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") __DEFAULT_YES_OPTIONS+=HYPERV diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index cefaab22c64..60f2551ffe5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -144,6 +144,14 @@ OLD_FILES+=usr/share/man/man8/authpf.8.gz OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_BHYVE} == no +OLD_FILES+=usr/sbin/bhyve +OLD_FILES+=usr/sbin/bhyvectl +OLD_FILES+=usr/sbin/bhyveload +OLD_FILES+=usr/share/man/man8/bhyve.8.gz +OLD_FILES+=usr/share/man/man8/bhyveload.8.gz +.endif + .if ${MK_BLUETOOTH} == no OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts diff --git a/tools/build/options/WITHOUT_BHYVE b/tools/build/options/WITHOUT_BHYVE new file mode 100644 index 00000000000..f60fd17ddba --- /dev/null +++ b/tools/build/options/WITHOUT_BHYVE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bhyve 8 , +associated utilities, and examples. diff --git a/tools/build/options/WITH_BHYVE b/tools/build/options/WITH_BHYVE new file mode 100644 index 00000000000..b136928c128 --- /dev/null +++ b/tools/build/options/WITH_BHYVE @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build and install +.Xr bhyve 8 , +associated utilities, and examples. diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 2d1a3e8daad..3f40974c7a0 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -10,9 +10,11 @@ SUBDIR+= acpi SUBDIR+= apm .endif SUBDIR+= asf +.if ${MK_BHYVE} != "no" SUBDIR+= bhyve SUBDIR+= bhyvectl SUBDIR+= bhyveload +.endif SUBDIR+= boot0cfg .if ${MK_TOOLCHAIN} != "no" SUBDIR+= btxld From 05d9930e0f44d7c4a65df1493776b4b479df719e Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:37:55 +0000 Subject: [PATCH 09/53] Only install etc/rc.d/bsnmpd if MK_BSNMP == yes --- etc/rc.d/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index d90fc835026..0bd1a96a616 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -27,7 +27,7 @@ FILES= DAEMON \ ${_bluetooth} \ bootparams \ bridge \ - bsnmpd \ + ${_bsnmpd} \ ${_bthidd} \ ${_casperd} \ ccd \ @@ -171,6 +171,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BSNMP} != "no" +_bsnmpd= bsnmpd +.endif + .if ${MK_CASPER} != "no" _casperd= casperd .endif From 6d94729e30e4ba3502ff862939843656adcb7616 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:38:23 +0000 Subject: [PATCH 10/53] Fill in entries for MK_BSNMP == no --- tools/build/mk/OptionalObsoleteFiles.inc | 82 ++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 60f2551ffe5..33f39c322ff 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -315,6 +315,88 @@ OLD_FILES+=usr/share/man/man8/sade.8.gz OLD_DIRS+=usr/libexec/bsdinstall .endif +.if ${MK_BSNMP} == no +OLD_FILES+=etc/rc.d/bsnmpd +OLD_FILES+=usr/bin/bsnmpget +OLD_FILES+=usr/bin/bsnmpset +OLD_FILES+=usr/bin/bsnmpwalk +OLD_FILES+=usr/include/bsnmp/asn1.h +OLD_FILES+=usr/include/bsnmp/bridge_snmp.h +OLD_FILES+=usr/include/bsnmp/snmp.h +OLD_FILES+=usr/include/bsnmp/snmp_mibII.h +OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h +OLD_FILES+=usr/include/bsnmp/snmpagent.h +OLD_FILES+=usr/include/bsnmp/snmpclient.h +OLD_FILES+=usr/include/bsnmp/snmpmod.h +OLD_FILES+=usr/lib/libbsnmp.a +OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_FILES+=usr/lib/libbsnmptools.a +OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_FILES+=usr/lib/snmp_bridge.so.6 +OLD_FILES+=usr/lib/snmp_hast.so.6 +OLD_FILES+=usr/lib/snmp_hostres.so.6 +OLD_FILES+=usr/lib/snmp_lm75.so.6 +OLD_FILES+=usr/lib/snmp_mibII.so.6 +OLD_FILES+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_target.so.6 +OLD_FILES+=usr/lib/snmp_usm.so.6 +OLD_FILES+=usr/lib/snmp_vacm.so.6 +OLD_FILES+=usr/lib/snmp_wlan.so.6 +OLD_FILES+=usr/sbin/bsnmpd +OLD_FILES+=usr/sbin/gensnmptree +OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz +OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz +OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz +OLD_FILES+=usr/share/man/man3/asn1.3.gz +OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz +OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz +OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz +OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz +OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz +OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz +OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz +OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz +OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz +OLD_FILES+=usr/share/man/man3/snmp_target.3.gz +OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz +OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz +OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz +OLD_FILES+=usr/share/man/man3/snmpmod.3.gz +OLD_FILES+=usr/share/snmp/defs/bridge_tree.def +OLD_FILES+=usr/share/snmp/defs/hast_tree.def +OLD_FILES+=usr/share/snmp/defs/hostres_tree.def +OLD_FILES+=usr/share/snmp/defs/lm75_tree.def +OLD_FILES+=usr/share/snmp/defs/mibII_tree.def +OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/snmp/defs/pf_tree.def +OLD_FILES+=usr/share/snmp/defs/target_tree.def +OLD_FILES+=usr/share/snmp/defs/tree.def +OLD_FILES+=usr/share/snmp/defs/usm_tree.def +OLD_FILES+=usr/share/snmp/defs/vacm_tree.def +OLD_FILES+=usr/share/snmp/defs/wlan_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt +OLD_DIRS+=usr/include/bsnmp +OLD_DIRS+=usr/share/snmp +OLD_DIRS+=usr/share/snmp/defs +OLD_DIRS+=usr/share/snmp/mibs +.endif + .if ${MK_CALENDAR} == no OLD_FILES+=etc/periodic/daily/300.calendar OLD_FILES+=usr/bin/calendar From 9a2c263854da01e1ef7cddf83df0a43ccca15979 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 19:45:28 +0000 Subject: [PATCH 11/53] Don't build/install lib/libvmmapi if MK_BHYVE == no Suggested by: grehan --- lib/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index a5d0df52a76..af5fb625571 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -167,6 +167,10 @@ _csu=csu _libngatm= libngatm .endif +.if ${MK_BHYVE} != "no" +_libvmmapi= libvmmapi +.endif + .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp @@ -242,10 +246,6 @@ _libproc= libproc _librtld_db= librtld_db .endif -.if ${MACHINE_CPUARCH} == "amd64" -_libvmmapi= libvmmapi -.endif - .if ${MACHINE_CPUARCH} == "mips" _libproc= libproc _librtld_db= librtld_db From 88585cd46c468c46b9f2622fd546e7b66c175013 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 22:38:16 +0000 Subject: [PATCH 12/53] Add more MK_BSNMP == no entries for things not caught due to custom settings in $SRCCONF --- tools/build/mk/OptionalObsoleteFiles.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 33f39c322ff..63e0fb6cde2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -323,6 +323,7 @@ OLD_FILES+=usr/bin/bsnmpwalk OLD_FILES+=usr/include/bsnmp/asn1.h OLD_FILES+=usr/include/bsnmp/bridge_snmp.h OLD_FILES+=usr/include/bsnmp/snmp.h +OLD_FILES+=usr/include/bsnmp/snmp_atm.h OLD_FILES+=usr/include/bsnmp/snmp_mibII.h OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h OLD_FILES+=usr/include/bsnmp/snmpagent.h @@ -330,14 +331,18 @@ OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_FILES+=usr/lib/libbsnmptools_p.a +OLD_FILES+=usr/lib/snmp_atm.so.6 OLD_FILES+=usr/lib/snmp_bridge.so.6 OLD_FILES+=usr/lib/snmp_hast.so.6 OLD_FILES+=usr/lib/snmp_hostres.so.6 OLD_FILES+=usr/lib/snmp_lm75.so.6 OLD_FILES+=usr/lib/snmp_mibII.so.6 OLD_FILES+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_pf.so.6 OLD_FILES+=usr/lib/snmp_target.so.6 OLD_FILES+=usr/lib/snmp_usm.so.6 OLD_FILES+=usr/lib/snmp_vacm.so.6 @@ -353,6 +358,7 @@ OLD_FILES+=usr/share/man/man3/asn1.3.gz OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz +OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz @@ -364,6 +370,8 @@ OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz OLD_FILES+=usr/share/man/man3/snmpmod.3.gz +OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def +OLD_FILES+=usr/share/snmp/defs/atm_tree.def OLD_FILES+=usr/share/snmp/defs/bridge_tree.def OLD_FILES+=usr/share/snmp/defs/hast_tree.def OLD_FILES+=usr/share/snmp/defs/hostres_tree.def @@ -376,6 +384,8 @@ OLD_FILES+=usr/share/snmp/defs/tree.def OLD_FILES+=usr/share/snmp/defs/usm_tree.def OLD_FILES+=usr/share/snmp/defs/vacm_tree.def OLD_FILES+=usr/share/snmp/defs/wlan_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt @@ -383,13 +393,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt -OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt -OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt OLD_DIRS+=usr/include/bsnmp OLD_DIRS+=usr/share/snmp From fe4c66a4f806597044d37ba70c6de6706de00bfa Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 25 Nov 2014 23:01:01 +0000 Subject: [PATCH 13/53] Add script I'm using to add entries to OptionalObsoleteFiles.inc --- tools/add-optional-obsolete-files-entries.sh | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 tools/add-optional-obsolete-files-entries.sh diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh new file mode 100755 index 00000000000..1c6de8c0206 --- /dev/null +++ b/tools/add-optional-obsolete-files-entries.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# +# Simple script for enumerating installed files for a list of directories +# +# usage: add-optional-obsolete-files-entries.sh directory .. +# +# $FreeBSD$ + +: ${TMPDIR=/tmp} + +DESTDIR=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit +trap "rm -Rf $DESTDIR" EXIT INT TERM + +# Don't pollute the output with +: ${SRCCONF=/dev/null} +: ${__MAKE_CONF=/dev/null} + +if [ $# -gt 0 ] +then + directories=$* +else + directories=. +fi + +export __MAKE_CONF DESTDIR SRCCONF + +SRCTOP=$(cd $(make -V'${.MAKE.MAKEFILES:M*/share/mk/sys.mk:H:H:H}'); pwd) + +# Don't install the manpage symlinks +(cd $SRCTOP; make hier INSTALL_SYMLINK=true MK_MAN=no >/dev/null) + +for directory in $directories +do + (cd $directory && make install >/dev/null) || exit +done +# Prune empty directories +# XXX: is [ -n ... ] call necessary? +while empty_dirs=$(find $DESTDIR -type d -and -empty) && [ -n "$empty_dirs" ] +do + rmdir $empty_dirs +done + +# Enumerate all of the installed files/directories +(cd $DESTDIR; + find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; + find -s . -type d -mindepth 1 -and \! -empty | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + sed -e 's,^,OLD_DIRS+=,' +) | sed -e 's,+=\./,+=,' From 3802be032310340c9f9a42e986de34b42bf18dfa Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 00:13:51 +0000 Subject: [PATCH 14/53] Remove deadcode --- libexec/rpc.rusersd/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index df2be379d08..7801a0cdcb0 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -7,9 +7,4 @@ MAN = rpc.rusersd.8 DPADD= ${LIBRPCSVC} ${LIBUTIL} LDADD= -lrpcsvc -lutil -#.if exists(/usr/X11R6/include/X11/extensions/xidle.h) -#CFLAGS+= -DXIDLE -#LDADD+= -L/usr/X11R6/lib -lXext -lX11 -#.endif - .include From bdf492a3ac3d6d35ee2694d1de48d5c0eb57b88b Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 02:37:00 +0000 Subject: [PATCH 15/53] Missed the bsnmp config file --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 63e0fb6cde2..25b62fbe051 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -316,6 +316,7 @@ OLD_DIRS+=usr/libexec/bsdinstall .endif .if ${MK_BSNMP} == no +OLD_FILES+=etc/snmpd.config OLD_FILES+=etc/rc.d/bsnmpd OLD_FILES+=usr/bin/bsnmpget OLD_FILES+=usr/bin/bsnmpset From 4bbfcad58016bd10bdedf239a4471dbe1bf4a360 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 02:46:48 +0000 Subject: [PATCH 16/53] Only install the accounting/apm rc scripts for MK_ACCT/MK_APM if the relevant knobs are set --- etc/rc.d/Makefile | 12 +++++++++--- tools/build/mk/OptionalObsoleteFiles.inc | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 0bd1a96a616..ef15d53b9f8 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -8,12 +8,9 @@ FILES= DAEMON \ NETWORKING \ SERVERS \ abi \ - accounting \ addswap \ adjkerntz \ amd \ - apm \ - apmd \ archdep \ atm1 \ atm2 \ @@ -164,6 +161,15 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_ACCT} != "no" +FILES+= accounting +.endif + +.if ${MK_APM} != "no" +FILES+= apm +FILES+= apmd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 25b62fbe051..d302898b9f7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6,6 +6,7 @@ # .if ${MK_ACCT} == no +OLD_FILES+=etc/rc.d/accounting OLD_FILES+=etc/periodic/daily/310.accounting OLD_FILES+=usr/sbin/accton OLD_FILES+=usr/sbin/sa @@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.8.gz .endif .if ${MK_APM} == no +OLD_FILES+=etc/rc.d/apm +OLD_FILES+=etc/rc.d/apmd OLD_FILES+=etc/apmd.conf OLD_FILES+=usr/sbin/apm OLD_FILES+=usr/share/examples/etc/apmd.conf From 961281fa16d3670c592ac27d5c8462f0e0f12fd1 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 02:59:37 +0000 Subject: [PATCH 17/53] Don't install the rsh and telnetd pam.d files if MK_RCMDS == no or MK_TELNET == no, respectively --- etc/pam.d/Makefile | 12 ++++++++++-- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile index 7369022cc8b..2d3356a8fca 100644 --- a/etc/pam.d/Makefile +++ b/etc/pam.d/Makefile @@ -2,6 +2,8 @@ NO_OBJ= +.include + FILES= README \ atrun \ cron \ @@ -10,11 +12,17 @@ FILES= README \ login \ other \ passwd pop3 \ - rsh \ sshd su system \ - telnetd \ xdm +.if ${MK_RCMDS} != "no" +FILES+= rsh +.endif + +.if ${MK_TELNET} != "no" +FILES+= telnetd +.endif + FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d302898b9f7..ea74c320323 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3913,6 +3913,7 @@ OLD_FILES+=usr/lib/private/libssh_p.a .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp +OLD_FILES+=etc/pam.d/rsh OLD_FILES+=etc/rc.d/rwho OLD_FILES+=etc/periodic/daily/140.clean-rwho OLD_FILES+=etc/periodic/daily/430.status-rwho @@ -4279,6 +4280,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat .endif .if ${MK_TELNET} == no +OLD_FILES+=etc/pam.d/telnetd OLD_FILES+=usr/bin/telnet OLD_FILES+=usr/libexec/telnetd OLD_FILES+=usr/share/man/man1/telnet.1.gz From fb624adcf88f0ead58d6be7c03c84e036580f0e1 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 03:38:12 +0000 Subject: [PATCH 18/53] MK_HYPERV: Sort OLD_FILES and add /usr/libexec/hyperv to OLD_DIRS --- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ea74c320323..e44ab9134ec 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4925,9 +4925,10 @@ OLD_FILES+=usr/share/examples/dma/mailer.conf .if ${MK_HYPERV} == no OLD_FILES+=etc/devd/hyperv.conf -OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig -OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info +OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info +OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig OLD_FILES+=usr/sbin/hv_kvp_daemon OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz +OLD_DIRS+=usr/libexec/hyperv .endif From 7e57795a34b906cdc7bf3356d968422bb453dd04 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 06:54:17 +0000 Subject: [PATCH 19/53] Don't try and build 32-bit versions of hyperv / bhyve --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7d828ec9d08..f54b3138cc3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -433,7 +433,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \ MK_TESTS=no LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - MK_MAN=no MK_INFO=no MK_HTML=no + MK_MAN=no MK_INFO=no MK_HTML=no MK_HYPERV=no MK_BHYVE=no LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \ MK_TOOLCHAIN=no ${IMAKE_INSTALL} .endif From 466046ec0d4dec84ee133aa1b6b22f9eaf6defa5 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 08:44:05 +0000 Subject: [PATCH 20/53] Conditionalize a number of components in the tree - bootparamd - bootpd - finger/fingerd - ftp/ftpd - hastctl/hastd - iscsid, et al - rbootd - talk/talkd - tcpd, et al - tftp/tftpd Add src.conf entries for the various components and do a best effort at adding components to tools/build/mk/OptionalObsoleteFiles.inc --- etc/Makefile | 5 +- etc/rc.d/Makefile | 22 ++++-- include/protocols/Makefile | 8 +- libexec/Makefile | 35 +++++++-- sbin/Makefile | 12 ++- share/examples/Makefile | 15 ++-- share/man/man4/Makefile | 7 +- share/mk/src.opts.mk | 10 +++ tools/build/mk/OptionalObsoleteFiles.inc | 97 ++++++++++++++++++++++++ tools/build/options/WITHOUT_BOOTPARAMD | 3 + tools/build/options/WITHOUT_BOOTPD | 3 + tools/build/options/WITHOUT_FINGER | 5 ++ tools/build/options/WITHOUT_FTP | 5 ++ tools/build/options/WITHOUT_HAST | 4 + tools/build/options/WITHOUT_ISCSI | 4 + tools/build/options/WITHOUT_RBOOTD | 3 + tools/build/options/WITHOUT_TALK | 5 ++ tools/build/options/WITHOUT_TCP_WRAPPERS | 4 + tools/build/options/WITHOUT_TFTP | 5 ++ usr.bin/Makefile | 25 ++++-- usr.sbin/Makefile | 17 ++++- 21 files changed, 260 insertions(+), 34 deletions(-) create mode 100644 tools/build/options/WITHOUT_BOOTPARAMD create mode 100644 tools/build/options/WITHOUT_BOOTPD create mode 100644 tools/build/options/WITHOUT_FINGER create mode 100644 tools/build/options/WITHOUT_FTP create mode 100644 tools/build/options/WITHOUT_HAST create mode 100644 tools/build/options/WITHOUT_ISCSI create mode 100644 tools/build/options/WITHOUT_RBOOTD create mode 100644 tools/build/options/WITHOUT_TALK create mode 100644 tools/build/options/WITHOUT_TCP_WRAPPERS create mode 100644 tools/build/options/WITHOUT_TFTP diff --git a/etc/Makefile b/etc/Makefile index d8d1f72b5ad..466bc7c9239 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -19,7 +19,6 @@ BIN1= auto_master \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ @@ -94,6 +93,10 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + .if ${MK_INETD} != "no" BIN1+= inetd.conf .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index ef15d53b9f8..855abcb7140 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -22,7 +22,6 @@ FILES= DAEMON \ autounmountd \ bgfsck \ ${_bluetooth} \ - bootparams \ bridge \ ${_bsnmpd} \ ${_bthidd} \ @@ -40,14 +39,12 @@ FILES= DAEMON \ dmesg \ dumpon \ fsck \ - ftpd \ gbde \ geli \ geli2 \ gptboot \ growfs \ gssd \ - hastd \ ${_hcsecd} \ hostapd \ hostid \ @@ -63,8 +60,6 @@ FILES= DAEMON \ ipropd_master \ ipropd_slave \ ipsec \ - iscsictl \ - iscsid \ jail \ ${_kadmind} \ ${_kdc} \ @@ -177,6 +172,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BOOTPARAMD} != "no" +FILES+= bootparams +.endif + .if ${MK_BSNMP} != "no" _bsnmpd= bsnmpd .endif @@ -185,10 +184,23 @@ _bsnmpd= bsnmpd _casperd= casperd .endif +.if ${MK_FTP} != "no" +FILES+= ftpd +.endif + +.if ${MK_HAST} != "no" +FILES+= hastd +.endif + .if ${MK_INETD} != "no" _inetd= inetd .endif +.if ${MK_ISCSI} != "no" +FILES+= iscsictl +FILES+= iscsid +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif diff --git a/include/protocols/Makefile b/include/protocols/Makefile index ddd8f21dc91..a9c82dbb25c 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,7 +1,13 @@ # $FreeBSD$ +.include + NO_OBJ= -INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h +INCS= dumprestore.h routed.h rwhod.h timed.h INCSDIR=${INCLUDEDIR}/protocols +.if ${MK_TALK} == "no" +INCS+= talkd.h +.endif + .include diff --git a/libexec/Makefile b/libexec/Makefile index 7d1c1f8ddae..27d245e5e07 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -5,18 +5,14 @@ SUBDIR= ${_atf} \ ${_atrun} \ - bootpd \ ${_casper} \ ${_comsat} \ ${_dma} \ ${_dma-mbox-create} \ - fingerd \ - ftpd \ getty \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ - rbootd \ revnetgroup \ ${_rlogind} \ rpc.rquotad \ @@ -28,11 +24,8 @@ SUBDIR= ${_atf} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - talkd \ - tcpd \ ${_telnetd} \ ${_tests} \ - tftpd \ ${_tftp-proxy} \ ulog-helper \ ${_ypxfr} @@ -41,10 +34,22 @@ SUBDIR= ${_atf} \ _atrun= atrun .endif +.if ${MK_BOOTPD} != "no" +SUBDIR+= bootpd +.endif + .if ${MK_CASPER} != "no" _casper= casper .endif +.if ${MK_FINGER} != "no" +SUBDIR+= fingerd +.endif + +.if ${MK_FTP} != "no" +SUBDIR+= ftpd +.endif + .if ${MK_MAIL} != "no" _comsat= comsat .endif @@ -71,6 +76,10 @@ _tftp-proxy= tftp-proxy _rtld-elf= rtld-elf .endif +.if ${MK_RBOOTD} != "no" +SUBDIR+= rbootd +.endif + .if ${MK_RCMDS} != "no" _rlogind= rlogind _rshd= rshd @@ -81,10 +90,22 @@ _mail.local= mail.local _smrsh= smrsh .endif +.if ${MK_TALK} != "no" +SUBDIR+= talkd +.endif + +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpd +.endif + .if ${MK_TELNET} != "no" _telnetd= telnetd .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftpd +.endif + .if ${MK_TESTS} != "no" _atf= atf _tests= tests diff --git a/sbin/Makefile b/sbin/Makefile index 3725270c4c3..7adaa929dee 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -31,11 +31,8 @@ SUBDIR=adjkerntz \ ggate \ growfs \ gvinum \ - hastctl \ - hastd \ ifconfig \ init \ - iscontrol \ kldconfig \ kldload \ kldstat \ @@ -86,6 +83,11 @@ SUBDIR+= casperd SUBDIR+= devd .endif +.if ${MK_HAST} != "no" +SUBDIR+= hastctl +SUBDIR+= hastd +.endif + .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif @@ -95,6 +97,10 @@ SUBDIR+= ipfw SUBDIR+= natd .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscontrol +.endif + .if ${MK_NAND} != "no" SUBDIR+= nandfs SUBDIR+= newfs_nandfs diff --git a/share/examples/Makefile b/share/examples/Makefile index 609344f66e2..7fd8723aa30 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -13,7 +13,6 @@ LDIRS= BSD_daemon \ drivers \ etc \ find_interface \ - hast \ ibcs2 \ indent \ ipfw \ @@ -62,11 +61,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ find_interface/Makefile \ find_interface/README \ find_interface/find_interface.c \ - hast/ucarp.sh \ - hast/ucarp_down.sh \ - hast/ucarp_up.sh \ - hast/vip-down.sh \ - hast/vip-up.sh \ ibcs2/README \ ibcs2/hello.uu \ indent/indent.pro \ @@ -210,6 +204,15 @@ LDIRS+= bhyve XFILES+= bhyve/vmrun.sh .endif +.if ${MK_HAST} != "no" +LDIRS+= hast +XFILES+= hast/ucarp.sh \ + hast/ucarp_down.sh \ + hast/ucarp_up.sh \ + hast/vip-down.sh \ + hast/vip-up.sh +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 1aefe7a4f13..7fa6dea4a67 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -206,8 +206,6 @@ MAN= aac.4 \ ipw.4 \ ipwfw.4 \ isci.4 \ - iscsi.4 \ - iscsi_initiator.4 \ ismt.4 \ isp.4 \ ispfw.4 \ @@ -861,6 +859,11 @@ SUBDIR= man4.${MACHINE_CPUARCH} _bhyve.4= bhyve.4 .endif +.if ${MK_ISCSI} != "no" +MAN+= iscsi.4 +MAN+= iscsi_initiator.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 87af499a12d..9132d23ed27 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -56,6 +56,8 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ BOOT \ + BOOTPD \ + BOOTPARAMD \ BSD_CPIO \ BSDINSTALL \ BSNMP \ @@ -76,11 +78,13 @@ __DEFAULT_YES_OPTIONS = \ ED_CRYPTO \ EXAMPLES \ FDT \ + FINGER \ FLOPPY \ FMTREE \ FORTH \ FP_LIBC \ FREEBSD_UPDATE \ + FTP \ GAMES \ GCOV \ GDB \ @@ -90,6 +94,7 @@ __DEFAULT_YES_OPTIONS = \ GPIO \ GPL_DTC \ GROFF \ + HAST \ HTML \ ICONV \ INET \ @@ -97,6 +102,7 @@ __DEFAULT_YES_OPTIONS = \ INETD \ IPFILTER \ IPFW \ + ISCSI \ JAIL \ KDUMP \ KVM \ @@ -130,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \ PPP \ QUOTAS \ RCMDS \ + RBOOTD \ RCS \ RESCUE \ ROUTED \ @@ -143,10 +150,13 @@ __DEFAULT_YES_OPTIONS = \ SYSCALL_COMPAT \ SYSCONS \ SYSINSTALL \ + TALK \ + TCP_WRAPPERS \ TCSH \ TELNET \ TESTS \ TEXTPROC \ + TFTP \ UNBOUND \ USB \ UTMPX \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e44ab9134ec..c1ddf1cd2de 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -285,6 +285,26 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz # to be filled in #.endif +.if ${MK_BOOTPARAMD} == no +OLD_FILES+=rc.d/bootparams +OLD_FILES+=usr/sbin/bootparamd +OLD_FILES+=usr/sbin/callbootd +OLD_FILES+=usr/share/man/man5/bootparams.5.gz +OLD_FILES+=usr/share/man/man8/bootparamd.8.gz +.endif + +.if ${MK_BOOTPD} == no +OLD_FILES+=usr/libexec/bootpd +OLD_FILES+=usr/libexec/bootpgw +OLD_FILES+=usr/sbin/bootpef +OLD_FILES+=usr/sbin/bootptest +OLD_FILES+=usr/share/man/man5/bootptab.5.gz +OLD_FILES+=usr/share/man/man8/bootpd.8.gz +OLD_FILES+=usr/share/man/man8/bootpef.8.gz +OLD_FILES+=usr/share/man/man8/bootpgw.8.gz +OLD_FILES+=usr/share/man/man8/bootptest.8.gz +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -742,6 +762,14 @@ OLD_FILES+=usr/share/man/man1/gperf.1.gz .endif .endif +.if ${MK_FINGER} == no +OLD_FILES+=usr/bin/finger +OLD_FILES+=usr/libexec/fingerd +OLD_FILES+=usr/share/man/man1/finger.1.gz +OLD_FILES+=usr/share/man/man5/finger.conf.5.gz +OLD_FILES+=usr/share/man/man8/fingerd.8.gz +.endif + .if ${MK_FMTREE} == no OLD_FILES+=usr/sbin/fmtree OLD_FILES+=usr/share/man/man8/fmtree.8.gz @@ -1358,6 +1386,18 @@ OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar @@ -2053,6 +2093,20 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif +.if ${MK_HAST} == no +OLD_FILES+=sbin/hastctl +OLD_FILES+=sbin/hastd +OLD_FILES+=usr/share/examples/hast/ucarp.sh +OLD_FILES+=usr/share/examples/hast/ucarp_down.sh +OLD_FILES+=usr/share/examples/hast/ucarp_up.sh +OLD_FILES+=usr/share/examples/hast/vip-down.sh +OLD_FILES+=usr/share/examples/hast/vip-up.sh +OLD_FILES+=usr/share/man/man5/hast.conf.5.gz +OLD_FILES+=usr/share/man/man8/hastctl.8.gz +OLD_FILES+=usr/share/man/man8/hastd.8.gz +OLD_DIRS+=usr/share/examples/hast +.endif + .if ${MK_HESIOD} == no OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/hesiod.h @@ -2252,6 +2306,20 @@ OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz OLD_FILES+=usr/share/man/man8/natd.8.gz .endif +.if ${MK_ISCSI} == no +OLD_FILES+=etc/rc.d/iscsictl +OLD_FILES+=etc/rc.d/iscsid +OLD_FILES+=sbin/iscontrol +OLD_FILES+=usr/bin/iscsictl +OLD_FILES+=usr/sbin/iscsid +OLD_FILES+=usr/share/man/man4/iscsi.4.gz +OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz +OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz +OLD_FILES+=usr/share/man/man8/iscontrol.8.gz +OLD_FILES+=usr/share/man/man8/iscsictl.8.gz +OLD_FILES+=usr/share/man/man8/iscsid.8.gz +.endif + .if ${MK_JAIL} == no OLD_FILES+=usr/sbin/jail OLD_FILES+=usr/sbin/jexec @@ -3911,6 +3979,11 @@ OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh_p.a .endif +.if ${MK_RBOOTD} == no +OLD_FILES+=usr/libexec/rbootd +OLD_FILES+=usr/share/man/man8/rbootd.8.gz +.endif + .if ${MK_RCMDS} == no OLD_FILES+=bin/rcp OLD_FILES+=etc/pam.d/rsh @@ -4219,6 +4292,23 @@ OLD_DIRS+=usr/share/doc/pjdfstest # to be filled in #.endif +.if ${MK_TALK} == no +OLD_FILES+=usr/bin/talk +OLD_FILES+=usr/include/protocols/talkd.h +OLD_FILES+=usr/libexec/ntalkd +OLD_FILES+=usr/share/man/man1/talk.1.gz +OLD_FILES+=usr/share/man/man8/talkd.8.gz +.endif + +.if ${MK_TCP_WRAPPERS} == no +OLD_FILES+=usr/libexec/tcpd +OLD_FILES+=usr/sbin/tcpdchk +OLD_FILES+=usr/sbin/tcpdmatch +OLD_FILES+=usr/share/man/man8/tcpd.8.gz +OLD_FILES+=usr/share/man/man8/tcpdchk.8.gz +OLD_FILES+=usr/share/man/man8/tcpdmatch.8.gz +.endif + .if ${MK_TCSH} == no OLD_FILES+=bin/csh OLD_FILES+=bin/tcsh @@ -4287,6 +4377,13 @@ OLD_FILES+=usr/share/man/man1/telnet.1.gz OLD_FILES+=usr/share/man/man8/telnetd.8.gz .endif +.if ${MK_TFTP} == no +OLD_FILES+=usr/bin/tftp +OLD_FILES+=usr/libexec/tftpd +OLD_FILES+=usr/share/man/man1/tftp.1.gz +OLD_FILES+=usr/share/man/man8/tftpd.8.gz +.endif + .if ${MK_TESTS} == yes OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp diff --git a/tools/build/options/WITHOUT_BOOTPARAMD b/tools/build/options/WITHOUT_BOOTPARAMD new file mode 100644 index 00000000000..f9960830fd2 --- /dev/null +++ b/tools/build/options/WITHOUT_BOOTPARAMD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootparamd 8 . diff --git a/tools/build/options/WITHOUT_BOOTPD b/tools/build/options/WITHOUT_BOOTPD new file mode 100644 index 00000000000..6733d5a7b83 --- /dev/null +++ b/tools/build/options/WITHOUT_BOOTPD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bootpd 8 . diff --git a/tools/build/options/WITHOUT_FINGER b/tools/build/options/WITHOUT_FINGER new file mode 100644 index 00000000000..7f654083a3c --- /dev/null +++ b/tools/build/options/WITHOUT_FINGER @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . diff --git a/tools/build/options/WITHOUT_FTP b/tools/build/options/WITHOUT_FTP new file mode 100644 index 00000000000..5e0fc8eedc1 --- /dev/null +++ b/tools/build/options/WITHOUT_FTP @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . diff --git a/tools/build/options/WITHOUT_HAST b/tools/build/options/WITHOUT_HAST new file mode 100644 index 00000000000..0c31b8c3d0c --- /dev/null +++ b/tools/build/options/WITHOUT_HAST @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr hastd 8 +and related utilities. diff --git a/tools/build/options/WITHOUT_ISCSI b/tools/build/options/WITHOUT_ISCSI new file mode 100644 index 00000000000..83f3d7467ba --- /dev/null +++ b/tools/build/options/WITHOUT_ISCSI @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr iscid 8 +and related utilities. diff --git a/tools/build/options/WITHOUT_RBOOTD b/tools/build/options/WITHOUT_RBOOTD new file mode 100644 index 00000000000..f7c33e194c8 --- /dev/null +++ b/tools/build/options/WITHOUT_RBOOTD @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr rbootd 8 . diff --git a/tools/build/options/WITHOUT_TALK b/tools/build/options/WITHOUT_TALK new file mode 100644 index 00000000000..33d41675000 --- /dev/null +++ b/tools/build/options/WITHOUT_TALK @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr talk 1 +and +.Xr talkd 8 . diff --git a/tools/build/options/WITHOUT_TCP_WRAPPERS b/tools/build/options/WITHOUT_TCP_WRAPPERS new file mode 100644 index 00000000000..7c41198308b --- /dev/null +++ b/tools/build/options/WITHOUT_TCP_WRAPPERS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tcpd 8 , +and related utilities. diff --git a/tools/build/options/WITHOUT_TFTP b/tools/build/options/WITHOUT_TFTP new file mode 100644 index 00000000000..bdb51ac7cfa --- /dev/null +++ b/tools/build/options/WITHOUT_TFTP @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 298903e5e5b..879cedaeba5 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -49,12 +49,10 @@ SUBDIR= alias \ fetch \ file \ find \ - finger \ fmt \ fold \ fstat \ fsync \ - ftp \ gcore \ gencat \ getconf \ @@ -68,7 +66,6 @@ SUBDIR= alias \ id \ ipcrm \ ipcs \ - iscsictl \ join \ jot \ ${_kdump} \ @@ -160,12 +157,10 @@ SUBDIR= alias \ systat \ tabs \ tail \ - talk \ tar \ tcopy \ tee \ ${_tests} \ - tftp \ time \ timeout \ tip \ @@ -236,10 +231,18 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_FINGER} != "no" +SUBDIR+= finger +.endif + .if ${MK_FMAKE} != "no" SUBDIR+= make .endif +.if ${MK_FTP} != "no" +SUBDIR+= ftp +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif @@ -258,6 +261,10 @@ _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsictl +.endif + .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss @@ -330,6 +337,10 @@ SUBDIR+= rwho SUBDIR+= vacation .endif +.if ${MK_TALK} != "no" +SUBDIR+= talk +.endif + .if ${MK_TELNET} != "no" SUBDIR+= telnet .endif @@ -344,6 +355,10 @@ SUBDIR+= colcrt SUBDIR+= ul .endif +.if ${MK_TFTP} != "no" +SUBDIR+= tftp +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= ar SUBDIR+= c89 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index dd29a0d49a2..cc686d07e38 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -7,7 +7,6 @@ SUBDIR= adduser \ arp \ autofs \ binmiscctl \ - bootparamd \ bsdconfig \ cdcontrol \ chkgrp \ @@ -35,7 +34,6 @@ SUBDIR= adduser \ i2c \ ifmcstat \ iostat \ - iscsid \ kldxref \ mailwrapper \ makefs \ @@ -82,8 +80,6 @@ SUBDIR= adduser \ spray \ syslogd \ sysrc \ - tcpdchk \ - tcpdmatch \ tcpdrop \ tcpdump \ timed \ @@ -126,6 +122,10 @@ SUBDIR+= authpf SUBDIR+= bluetooth .endif +.if ${MK_BOOTPARAMD} != "no" +SUBDIR+= bootparamd +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif @@ -182,6 +182,10 @@ SUBDIR+= inetd SUBDIR+= ipfwpcap .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsid +.endif + .if ${MK_JAIL} != "no" SUBDIR+= jail SUBDIR+= jexec @@ -294,6 +298,11 @@ SUBDIR+= praliases SUBDIR+= sendmail .endif +.if ${MK_TCP_WRAPPERS} != "no" +SUBDIR+= tcpdchk +SUBDIR+= tcpdmatch +.endif + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif From 12de3059d049b66cc1ca95509c253dc1359b2816 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 12:49:37 +0000 Subject: [PATCH 21/53] Fix some accidentally inverted logic --- include/protocols/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/protocols/Makefile b/include/protocols/Makefile index a9c82dbb25c..0008c76fb87 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -6,7 +6,7 @@ NO_OBJ= INCS= dumprestore.h routed.h rwhod.h timed.h INCSDIR=${INCLUDEDIR}/protocols -.if ${MK_TALK} == "no" +.if ${MK_TALK} != "no" INCS+= talkd.h .endif From 046cc7b93efb079e02456dad8172f924009c8c48 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 12:54:58 +0000 Subject: [PATCH 22/53] Account for /usr/include/protocols/r{outed,whod}.h with their respective build knobs --- include/protocols/Makefile | 10 +++++++++- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/protocols/Makefile b/include/protocols/Makefile index 0008c76fb87..c39002ef959 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -3,9 +3,17 @@ .include NO_OBJ= -INCS= dumprestore.h routed.h rwhod.h timed.h +INCS= dumprestore.h timed.h INCSDIR=${INCLUDEDIR}/protocols +.if ${MK_RCMDS} != "no" +INCS+= rwhod.h +.endif + +.if ${MK_ROUTED} != "no" +INCS+= routed.h +.endif + .if ${MK_TALK} != "no" INCS+= talkd.h .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c1ddf1cd2de..98dd39c7da7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3985,6 +3985,7 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz .endif .if ${MK_RCMDS} == no +OLD_FILES+=usr/include/protocols/rwhod.h OLD_FILES+=bin/rcp OLD_FILES+=etc/pam.d/rsh OLD_FILES+=etc/rc.d/rwho @@ -4040,6 +4041,7 @@ OLD_FILES+=usr/share/man/man8/etcupdate.8.gz #.endif .if ${MK_ROUTED} == no +OLD_FILES+=usr/include/protocols/routed.h OLD_FILES+=sbin/routed OLD_FILES+=sbin/rtquery OLD_FILES+=usr/share/man/man8/routed.8.gz From a3f5edf093c370c21ef6a0496c073c1b0194cfd3 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 13:25:09 +0000 Subject: [PATCH 23/53] Add MK_TIMED option for optionally building usr.sbin/timed, et al --- etc/rc.d/Makefile | 5 ++++- share/mk/src.opts.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 8 ++++++++ tools/build/options/WITHOUT_TIMED | 3 +++ usr.sbin/Makefile | 5 ++++- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 tools/build/options/WITHOUT_TIMED diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 855abcb7140..427cb7545e7 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -137,7 +137,6 @@ FILES= DAEMON \ syscons \ sysctl \ syslogd \ - timed \ tmp \ ${_ubthidhci} \ ugidfw \ @@ -236,6 +235,10 @@ FILES+= ftp-proxy FILES+= rwho .endif +.if ${MK_TIMED} != "no" +FILES+= timed +.endif + .if ${MK_UNBOUND} != "no" _unbound= local_unbound .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 9132d23ed27..a18e1a1308e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -157,6 +157,7 @@ __DEFAULT_YES_OPTIONS = \ TESTS \ TEXTPROC \ TFTP \ + TIMED \ UNBOUND \ USB \ UTMPX \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 98dd39c7da7..e7fa7f657e0 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4911,6 +4911,14 @@ OLD_FILES+=${TESTS_FILES} . endif .endif # Test suite. +.if ${MK_TIMED} == no +OLD_FILES+=etc/rc.d/timed +OLD_FILES+=usr/sbin/timed +OLD_FILES+=usr/sbin/timedc +OLD_FILES+=usr/share/man/man8/timed.8.gz +OLD_FILES+=usr/share/man/man8/timedc.8.gz +.endif + #.if ${MK_TOOLCHAIN} == no # to be filled in #.endif diff --git a/tools/build/options/WITHOUT_TIMED b/tools/build/options/WITHOUT_TIMED new file mode 100644 index 00000000000..a1f4c6859a3 --- /dev/null +++ b/tools/build/options/WITHOUT_TIMED @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr timed 8 . diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index cc686d07e38..2b6cb1b62d8 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -82,7 +82,6 @@ SUBDIR= adduser \ sysrc \ tcpdrop \ tcpdump \ - timed \ traceroute \ trpt \ tzsetup \ @@ -307,6 +306,10 @@ SUBDIR+= tcpdmatch SUBDIR+= tests .endif +.if ${MK_TIMED} != "no" +SUBDIR+= timed +.endif + .if ${MK_TOOLCHAIN} != "no" SUBDIR+= config SUBDIR+= crunch From 24dce9ffb7d197f6a574cba1960195c4aa79bd67 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 13:26:12 +0000 Subject: [PATCH 24/53] Ignore LIBPRIVATEDIR when suggesting directories to prune --- tools/add-optional-obsolete-files-entries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index 1c6de8c0206..7776780a4d4 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -44,6 +44,6 @@ done (cd $DESTDIR; find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; find -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From ece34a4f2de9d58100ff37c2a149ba5b6bb4b97b Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 14:01:27 +0000 Subject: [PATCH 25/53] Fix use of OLD_FILES and OLD_LIBS for MK_BSNMP and MK_TESTS Convention in the file is that .a files be added to OLD_FILES and versioned .so's be added to OLD_LIBS --- tools/build/mk/OptionalObsoleteFiles.inc | 40 ++++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e7fa7f657e0..f74b099262a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -354,23 +354,23 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a -OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_LIBS+=usr/lib/libbsnmp.so.6 OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a -OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a -OLD_FILES+=usr/lib/snmp_atm.so.6 -OLD_FILES+=usr/lib/snmp_bridge.so.6 -OLD_FILES+=usr/lib/snmp_hast.so.6 -OLD_FILES+=usr/lib/snmp_hostres.so.6 -OLD_FILES+=usr/lib/snmp_lm75.so.6 -OLD_FILES+=usr/lib/snmp_mibII.so.6 -OLD_FILES+=usr/lib/snmp_netgraph.so.6 -OLD_FILES+=usr/lib/snmp_pf.so.6 -OLD_FILES+=usr/lib/snmp_target.so.6 -OLD_FILES+=usr/lib/snmp_usm.so.6 -OLD_FILES+=usr/lib/snmp_vacm.so.6 -OLD_FILES+=usr/lib/snmp_wlan.so.6 +OLD_LIBS+=usr/lib/snmp_atm.so.6 +OLD_LIBS+=usr/lib/snmp_bridge.so.6 +OLD_LIBS+=usr/lib/snmp_hast.so.6 +OLD_LIBS+=usr/lib/snmp_hostres.so.6 +OLD_LIBS+=usr/lib/snmp_lm75.so.6 +OLD_LIBS+=usr/lib/snmp_mibII.so.6 +OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_LIBS+=usr/lib/snmp_pf.so.6 +OLD_LIBS+=usr/lib/snmp_target.so.6 +OLD_LIBS+=usr/lib/snmp_usm.so.6 +OLD_LIBS+=usr/lib/snmp_vacm.so.6 +OLD_LIBS+=usr/lib/snmp_wlan.so.6 OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz @@ -4390,15 +4390,15 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp OLD_FILES+=usr/include/atf-c/config.h -OLD_LIBS+=usr/lib/libatf-c++.a +OLD_FILES+=usr/lib/libatf-c++.a OLD_LIBS+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_LIBS+=usr/lib/libatf-c++.so.2 -OLD_LIBS+=usr/lib/libatf-c++_p.a -OLD_LIBS+=usr/lib/libatf-c.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c.a OLD_LIBS+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_LIBS+=usr/lib/libatf-c_p.a +OLD_FILES+=usr/lib/libatf-c_p.a OLD_LIBS+=usr/lib/private/libatf-c.so.0 OLD_LIBS+=usr/lib/private/libatf-c++.so.1 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -4878,11 +4878,11 @@ OLD_FILES+=usr/include/atf-c++/tests.hpp OLD_FILES+=usr/include/atf-c++/utils.hpp OLD_FILES+=usr/include/atf-c++.hpp OLD_FILES+=usr/lib/libatf-c_p.a -OLD_FILES+=usr/lib/libatf-c.so.1 +OLD_LIBS+=usr/lib/libatf-c.so.1 OLD_FILES+=usr/lib/libatf-c.so OLD_FILES+=usr/lib/libatf-c++.a OLD_FILES+=usr/lib/libatf-c++_p.a -OLD_FILES+=usr/lib/libatf-c++.so.1 +OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/libexec/atf-check From 38082ac9aed3bbef5c81dfee18880c1c3fec4b06 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 21:17:32 +0000 Subject: [PATCH 26/53] - Handle OLD_LIBS properly by looking for versioned .so's - Filter out /usr/libdata and /usr/libdata/pkgconfig from OLD_DIRS --- tools/add-optional-obsolete-files-entries.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index 7776780a4d4..f4c5ed69b8f 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -42,8 +42,10 @@ done # Enumerate all of the installed files/directories (cd $DESTDIR; - find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,'; + find -s . -type f -mindepth 1 | \ + sed -e 's,^,OLD_FILES+=,' \ + -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \ + grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From 0341ccf22728f358d39b1f696786e7a34ce23669 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 21:18:52 +0000 Subject: [PATCH 27/53] Clean up more usb related files when MK_USB == no when dealing with manpages, libraries, and binaries --- include/Makefile | 6 +- share/examples/Makefile | 17 +- share/man/man4/Makefile | 119 ++++---- share/man/man9/Makefile | 7 +- share/misc/Makefile | 9 +- tools/build/mk/OptionalObsoleteFiles.inc | 371 +++++++++++++++++++++++ 6 files changed, 462 insertions(+), 67 deletions(-) diff --git a/include/Makefile b/include/Makefile index fe62e5e26d4..6003e2683bb 100644 --- a/include/Makefile +++ b/include/Makefile @@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ - dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ + dev/speaker dev/utopia dev/vkbd dev/wi \ fs/cuse \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ @@ -57,6 +57,10 @@ LSUBDIRS= cam/ata cam/scsi \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MK_USB} != "no" +LSUBDIRS+= dev/usb +.endif + LSUBSUBDIRS= dev/mpt/mpilib .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" diff --git a/share/examples/Makefile b/share/examples/Makefile index 7fd8723aa30..6d8eceba130 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -18,7 +18,6 @@ LDIRS= BSD_daemon \ ipfw \ jails \ kld \ - libusb20 \ libvgl \ mdoc \ netgraph \ @@ -92,12 +91,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/syscall/module/syscall.c \ kld/syscall/test/Makefile \ kld/syscall/test/call.c \ - libusb20/Makefile \ - libusb20/README \ - libusb20/util.c \ - libusb20/util.h \ - libusb20/bulk.c \ - libusb20/control.c \ libvgl/Makefile \ libvgl/demo.c \ mdoc/POSIX-copyright \ @@ -213,6 +206,16 @@ XFILES+= hast/ucarp.sh \ hast/vip-up.sh .endif +.if ${MK_USB} != "no" +LDIRS+= libusb20 +XFILES+= libusb20/Makefile \ + libusb20/README \ + libusb20/util.c \ + libusb20/util.h \ + libusb20/bulk.c \ + libusb20/control.c +.endif + beforeinstall: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7fa6dea4a67..ad8e622cc00 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -503,56 +503,6 @@ MAN= aac.4 \ tws.4 \ tx.4 \ txp.4 \ - u3g.4 \ - uark.4 \ - uart.4 \ - uath.4 \ - ubsa.4 \ - ubsec.4 \ - ubser.4 \ - ubtbcmfw.4 \ - uchcom.4 \ - ucom.4 \ - ucycom.4 \ - udav.4 \ - udbp.4 \ - udp.4 \ - udplite.4 \ - uep.4 \ - ufm.4 \ - ufoma.4 \ - uftdi.4 \ - ugen.4 \ - uhci.4 \ - uhid.4 \ - uhso.4 \ - uipaq.4 \ - ukbd.4 \ - uled.4 \ - ulpt.4 \ - umass.4 \ - umcs.4 \ - umct.4 \ - umodem.4 \ - umoscom.4 \ - ums.4 \ - unix.4 \ - upgt.4 \ - uplcom.4 \ - ural.4 \ - urio.4 \ - urndis.4 \ - ${_urtw.4} \ - urtwn.4 \ - urtwnfw.4 \ - usb.4 \ - usb_template.4 \ - usb_quirk.4 \ - uslcom.4 \ - usfs.4 \ - utopia.4 \ - uvisor.4 \ - uvscom.4 \ vale.4 \ vga.4 \ vge.4 \ @@ -733,13 +683,6 @@ MLINKS+=tl.4 if_tl.4 MLINKS+=tun.4 if_tun.4 MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 -MLINKS+=u3g.4 u3gstub.4 -MLINKS+=uath.4 if_uath.4 -MLINKS+=udav.4 if_udav.4 -MLINKS+=upgt.4 if_upgt.4 -MLINKS+=ural.4 if_ural.4 -MLINKS+=urndis.4 if_urndis.4 -MLINKS+=${_urtw.4} ${_if_urtw.4} MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vxlan.4 if_vxlan.4 @@ -876,4 +819,66 @@ _pflog.4= pflog.4 _pfsync.4= pfsync.4 .endif +.if ${MK_USB} != "no" +MAN+= \ + u3g.4 \ + uark.4 \ + uart.4 \ + uath.4 \ + ubsa.4 \ + ubsec.4 \ + ubser.4 \ + ubtbcmfw.4 \ + uchcom.4 \ + ucom.4 \ + ucycom.4 \ + udav.4 \ + udbp.4 \ + udp.4 \ + udplite.4 \ + uep.4 \ + ufm.4 \ + ufoma.4 \ + uftdi.4 \ + ugen.4 \ + uhci.4 \ + uhid.4 \ + uhso.4 \ + uipaq.4 \ + ukbd.4 \ + uled.4 \ + ulpt.4 \ + umass.4 \ + umcs.4 \ + umct.4 \ + umodem.4 \ + umoscom.4 \ + ums.4 \ + unix.4 \ + upgt.4 \ + uplcom.4 \ + ural.4 \ + urio.4 \ + urndis.4 \ + ${_urtw.4} \ + urtwn.4 \ + urtwnfw.4 \ + usb.4 \ + usb_quirk.4 \ + usb_template.4 \ + usfs.4 \ + uslcom.4 + utopia.4 \ + uvisor.4 \ + uvscom.4 \ + +MLINKS+=u3g.4 u3gstub.4 +MLINKS+=uath.4 if_uath.4 +MLINKS+=udav.4 if_udav.4 +MLINKS+=upgt.4 if_upgt.4 +MLINKS+=ural.4 if_ural.4 +MLINKS+=urndis.4 if_urndis.4 +MLINKS+=${_urtw.4} ${_if_urtw.4} +.endif + .include diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 6b6ee16165c..eef10fcbf95 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + MAN= accept_filter.9 \ accf_data.9 \ accf_dns.9 \ @@ -272,7 +274,6 @@ MAN= accept_filter.9 \ uidinfo.9 \ uio.9 \ unr.9 \ - usbdi.9 \ utopia.9 \ vaccess.9 \ vaccess_acl_nfs4.9 \ @@ -1600,6 +1601,9 @@ MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 \ uio.9 uiomove_nofault.9 + +.if ${MK_USB} != "no" +MAN+= usbdi.9 MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ @@ -1651,6 +1655,7 @@ MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usb_fifo_reset.9 \ usbdi.9 usb_fifo_softc.9 \ usbdi.9 usb_fifo_wakeup.9 +.endif MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ diff --git a/share/misc/Makefile b/share/misc/Makefile index 3e2afc43125..16f803c2b27 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,15 +1,22 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD$ +.include + .PATH: ${.CURDIR}/../../sys/dev/usb FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ committers-src.dot eqnchar flowers init.ee \ iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ - scsi_modes usb_hid_usages usbdevs \ + scsi_modes \ organization.dot NO_OBJ= FILESDIR= ${BINDIR}/misc +.if ${MK_USB} != "no" +FILES+= usb_hid_usages +FILES+= usbdevs +.endif + .include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f74b099262a..08d722c213b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4946,6 +4946,377 @@ OLD_FILES+=usr/sbin/unbound-control-setup .if ${MK_USB} == no OLD_FILES+=etc/devd/uauth.conf OLD_FILES+=etc/devd/usb.conf +OLD_FILES+=usr/bin/usbhidaction +OLD_FILES+=usr/bin/usbhidctl +OLD_FILES+=usr/include/dev/usb/ufm_ioctl.h +OLD_FILES+=usr/include/dev/usb/uftdiio.h +OLD_FILES+=usr/include/dev/usb/uled_ioctl.h +OLD_FILES+=usr/include/dev/usb/usb.h +OLD_FILES+=usr/include/dev/usb/usb_bus.h +OLD_FILES+=usr/include/dev/usb/usb_busdma.h +OLD_FILES+=usr/include/dev/usb/usb_cdc.h +OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h +OLD_FILES+=usr/include/dev/usb/usb_controller.h +OLD_FILES+=usr/include/dev/usb/usb_core.h +OLD_FILES+=usr/include/dev/usb/usb_debug.h +OLD_FILES+=usr/include/dev/usb/usb_dev.h +OLD_FILES+=usr/include/dev/usb/usb_device.h +OLD_FILES+=usr/include/dev/usb/usb_dynamic.h +OLD_FILES+=usr/include/dev/usb/usb_endian.h +OLD_FILES+=usr/include/dev/usb/usb_freebsd.h +OLD_FILES+=usr/include/dev/usb/usb_freebsd_loader.h +OLD_FILES+=usr/include/dev/usb/usb_generic.h +OLD_FILES+=usr/include/dev/usb/usb_hub.h +OLD_FILES+=usr/include/dev/usb/usb_ioctl.h +OLD_FILES+=usr/include/dev/usb/usb_mbuf.h +OLD_FILES+=usr/include/dev/usb/usb_msctest.h +OLD_FILES+=usr/include/dev/usb/usb_pci.h +OLD_FILES+=usr/include/dev/usb/usb_pf.h +OLD_FILES+=usr/include/dev/usb/usb_process.h +OLD_FILES+=usr/include/dev/usb/usb_request.h +OLD_FILES+=usr/include/dev/usb/usb_transfer.h +OLD_FILES+=usr/include/dev/usb/usb_util.h +OLD_FILES+=usr/include/dev/usb/usbdi.h +OLD_FILES+=usr/include/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/dev/usb/usbhid.h +OLD_DIRS+=usr/include/dev/usb +OLD_FILES+=usr/include/libusb.h +OLD_FILES+=usr/include/libusb20.h +OLD_FILES+=usr/include/libusb20_desc.h +OLD_FILES+=usr/include/usb.h +OLD_FILES+=usr/include/usbhid.h +OLD_FILES+=usr/lib/libusb.a +OLD_LIBS+=usr/lib/libusb.so.3 +OLD_FILES+=usr/lib/libusb_p.a +OLD_FILES+=usr/lib/libusbhid.a +OLD_LIBS+=usr/lib/libusbhid.so.4 +OLD_FILES+=usr/lib/libusbhid_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libusb.a +OLD_LIBS+=usr/lib32/libusb.so.3 +OLD_FILES+=usr/lib32/libusbhid.a +OLD_LIBS+=usr/lib32/libusbhid.so.4 +.endif +OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc +OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc +OLD_FILES+=usr/sbin/usbconfig +OLD_FILES+=usr/sbin/usbdump +OLD_FILES+=usr/share/examples/libusb20/Makefile +OLD_FILES+=usr/share/examples/libusb20/README +OLD_FILES+=usr/share/examples/libusb20/bulk.c +OLD_FILES+=usr/share/examples/libusb20/control.c +OLD_FILES+=usr/share/examples/libusb20/util.c +OLD_FILES+=usr/share/examples/libusb20/util.h +OLD_DIRS+=usr/share/examples/libusb20 +OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz +OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz +OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz +OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz +OLD_FILES+=usr/share/man/man3/hid_init.3.gz +OLD_FILES+=usr/share/man/man3/hid_locate.3.gz +OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz +OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz +OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz +OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz +OLD_FILES+=usr/share/man/man3/libusb.3.gz +OLD_FILES+=usr/share/man/man3/libusb20.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz +OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/libusb_close.3.gz +OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz +OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz +OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz +OLD_FILES+=usr/share/man/man3/libusb_init.3.gz +OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open.3.gz +OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz +OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz +OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz +OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz +OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz +OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz +OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz +OLD_FILES+=usr/share/man/man3/libusbhid.3.gz +OLD_FILES+=usr/share/man/man3/usb.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz +OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz +OLD_FILES+=usr/share/man/man3/usb_close.3.gz +OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz +OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_device.3.gz +OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz +OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz +OLD_FILES+=usr/share/man/man3/usb_init.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz +OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz +OLD_FILES+=usr/share/man/man3/usb_open.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz +OLD_FILES+=usr/share/man/man3/usb_reset.3.gz +OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz +OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz +OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz +OLD_FILES+=usr/share/man/man3/usbhid.3.gz +OLD_FILES+=usr/share/man/man4/u3g.4.gz +OLD_FILES+=usr/share/man/man4/u3gstub.4.gz +OLD_FILES+=usr/share/man/man4/uark.4.gz +OLD_FILES+=usr/share/man/man4/uart.4.gz +OLD_FILES+=usr/share/man/man4/uath.4.gz +OLD_FILES+=usr/share/man/man4/ubsa.4.gz +OLD_FILES+=usr/share/man/man4/ubsec.4.gz +OLD_FILES+=usr/share/man/man4/ubser.4.gz +OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz +OLD_FILES+=usr/share/man/man4/uchcom.4.gz +OLD_FILES+=usr/share/man/man4/ucom.4.gz +OLD_FILES+=usr/share/man/man4/ucycom.4.gz +OLD_FILES+=usr/share/man/man4/udav.4.gz +OLD_FILES+=usr/share/man/man4/udbp.4.gz +OLD_FILES+=usr/share/man/man4/udp.4.gz +OLD_FILES+=usr/share/man/man4/udplite.4.gz +OLD_FILES+=usr/share/man/man4/uep.4.gz +OLD_FILES+=usr/share/man/man4/ufm.4.gz +OLD_FILES+=usr/share/man/man4/ufoma.4.gz +OLD_FILES+=usr/share/man/man4/uftdi.4.gz +OLD_FILES+=usr/share/man/man4/ugen.4.gz +OLD_FILES+=usr/share/man/man4/uhci.4.gz +OLD_FILES+=usr/share/man/man4/uhid.4.gz +OLD_FILES+=usr/share/man/man4/uhso.4.gz +OLD_FILES+=usr/share/man/man4/uipaq.4.gz +OLD_FILES+=usr/share/man/man4/ukbd.4.gz +OLD_FILES+=usr/share/man/man4/uled.4.gz +OLD_FILES+=usr/share/man/man4/ulpt.4.gz +OLD_FILES+=usr/share/man/man4/umass.4.gz +OLD_FILES+=usr/share/man/man4/umcs.4.gz +OLD_FILES+=usr/share/man/man4/umct.4.gz +OLD_FILES+=usr/share/man/man4/umodem.4.gz +OLD_FILES+=usr/share/man/man4/umoscom.4.gz +OLD_FILES+=usr/share/man/man4/ums.4.gz +OLD_FILES+=usr/share/man/man4/unix.4.gz +OLD_FILES+=usr/share/man/man4/upgt.4.gz +OLD_FILES+=usr/share/man/man4/uplcom.4.gz +OLD_FILES+=usr/share/man/man4/ural.4.gz +OLD_FILES+=usr/share/man/man4/urio.4.gz +OLD_FILES+=usr/share/man/man4/urndis.4.gz +OLD_FILES+=usr/share/man/man4/urtw.4.gz +OLD_FILES+=usr/share/man/man4/urtwn.4.gz +OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz +OLD_FILES+=usr/share/man/man4/usb.4.gz +OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz +OLD_FILES+=usr/share/man/man4/usb_template.4.gz +OLD_FILES+=usr/share/man/man4/usfs.4.gz +OLD_FILES+=usr/share/man/man4/uslcom.4.gz +OLD_FILES+=usr/share/man/man4/utopia.4.gz +OLD_FILES+=usr/share/man/man4/uvisor.4.gz +OLD_FILES+=usr/share/man/man4/uvscom.4.gz +OLD_FILES+=usr/share/man/man8/usbconfig.8.gz +OLD_FILES+=usr/share/man/man8/usbdump.8.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz +OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz +OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz +OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz +OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz +OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz +OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz +OLD_FILES+=usr/share/man/man9/usbdi.9.gz +OLD_FILES+=usr/share/misc/usb_hid_usages +OLD_FILES+=usr/share/misc/usbdevs .endif .if ${MK_UTMPX} == no From f8a682df154a6ea03a3476a3b987e023be481613 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 21:32:12 +0000 Subject: [PATCH 28/53] Add missing line continuation --- share/man/man4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ad8e622cc00..a1e020a6ea5 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -867,7 +867,7 @@ MAN+= \ usb_quirk.4 \ usb_template.4 \ usfs.4 \ - uslcom.4 + uslcom.4 \ utopia.4 \ uvisor.4 \ uvscom.4 \ From f5ce9d6be99139b8787f55cf9c579c00c0bfe016 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 21:53:53 +0000 Subject: [PATCH 29/53] Installing zzz(8) doesn't make sense when both ACPI and APM are disabled --- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 08d722c213b..028555156ac 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -58,6 +58,11 @@ OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz .endif +.if ${MK_APM} == no && ${MK_ACPI} == no +OLD_FILES+=usr/sbin/zzz +OLD_FILES+=usr/share/man/man8/zzz.8.gz +.endif + .if ${MK_AT} == no OLD_FILES+=usr/bin/at OLD_FILES+=usr/bin/atq From c1399c63ec419aaae204c3e4da308c9e4abdac5a Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 22:26:22 +0000 Subject: [PATCH 30/53] - Fix egrep -> grep typo introduced in previous commit - Do depth-first search on OLD_DIRS so the list is logically sorted --- tools/add-optional-obsolete-files-entries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index f4c5ed69b8f..d9095cec594 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -45,7 +45,7 @@ done find -s . -type f -mindepth 1 | \ sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; - find -s . -type d -mindepth 1 -and \! -empty | \ - grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \ + find -d -s . -type d -mindepth 1 -and \! -empty | \ + egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From 238fb74d5c0752456590f4ac831e7b9007084369 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 22:27:31 +0000 Subject: [PATCH 31/53] Followup to r275144 -- don't traverse down usr.sbin/zzz if ACPI/APM are disabled --- usr.sbin/Makefile.amd64 | 2 ++ usr.sbin/Makefile.i386 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 3f40974c7a0..d821510d89f 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -32,4 +32,6 @@ SUBDIR+= ndiscvt .endif SUBDIR+= sicontrol SUBDIR+= spkrtest +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" SUBDIR+= zzz +.endif diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index de7bb464f58..70e4ef5a391 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -23,7 +23,9 @@ SUBDIR+= ndiscvt SUBDIR+= pnpinfo SUBDIR+= sicontrol SUBDIR+= spkrtest +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" SUBDIR+= zzz +.endif # Differentiate between FreeBSD/i386 and FreeBSD/pc98 .if ${MACHINE} == "i386" From d96b818e7360a3891664235ba412af35db268c4e Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 22:41:51 +0000 Subject: [PATCH 32/53] - Fill in MK_LEGACY_CONSOLE == no and SYSCONS == no - Don't install syscons(4) - Don't install the moused or syscons rc.d scripts if MK_LEGACY_CONSOLE == no --- etc/rc.d/Makefile | 7 +- share/man/man4/Makefile | 5 +- tools/build/mk/OptionalObsoleteFiles.inc | 209 ++++++++++++++++++++++- 3 files changed, 215 insertions(+), 6 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 427cb7545e7..634895d6350 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -80,7 +80,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - moused \ mroute6d \ mrouted \ msgs \ @@ -134,7 +133,6 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - syscons \ sysctl \ syslogd \ tmp \ @@ -200,6 +198,11 @@ FILES+= iscsictl FILES+= iscsid .endif +.if ${MK_LEGACY_CONSOLE} != "no" +FILES+= moused +FILES+= syscons +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index a1e020a6ea5..2df7bdbc958 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -481,7 +481,6 @@ MAN= aac.4 \ sym.4 \ syncache.4 \ syncer.4 \ - syscons.4 \ sysmouse.4 \ tap.4 \ targ.4 \ @@ -819,6 +818,10 @@ _pflog.4= pflog.4 _pfsync.4= pfsync.4 .endif +.if ${MK_SYSCONS} != "no" +MAN+= syscons.4 +.endif + .if ${MK_USB} != "no" MAN+= \ u3g.4 \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 028555156ac..b5bfd33f0d2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3328,6 +3328,23 @@ OLD_FILES+=usr/bin/host OLD_FILES+=usr/share/man/man1/host.1.gz .endif +.if ${MK_LEGACY_CONSOLE} == no +OLD_FILES+=etc/rc.d/moused +OLD_FILES+=etc/rc.d/syscons +OLD_FILES+=usr/sbin/kbdcontrol +OLD_FILES+=usr/sbin/kbdmap +OLD_FILES+=usr/sbin/moused +OLD_FILES+=usr/sbin/vidcontrol +OLD_FILES+=usr/sbin/vidfont +OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz +OLD_FILES+=usr/share/man/man1/kbdmap.1.gz +OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz +OLD_FILES+=usr/share/man/man1/vidfont.1.gz +OLD_FILES+=usr/share/man/man5/kbdmap.5.gz +OLD_FILES+=usr/share/man/man5/keymap.5.gz +OLD_FILES+=usr/share/man/man8/moused.8.g +.endif + #.if ${MK_LIB32} == no # to be filled in #.endif @@ -4295,9 +4312,195 @@ OLD_FILES+=usr/share/doc/pjdfstest/README OLD_DIRS+=usr/share/doc/pjdfstest .endif -#.if ${MK_SYSCONS} == no -# to be filled in -#.endif +.if ${MK_SYSCONS} == no +OLD_FILES+=usr/share/man/man4/syscons.4.gz +OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt +OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt +OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps +OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd +OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/colemak.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/cs.latin2.qwertz.kbd +OLD_FILES+=usr/share/syscons/keymaps/cz.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.cp865.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/danish.iso.macbook.kbd +OLD_FILES+=usr/share/syscons/keymaps/dutch.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/eee_nordic.kbd +OLD_FILES+=usr/share/syscons/keymaps/el.iso07.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/estonian.iso15.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/finnish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/fr_CA.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/german.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.elot.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/gr.us101.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/hr.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.101keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hu.iso2.102keys.kbd +OLD_FILES+=usr/share/syscons/keymaps/hy.armscii-8.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/icelandic.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd +OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/latinamerican.kbd +OLD_FILES+=usr/share/syscons/keymaps/lt.iso4.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/norwegian.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.ISO8859-2.kbd +OLD_FILES+=usr/share/syscons/keymaps/pl_PL.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/pt.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.cp866.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.shift.kbd +OLD_FILES+=usr/share/syscons/keymaps/ru.koi8-r.win.kbd +OLD_FILES+=usr/share/syscons/keymaps/si.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/sk.iso2.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/spanish.iso15.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swedish.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissfrench.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/swissgerman.macbook.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/tr.iso9.q.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.iso5.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.kbd +OLD_FILES+=usr/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.cp850.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/uk.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorak.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakp.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakr.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.dvorakx.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.emacs.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.acc.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.iso.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.pc-ctrl.kbd +OLD_FILES+=usr/share/syscons/keymaps/us.unix.kbd +OLD_FILES+=usr/share/syscons/scrnmaps/armscii8-2haik8.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-1_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-4_for_vga9.scm +OLD_FILES+=usr/share/syscons/scrnmaps/iso-8859-7_to_cp437.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-r2cp866.scm +OLD_FILES+=usr/share/syscons/scrnmaps/koi8-u2cp866u.scm +OLD_FILES+=usr/share/syscons/scrnmaps/us-ascii_to_cp437.scm +OLD_DIRS+=usr/share/syscons/fonts +OLD_DIRS+=usr/share/syscons/keymaps +OLD_DIRS+=usr/share/syscons/scrnmaps +OLD_DIRS+=usr/share/syscons +.endif .if ${MK_TALK} == no OLD_FILES+=usr/bin/talk From bb9096f6cac86645886d7bd8049404d1445b26e5 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 26 Nov 2014 23:07:54 +0000 Subject: [PATCH 33/53] Move hyperv/vmm under MK_HYPERV/MK_BHYVE, respectively --- sys/modules/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index fedc92e362c..fe083910fd9 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -389,6 +389,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_BHYVE} != "no" || defined(ALL_MODULES) +_vmm= vmm +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto @@ -399,6 +403,10 @@ _random= random .endif .endif +.if ${MK_HYPERV} != "no" || defined(ALL_MODULES) +_hyperv= hyperv +.endif + .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) _carp= carp @@ -550,7 +558,6 @@ _hptmv= hptmv _hptnr= hptnr _hptrr= hptrr .endif -_hyperv= hyperv _ichwd= ichwd _ida= ida _iir= iir @@ -612,7 +619,6 @@ _qlxge= qlxge _qlxgb= qlxgb _qlxgbe= qlxgbe _sfxge= sfxge -_vmm= vmm .endif .if ${MACHINE_CPUARCH} == "i386" From 49a61f07c165a756949f854b49b2ead881eaa956 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 00:02:42 +0000 Subject: [PATCH 34/53] Only build iscsi/iscsi_initiator if MK_ISCSI != no --- sys/modules/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index fe083910fd9..f66d6c2a2fb 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -171,8 +171,6 @@ SUBDIR= \ ${_ipw} \ ${_ipwfw} \ ${_isci} \ - iscsi \ - iscsi_initiator \ isp \ ${_ispfw} \ ${_iwi} \ @@ -425,6 +423,11 @@ _ipfw= ipfw _ipfilter= ipfilter .endif +.if ${MK_ISCSI} != "no" || defined(ALL_MODULES) +SUBDIR+= iscsi +SUBDIR+= iscsi_initiator +.endif + .if ${MK_NAND} != "no" || defined(ALL_MODULES) _nandfs= nandfs _nandsim= nandsim From e26856d614b4c610d0bb4592351167d330b718a4 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 00:10:16 +0000 Subject: [PATCH 35/53] Honor MK_NETGRAPH for netgraph components --- share/examples/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/share/examples/Makefile b/share/examples/Makefile index 6d8eceba130..a0bd647c19e 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -20,7 +20,6 @@ LDIRS= BSD_daemon \ kld \ libvgl \ mdoc \ - netgraph \ perfmon \ ppi \ ppp \ @@ -99,13 +98,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ mdoc/example.3 \ mdoc/example.4 \ mdoc/example.9 \ - netgraph/ether.bridge \ - netgraph/frame_relay \ - netgraph/ngctl \ - netgraph/raw \ - netgraph/udp.tunnel \ - netgraph/virtual.chain \ - netgraph/virtual.lan \ perfmon/Makefile \ perfmon/README \ perfmon/perfmon.c \ @@ -206,6 +198,17 @@ XFILES+= hast/ucarp.sh \ hast/vip-up.sh .endif +.if ${MK_NETGRAPH} != "no" +LDIRS+= netgraph +XFILES+= netgraph/ether.bridge \ + netgraph/frame_relay \ + netgraph/ngctl \ + netgraph/raw \ + netgraph/udp.tunnel \ + netgraph/virtual.chain \ + netgraph/virtual.lan +.endif + .if ${MK_USB} != "no" LDIRS+= libusb20 XFILES+= libusb20/Makefile \ From 44834b8f270ea2cec7ce73954183cd2073948ccf Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 00:10:59 +0000 Subject: [PATCH 36/53] Honor MK_NETGRAPH for netgraph manpages --- share/man/man4/Makefile | 120 +++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2df7bdbc958..0fcdda2e93a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -290,65 +290,7 @@ MAN= aac.4 \ netmap.4 \ ${_nfe.4} \ ${_nfsmb.4} \ - ng_async.4 \ - ng_atm.4 \ - ngatmbase.4 \ - ng_atmllc.4 \ - ng_bluetooth.4 \ - ng_bpf.4 \ - ng_bridge.4 \ - ng_bt3c.4 \ - ng_btsocket.4 \ - ng_car.4 \ - ng_ccatm.4 \ - ng_cisco.4 \ - ng_deflate.4 \ - ng_device.4 \ nge.4 \ - ng_echo.4 \ - ng_eiface.4 \ - ng_etf.4 \ - ng_ether.4 \ - ng_ether_echo.4 \ - ng_frame_relay.4 \ - ng_gif.4 \ - ng_gif_demux.4 \ - ng_h4.4 \ - ng_hci.4 \ - ng_hole.4 \ - ng_hub.4 \ - ng_iface.4 \ - ng_ipfw.4 \ - ng_ip_input.4 \ - ng_ksocket.4 \ - ng_l2cap.4 \ - ng_l2tp.4 \ - ng_lmi.4 \ - ng_mppc.4 \ - ng_nat.4 \ - ng_netflow.4 \ - ng_one2many.4 \ - ng_patch.4 \ - ng_ppp.4 \ - ng_pppoe.4 \ - ng_pptpgre.4 \ - ng_pred1.4 \ - ng_rfc1490.4 \ - ng_socket.4 \ - ng_source.4 \ - ng_split.4 \ - ng_sppp.4 \ - ng_sscfu.4 \ - ng_sscop.4 \ - ng_tag.4 \ - ng_tcpmss.4 \ - ng_tee.4 \ - ng_tty.4 \ - ng_ubt.4 \ - ng_UI.4 \ - ng_uni.4 \ - ng_vjc.4 \ - ng_vlan.4 \ nmdm.4 \ nsp.4 \ ${_ntb.4} \ @@ -806,6 +748,68 @@ MAN+= iscsi.4 MAN+= iscsi_initiator.4 .endif +.if ${MK_NETGRAPH} != "no" +MAN+= \ + ng_async.4 \ + ng_atm.4 \ + ngatmbase.4 \ + ng_atmllc.4 \ + ng_bluetooth.4 \ + ng_bpf.4 \ + ng_bridge.4 \ + ng_bt3c.4 \ + ng_btsocket.4 \ + ng_car.4 \ + ng_ccatm.4 \ + ng_cisco.4 \ + ng_deflate.4 \ + ng_device.4 \ + ng_echo.4 \ + ng_eiface.4 \ + ng_etf.4 \ + ng_ether.4 \ + ng_ether_echo.4 \ + ng_frame_relay.4 \ + ng_gif.4 \ + ng_gif_demux.4 \ + ng_h4.4 \ + ng_hci.4 \ + ng_hole.4 \ + ng_hub.4 \ + ng_iface.4 \ + ng_ipfw.4 \ + ng_ip_input.4 \ + ng_ksocket.4 \ + ng_l2cap.4 \ + ng_l2tp.4 \ + ng_lmi.4 \ + ng_mppc.4 \ + ng_nat.4 \ + ng_netflow.4 \ + ng_one2many.4 \ + ng_patch.4 \ + ng_ppp.4 \ + ng_pppoe.4 \ + ng_pptpgre.4 \ + ng_pred1.4 \ + ng_rfc1490.4 \ + ng_socket.4 \ + ng_source.4 \ + ng_split.4 \ + ng_sppp.4 \ + ng_sscfu.4 \ + ng_sscop.4 \ + ng_tag.4 \ + ng_tcpmss.4 \ + ng_tee.4 \ + ng_tty.4 \ + ng_ubt.4 \ + ng_UI.4 \ + ng_uni.4 \ + ng_vjc.4 \ + ng_vlan.4 +.endif + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc From 9f325b1e411b4f788818dc4cf358e332004304b7 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 03:59:57 +0000 Subject: [PATCH 37/53] Implement knobs for MK_NETGRAPH_SUPPORT --- share/mk/src.opts.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index a18e1a1308e..c99286879a0 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -123,6 +123,7 @@ __DEFAULT_YES_OPTIONS = \ NDIS \ NETCAT \ NETGRAPH \ + NETGRAPH_SUPPORT \ NLS_CATALOGS \ NS_CACHING \ NTP \ @@ -306,6 +307,7 @@ MK_DMAGENT:= no .if ${MK_NETGRAPH} == "no" MK_ATM:= no MK_BLUETOOTH:= no +MK_NETGRAPH_SUPPORT:= no .endif .if ${MK_OPENSSL} == "no" From ebb7b8dbb0aa21804c13c3216863adddda7b82e6 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 04:01:39 +0000 Subject: [PATCH 38/53] Honor MK_ATM, MK_CUSE, and MK_NETGRAPH_SUPPORT Shuffle around conditionals so they're better sorted --- include/Makefile | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/include/Makefile b/include/Makefile index 6003e2683bb..c13dba2ea08 100644 --- a/include/Makefile +++ b/include/Makefile @@ -36,8 +36,8 @@ PHDRS= sched.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ syslog.h ucontext.h -LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \ - netipsec netnatm netsmb nfs nfsclient nfsserver sys vm +LDIRS= bsm cam geom net net80211 netinet netinet6 \ + netipsec netsmb nfs nfsclient nfsserver sys vm LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ @@ -45,24 +45,40 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/utopia dev/vkbd dev/wi \ - fs/cuse \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ - netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +LSUBSUBDIRS= dev/mpt/mpilib + +.if ${MK_ATM} != "no" +LDIRS+= netnatm +LSUBDIRS+= netgraph/atm +.endif + +.if ${MK_BLUETOOTH} != "no" +LSUBSUBDIRS+= netgraph/bluetooth/include +.endif + +.if ${MK_CUSE} != "no" +LSUBDIRS+= fs/cuse +.endif + +.if ${MK_NETGRAPH_SUPPORT} != "no" +LDIRS+= netgraph +LSUBDIRS+= netgraph/netflow +.endif + .if ${MK_USB} != "no" LSUBDIRS+= dev/usb .endif -LSUBSUBDIRS= dev/mpt/mpilib - .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" _dev_powermac_nvram= dev/powermac_nvram .endif @@ -80,10 +96,6 @@ INCS+= gssapi.h INCS+= hesiod.h .endif -.if ${MK_BLUETOOTH} != "no" -LSUBSUBDIRS+= netgraph/bluetooth/include -.endif - # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" INCS+= iconv.h From f541dd9b519891eb8fb2a8f1737d2b9b59a71488 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 04:16:47 +0000 Subject: [PATCH 39/53] Implement MK_RADIUS_SUPPORT to make libradius and assorted support optional --- Makefile.inc1 | 6 +++++- lib/Makefile | 8 ++++++-- lib/libpam/modules/modules.inc | 4 ++++ share/mk/src.opts.mk | 5 +++++ tools/build/options/WITHOUT_RADIUS_SUPPORT | 5 +++++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 tools/build/options/WITHOUT_RADIUS_SUPPORT diff --git a/Makefile.inc1 b/Makefile.inc1 index f54b3138cc3..49577a57326 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1605,7 +1605,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1628,6 +1628,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif diff --git a/lib/Makefile b/lib/Makefile index af5fb625571..064587e2b52 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -80,7 +80,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libpmc} \ ${_libproc} \ libprocstat \ - libradius \ + ${_libradius} \ librpcsvc \ librt \ ${_librtld_db} \ @@ -140,7 +140,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd -SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} +SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd @@ -269,6 +269,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index 66fc63c89dc..1582931962c 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -7,7 +7,9 @@ MODULES += pam_chroot MODULES += pam_deny MODULES += pam_echo MODULES += pam_exec +.if ${MK_FTP} != "no" MODULES += pam_ftpusers +.endif MODULES += pam_group MODULES += pam_guest .if ${MK_KERBEROS} != "no" @@ -21,7 +23,9 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit +.if ${MK_RADIUS} != "no MODULES += pam_radius +.endif MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c99286879a0..de5a8e140cd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -136,6 +136,7 @@ __DEFAULT_YES_OPTIONS = \ PORTSNAP \ PPP \ QUOTAS \ + RADIUS_SUPPORT \ RCMDS \ RBOOTD \ RCS \ @@ -310,6 +311,10 @@ MK_BLUETOOTH:= no MK_NETGRAPH_SUPPORT:= no .endif +.if ${MK_NETGRAPH_SUPPORT} == "no" +MK_RADIUS_SUPPORT:= no +.endif + .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no diff --git a/tools/build/options/WITHOUT_RADIUS_SUPPORT b/tools/build/options/WITHOUT_RADIUS_SUPPORT new file mode 100644 index 00000000000..31f5aab012b --- /dev/null +++ b/tools/build/options/WITHOUT_RADIUS_SUPPORT @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . From 7a818dff67aa585b89e6f065194b55e1894b698d Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 04:19:01 +0000 Subject: [PATCH 40/53] Populate MK_CUSE, MK_NETGRAPH, MK_NETGRAPH_SUPPORT, and MK_RADIUS_SUPPORT --- tools/build/mk/OptionalObsoleteFiles.inc | 222 +++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b5bfd33f0d2..a8134b860f9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -753,6 +753,43 @@ OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz OLD_FILES+=usr/share/man/man5/ctm.5.gz .endif +.if ${MK_CUSE} == no +OLD_FILES+=usr/include/fs/cuse/cuse_defs.h +OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h +OLD_FILES+=usr/include/cuse.h +OLD_FILES+=usr/lib/libcuse.a +OLD_LIBS+=usr/lib/libcuse.so.1 +OLD_FILES+=usr/lib/libcuse_p.a +OLD_FILES+=usr/share/man/man3/cuse.3.gz +OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz +OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz +OLD_FILES+=usr/share/man/man3/cuse_copy_in.3.gz +OLD_FILES+=usr/share/man/man3/cuse_copy_out.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_create.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_destroy.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_current.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_per_file_handle.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv0.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv1.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_per_file_handle.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv0.3.gz +OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv1.3.gz +OLD_FILES+=usr/share/man/man3/cuse_free_unit_number.3.gz +OLD_FILES+=usr/share/man/man3/cuse_free_unit_number_by_id.3.gz +OLD_FILES+=usr/share/man/man3/cuse_get_local.3.gz +OLD_FILES+=usr/share/man/man3/cuse_got_peer_signal.3.gz +OLD_FILES+=usr/share/man/man3/cuse_init.3.gz +OLD_FILES+=usr/share/man/man3/cuse_is_vmalloc_addr.3.gz +OLD_FILES+=usr/share/man/man3/cuse_poll_wakeup.3.gz +OLD_FILES+=usr/share/man/man3/cuse_set_local.3.gz +OLD_FILES+=usr/share/man/man3/cuse_uninit.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmalloc.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmfree.3.gz +OLD_FILES+=usr/share/man/man3/cuse_vmoffset.3.gz +OLD_FILES+=usr/share/man/man3/cuse_wait_and_process.3.gz +OLD_DIRS+=usr/include/fs/cuse +.endif + # devd(8) not listed here on purpose .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC @@ -1395,12 +1432,14 @@ OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz OLD_FILES+=usr/bin/ftp OLD_FILES+=usr/bin/gate-ftp OLD_FILES+=usr/bin/pftp +OLD_LIBS+=usr/lib/pam_ftpusers.so.5 OLD_FILES+=usr/libexec/ftpd OLD_FILES+=usr/share/man/man1/ftp.1.gz OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz OLD_FILES+=usr/share/man/man1/pftp.1.gz OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz OLD_FILES+=usr/share/man/man8/ftpd.8.gz +OLD_FILES+=usr/share/man/man8/pam_ftpusers.8.gz .endif .if ${MK_GAMES} == no @@ -3570,6 +3609,143 @@ OLD_FILES+=usr/bin/nc OLD_FILES+=usr/share/man/man1/nc.1.gz .endif +.if ${MK_NETGRAPH} == no +OLD_FILES+=usr/sbin/ngctl +OLD_FILES+=usr/sbin/nghook +OLD_FILES+=usr/share/examples/netgraph/ether.bridge +OLD_FILES+=usr/share/examples/netgraph/frame_relay +OLD_FILES+=usr/share/examples/netgraph/ngctl +OLD_FILES+=usr/share/examples/netgraph/raw +OLD_FILES+=usr/share/examples/netgraph/udp.tunnel +OLD_FILES+=usr/share/examples/netgraph/virtual.chain +OLD_FILES+=usr/share/examples/netgraph/virtual.lan +OLD_FILES+=usr/share/man/man4/ng_UI.4.gz +OLD_FILES+=usr/share/man/man4/ng_async.4.gz +OLD_FILES+=usr/share/man/man4/ng_atm.4.gz +OLD_FILES+=usr/share/man/man4/ng_atmllc.4.gz +OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz +OLD_FILES+=usr/share/man/man4/ng_bpf.4.gz +OLD_FILES+=usr/share/man/man4/ng_bridge.4.gz +OLD_FILES+=usr/share/man/man4/ng_bt3c.4.gz +OLD_FILES+=usr/share/man/man4/ng_btsocket.4.gz +OLD_FILES+=usr/share/man/man4/ng_car.4.gz +OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz +OLD_FILES+=usr/share/man/man4/ng_cisco.4.gz +OLD_FILES+=usr/share/man/man4/ng_deflate.4.gz +OLD_FILES+=usr/share/man/man4/ng_device.4.gz +OLD_FILES+=usr/share/man/man4/ng_echo.4.gz +OLD_FILES+=usr/share/man/man4/ng_eiface.4.gz +OLD_FILES+=usr/share/man/man4/ng_etf.4.gz +OLD_FILES+=usr/share/man/man4/ng_ether.4.gz +OLD_FILES+=usr/share/man/man4/ng_ether_echo.4.gz +OLD_FILES+=usr/share/man/man4/ng_frame_relay.4.gz +OLD_FILES+=usr/share/man/man4/ng_gif.4.gz +OLD_FILES+=usr/share/man/man4/ng_gif_demux.4.gz +OLD_FILES+=usr/share/man/man4/ng_h4.4.gz +OLD_FILES+=usr/share/man/man4/ng_hci.4.gz +OLD_FILES+=usr/share/man/man4/ng_hole.4.gz +OLD_FILES+=usr/share/man/man4/ng_hub.4.gz +OLD_FILES+=usr/share/man/man4/ng_iface.4.gz +OLD_FILES+=usr/share/man/man4/ng_ip_input.4.gz +OLD_FILES+=usr/share/man/man4/ng_ipfw.4.gz +OLD_FILES+=usr/share/man/man4/ng_ksocket.4.gz +OLD_FILES+=usr/share/man/man4/ng_l2cap.4.gz +OLD_FILES+=usr/share/man/man4/ng_l2tp.4.gz +OLD_FILES+=usr/share/man/man4/ng_lmi.4.gz +OLD_FILES+=usr/share/man/man4/ng_mppc.4.gz +OLD_FILES+=usr/share/man/man4/ng_nat.4.gz +OLD_FILES+=usr/share/man/man4/ng_netflow.4.gz +OLD_FILES+=usr/share/man/man4/ng_one2many.4.gz +OLD_FILES+=usr/share/man/man4/ng_patch.4.gz +OLD_FILES+=usr/share/man/man4/ng_ppp.4.gz +OLD_FILES+=usr/share/man/man4/ng_pppoe.4.gz +OLD_FILES+=usr/share/man/man4/ng_pptpgre.4.gz +OLD_FILES+=usr/share/man/man4/ng_pred1.4.gz +OLD_FILES+=usr/share/man/man4/ng_rfc1490.4.gz +OLD_FILES+=usr/share/man/man4/ng_socket.4.gz +OLD_FILES+=usr/share/man/man4/ng_source.4.gz +OLD_FILES+=usr/share/man/man4/ng_split.4.gz +OLD_FILES+=usr/share/man/man4/ng_sppp.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz +OLD_FILES+=usr/share/man/man4/ng_tag.4.gz +OLD_FILES+=usr/share/man/man4/ng_tcpmss.4.gz +OLD_FILES+=usr/share/man/man4/ng_tee.4.gz +OLD_FILES+=usr/share/man/man4/ng_tty.4.gz +OLD_FILES+=usr/share/man/man4/ng_ubt.4.gz +OLD_FILES+=usr/share/man/man4/ng_uni.4.gz +OLD_FILES+=usr/share/man/man4/ng_vjc.4.gz +OLD_FILES+=usr/share/man/man4/ng_vlan.4.gz +OLD_FILES+=usr/share/man/man8/ngctl.8.gz +OLD_FILES+=usr/share/man/man8/nghook.8.gz +OLD_DIRS+=usr/share/examples/netgraph +.endif + +.if ${MK_NETGRAPH_SUPPORT} == no +OLD_FILES+=usr/include/netgraph/atm/ng_atm.h +OLD_FILES+=usr/include/netgraph/atm/ng_ccatm.h +OLD_FILES+=usr/include/netgraph/atm/ng_sscfu.h +OLD_FILES+=usr/include/netgraph/atm/ng_sscop.h +OLD_FILES+=usr/include/netgraph/atm/ng_uni.h +OLD_FILES+=usr/include/netgraph/atm/ngatmbase.h +OLD_FILES+=usr/include/netgraph/netflow/netflow.h +OLD_FILES+=usr/include/netgraph/netflow/netflow_v9.h +OLD_FILES+=usr/include/netgraph/netflow/ng_netflow.h +OLD_FILES+=usr/include/netgraph/netgraph.h +OLD_FILES+=usr/include/netgraph/ng_UI.h +OLD_FILES+=usr/include/netgraph/ng_async.h +OLD_FILES+=usr/include/netgraph/ng_atmllc.h +OLD_FILES+=usr/include/netgraph/ng_bpf.h +OLD_FILES+=usr/include/netgraph/ng_bridge.h +OLD_FILES+=usr/include/netgraph/ng_car.h +OLD_FILES+=usr/include/netgraph/ng_cisco.h +OLD_FILES+=usr/include/netgraph/ng_deflate.h +OLD_FILES+=usr/include/netgraph/ng_device.h +OLD_FILES+=usr/include/netgraph/ng_echo.h +OLD_FILES+=usr/include/netgraph/ng_eiface.h +OLD_FILES+=usr/include/netgraph/ng_etf.h +OLD_FILES+=usr/include/netgraph/ng_ether.h +OLD_FILES+=usr/include/netgraph/ng_ether_echo.h +OLD_FILES+=usr/include/netgraph/ng_frame_relay.h +OLD_FILES+=usr/include/netgraph/ng_gif.h +OLD_FILES+=usr/include/netgraph/ng_gif_demux.h +OLD_FILES+=usr/include/netgraph/ng_hole.h +OLD_FILES+=usr/include/netgraph/ng_hub.h +OLD_FILES+=usr/include/netgraph/ng_iface.h +OLD_FILES+=usr/include/netgraph/ng_ip_input.h +OLD_FILES+=usr/include/netgraph/ng_ipfw.h +OLD_FILES+=usr/include/netgraph/ng_ksocket.h +OLD_FILES+=usr/include/netgraph/ng_l2tp.h +OLD_FILES+=usr/include/netgraph/ng_lmi.h +OLD_FILES+=usr/include/netgraph/ng_message.h +OLD_FILES+=usr/include/netgraph/ng_mppc.h +OLD_FILES+=usr/include/netgraph/ng_nat.h +OLD_FILES+=usr/include/netgraph/ng_one2many.h +OLD_FILES+=usr/include/netgraph/ng_parse.h +OLD_FILES+=usr/include/netgraph/ng_patch.h +OLD_FILES+=usr/include/netgraph/ng_pipe.h +OLD_FILES+=usr/include/netgraph/ng_ppp.h +OLD_FILES+=usr/include/netgraph/ng_pppoe.h +OLD_FILES+=usr/include/netgraph/ng_pptpgre.h +OLD_FILES+=usr/include/netgraph/ng_pred1.h +OLD_FILES+=usr/include/netgraph/ng_rfc1490.h +OLD_FILES+=usr/include/netgraph/ng_sample.h +OLD_FILES+=usr/include/netgraph/ng_socket.h +OLD_FILES+=usr/include/netgraph/ng_socketvar.h +OLD_FILES+=usr/include/netgraph/ng_source.h +OLD_FILES+=usr/include/netgraph/ng_split.h +OLD_FILES+=usr/include/netgraph/ng_sppp.h +OLD_FILES+=usr/include/netgraph/ng_tag.h +OLD_FILES+=usr/include/netgraph/ng_tcpmss.h +OLD_FILES+=usr/include/netgraph/ng_tee.h +OLD_FILES+=usr/include/netgraph/ng_tty.h +OLD_FILES+=usr/include/netgraph/ng_vjc.h +OLD_FILES+=usr/include/netgraph/ng_vlan.h +OLD_DIRS+=usr/include/netgraph/atm +OLD_DIRS+=usr/include/netgraph/netflow +OLD_DIRS+=usr/include/netgraph +.endif + .if ${MK_NIS} == no OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn @@ -4001,6 +4177,52 @@ OLD_FILES+=usr/lib/private/libldns_p.a OLD_FILES+=usr/lib/private/libssh_p.a .endif +.if ${MK_RADIUS_SUPPORT} == no +OLD_FILES+=usr/include/radlib.h +OLD_FILES+=usr/include/radlib_vs.h +OLD_FILES+=usr/lib/libradius.a +OLD_LIBS+=usr/lib/libradius.so.4 +OLD_LIBS+=usr/lib/pam_radius.so.5 +OLD_FILES+=usr/lib/libradius_p.a +OLD_FILES+=usr/share/man/man3/libradius.3.gz +OLD_FILES+=usr/share/man/man3/rad_acct_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_add_server.3.gz +OLD_FILES+=usr/share/man/man3/rad_add_server_ex.3.gz +OLD_FILES+=usr/share/man/man3/rad_auth_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_bind_to.3.gz +OLD_FILES+=usr/share/man/man3/rad_close.3.gz +OLD_FILES+=usr/share/man/man3/rad_config.3.gz +OLD_FILES+=usr/share/man/man3/rad_continue_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_create_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_create_response.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_cvt_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_demangle.3.gz +OLD_FILES+=usr/share/man/man3/rad_demangle_mppe_key.3.gz +OLD_FILES+=usr/share/man/man3/rad_get_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_get_vendor_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_init_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_message_authentic.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_addr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_attr.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_int.3.gz +OLD_FILES+=usr/share/man/man3/rad_put_vendor_string.3.gz +OLD_FILES+=usr/share/man/man3/rad_receive_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_request_authenticator.3.gz +OLD_FILES+=usr/share/man/man3/rad_send_request.3.gz +OLD_FILES+=usr/share/man/man3/rad_send_response.3.gz +OLD_FILES+=usr/share/man/man3/rad_server_open.3.gz +OLD_FILES+=usr/share/man/man3/rad_server_secret.3.gz +OLD_FILES+=usr/share/man/man3/rad_strerror.3.gz +OLD_FILES+=usr/share/man/man5/radius.conf.5.gz +OLD_FILES+=usr/share/man/man8/pam_radius.8.gz +.endif + .if ${MK_RBOOTD} == no OLD_FILES+=usr/libexec/rbootd OLD_FILES+=usr/share/man/man8/rbootd.8.gz From 254aaed7cf21504ca627d8b865de2583e7d9ae2c Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 04:23:00 +0000 Subject: [PATCH 41/53] Fix typos: MK_RADIUS -> MK_RADIUS_SUPPORT --- lib/Makefile | 2 +- lib/libpam/modules/modules.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 064587e2b52..958721d37bb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -269,7 +269,7 @@ _libmp= libmp _libpmc= libpmc .endif -.if ${MK_RADIUS} != "no" +.if ${MK_RADIUS_SUPPORT} != "no" _libradius= libradius .endif diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index 1582931962c..a4bd282ed48 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -23,7 +23,7 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit -.if ${MK_RADIUS} != "no +.if ${MK_RADIUS_SUPPORT} != "no MODULES += pam_radius .endif MODULES += pam_rhosts From b13f4f90e483dbfd72f6ce6d1ba872bea45b5897 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:17:32 +0000 Subject: [PATCH 42/53] Fill in MK_BOOT for amd64 --- tools/build/mk/OptionalObsoleteFiles.inc | 64 ++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a8134b860f9..471ea27e082 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -156,8 +156,10 @@ OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl OLD_FILES+=usr/sbin/bhyveload +OLD_FILES+=usr/share/examples/bhyve/vmrun.sh OLD_FILES+=usr/share/man/man8/bhyve.8.gz OLD_FILES+=usr/share/man/man8/bhyveload.8.gz +OLD_DIRS+=usr/share/examples/bhyve .endif .if ${MK_BLUETOOTH} == no @@ -286,9 +288,65 @@ OLD_FILES+=usr/share/man/man8/sdpcontrol.8.gz OLD_FILES+=usr/share/man/man8/sdpd.8.gz .endif -#.if ${MK_BOOT} == no -# to be filled in -#.endif +.if ${MK_BOOT} == no +OLD_FILES+=boot/beastie.4th +OLD_FILES+=boot/boot +OLD_FILES+=boot/boot0 +OLD_FILES+=boot/boot0sio +OLD_FILES+=boot/boot1 +OLD_FILES+=boot/boot1.efi +OLD_FILES+=boot/boot1.efifat +OLD_FILES+=boot/boot2 +OLD_FILES+=boot/brand.4th +OLD_FILES+=boot/cdboot +OLD_FILES+=boot/check-password.4th +OLD_FILES+=boot/color.4th +OLD_FILES+=boot/defaults/loader.conf +OLD_FILES+=boot/delay.4th +OLD_FILES+=boot/device.hints +OLD_FILES+=boot/frames.4th +OLD_FILES+=boot/gptboot +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/loader +OLD_FILES+=boot/loader.4th +OLD_FILES+=boot/loader.efi +OLD_FILES+=boot/loader.help +OLD_FILES+=boot/loader.rc +OLD_FILES+=boot/mbr +OLD_FILES+=boot/menu-commands.4th +OLD_FILES+=boot/menu.4th +OLD_FILES+=boot/menu.rc +OLD_FILES+=boot/menusets.4th +OLD_FILES+=boot/pcibios.4th +OLD_FILES+=boot/pmbr +OLD_FILES+=boot/pxeboot +OLD_FILES+=boot/screen.4th +OLD_FILES+=boot/shortcuts.4th +OLD_FILES+=boot/support.4th +OLD_FILES+=boot/userboot.so +OLD_FILES+=boot/version.4th +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_FILES+=usr/lib/kgzldr.o +OLD_FILES+=usr/share/man/man5/loader.conf.5.gz +OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz +OLD_FILES+=usr/share/man/man8/brand.4th.8.gz +OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz +OLD_FILES+=usr/share/man/man8/color.4th.8.gz +OLD_FILES+=usr/share/man/man8/delay.4th.8.gz +OLD_FILES+=usr/share/man/man8/gptboot.8.gz +OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz +OLD_FILES+=usr/share/man/man8/loader.4th.8.gz +OLD_FILES+=usr/share/man/man8/loader.8.gz +OLD_FILES+=usr/share/man/man8/menu.4th.8.gz +OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz +OLD_FILES+=usr/share/man/man8/pxeboot.8.gz +OLD_FILES+=usr/share/man/man8/version.4th.8.gz +OLD_FILES+=usr/share/man/man8/zfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zfsloader.8.gz +OLD_DIRS+=boot/defaults +OLD_DIRS+=boot +.endif .if ${MK_BOOTPARAMD} == no OLD_FILES+=rc.d/bootparams From eaf49814e9ce20c9c846a7eaecca80da069b2874 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:19:36 +0000 Subject: [PATCH 43/53] Ignore boot and remove from MK_BOOT additions done in previous commit --- tools/add-optional-obsolete-files-entries.sh | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index d9095cec594..1aafdf316a8 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -46,6 +46,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 471ea27e082..62716212b12 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -345,7 +345,6 @@ OLD_FILES+=usr/share/man/man8/version.4th.8.gz OLD_FILES+=usr/share/man/man8/zfsboot.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_DIRS+=boot/defaults -OLD_DIRS+=boot .endif .if ${MK_BOOTPARAMD} == no From 7e8bf5690fc906df8992eea68d0d602361d8030f Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:26:20 +0000 Subject: [PATCH 44/53] Remove /etc/X11 entry from BSD.root.dist - FreeBSD hasn't packaged X11 with the distro since 8.x - X.org hasn't required xorg.conf [in /etc/X11] for some time now - X.org should work with ${LOCALBASE}/etc/X11 - This path should be included in the X.org package manifest --- etc/mtree/BSD.root.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index af2f6a9add0..5eb8c01a4f0 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -24,8 +24,6 @@ dev mode=0555 .. etc - X11 - .. autofs .. bluetooth From ee0d2af8e2a311fb27b87e7a999e705933aef064 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:33:50 +0000 Subject: [PATCH 45/53] Until I teach bsd.*.mk to accept NO_ROOT, make this script only accept root users --- tools/add-optional-obsolete-files-entries.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index 1aafdf316a8..9eeab4e1668 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -6,6 +6,12 @@ # # $FreeBSD$ +# NO_ROOT doesn't seem to work at a non-installworld, etc level yet +if [ $(id -u) -ne 0 ]; then + echo "${0##*/}: ERROR: this script must be run as root" + exit 1 +fi + : ${TMPDIR=/tmp} DESTDIR=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit From 899d8a5bd5e797ffbdb51e1b6b68b34d4f7b1a0f Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:49:25 +0000 Subject: [PATCH 46/53] Only install libmap32.conf if MK_LIB32 != no --- etc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 466bc7c9239..a9073f5db40 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -53,10 +53,6 @@ BIN1= auto_master \ syslog.conf \ termcap.small -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" -BIN1+= libmap32.conf -.endif - .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys) @@ -105,6 +101,10 @@ BIN1+= inetd.conf BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif +.if ${MK_LIB32} != "no" +BIN1+= libmap32.conf +.endif + .if ${MK_LPR} != "no" BIN1+= hosts.lpd printcap .endif From 0a579cc7074bae0ce20acc31f592776980d0c0e3 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 07:56:28 +0000 Subject: [PATCH 47/53] Handle MK_RADIUS_SUPPORT in usr.sbin/ppp --- usr.sbin/ppp/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index dda493e4534..7783f42909b 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -31,6 +31,9 @@ PPP_NO_NETGRAPH= .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif +.if ${MK_RADIUS_SUPPORT} == "no" +PPP_NO_RADIUS= +.endif .if defined(PPP_NO_SUID) BINMODE=554 From caedb5eb290137a4d2c8ff78e23d02c22dcaca39 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 08:31:20 +0000 Subject: [PATCH 48/53] Honor MK_EXAMPLES --- usr.sbin/bsdconfig/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile index 1f1ec9e6ca4..bfccce9be4b 100644 --- a/usr.sbin/bsdconfig/Makefile +++ b/usr.sbin/bsdconfig/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ +.include + SUBDIR= console \ diskmgmt \ docsinstall \ dot \ - examples \ include \ includes \ mouse \ @@ -25,4 +26,8 @@ SCRIPTS= bsdconfig MAN= bsdconfig.8 +.if ${MK_EXAMPLES} != "no" +SUBDIR+= examples +.endif + .include From b7c1742fa82fc3295d2c43258e2b801f406aada3 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 09:40:36 +0000 Subject: [PATCH 49/53] Filter out /lib, /usr/lib32, and fold the /usr/lib* checks into one expression --- tools/add-optional-obsolete-files-entries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh index 9eeab4e1668..8384b31a8ef 100755 --- a/tools/add-optional-obsolete-files-entries.sh +++ b/tools/add-optional-obsolete-files-entries.sh @@ -52,6 +52,6 @@ done sed -e 's,^,OLD_FILES+=,' \ -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g'; find -d -s . -type d -mindepth 1 -and \! -empty | \ - egrep -v '^\./(boot|s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ + egrep -v '^\./(boot|s*bin|lib|libexec|usr|usr/include|usr/lib(32|data|exec)?|usr/libdata/pkgconfig|usr/lib/private|usr/s*bin|usr/share|usr/share/(examples|man)|usr/share/man/man[0-9])$' | \ sed -e 's,^,OLD_DIRS+=,' ) | sed -e 's,+=\./,+=,' From a8b303ad4d16cae08e9da613228639ffb8889ab4 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 09:42:40 +0000 Subject: [PATCH 50/53] Add WITHOUT_AUTOFS and WITHOUT_BSDCONFIG --- etc/Makefile | 9 +++++++-- etc/rc.d/Makefile | 9 ++++++--- share/Makefile | 6 +++++- share/man/man5/Makefile | 5 ++++- share/mk/src.opts.mk | 2 ++ tools/build/options/WITHOUT_AUTOFS | 4 ++++ tools/build/options/WITHOUT_BSDCONFIG | 5 +++++ usr.sbin/Makefile | 12 +++++++++--- 8 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 tools/build/options/WITHOUT_AUTOFS create mode 100644 tools/build/options/WITHOUT_BSDCONFIG diff --git a/etc/Makefile b/etc/Makefile index a9073f5db40..8aa64e5f7f0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -11,8 +11,7 @@ SUBDIR= sendmail SUBDIR+=tests .endif -BIN1= auto_master \ - crontab \ +BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ @@ -81,6 +80,10 @@ BIN1+= amd.map BIN1+= apmd.conf .endif +.if ${MK_AUTOFS} != "no" +BIN1+= auto_master +.endif + .if ${MK_BSNMP} != "no" BIN1+= snmpd.config .endif @@ -232,7 +235,9 @@ distribution: echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif +.if ${MK_AUTOFS} != "no" ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install +.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 634895d6350..91b94e90c06 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -17,9 +17,6 @@ FILES= DAEMON \ atm3 \ auditd \ auditdistd \ - automount \ - automountd \ - autounmountd \ bgfsck \ ${_bluetooth} \ bridge \ @@ -162,6 +159,12 @@ FILES+= apm FILES+= apmd .endif +.if ${MK_AUTOFS} != "no" +FILES+= automount +FILES+= automountd +FILES+= autounmountd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd diff --git a/share/Makefile b/share/Makefile index 63c18bb6464..97d1dac540c 100644 --- a/share/Makefile +++ b/share/Makefile @@ -8,7 +8,7 @@ SUBDIR= ${_colldef} \ ${_dict} \ ${_doc} \ - dtrace \ + ${_dtrace} \ ${_examples} \ ${_i18n} \ keys \ @@ -37,6 +37,10 @@ SUBDIR= ${_colldef} \ _snmp= snmp .endif +.if ${MK_CDDL} != "no" +_dtrace= dtrace +.endif + .if ${MK_DICT} != "no" _dict= dict .endif diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index e8483355926..15056f3395e 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -7,7 +7,6 @@ MAN= acct.5 \ ar.5 \ a.out.5 \ - autofs.5 \ bluetooth.device.conf.5 \ bluetooth.hosts.5 \ bluetooth.protocols.5 \ @@ -80,6 +79,10 @@ MLINKS+=quota.user.5 quota.group.5 MLINKS+=rc.conf.5 rc.conf.local.5 MLINKS+=resolver.5 resolv.conf.5 +.if ${MK_AUTOFS} != "no" +MAN+= autofs.5 +.endif + .if ${MK_FREEBSD_UPDATE} != "no" MAN+= freebsd-update.conf.5 .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index de5a8e140cd..97e162adff6 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + AUTOFS \ BINUTILS \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ @@ -59,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \ BOOTPD \ BOOTPARAMD \ BSD_CPIO \ + BSDCONFIG \ BSDINSTALL \ BSNMP \ BZIP2 \ diff --git a/tools/build/options/WITHOUT_AUTOFS b/tools/build/options/WITHOUT_AUTOFS new file mode 100644 index 00000000000..f9c5c2ce5a1 --- /dev/null +++ b/tools/build/options/WITHOUT_AUTOFS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr autofs 4 +related programs, libraries, and kernel modules. diff --git a/tools/build/options/WITHOUT_BSDCONFIG b/tools/build/options/WITHOUT_BSDCONFIG new file mode 100644 index 00000000000..10d8b6e5f44 --- /dev/null +++ b/tools/build/options/WITHOUT_BSDCONFIG @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr bsdconfig 8 , +.Xr sysrc 8 , +and related programs. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 2b6cb1b62d8..c412682f4dc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -5,9 +5,7 @@ SUBDIR= adduser \ arp \ - autofs \ binmiscctl \ - bsdconfig \ cdcontrol \ chkgrp \ chown \ @@ -79,7 +77,6 @@ SUBDIR= adduser \ snapinfo \ spray \ syslogd \ - sysrc \ tcpdrop \ tcpdump \ traceroute \ @@ -117,6 +114,10 @@ SUBDIR+= praudit SUBDIR+= authpf .endif +.if ${MK_AUTOFS} != "no" +SUBDIR+= autofs +.endif + .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif @@ -125,6 +126,11 @@ SUBDIR+= bluetooth SUBDIR+= bootparamd .endif +.if ${MK_BSDCONFIG} != "no" +SUBDIR+= bsdconfig +SUBDIR+= sysrc +.endif + .if ${MK_BSDINSTALL} != "no" SUBDIR+= bsdinstall .endif From 92e0655db4e102be7c519d2177698f5b74086832 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 09:50:12 +0000 Subject: [PATCH 51/53] Honor MK_AUTOFS --- sys/modules/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f66d6c2a2fb..34a66ff20eb 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -48,7 +48,7 @@ SUBDIR= \ ata \ ath \ ath_pci \ - autofs \ + ${_autofs} \ ${_auxio} \ ${_bce} \ bfe \ @@ -387,6 +387,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) +_autofs= autofs +.endif + .if ${MK_BHYVE} != "no" || defined(ALL_MODULES) _vmm= vmm .endif From 68b259bdd5a6c88f01a4966c83442dea20763473 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 09:53:17 +0000 Subject: [PATCH 52/53] Populate MK_AUTOFS and MK_BSDCONFIG; add more dtrace bits to MK_CDDL; add minimal bits to MK_LIB32 --- tools/build/mk/OptionalObsoleteFiles.inc | 234 ++++++++++++++++++++++- 1 file changed, 229 insertions(+), 5 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 62716212b12..a23637bb15c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -152,6 +152,22 @@ OLD_FILES+=usr/share/man/man8/authpf.8.gz OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_AUTOFS} == no +OLD_FILES+=etc/autofs/include_ldap +OLD_FILES+=etc/autofs/special_hosts +OLD_FILES+=etc/autofs/special_null +OLD_FILES+=etc/auto_master +OLD_FILES+=usr/sbin/automount +OLD_FILES+=usr/sbin/automountd +OLD_FILES+=usr/sbin/autounmountd +OLD_FILES+=usr/share/man/man5/autofs.5.gz +OLD_FILES+=usr/share/man/man5/auto_master.5.gz +OLD_FILES+=usr/share/man/man8/automount.8.gz +OLD_FILES+=usr/share/man/man8/automountd.8.gz +OLD_FILES+=usr/share/man/man8/autounmountd.8.gz +OLD_DIRS+=etc/autofs +.endif + .if ${MK_BHYVE} == no OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl @@ -367,6 +383,201 @@ OLD_FILES+=usr/share/man/man8/bootpgw.8.gz OLD_FILES+=usr/share/man/man8/bootptest.8.gz .endif +.if ${MK_BSDCONFIG} == no +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/INDEX +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/USAGE +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/docsinstall +OLD_FILES+=usr/libexec/bsdconfig/020.docsinstall/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/030.packages/INDEX +OLD_FILES+=usr/libexec/bsdconfig/030.packages/USAGE +OLD_FILES+=usr/libexec/bsdconfig/030.packages/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/030.packages/packages +OLD_FILES+=usr/libexec/bsdconfig/040.password/INDEX +OLD_FILES+=usr/libexec/bsdconfig/040.password/USAGE +OLD_FILES+=usr/libexec/bsdconfig/040.password/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/040.password/password +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/INDEX +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/USAGE +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/diskmgmt +OLD_FILES+=usr/libexec/bsdconfig/050.diskmgmt/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/INDEX +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/USAGE +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupadd +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupdel +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupedit +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/include/usermgmt.hlp +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/useradd +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userdel +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/useredit +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/usermgmt +OLD_FILES+=usr/libexec/bsdconfig/080.console/INDEX +OLD_FILES+=usr/libexec/bsdconfig/080.console/USAGE +OLD_FILES+=usr/libexec/bsdconfig/080.console/console +OLD_FILES+=usr/libexec/bsdconfig/080.console/font +OLD_FILES+=usr/libexec/bsdconfig/080.console/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/080.console/keymap +OLD_FILES+=usr/libexec/bsdconfig/080.console/repeat +OLD_FILES+=usr/libexec/bsdconfig/080.console/saver +OLD_FILES+=usr/libexec/bsdconfig/080.console/screenmap +OLD_FILES+=usr/libexec/bsdconfig/080.console/ttys +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/INDEX +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/USAGE +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/090.timezone/timezone +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/INDEX +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/USAGE +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/disable +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/enable +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/flags +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/mouse +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/port +OLD_FILES+=usr/libexec/bsdconfig/110.mouse/type +OLD_FILES+=usr/libexec/bsdconfig/120.networking/INDEX +OLD_FILES+=usr/libexec/bsdconfig/120.networking/USAGE +OLD_FILES+=usr/libexec/bsdconfig/120.networking/defaultrouter +OLD_FILES+=usr/libexec/bsdconfig/120.networking/devices +OLD_FILES+=usr/libexec/bsdconfig/120.networking/hostname +OLD_FILES+=usr/libexec/bsdconfig/120.networking/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/120.networking/nameservers +OLD_FILES+=usr/libexec/bsdconfig/120.networking/networking +OLD_FILES+=usr/libexec/bsdconfig/130.security/INDEX +OLD_FILES+=usr/libexec/bsdconfig/130.security/USAGE +OLD_FILES+=usr/libexec/bsdconfig/130.security/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/130.security/include/securelevel.hlp +OLD_FILES+=usr/libexec/bsdconfig/130.security/kern_securelevel +OLD_FILES+=usr/libexec/bsdconfig/130.security/security +OLD_FILES+=usr/libexec/bsdconfig/140.startup/INDEX +OLD_FILES+=usr/libexec/bsdconfig/140.startup/USAGE +OLD_FILES+=usr/libexec/bsdconfig/140.startup/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/140.startup/misc +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcadd +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcconf +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcdelete +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcedit +OLD_FILES+=usr/libexec/bsdconfig/140.startup/rcvar +OLD_FILES+=usr/libexec/bsdconfig/140.startup/startup +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/INDEX +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/USAGE +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/150.ttys/ttys +OLD_FILES+=usr/libexec/bsdconfig/USAGE +OLD_FILES+=usr/libexec/bsdconfig/dot/INDEX +OLD_FILES+=usr/libexec/bsdconfig/dot/USAGE +OLD_FILES+=usr/libexec/bsdconfig/dot/dot +OLD_FILES+=usr/libexec/bsdconfig/dot/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/include/bsdconfig.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/media.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/include/network_device.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/options.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/tcp.hlp +OLD_FILES+=usr/libexec/bsdconfig/include/usage.hlp +OLD_FILES+=usr/libexec/bsdconfig/includes/INDEX +OLD_FILES+=usr/libexec/bsdconfig/includes/USAGE +OLD_FILES+=usr/libexec/bsdconfig/includes/include/messages.subr +OLD_FILES+=usr/libexec/bsdconfig/includes/includes +OLD_FILES+=usr/sbin/bsdconfig +OLD_FILES+=usr/sbin/sysrc +OLD_FILES+=usr/share/bsdconfig/common.subr +OLD_FILES+=usr/share/bsdconfig/device.subr +OLD_FILES+=usr/share/bsdconfig/dialog.subr +OLD_FILES+=usr/share/bsdconfig/geom.subr +OLD_FILES+=usr/share/bsdconfig/keymap.subr +OLD_FILES+=usr/share/bsdconfig/media/any.subr +OLD_FILES+=usr/share/bsdconfig/media/cdrom.subr +OLD_FILES+=usr/share/bsdconfig/media/common.subr +OLD_FILES+=usr/share/bsdconfig/media/directory.subr +OLD_FILES+=usr/share/bsdconfig/media/dos.subr +OLD_FILES+=usr/share/bsdconfig/media/floppy.subr +OLD_FILES+=usr/share/bsdconfig/media/ftp.subr +OLD_FILES+=usr/share/bsdconfig/media/http.subr +OLD_FILES+=usr/share/bsdconfig/media/httpproxy.subr +OLD_FILES+=usr/share/bsdconfig/media/network.subr +OLD_FILES+=usr/share/bsdconfig/media/nfs.subr +OLD_FILES+=usr/share/bsdconfig/media/options.subr +OLD_FILES+=usr/share/bsdconfig/media/tcpip.subr +OLD_FILES+=usr/share/bsdconfig/media/ufs.subr +OLD_FILES+=usr/share/bsdconfig/media/usb.subr +OLD_FILES+=usr/share/bsdconfig/mustberoot.subr +OLD_FILES+=usr/share/bsdconfig/networking/common.subr +OLD_FILES+=usr/share/bsdconfig/networking/device.subr +OLD_FILES+=usr/share/bsdconfig/networking/hostname.subr +OLD_FILES+=usr/share/bsdconfig/networking/ipaddr.subr +OLD_FILES+=usr/share/bsdconfig/networking/media.subr +OLD_FILES+=usr/share/bsdconfig/networking/netmask.subr +OLD_FILES+=usr/share/bsdconfig/networking/resolv.subr +OLD_FILES+=usr/share/bsdconfig/networking/routing.subr +OLD_FILES+=usr/share/bsdconfig/networking/services.subr +OLD_FILES+=usr/share/bsdconfig/packages/categories.subr +OLD_FILES+=usr/share/bsdconfig/packages/index.subr +OLD_FILES+=usr/share/bsdconfig/packages/musthavepkg.subr +OLD_FILES+=usr/share/bsdconfig/packages/packages.subr +OLD_FILES+=usr/share/bsdconfig/password/password.subr +OLD_FILES+=usr/share/bsdconfig/script.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcconf.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcedit.subr +OLD_FILES+=usr/share/bsdconfig/startup/rcvar.subr +OLD_FILES+=usr/share/bsdconfig/strings.subr +OLD_FILES+=usr/share/bsdconfig/struct.subr +OLD_FILES+=usr/share/bsdconfig/sysrc.subr +OLD_FILES+=usr/share/bsdconfig/timezone/continents.subr +OLD_FILES+=usr/share/bsdconfig/timezone/countries.subr +OLD_FILES+=usr/share/bsdconfig/timezone/iso3166.subr +OLD_FILES+=usr/share/bsdconfig/timezone/menus.subr +OLD_FILES+=usr/share/bsdconfig/timezone/zones.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/group.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/group_input.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/user.subr +OLD_FILES+=usr/share/bsdconfig/usermgmt/user_input.subr +OLD_FILES+=usr/share/bsdconfig/variable.subr +OLD_FILES+=usr/share/examples/bsdconfig/add_some_packages.sh +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_http.sh +OLD_FILES+=usr/share/examples/bsdconfig/bsdconfigrc +OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz +OLD_FILES+=usr/share/man/man8/sysrc.8.gz +OLD_DIRS+=usr/libexec/bsdconfig/020.docsinstall/include +OLD_DIRS+=usr/libexec/bsdconfig/020.docsinstall +OLD_DIRS+=usr/libexec/bsdconfig/030.packages/include +OLD_DIRS+=usr/libexec/bsdconfig/030.packages +OLD_DIRS+=usr/libexec/bsdconfig/040.password/include +OLD_DIRS+=usr/libexec/bsdconfig/040.password +OLD_DIRS+=usr/libexec/bsdconfig/050.diskmgmt/include +OLD_DIRS+=usr/libexec/bsdconfig/050.diskmgmt +OLD_DIRS+=usr/libexec/bsdconfig/070.usermgmt/include +OLD_DIRS+=usr/libexec/bsdconfig/070.usermgmt +OLD_DIRS+=usr/libexec/bsdconfig/080.console/include +OLD_DIRS+=usr/libexec/bsdconfig/080.console +OLD_DIRS+=usr/libexec/bsdconfig/090.timezone/include +OLD_DIRS+=usr/libexec/bsdconfig/090.timezone +OLD_DIRS+=usr/libexec/bsdconfig/110.mouse/include +OLD_DIRS+=usr/libexec/bsdconfig/110.mouse +OLD_DIRS+=usr/libexec/bsdconfig/120.networking/include +OLD_DIRS+=usr/libexec/bsdconfig/120.networking +OLD_DIRS+=usr/libexec/bsdconfig/130.security/include +OLD_DIRS+=usr/libexec/bsdconfig/130.security +OLD_DIRS+=usr/libexec/bsdconfig/140.startup/include +OLD_DIRS+=usr/libexec/bsdconfig/140.startup +OLD_DIRS+=usr/libexec/bsdconfig/150.ttys/include +OLD_DIRS+=usr/libexec/bsdconfig/150.ttys +OLD_DIRS+=usr/libexec/bsdconfig/dot/include +OLD_DIRS+=usr/libexec/bsdconfig/dot +OLD_DIRS+=usr/libexec/bsdconfig/include +OLD_DIRS+=usr/libexec/bsdconfig/includes/include +OLD_DIRS+=usr/libexec/bsdconfig/includes +OLD_DIRS+=usr/libexec/bsdconfig +OLD_DIRS+=usr/share/bsdconfig/media +OLD_DIRS+=usr/share/bsdconfig/networking +OLD_DIRS+=usr/share/bsdconfig/packages +OLD_DIRS+=usr/share/bsdconfig/password +OLD_DIRS+=usr/share/bsdconfig/startup +OLD_DIRS+=usr/share/bsdconfig/timezone +OLD_DIRS+=usr/share/bsdconfig/usermgmt +OLD_DIRS+=usr/share/bsdconfig +OLD_DIRS+=usr/share/examples/bsdconfig +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -607,7 +818,6 @@ OLD_FILES+=usr/lib/dtrace/signal.d OLD_FILES+=usr/lib/dtrace/tcp.d OLD_FILES+=usr/lib/dtrace/udp.d OLD_FILES+=usr/lib/dtrace/unistd.d -OLD_DIRS+=usr/lib/dtrace OLD_FILES+=usr/lib/libavl.a OLD_FILES+=usr/lib/libavl.so OLD_FILES+=usr/lib/libavl_p.a @@ -628,7 +838,6 @@ OLD_FILES+=usr/lib/libuutil.so OLD_FILES+=usr/lib/libuutil_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/dtrace/drti.o -OLD_DIRS+=usr/lib32/dtrace OLD_FILES+=usr/lib32/libavl.a OLD_FILES+=usr/lib32/libavl.so OLD_LIBS+=usr/lib32/libavl.so.2 @@ -654,9 +863,24 @@ OLD_FILES+=usr/lib32/libuutil.so OLD_LIBS+=usr/lib32/libuutil.so.2 OLD_FILES+=usr/lib32/libuutil_p.a .endif +OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/sbin/dtrace OLD_FILES+=usr/sbin/lockstat OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_FILES+=usr/share/dtrace/disklatency +OLD_FILES+=usr/share/dtrace/disklatencycmd +OLD_FILES+=usr/share/dtrace/hotopen +OLD_FILES+=usr/share/dtrace/nfsclienttime +OLD_FILES+=usr/share/dtrace/toolkit/execsnoop +OLD_FILES+=usr/share/dtrace/toolkit/hotkernel +OLD_FILES+=usr/share/dtrace/toolkit/hotuser +OLD_FILES+=usr/share/dtrace/toolkit/opensnoop +OLD_FILES+=usr/share/dtrace/toolkit/procsystime +OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_DIRS+=usr/lib/dtrace +OLD_DIRS+=usr/lib32/dtrace +OLD_DIRS+=usr/share/dtrace/toolkit +OLD_DIRS+=usr/share/dtrace .endif .if ${MK_ZFS} == no @@ -3441,9 +3665,9 @@ OLD_FILES+=usr/share/man/man5/keymap.5.gz OLD_FILES+=usr/share/man/man8/moused.8.g .endif -#.if ${MK_LIB32} == no -# to be filled in -#.endif +.if ${MK_LIB32} == no +OLD_FILES+=etc/libmap32.conf +.endif .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 From 2d561fcbcf5643baa7759f7479af312cb5247229 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 27 Nov 2014 23:42:32 +0000 Subject: [PATCH 53/53] Use ${.TARGET} instead of hardcoding the name in the dump build rule --- usr.bin/vi/catalog/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index bd9db9f22e3..4e21298a095 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -101,7 +101,7 @@ english.base: dump ${SCAN} #Makefile dump: dump.c - ${CC} -o dump ${.ALLSRC} + ${CC} -o ${.TARGET} ${.ALLSRC} CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2