From owner-freebsd-bugs@FreeBSD.ORG Mon Jul 28 12:04:40 2008 Return-Path: Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 187C8106567D for ; Mon, 28 Jul 2008 12:04:40 +0000 (UTC) (envelope-from mozolevsky@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.169]) by mx1.freebsd.org (Postfix) with ESMTP id 908328FC16 for ; Mon, 28 Jul 2008 12:04:39 +0000 (UTC) (envelope-from mozolevsky@gmail.com) Received: by ug-out-1314.google.com with SMTP id q2so16108uge.37 for ; Mon, 28 Jul 2008 05:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender :to:subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=yM2kl2Uixmuyg6t+LHwqRktOUAP/SoILPEla1cQUyn4=; b=UoWL09s0NAj2sHaNmB98dwB/BXH3P4Bq7gBjO5slmWPMryUSyqMIYCXDP67DqWZb+c 3txUYSwgix10cMe91hlJogRlVRJaKTiqmC8bZsjXbX42kDbUPHUwsv994VoURswRa50I yOs3j64C0qpgoFHspnZM3GWB6eu37luXrYoeE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=GCNxA6WYYwaeCkEfIrAfnbPJtb8XItdURx25JtzAXECMHnZJwxSaPNQW15E6hShSxy yMe/9mQ3Ts/UjwPKf/y37YnPbfdk5NKdi+dOI7nuLvxPJ+vPdQC7FUddO5fNSrnIzkIl P0dXxbY0PwmaKcQeIDSFGa5cecCSEc2TL+tho= Received: by 10.67.26.7 with SMTP id d7mr2056392ugj.44.1217246677996; Mon, 28 Jul 2008 05:04:37 -0700 (PDT) Received: by 10.67.10.13 with HTTP; Mon, 28 Jul 2008 05:04:37 -0700 (PDT) Message-ID: Date: Mon, 28 Jul 2008 13:04:37 +0100 From: "Igor Mozolevsky" Sender: mozolevsky@gmail.com To: freebsd-gnats-submit@freebsd.org In-Reply-To: <200807122050.43490.asstec@matik.com.br> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200807122152.m6CLqcB6031483@www.freebsd.org> <200807121915.04944.asstec@matik.com.br> <200807122050.43490.asstec@matik.com.br> X-Google-Sender-Auth: b3ed56c8a89f3222 Cc: freebsd-bugs@freebsd.org Subject: Re: conf/125551: [PATCH] building WLAN userland should be optional X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2008 12:04:40 -0000 Ok, take three: --- share/mk/bsd.own.mk.orig 2008-07-24 23:06:09.000000000 +0100 +++ share/mk/bsd.own.mk 2008-07-24 23:42:33.000000000 +0100 @@ -358,6 +358,9 @@ TCSH \ TOOLCHAIN \ USB \ + WLAN \ + WLANDEBUG \ + WPA \ WPA_SUPPLICANT_EAPOL \ ZONEINFO \ ZFS @@ -448,6 +451,11 @@ MK_GDB:= no .endif +.if ${MK_WLAN} == "no" +MK_WPA:= no +MK_WLANDEBUG:= no +.endif + # # Set defaults for the MK_*_SUPPORT variables. # --- usr.sbin/Makefile.orig 2008-07-24 02:17:16.000000000 +0100 +++ usr.sbin/Makefile 2008-07-24 23:45:48.000000000 +0100 @@ -185,9 +185,9 @@ vipw \ watch \ watchdogd \ - wlandebug \ + ${_wlandebug} \ ${_wlconfig} \ - wpa \ + ${_wpa} \ ${_ypbind} \ ${_yp_mkdb} \ ${_yppoll} \ @@ -297,6 +297,14 @@ _usbdevs= usbdevs .endif +.if ${MK_WLANDEBUG} != "no" +_wlandebug= wlandebug +.endif + +.if ${MK_WPA} != "no" +_wpa= wpa +.endif + .if ${MACHINE_ARCH} == "arm" _kgmon= kgmon .endif --- /dev/null 2008-07-24 23:44:00.000000000 +0100 +++ tools/build/options/WITHOUT_WLAN 2008-07-24 23:35:36.000000000 +0100 @@ -0,0 +1 @@ +This option will prevent all userland WLAN utilities from being built. --- /dev/null 2008-07-24 23:44:00.000000000 +0100 +++ tools/build/options/WITHOUT_WLANDEBUG 2008-07-24 23:35:51.000000000 +0100 @@ -0,0 +1,3 @@ +Setting this variable will prevent +.Xr wlandebug 8 +from being built. --- /dev/null 2008-07-24 23:44:00.000000000 +0100 +++ tools/build/options/WITHOUT_WPA 2008-07-24 23:35:58.000000000 +0100 @@ -0,0 +1,5 @@ +Setting this variable will prevent +.Xr hostapd 8 +and +.Xr wpa_supplicant 8 +from being built.