d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionalize a number of components in the tree

Browse Source 
- 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
This commit is contained in:
Enji Cooper 2014-11-26 08:44:05 +00:00
parent 7e57795a34
commit 466046ec0d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/building-blocks/; revision=275106
21 changed files with 260 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/Makefile
View File

@ -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

22
etc/rc.d/Makefile
View File

@ -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

8
include/protocols/Makefile
View File

@ -1,7 +1,13 @@
# $FreeBSD$
.include <src.opts.mk>
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 <bsd.prog.mk>

35
libexec/Makefile
View File

@ -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

12
sbin/Makefile
View File

@ -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

15
share/examples/Makefile
View File

@ -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

7
share/man/man4/Makefile
View File

@ -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

10
share/mk/src.opts.mk
View File

@ -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 \

97
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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

3
tools/build/options/WITHOUT_BOOTPARAMD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr bootparamd 8 .

3
tools/build/options/WITHOUT_BOOTPD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr bootpd 8 .

5
tools/build/options/WITHOUT_FINGER Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr finger 1
and
.Xr fingerd 8 .

5
tools/build/options/WITHOUT_FTP Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr ftp 1
and
.Xr ftpd 8 .

4
tools/build/options/WITHOUT_HAST Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build
.Xr hastd 8
and related utilities.

4
tools/build/options/WITHOUT_ISCSI Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build
.Xr iscid 8
and related utilities.

3
tools/build/options/WITHOUT_RBOOTD Normal file
View File

@ -0,0 +1,3 @@
.\" $FreeBSD$
Set to not build or install
.Xr rbootd 8 .

5
tools/build/options/WITHOUT_TALK Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr talk 1
and
.Xr talkd 8 .

4
tools/build/options/WITHOUT_TCP_WRAPPERS Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build or install
.Xr tcpd 8 ,
and related utilities.

5
tools/build/options/WITHOUT_TFTP Normal file
View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build or install
.Xr tftp 1
and
.Xr tftpd 8 .

25
usr.bin/Makefile
View File

@ -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

17
usr.sbin/Makefile
View File

@ -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