pkgbase: Stop threating rc files as config files
rc scripts arent configuration files so use FILES instead of CONFS. While here put rc scripts into related package (sendmail in the FreeBSD-sendmail package, wpa_supplicant in the FreeBSD-wpa etc ...) Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D24177
This commit is contained in:
parent
970d1bbf71
commit
77f0f1df8b
@ -2,25 +2,28 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS
|
BINDIR= /etc
|
||||||
CONFETCDIR= /etc
|
FILESGROUPS= RCETC RCETCEXEC RCETCDEFAULTS
|
||||||
CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended
|
RCETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended
|
||||||
CONFETCPACKAGE= rc
|
RCETCPACKAGE= rc
|
||||||
|
|
||||||
.if ${MK_IPFW} != "no"
|
.if ${MK_IPFW} != "no"
|
||||||
CONFETC+= rc.firewall
|
FILESGROUPS+= RCIPFW
|
||||||
|
RCIPFW+= rc.firewall
|
||||||
|
RCIPFWPACKAGE= ipfw
|
||||||
.endif
|
.endif
|
||||||
.if ${MK_SENDMAIL} != "no"
|
.if ${MK_SENDMAIL} != "no"
|
||||||
CONFETC+= rc.sendmail
|
FILESGROUPS+= RCSENDMAIL
|
||||||
|
RCSENDMAIL+= rc.sendmail
|
||||||
|
RCSENDMAILPACKAGE= sendmail
|
||||||
.endif
|
.endif
|
||||||
CONFETCMODE= 644
|
RCETCMODE= 644
|
||||||
CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend
|
RCETCEXEC= netstart pccard_ether rc.resume rc.suspend
|
||||||
CONFETCEXECDIR= /etc
|
RCETCEXECMODE= 755
|
||||||
CONFETCEXECMODE= 755
|
RCETCEXECPACKAGE= rc
|
||||||
CONFETCEXECPACKAGE= rc
|
RCETCDEFAULTSDIR= /etc/defaults
|
||||||
CONFETCDEFAULTSDIR= /etc/defaults
|
RCETCDEFAULTS= rc.conf
|
||||||
CONFETCDEFAULTS= rc.conf
|
RCETCDEFAULTSPACKAGE= rc
|
||||||
CONFETCDEFAULTSPACKAGE= rc
|
|
||||||
|
|
||||||
SUBDIR+= rc.d
|
SUBDIR+= rc.d
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
CONFDIR= /etc/rc.d
|
BINDIR= /etc/rc.d
|
||||||
CONFGROUPS= CONFS
|
FILESGROUPS= BASERC
|
||||||
CONFSPACKAGE= rc
|
BASERCPACKAGE= rc
|
||||||
|
|
||||||
CONFS= DAEMON \
|
BASERC= DAEMON \
|
||||||
FILESYSTEMS \
|
FILESYSTEMS \
|
||||||
LOGIN \
|
LOGIN \
|
||||||
NETWORKING \
|
NETWORKING \
|
||||||
@ -115,7 +115,7 @@ CONFS= DAEMON \
|
|||||||
watchdogd
|
watchdogd
|
||||||
|
|
||||||
.if ${MK_NIS} != "no"
|
.if ${MK_NIS} != "no"
|
||||||
CONFS+= ypbind \
|
BASERC+= ypbind \
|
||||||
ypldap \
|
ypldap \
|
||||||
yppasswdd \
|
yppasswdd \
|
||||||
ypserv \
|
ypserv \
|
||||||
@ -125,23 +125,23 @@ CONFS+= ypbind \
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ACCT} != "no"
|
.if ${MK_ACCT} != "no"
|
||||||
CONFGROUPS+= ACCT
|
FILESGROUPS+= ACCT
|
||||||
ACCT+= accounting
|
ACCT+= accounting
|
||||||
ACCTPACKAGE= acct
|
ACCTPACKAGE= acct
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ACPI} != "no"
|
.if ${MK_ACPI} != "no"
|
||||||
CONFGROUPS+= ACPI
|
FILESGROUPS+= ACPI
|
||||||
ACPI= power_profile
|
ACPI= power_profile
|
||||||
ACPIPACKAGE= acpi
|
ACPIPACKAGE= acpi
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
|
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
|
||||||
CONFS+= powerd
|
BASERC+= powerd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_APM} != "no"
|
.if ${MK_APM} != "no"
|
||||||
CONFGROUPS+= APM
|
FILESGROUPS+= APM
|
||||||
APM+= apm
|
APM+= apm
|
||||||
.if ${MACHINE} == "i386"
|
.if ${MACHINE} == "i386"
|
||||||
APM+= apmd
|
APM+= apmd
|
||||||
@ -150,15 +150,17 @@ APMPACKAGE= apm
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_AUDIT} != "no"
|
.if ${MK_AUDIT} != "no"
|
||||||
CONFGROUPS+= AUDIT
|
FILESGROUPS+= AUDIT
|
||||||
AUDIT+= auditd
|
AUDIT+= auditd
|
||||||
AUDIT+= auditdistd
|
AUDIT+= auditdistd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_AUTOFS} != "no"
|
.if ${MK_AUTOFS} != "no"
|
||||||
CONFS+= automount
|
FILESGROUPS+= AUFOFS
|
||||||
CONFS+= automountd
|
AUTOFS+= automount
|
||||||
CONFS+= autounmountd
|
AUTOFS+= automountd
|
||||||
|
AUTOFS+= autounmountd
|
||||||
|
AUTOFSPACKAGE= autofs
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_BLACKLIST} != "no"
|
.if ${MK_BLACKLIST} != "no"
|
||||||
@ -166,7 +168,7 @@ _blacklistd+= blacklistd
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_BLUETOOTH} != "no"
|
.if ${MK_BLUETOOTH} != "no"
|
||||||
CONFGROUPS+= BLUETOOTH
|
FILESGROUPS+= BLUETOOTH
|
||||||
BLUETOOTH+= bluetooth \
|
BLUETOOTH+= bluetooth \
|
||||||
bthidd \
|
bthidd \
|
||||||
hcsecd \
|
hcsecd \
|
||||||
@ -177,71 +179,79 @@ BLUETOOTHPACKAGE= bluetooth
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_BOOTPARAMD} != "no"
|
.if ${MK_BOOTPARAMD} != "no"
|
||||||
CONFS+= bootparams
|
BASERC+= bootparams
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_BSNMP} != "no"
|
.if ${MK_BSNMP} != "no"
|
||||||
CONFGROUPS+= BSNMP
|
FILESGROUPS+= BSNMP
|
||||||
BSNMP+= bsnmpd
|
BSNMP+= bsnmpd
|
||||||
BSNMPPACKAGE= bsnmp
|
BSNMPPACKAGE= bsnmp
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_CCD} != "no"
|
.if ${MK_CCD} != "no"
|
||||||
CONFS+= ccd
|
FILESGROUPS+= CCD
|
||||||
|
CCD+= ccd
|
||||||
|
CCDPACKAGE= ccdconfig
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_FTP} != "no"
|
.if ${MK_FTP} != "no"
|
||||||
CONFS+= ftpd
|
BASERC+= ftpd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_HAST} != "no"
|
.if ${MK_HAST} != "no"
|
||||||
CONFGROUPS+= HAST
|
FILESGROUPS+= HAST
|
||||||
HAST= hastd
|
HAST= hastd
|
||||||
HASTPACKAGE= hast
|
HASTPACKAGE= hast
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_INETD} != "no"
|
.if ${MK_INETD} != "no"
|
||||||
CONFS+= inetd
|
BASERC+= inetd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_IPFILTER} != "no"
|
.if ${MK_IPFILTER} != "no"
|
||||||
CONFS+= ipfilter \
|
FILESGROUPS+= IPFILTER
|
||||||
|
IPFILTER+= ipfilter \
|
||||||
ipfs \
|
ipfs \
|
||||||
ipmon \
|
ipmon \
|
||||||
ipnat \
|
ipnat \
|
||||||
ippool
|
ippool
|
||||||
|
IPFILTERPACKAGE= ipf
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_IPFW} != "no"
|
.if ${MK_IPFW} != "no"
|
||||||
CONFS+= ipfw
|
FILESGROUP+= IPFW
|
||||||
|
IPFW+= ipfw
|
||||||
.if ${MK_NETGRAPH} != "no"
|
.if ${MK_NETGRAPH} != "no"
|
||||||
CONFS+= ipfw_netflow
|
IPFW+= ipfw_netflow
|
||||||
.endif
|
.endif
|
||||||
|
IPFWPACKAGE= ipfw
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ISCSI} != "no"
|
.if ${MK_ISCSI} != "no"
|
||||||
CONFS+= iscsictl
|
FILESGROUPS+= ISCSI
|
||||||
CONFS+= iscsid
|
ISCSI+= iscsictl
|
||||||
|
ISCSI+= iscsid
|
||||||
|
ISCSIPACKAGE= iscsi
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_JAIL} != "no"
|
.if ${MK_JAIL} != "no"
|
||||||
CONFGROUPS+= JAIL
|
FILESGROUPS+= JAIL
|
||||||
JAIL+= jail
|
JAIL+= jail
|
||||||
JAILPACKAGE= jail
|
JAILPACKAGE= jail
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_LEGACY_CONSOLE} != "no"
|
.if ${MK_LEGACY_CONSOLE} != "no"
|
||||||
CONFS+= moused
|
BASERC+= moused
|
||||||
CONFS+= syscons
|
BASERC+= syscons
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_LPR} != "no"
|
.if ${MK_LPR} != "no"
|
||||||
CONFS+= lpd
|
BASERC+= lpd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_KERBEROS} != "no"
|
.if ${MK_KERBEROS} != "no"
|
||||||
CONFS+= ipropd_master
|
BASERC+= ipropd_master
|
||||||
CONFS+= ipropd_slave
|
BASERC+= ipropd_slave
|
||||||
_kadmind= kadmind
|
_kadmind= kadmind
|
||||||
_kdc= kdc
|
_kdc= kdc
|
||||||
_kfd= kfd
|
_kfd= kfd
|
||||||
@ -253,7 +263,7 @@ VAR_HEMIDAL_MODE= 700
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_MAIL} != "no"
|
.if ${MK_MAIL} != "no"
|
||||||
CONFS+= othermta
|
BASERC+= othermta
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_NS_CACHING} != "no"
|
.if ${MK_NS_CACHING} != "no"
|
||||||
@ -261,7 +271,7 @@ _nscd= nscd
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_NTP} != "no"
|
.if ${MK_NTP} != "no"
|
||||||
CONFS+= ntpd
|
BASERC+= ntpd
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_OFED} != "no"
|
.if ${MK_OFED} != "no"
|
||||||
@ -269,31 +279,31 @@ _opensm= opensm
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_OPENSSL} != "no"
|
.if ${MK_OPENSSL} != "no"
|
||||||
CONFS+= keyserv
|
BASERC+= keyserv
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_OPENSSH} != "no"
|
.if ${MK_OPENSSH} != "no"
|
||||||
CONFGROUPS+= SSH
|
FILESGROUPS+= SSH
|
||||||
SSH= sshd
|
SSH= sshd
|
||||||
SSHPACKAGE= ssh
|
SSHPACKAGE= ssh
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_PF} != "no"
|
.if ${MK_PF} != "no"
|
||||||
CONFS+= ftp-proxy
|
BASERC+= ftp-proxy
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ROUTED} != "no"
|
.if ${MK_ROUTED} != "no"
|
||||||
CONFS+= routed
|
BASERC+= routed
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_SENDMAIL} != "no"
|
.if ${MK_SENDMAIL} != "no"
|
||||||
CONFGROUPS+= SMRCD
|
FILESGROUPS+= SMRCD
|
||||||
SMRCD= sendmail
|
SMRCD= sendmail
|
||||||
SMRCDPACKAGE= sendmail
|
SMRCDPACKAGE= sendmail
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_UNBOUND} != "no"
|
.if ${MK_UNBOUND} != "no"
|
||||||
CONFGROUPS+= UNBOUND
|
FILESGROUPS+= UNBOUND
|
||||||
UNBOUND+= local_unbound
|
UNBOUND+= local_unbound
|
||||||
UNBOUNDPACKAGE= unbound
|
UNBOUNDPACKAGE= unbound
|
||||||
.endif
|
.endif
|
||||||
@ -303,25 +313,28 @@ _utx= utx
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_VI} != "no"
|
.if ${MK_VI} != "no"
|
||||||
CONFGROUPS+= VI
|
FILESGROUPS+= VI
|
||||||
VI+= virecover
|
VI+= virecover
|
||||||
VIPACKAGE= vi
|
VIPACKAGE= vi
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_WIRELESS} != "no"
|
.if ${MK_WIRELESS} != "no"
|
||||||
CONFS+= hostapd
|
FILESGROUPS+= HOSTAPD WPA
|
||||||
CONFS+= wpa_supplicant
|
HOSTAPD+= hostapd
|
||||||
|
HOSTAPDPACKAGE= hostapd
|
||||||
|
WPA+= wpa_supplicant
|
||||||
|
WPAPACKAGE= wpa
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_ZFS} != "no"
|
.if ${MK_ZFS} != "no"
|
||||||
CONFGROUPS+= ZFS
|
FILESGROUPS+= ZFS
|
||||||
ZFS+= zfs
|
ZFS+= zfs
|
||||||
ZFS+= zfsbe
|
ZFS+= zfsbe
|
||||||
ZFS+= zfsd
|
ZFS+= zfsd
|
||||||
ZFS+= zvol
|
ZFS+= zvol
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.for fg in ${CONFGROUPS}
|
.for fg in ${FILESGROUPS}
|
||||||
${fg}MODE?= ${BINMODE}
|
${fg}MODE?= ${BINMODE}
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user