svn commit: r277740 - in head: etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 09:43:08 2015
New Revision: 277740
URL: https://svnweb.freebsd.org/changeset/base/277740

Log:
  Honor MK_WIRELESS with etc/rc.d/hostapd and etc/rc.d/wpa_supplicant
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Mon Jan 26 09:37:14 2015	(r277739)
+++ head/etc/rc.d/Makefile	Mon Jan 26 09:43:08 2015	(r277740)
@@ -247,6 +247,11 @@ _unbound=	local_unbound
 _utx=		utx
 .endif
 
+.if ${MK_WIRELESS} != "no"
+FILES+=		hostapd
+FILES+=		wpa_supplicant
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:37:14 2015	(r277739)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 09:43:08 2015	(r277740)
@@ -4981,6 +4981,8 @@ OLD_FILES+=usr/share/man/man8/utx.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