From owner-svn-src-all@FreeBSD.ORG Thu Feb 5 09:59:19 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 933FC986; Thu, 5 Feb 2015 09:59:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E672F20; Thu, 5 Feb 2015 09:59:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t159xJY8023541; Thu, 5 Feb 2015 09:59:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t159xJiJ023539; Thu, 5 Feb 2015 09:59:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502050959.t159xJiJ023539@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 09:59:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278242 - in stable/10: etc/rc.d tools/build/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 09:59:19 -0000 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