From owner-svn-src-stable-9@FreeBSD.ORG Thu Feb 5 09:55:01 2015 Return-Path: Delivered-To: svn-src-stable-9@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 C37B87F6; Thu, 5 Feb 2015 09:55:01 +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 94988EEF; Thu, 5 Feb 2015 09:55:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t159t11d022958; Thu, 5 Feb 2015 09:55:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t159t17D022933; Thu, 5 Feb 2015 09:55:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502050955.t159t17D022933@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:55:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278241 - in stable/9: etc/rc.d tools/build/mk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 09:55:01 -0000 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