From patchwork Wed May 23 12:06:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 160917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id A56A8B6F86 for ; Wed, 23 May 2012 22:06:16 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5071C1000A5; Wed, 23 May 2012 12:06:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K4IdCHsum5V4; Wed, 23 May 2012 12:06:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3C4621001D4; Wed, 23 May 2012 12:06:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7F3818F753 for ; Wed, 23 May 2012 12:06:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7384E8D3E6 for ; Wed, 23 May 2012 12:06:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aY5WPrrSaRou for ; Wed, 23 May 2012 12:06:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 352628D25F for ; Wed, 23 May 2012 12:06:10 +0000 (UTC) Received: from asgard (host31.190-224-150.telecom.net.ar [190.224.150.31]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id q4NC62h1018819 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 23 May 2012 09:06:06 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1337774768; bh=C6L/b2ETJpZMKEtBiy9onKhaTbDUK0lye4tz3cvkqJw=; h=From:To:Cc:Subject:Date:Message-Id; b=pZoq5meBQulvSukF6oED3rBrc6AabL6CNE+6/cpI2lcFlTt75x0XrzXfwLxwIWvnN tmS2PLZT/TUgLA0PQfNqFzvw3XKAFI5L9GCYRVtHP0Vbo8lN2FcteIBcMXgtF8rAf7 7PnQ0QnTkxw3n/0pqu0m8h4SmYl4KcHIMYC3de0A= Received: by asgard (sSMTP sendmail emulation); Wed, 23 May 2012 09:06:01 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 23 May 2012 09:06:00 -0300 Message-Id: <1337774761-14447-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 1/2] hostapd: enable interworking and enhance X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Enable IEEE 802.11u (interworking). Also enable new supported EAP methods. Switch from echo to sed where possible for a cleaner .config output Signed-off-by: Gustavo Zacarias --- package/hostapd/hostapd.mk | 59 +++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 31 deletions(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index d9ee4f0..c7c59ec 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -18,76 +18,73 @@ HOSTAPD_LDFLAGS += -lm endif define HOSTAPD_LIBNL_CONFIG - echo "CONFIG_LIBNL32=y" >>$(HOSTAPD_CONFIG) + echo 'CONFIG_LIBNL32=y' >>$(HOSTAPD_CONFIG) endef -define HOSTAPD_CRYPTO_CONFIG - echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG) +define HOSTAPD_LIBTOMMATH_CONFIG + $(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG) endef # Try to use openssl or gnutls if it's already available ifeq ($(BR2_PACKAGE_OPENSSL),y) HOSTAPD_DEPENDENCIES += openssl define HOSTAPD_TLS_CONFIG - echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG) endef else ifeq ($(BR2_PACKAGE_GNUTLS),y) HOSTAPD_DEPENDENCIES += gnutls define HOSTAPD_TLS_CONFIG - echo "CONFIG_TLS=gnutls" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG) endef else define HOSTAPD_TLS_CONFIG - echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG) endef endif endif ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y) define HOSTAPD_EAP_CONFIG - $(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG) - echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_RADIUS_SERVER.*\)/\2/' $(HOSTAPD_CONFIG) endef -ifeq ($(BR2_INET_IPV6),y) +ifneq ($(BR2_INET_IPV6),y) define HOSTAPD_RADIUS_IPV6_CONFIG - $(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG) + $(SED) 's/\(CONFIG_IPV6.*\)/#\1/' $(HOSTAPD_CONFIG) endef endif else define HOSTAPD_EAP_CONFIG - $(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG) + $(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_NO_ACCOUNTING.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_NO_RADIUS.*\)/\2/' $(HOSTAPD_CONFIG) endef endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) define HOSTAPD_WPS_CONFIG - $(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(HOSTAPD_CONFIG) endef endif define HOSTAPD_CONFIGURE_CMDS cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) # Misc - $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG) - $(HOSTAPD_CRYPTO_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_FULL_DYNAMIC_VLAN.*\)/\2/' $(HOSTAPD_CONFIG) + $(HOSTAPD_LIBTOMMATH_CONFIG) $(HOSTAPD_TLS_CONFIG) $(HOSTAPD_RADIUS_IPV6_CONFIG) $(HOSTAPD_EAP_CONFIG)