diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-05 09:59:18 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-05 09:59:18 +0000 |
| commit | 4b0ec0fcb80978afa6204774c050559d41d5b547 (patch) | |
| tree | 311f89ea367a7d80321a0152989839eafb427378 | |
| parent | 87b6a908d9fb306c05e9686d5d74e08c995143c9 (diff) | |
| download | FreeBSD-src-4b0ec0fcb80978afa6204774c050559d41d5b547.zip FreeBSD-src-4b0ec0fcb80978afa6204774c050559d41d5b547.tar.gz | |
MFC r277740,r278053:
r277740:
Honor MK_WIRELESS with etc/rc.d/hostapd and etc/rc.d/wpa_supplicant
Sponsored by: EMC / Isilon Storage Division
r278053:
Remove hostapd and wpa_supplicant from FILES so they're installed conditionally
if MK_WIRELESS != no
| -rw-r--r-- | etc/rc.d/Makefile | 7 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 8c69fb6..f922e97 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -48,7 +48,6 @@ FILES= DAEMON \ gssd \ hastd \ ${_hcsecd} \ - hostapd \ hostid \ hostid_save \ hostname \ @@ -153,7 +152,6 @@ FILES= DAEMON \ var \ virecover \ watchdogd \ - wpa_supplicant \ ypbind \ yppasswdd \ ypserv \ @@ -222,6 +220,11 @@ _unbound= local_unbound _utx= utx .endif +.if ${MK_WIRELESS} != "no" +FILES+= hostapd +FILES+= wpa_supplicant +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 968f60d..536617f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4758,6 +4758,8 @@ OLD_FILES+=usr/share/man/man8/utxrm.8.gz .if ${MK_WIRELESS} == no OLD_FILES+=etc/regdomain.xml +OLD_FILES+=etc/rc.d/hostapd +OLD_FILES+=etc/rc.d/wpa_supplicant OLD_FILES+=usr/sbin/ancontrol OLD_FILES+=usr/sbin/hostapd OLD_FILES+=usr/sbin/hostapd_cli |
