mirror of
https://git.freebsd.org/src.git
synced 2026-01-16 23:02:24 +00:00
libexec/rc/rc.d/Makefile: Use CONFGROUPS.yes
Replace .if statements with CONFGROUPS.${MK_FOO} where possible,
and also sort and re-indent the file for readability.
A couple of more complicated sections don't work with CONFGROUPS.yes
yet, so leave those as they are for now.
MFC after: 1 week
Reviewed by: imp
Sponsored by: https://www.patreon.com/bsdivy
Differential Revision: https://reviews.freebsd.org/D52974
This commit is contained in:
Lexi Winter
parent
0f5ed3c427
commit
56f9879c3d
1 changed files with 204 additions and 261 deletions
|
|
@ -4,6 +4,7 @@ CONFDIR= /etc/rc.d
|
|||
CONFGROUPS= CONFS
|
||||
CONFSPACKAGE= rc
|
||||
|
||||
# Files which are always installed and go in the -rc package.
|
||||
CONFS= DAEMON \
|
||||
FILESYSTEMS \
|
||||
LOGIN \
|
||||
|
|
@ -47,8 +48,6 @@ CONFS= DAEMON \
|
|||
netoptions \
|
||||
netwait \
|
||||
noshutdown \
|
||||
${_nscd} \
|
||||
${_opensm} \
|
||||
os-release \
|
||||
pwcheck \
|
||||
quota \
|
||||
|
|
@ -77,218 +76,258 @@ CONFS= DAEMON \
|
|||
var_run \
|
||||
watchdogd
|
||||
|
||||
CONFGROUPS+= DEVD
|
||||
DEVD= devd
|
||||
DEVDPACKAGE= devd
|
||||
|
||||
CONFGROUPS+= DEVMATCH
|
||||
DEVMATCH= devmatch
|
||||
DEVMATCHPACKAGE= devmatch
|
||||
|
||||
CONFGROUPS+= DHCLIENT
|
||||
DHCLIENT= dhclient
|
||||
DHCLIENTPACKAGE= dhclient
|
||||
|
||||
CONFGROUPS+= GEOM
|
||||
GEOM= geli \
|
||||
geli2 \
|
||||
gptboot
|
||||
GEOMPACKAGE= geom
|
||||
|
||||
CONFGROUPS+= GGATED
|
||||
GGATED= ggated
|
||||
GGATEDPACKAGE= ggate
|
||||
|
||||
CONFGROUPS+= RESOLVCONF
|
||||
RESOLVCONF= resolv
|
||||
RESOLVCONFPACKAGE= resolvconf
|
||||
|
||||
CONFGROUPS+= CRON
|
||||
CRON+= cron
|
||||
CRONPACKAGE= cron
|
||||
|
||||
CONFGROUPS+= CTL
|
||||
CTL= ctld
|
||||
CTLPACKAGE= ctl
|
||||
|
||||
CONFGROUPS+= NFS
|
||||
NFS= lockd \
|
||||
mountd \
|
||||
nfscbd \
|
||||
nfsclient \
|
||||
nfsd \
|
||||
nfsuserd \
|
||||
statd
|
||||
NFSPACKAGE= nfs
|
||||
|
||||
CONFGROUPS+= NEWSYSLOG
|
||||
NEWSYSLOG= newsyslog
|
||||
NEWSYSLOGPACKAGE= newsyslog
|
||||
|
||||
CONFGROUPS+= POWERD
|
||||
POWERD= powerd
|
||||
POWERDPACKAGE= powerd
|
||||
|
||||
CONFGROUPS+= PPPOED
|
||||
PPPOED= pppoed
|
||||
PPPOEDPACKAGE= ppp
|
||||
|
||||
CONFGROUPS+= SYSLOGD
|
||||
SYSLOGD= syslogd
|
||||
SYSLOGDPACKAGE= syslogd
|
||||
|
||||
CONFGROUPS+= RCMDS
|
||||
RCMDS= rwho
|
||||
RCMDSPACKAGE= rcmds
|
||||
# Groups for files which don't go in -rc, or which depend on src.conf knobs.
|
||||
|
||||
.if ${MK_ACCT} != "no" || ${MK_UTMPX} != "no"
|
||||
CONFGROUPS+= ACCT
|
||||
ACCTPACKAGE= acct
|
||||
CONFGROUPS+= ACCT
|
||||
ACCTPACKAGE= acct
|
||||
.if ${MK_ACCT} != "no"
|
||||
ACCT+= accounting
|
||||
ACCT= accounting
|
||||
.endif
|
||||
.if ${MK_UTMPX} != "no"
|
||||
ACCT+= utx
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MK_ACPI} != "no"
|
||||
CONFGROUPS+= ACPI
|
||||
CONFGROUPS.${MK_ACPI}+= ACPI
|
||||
ACPIPACKAGE= acpi
|
||||
ACPI= power_profile
|
||||
ACPIPACKAGE= acpi
|
||||
.endif
|
||||
|
||||
.if ${MK_APM} != "no"
|
||||
CONFGROUPS+= APM
|
||||
APM+= apm
|
||||
CONFGROUPS.${MK_APM}+= APM
|
||||
APMPACKAGE= apm
|
||||
APM= apm
|
||||
.if ${MACHINE} == "i386"
|
||||
APM+= apmd
|
||||
.endif
|
||||
APMPACKAGE= apm
|
||||
.endif
|
||||
|
||||
.if ${MK_AUDIT} != "no"
|
||||
CONFGROUPS+= AUDIT
|
||||
AUDIT+= auditd
|
||||
AUDIT+= auditdistd
|
||||
AUDITPACKAGE= audit
|
||||
.endif
|
||||
CONFGROUPS.${MK_AUDIT}+= AUDIT
|
||||
AUDITPACKAGE= audit
|
||||
AUDIT= auditd \
|
||||
auditdistd
|
||||
|
||||
.if ${MK_AUTOFS} != "no"
|
||||
CONFGROUPS+= AUTOFS
|
||||
CONFGROUPS.${MK_AUTOFS}+= AUTOFS
|
||||
AUTOFSPACKAGE= autofs
|
||||
AUTOFS= automount \
|
||||
automountd \
|
||||
autounmountd
|
||||
AUTOFSPACKAGE= autofs
|
||||
.endif
|
||||
|
||||
.if ${MK_BLACKLIST} != "no"
|
||||
CONFGROUPS+= BLOCKLIST
|
||||
CONFGROUPS.${MK_BLACKLIST}+= BLOCKLIST
|
||||
BLOCKLISTPACKAGE= blocklist
|
||||
BLOCKLIST= blacklistd
|
||||
BLOCKLISTPACKAGE=blocklist
|
||||
.endif
|
||||
|
||||
.if ${MK_BLUETOOTH} != "no"
|
||||
CONFGROUPS+= BLUETOOTH
|
||||
BLUETOOTH+= bluetooth \
|
||||
CONFGROUPS.${MK_BLUETOOTH}+= BLUETOOTH
|
||||
BLUETOOTHPACKAGE= bluetooth
|
||||
BLUETOOTH= bluetooth \
|
||||
bthidd \
|
||||
hcsecd \
|
||||
rfcomm_pppd_server \
|
||||
sdpd \
|
||||
ubthidhci
|
||||
BLUETOOTHPACKAGE= bluetooth
|
||||
.endif
|
||||
|
||||
.if ${MK_BOOTPARAMD} != "no"
|
||||
CONFS+= bootparams
|
||||
.endif
|
||||
CONFGROUPS.${MK_BOOTPARAMD}+= BOOTPARAMD
|
||||
BOOTPARAMD= bootparams
|
||||
|
||||
.if ${MK_BSNMP} != "no"
|
||||
CONFGROUPS+= BSNMP
|
||||
BSNMP+= bsnmpd
|
||||
BSNMPPACKAGE= bsnmp
|
||||
.endif
|
||||
CONFGROUPS.${MK_BSNMP}+= BSNMP
|
||||
BSNMPPACKAGE= bsnmp
|
||||
BSNMP= bsnmpd
|
||||
|
||||
.if ${MK_CCD} != "no"
|
||||
CONFGROUPS+= CCD
|
||||
CONFGROUPS.${MK_CCD}+= CCD
|
||||
CCDPACKAGE= ccdconfig
|
||||
CCD= ccd
|
||||
CCDPACKAGE= ccdconfig
|
||||
.endif
|
||||
|
||||
.if ${MK_CUSE} != "no"
|
||||
CONFGROUPS+= VOSS
|
||||
VOSS= virtual_oss
|
||||
VOSSPACKAGE= sound
|
||||
.endif
|
||||
CONFGROUPS+= DEVD
|
||||
DEVDPACKAGE= devd
|
||||
DEVD= devd
|
||||
|
||||
.if ${MK_KERBEROS_SUPPORT} != "no"
|
||||
CONFGROUPS+= GSSD
|
||||
CONFGROUPS+= DEVMATCH
|
||||
DEVMATCHPACKAGE= devmatch
|
||||
DEVMATCH= devmatch
|
||||
|
||||
CONFGROUPS+= DHCLIENT
|
||||
DHCLIENTPACKAGE= dhclient
|
||||
DHCLIENT= dhclient
|
||||
|
||||
CONFGROUPS+= CRON
|
||||
CRONPACKAGE= cron
|
||||
CRON= cron
|
||||
|
||||
CONFGROUPS+= CTL
|
||||
CTLPACKAGE= ctl
|
||||
CTL= ctld
|
||||
|
||||
CONFGROUPS+= GEOM
|
||||
GEOMPACKAGE= geom
|
||||
GEOM= geli \
|
||||
geli2 \
|
||||
gptboot
|
||||
|
||||
CONFGROUPS+= GGATED
|
||||
GGATEDPACKAGE= ggate
|
||||
GGATED= ggated
|
||||
|
||||
CONFGROUPS.${MK_KERBEROS_SUPPORT}+=GSSD
|
||||
GSSDPACKAGE= gssd
|
||||
GSSD= gssd
|
||||
GSSDPACKAGE= gssd
|
||||
.endif
|
||||
|
||||
.if ${MK_HAST} != "no"
|
||||
CONFGROUPS+= HAST
|
||||
CONFGROUPS.${MK_HAST}+= HAST
|
||||
HASTPACKAGE= hast
|
||||
HAST= hastd
|
||||
HASTPACKAGE= hast
|
||||
.endif
|
||||
|
||||
.if ${MK_INETD} != "no"
|
||||
CONFGROUPS+= INETD
|
||||
CONFGROUPS.${MK_INETD}+= INETD
|
||||
INETDPACKAGE= inetd
|
||||
INETD= inetd
|
||||
INETDPACKAGE= inetd
|
||||
.endif
|
||||
|
||||
.if ${MK_IPFILTER} != "no"
|
||||
CONFGROUPS+= IPF
|
||||
CONFGROUPS.${MK_IPFILTER}+= IPF
|
||||
IPFPACKAGE= ipf
|
||||
IPF= ipfilter \
|
||||
ipfs \
|
||||
ipmon \
|
||||
ipnat \
|
||||
ippool
|
||||
IPFPACKAGE= ipf
|
||||
.endif
|
||||
|
||||
.if ${MK_IPFW} != "no"
|
||||
CONFGROUPS+= IPFW
|
||||
IPFW= ipfw dnctl
|
||||
CONFGROUPS.${MK_IPFW}+= IPFW
|
||||
IPFWPACKAGE= ipfw
|
||||
IPFW= ipfw \
|
||||
dnctl
|
||||
.if ${MK_NETGRAPH} != "no"
|
||||
IPFW+= ipfw_netflow
|
||||
.endif
|
||||
IPFWPACKAGE= ipfw
|
||||
|
||||
# natd is only built when ipfw is built
|
||||
CONFGROUPS+= NATD
|
||||
NATD+= natd
|
||||
NATDPACKAGE= natd
|
||||
.endif
|
||||
|
||||
.if ${MK_ISCSI} != "no"
|
||||
CONFGROUPS+= ISCSI
|
||||
CONFGROUPS.${MK_ISCSI}+= ISCSI
|
||||
ISCSIPACKAGE= iscsi
|
||||
ISCSI= iscsictl \
|
||||
iscsid
|
||||
ISCSIPACKAGE= iscsi
|
||||
.endif
|
||||
|
||||
.if ${MK_JAIL} != "no"
|
||||
CONFGROUPS+= JAIL
|
||||
JAIL+= jail
|
||||
JAILPACKAGE= jail
|
||||
.endif
|
||||
# natd is only built when ipfw is built
|
||||
CONFGROUPS.${MK_IPFW}+= NATD
|
||||
NATDPACKAGE= natd
|
||||
NATD= natd
|
||||
|
||||
.if ${MK_LEGACY_CONSOLE} != "no"
|
||||
CONFGROUPS+= CONSOLE
|
||||
CONSOLE+= moused
|
||||
CONSOLE+= msconvd
|
||||
CONSOLE+= syscons
|
||||
CONSOLEPACKAGE= console-tools
|
||||
.endif
|
||||
CONFGROUPS.${MK_JAIL}+= JAIL
|
||||
JAILPACKAGE= jail
|
||||
JAIL= jail
|
||||
|
||||
.if ${MK_LPR} != "no"
|
||||
CONFGROUPS+= LP
|
||||
LP+= lpd
|
||||
LPPACKAGE= lp
|
||||
.endif
|
||||
CONFGROUPS.${MK_LPR}+= LP
|
||||
LPPACKAGE= lp
|
||||
LP= lpd
|
||||
|
||||
CONFGROUPS+= NEWSYSLOG
|
||||
NEWSYSLOGPACKAGE= newsyslog
|
||||
NEWSYSLOG= newsyslog
|
||||
|
||||
CONFGROUPS+= NFS
|
||||
NFSPACKAGE= nfs
|
||||
NFS= lockd \
|
||||
mountd \
|
||||
nfscbd \
|
||||
nfsclient \
|
||||
nfsd \
|
||||
nfsuserd \
|
||||
statd
|
||||
|
||||
CONFGROUPS.${MK_NIS}+= NIS
|
||||
NISPACKAGE= yp
|
||||
NIS= ypbind \
|
||||
ypldap \
|
||||
yppasswdd \
|
||||
ypserv \
|
||||
ypset \
|
||||
ypupdated \
|
||||
ypxfrd \
|
||||
nisdomain
|
||||
|
||||
CONFGROUPS.${MK_NS_CACHING}+= NSCD
|
||||
NSCD= nscd
|
||||
|
||||
CONFGROUPS.${MK_NTP}+= NTP
|
||||
NTPPACKAGE= ntp
|
||||
NTP= ntpd \
|
||||
ntpdate
|
||||
|
||||
CONFGROUPS.${MK_NUAGEINIT}+= NUAGEINIT
|
||||
NUAGEINITPACKAGE= nuageinit
|
||||
NUAGEINIT= nuageinit \
|
||||
nuageinit_post_net \
|
||||
nuageinit_user_data_script
|
||||
|
||||
CONFGROUPS.${MK_OFED_EXTRA}+= OPENSM
|
||||
OPENSM= opensm
|
||||
|
||||
CONFGROUPS.${MK_PF}+= PF
|
||||
PFPACKAGE= pf
|
||||
PF= pf \
|
||||
pflog \
|
||||
pfsync \
|
||||
ftp-proxy
|
||||
|
||||
CONFGROUPS+= POWERD
|
||||
POWERDPACKAGE= powerd
|
||||
POWERD= powerd
|
||||
|
||||
CONFGROUPS.${MK_PPP}+= PPP
|
||||
PPPPACKAGE= ppp
|
||||
PPP= ppp
|
||||
|
||||
CONFGROUPS+= PPPOED
|
||||
PPPOEDPACKAGE= ppp
|
||||
PPPOED= pppoed
|
||||
|
||||
CONFGROUPS+= SYSLOGD
|
||||
SYSLOGDPACKAGE= syslogd
|
||||
SYSLOGD= syslogd
|
||||
|
||||
CONFGROUPS+= RCMDS
|
||||
RCMDSPACKAGE= rcmds
|
||||
RCMDS= rwho
|
||||
|
||||
CONFGROUPS+= RESOLVCONF
|
||||
RESOLVCONFPACKAGE= resolvconf
|
||||
RESOLVCONF= resolv
|
||||
|
||||
CONFGROUPS.${MK_SENDMAIL}+= SENDMAIL
|
||||
SENDMAILPACKAGE= sendmail
|
||||
SENDMAIL= sendmail
|
||||
|
||||
CONFGROUPS.${MK_OPENSSH}+= SSH
|
||||
SSHPACKAGE= ssh
|
||||
SSH= sshd
|
||||
|
||||
CONFGROUPS.${MK_UNBOUND}+= UNBOUND
|
||||
UNBOUNDPACKAGE= unbound
|
||||
UNBOUND= local_unbound
|
||||
|
||||
CONFGROUPS.${MK_VI}+= VI
|
||||
VIPACKAGE= vi
|
||||
VI= virecover
|
||||
|
||||
CONFGROUPS.${MK_CUSE}+= VOSS
|
||||
VOSSPACKAGE= sound
|
||||
VOSS= virtual_oss
|
||||
|
||||
CONFGROUPS.${MK_WIRELESS}+= HOSTAPD
|
||||
HOSTAPDPACKAGE= hostapd
|
||||
HOSTAPD= hostapd
|
||||
|
||||
CONFGROUPS.${MK_WIRELESS}+= WPA
|
||||
WPAPACKAGE= wpa
|
||||
WPA= wpa_supplicant
|
||||
|
||||
CONFGROUPS.${MK_ZFS}+= ZFS
|
||||
ZFSPACKAGE= zfs
|
||||
ZFS= zfs \
|
||||
zfsbe \
|
||||
zfsd \
|
||||
zfskeys \
|
||||
zpool \
|
||||
zpoolreguid \
|
||||
zpoolupgrade \
|
||||
zvol
|
||||
|
||||
CONFGROUPS.${MK_LEGACY_CONSOLE}+=SYSCONS
|
||||
SYSCONSPACKAGE= console-tools
|
||||
SYSCONS= moused \
|
||||
msconvd \
|
||||
syscons
|
||||
|
||||
.if ${MK_KERBEROS} != "no"
|
||||
.if ${MK_MITKRB5} == "no"
|
||||
|
|
@ -318,58 +357,10 @@ KRB5PACKAGE= kerberos-kdc
|
|||
.endif # ${MK_MITKRB5}
|
||||
.endif # ${MK_KERBEROS}
|
||||
|
||||
.if ${MK_NIS} != "no"
|
||||
CONFGROUPS+= YP
|
||||
YP= ypbind \
|
||||
ypldap \
|
||||
yppasswdd \
|
||||
ypserv \
|
||||
ypset \
|
||||
ypupdated \
|
||||
ypxfrd \
|
||||
nisdomain
|
||||
YPPACKAGE= yp
|
||||
.endif
|
||||
|
||||
.if ${MK_NS_CACHING} != "no"
|
||||
_nscd= nscd
|
||||
.endif
|
||||
|
||||
.if ${MK_NTP} != "no"
|
||||
CONFGROUPS+= NTP
|
||||
NTP+= ntpd \
|
||||
ntpdate
|
||||
NTPPACKAGE= ntp
|
||||
.endif
|
||||
|
||||
.if ${MK_OFED_EXTRA} != "no"
|
||||
_opensm= opensm
|
||||
.endif
|
||||
|
||||
.if ${MK_OPENSSL} != "no" && ${MK_OPENSSL_KTLS} != "no"
|
||||
CONFS+= tlsclntd \
|
||||
tlsservd
|
||||
.endif
|
||||
|
||||
.if ${MK_OPENSSH} != "no"
|
||||
CONFGROUPS+= SSH
|
||||
SSH= sshd
|
||||
SSHPACKAGE= ssh
|
||||
.endif
|
||||
|
||||
.if ${MK_PF} != "no"
|
||||
CONFGROUPS+= PF
|
||||
PF= pf \
|
||||
pflog \
|
||||
pfsync \
|
||||
ftp-proxy
|
||||
PFPACKAGE= pf
|
||||
.endif
|
||||
|
||||
.if ${MK_PPP} != "no"
|
||||
CONFGROUPS+= PPP
|
||||
PPP= ppp
|
||||
PPPPACKAGE= ppp
|
||||
CONFGROUPS+= KTLS
|
||||
KTLS= tlsclntd \
|
||||
tlsservd
|
||||
.endif
|
||||
|
||||
.if ${MK_INET6} != "no" || ${MK_ROUTED} != "no"
|
||||
|
|
@ -384,57 +375,9 @@ RIP+= routed
|
|||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MK_SENDMAIL} != "no"
|
||||
CONFGROUPS+= SMRCD
|
||||
SMRCD= sendmail
|
||||
SMRCDPACKAGE= sendmail
|
||||
.endif
|
||||
|
||||
.if ${MK_NUAGEINIT} != "no"
|
||||
CONFGROUPS+= NIUAGEINIT
|
||||
NIUAGEINIT= nuageinit \
|
||||
nuageinit_post_net \
|
||||
nuageinit_user_data_script
|
||||
NIUAGEINITPACKAGE= nuageinit
|
||||
.endif
|
||||
|
||||
.if ${MK_UNBOUND} != "no"
|
||||
CONFGROUPS+= UNBOUND
|
||||
UNBOUND+= local_unbound
|
||||
UNBOUNDPACKAGE= unbound
|
||||
.endif
|
||||
|
||||
.if ${MK_VI} != "no"
|
||||
CONFGROUPS+= VI
|
||||
VI+= virecover
|
||||
VIPACKAGE= vi
|
||||
.endif
|
||||
|
||||
.if ${MK_WIRELESS} != "no"
|
||||
CONFGROUPS+= HOSTAPD
|
||||
HOSTAPD= hostapd
|
||||
HOSTAPDPACKAGE= hostapd
|
||||
|
||||
CONFGROUPS+= WPA
|
||||
WPA= wpa_supplicant
|
||||
WPAPACKAGE= wpa
|
||||
.endif
|
||||
|
||||
.if ${MK_ZFS} != "no"
|
||||
CONFGROUPS+= ZFS
|
||||
ZFS+= zfs
|
||||
ZFS+= zfsbe
|
||||
ZFS+= zfsd
|
||||
ZFS+= zfskeys
|
||||
ZFS+= zpool
|
||||
ZFS+= zpoolreguid
|
||||
ZFS+= zpoolupgrade
|
||||
ZFS+= zvol
|
||||
ZFSPACKAGE= zfs
|
||||
.endif
|
||||
|
||||
.for fg in ${CONFGROUPS}
|
||||
.for fg in ${CONFGROUPS} ${CONFGROUPS.yes}
|
||||
${fg}MODE?= ${BINMODE}
|
||||
${fg}PACKAGE?= rc
|
||||
.endfor
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue