Author: ngie
Date: Thu Feb 5 09:59:18 2015
New Revision: 278242
URL: https://svnweb.freebsd.org/changeset/base/278242
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/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Thu Feb 5 09:55:00 2015 (r278241)
+++ stable/10/etc/rc.d/Makefile Thu Feb 5 09:59:18 2015 (r278242)
@@ -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}
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 09:55:00
2015 (r278241)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 09:59:18
2015 (r278242)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
