Author: ngie
Date: Wed Feb 4 10:19:32 2015
New Revision: 278192
URL: https://svnweb.freebsd.org/changeset/base/278192
Log:
Add the following options to enable/disable several features in the base
system
WITHOUT_BOOTPARAMD - bootparamd
WITHOUT_BOOTPD - bootpd
WITHOUT_FINGER - finger, fingerd
WITHOUT_FTP - ftp, ftpd
WITHOUT_INETD - inetd
WITHOUT_RBOOTD - rbootd
WITHOUT_TCP_WRAPPERS - tcpd, et al
WITHOUT_TFTP - tftp, tftp-server
WITHOUT_TIMED - timed
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_BOOTPARAMD (contents, props changed)
head/tools/build/options/WITHOUT_BOOTPD (contents, props changed)
head/tools/build/options/WITHOUT_FINGER (contents, props changed)
head/tools/build/options/WITHOUT_FTP (contents, props changed)
head/tools/build/options/WITHOUT_INETD (contents, props changed)
head/tools/build/options/WITHOUT_RBOOTD (contents, props changed)
head/tools/build/options/WITHOUT_TCP_WRAPPERS (contents, props changed)
head/tools/build/options/WITHOUT_TFTP (contents, props changed)
head/tools/build/options/WITHOUT_TIMED (contents, props changed)
Modified:
head/etc/Makefile
head/libexec/Makefile
head/share/mk/src.opts.mk
head/usr.bin/Makefile
head/usr.sbin/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Wed Feb 4 09:33:42 2015 (r278191)
+++ head/etc/Makefile Wed Feb 4 10:19:32 2015 (r278192)
@@ -21,13 +21,11 @@ BIN1= crontab \
dhclient.conf \
disktab \
fbtab \
- ftpusers \
gettytab \
group \
hosts \
hosts.allow \
hosts.equiv \
- inetd.conf \
libalias.conf \
libmap.conf \
login.access \
@@ -101,6 +99,14 @@ BIN1+= snmpd.config
BIN1+= freebsd-update.conf
.endif
+.if ${MK_FTP} != "no"
+BIN1+= ftpusers
+.endif
+
+.if ${MK_INETD} != "no"
+BIN1+= inetd.conf
+.endif
+
.if ${MK_LOCATE} != "no"
BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc
.endif
Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile Wed Feb 4 09:33:42 2015 (r278191)
+++ head/libexec/Makefile Wed Feb 4 10:19:32 2015 (r278192)
@@ -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,10 +24,8 @@ SUBDIR= ${_atf} \
${_rtld-elf} \
save-entropy \
${_smrsh} \
- tcpd \
${_telnetd} \
${_tests} \
- tftpd \
${_tftp-proxy} \
ulog-helper \
${_ypxfr}
@@ -40,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
@@ -70,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
@@ -84,10 +94,18 @@ _smrsh= smrsh
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
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Wed Feb 4 09:33:42 2015 (r278191)
+++ head/share/mk/src.opts.mk Wed Feb 4 10:19:32 2015 (r278192)
@@ -58,6 +58,8 @@ __DEFAULT_YES_OPTIONS = \
BINUTILS_BOOTSTRAP \
BLUETOOTH \
BOOT \
+ BOOTPARAMD \
+ BOOTPD \
BSD_CPIO \
BSDINSTALL \
BSNMP \
@@ -81,11 +83,13 @@ __DEFAULT_YES_OPTIONS = \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
+ FINGER \
FLOPPY \
FMTREE \
FORTH \
FP_LIBC \
FREEBSD_UPDATE \
+ FTP \
GAMES \
GCOV \
GDB \
@@ -100,6 +104,7 @@ __DEFAULT_YES_OPTIONS = \
ICONV \
INET \
INET6 \
+ INETD \
IPFILTER \
IPFW \
ISCSI \
@@ -137,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \
QUOTAS \
RADIUS_SUPPORT \
RCMDS \
+ RBOOTD \
RCS \
RESCUE \
ROUTED \
@@ -151,10 +157,13 @@ __DEFAULT_YES_OPTIONS = \
SYSCONS \
SYSINSTALL \
TALK \
+ TCP_WRAPPERS \
TCSH \
TELNET \
TESTS \
TEXTPROC \
+ TFTP \
+ TIMED \
UNBOUND \
USB \
UTMPX \
Added: head/tools/build/options/WITHOUT_BOOTPARAMD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_BOOTPARAMD Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootparamd 8 .
Added: head/tools/build/options/WITHOUT_BOOTPD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_BOOTPD Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bootpd 8 .
Added: head/tools/build/options/WITHOUT_FINGER
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_FINGER Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr finger 1
+and
+.Xr fingerd 8 .
Added: head/tools/build/options/WITHOUT_FTP
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_FTP Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr ftp 1
+and
+.Xr ftpd 8 .
Added: head/tools/build/options/WITHOUT_INETD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_INETD Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr inetd 8 .
Added: head/tools/build/options/WITHOUT_RBOOTD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_RBOOTD Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr rbootd 8 .
Added: head/tools/build/options/WITHOUT_TCP_WRAPPERS
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_TCP_WRAPPERS Wed Feb 4 10:19:32
2015 (r278192)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr tcpd 8 ,
+and related utilities.
Added: head/tools/build/options/WITHOUT_TFTP
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_TFTP Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr tftp 1
+and
+.Xr tftpd 8 .
Added: head/tools/build/options/WITHOUT_TIMED
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_TIMED Wed Feb 4 10:19:32 2015
(r278192)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr timed 8 .
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Wed Feb 4 09:33:42 2015 (r278191)
+++ head/usr.bin/Makefile Wed Feb 4 10:19:32 2015 (r278192)
@@ -50,12 +50,10 @@ SUBDIR= ${_addr2line} \
fetch \
file \
find \
- finger \
fmt \
fold \
fstat \
fsync \
- ftp \
gcore \
gencat \
getconf \
@@ -166,7 +164,6 @@ SUBDIR= ${_addr2line} \
tcopy \
tee \
${_tests} \
- tftp \
time \
timeout \
tip \
@@ -249,10 +246,18 @@ _size= size
_strings= strings
.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
@@ -365,6 +370,10 @@ SUBDIR+= colcrt
SUBDIR+= ul
.endif
+.if ${MK_TFTP} != "no"
+SUBDIR+= tftp
+.endif
+
.if ${MK_TOOLCHAIN} != "no"
SUBDIR+= ar
SUBDIR+= c89
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Wed Feb 4 09:33:42 2015 (r278191)
+++ head/usr.sbin/Makefile Wed Feb 4 10:19:32 2015 (r278192)
@@ -6,7 +6,6 @@
SUBDIR= adduser \
arp \
binmiscctl \
- bootparamd \
bsdconfig \
cdcontrol \
chkgrp \
@@ -34,7 +33,6 @@ SUBDIR= adduser \
gstat \
i2c \
ifmcstat \
- inetd \
iostat \
kldxref \
mailwrapper \
@@ -82,11 +80,8 @@ SUBDIR= adduser \
spray \
syslogd \
sysrc \
- tcpdchk \
- tcpdmatch \
tcpdrop \
tcpdump \
- timed \
traceroute \
trpt \
tzsetup \
@@ -131,6 +126,10 @@ SUBDIR+= autofs
SUBDIR+= bluetooth
.endif
+.if ${MK_BOOTPARAMD} != "no"
+SUBDIR+= bootparamd
+.endif
+
.if ${MK_BSDINSTALL} != "no"
SUBDIR+= bsdinstall
.endif
@@ -179,6 +178,10 @@ SUBDIR+= rtsold
SUBDIR+= traceroute6
.endif
+.if ${MK_INETD} != "no"
+SUBDIR+= inetd
+.endif
+
.if ${MK_IPFW} != "no"
SUBDIR+= ipfwpcap
.endif
@@ -300,10 +303,19 @@ SUBDIR+= praliases
SUBDIR+= sendmail
.endif
+.if ${MK_TCP_WRAPPERS} != "no"
+SUBDIR+= tcpdchk
+SUBDIR+= tcpdmatch
+.endif
+
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
+.if ${MK_TIMED} != "no"
+SUBDIR+= timed
+.endif
+
.if ${MK_TOOLCHAIN} != "no"
SUBDIR+= config
SUBDIR+= crunch
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
