Author: ngie
Date: Thu Feb 5 09:55:00 2015
New Revision: 278241
URL: https://svnweb.freebsd.org/changeset/base/278241
Log:
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
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Thu Feb 5 09:29:57 2015 (r278240)
+++ stable/9/etc/rc.d/Makefile Thu Feb 5 09:55:00 2015 (r278241)
@@ -45,7 +45,6 @@ FILES= DAEMON \
gssd \
hastd \
${_hcsecd} \
- hostapd \
hostid \
hostid_save \
hostname \
@@ -142,7 +141,6 @@ FILES= DAEMON \
var \
virecover \
watchdogd \
- wpa_supplicant \
ypbind \
yppasswdd \
ypserv \
@@ -196,6 +194,11 @@ _hcsecd= hcsecd
_ubthidhci= ubthidhci
.endif
+.if ${MK_WIRELESS} != "no"
+FILES+= hostapd
+FILES+= wpa_supplicant
+.endif
+
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 09:29:57
2015 (r278240)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 09:55:00
2015 (r278241)
@@ -3876,6 +3876,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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
