From patchwork Thu Jul 12 17:33:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 943155 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kresin.me Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="A2WDpFQr"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="VV4hMdY6"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41RNTW2HfMz9rxs for ; Fri, 13 Jul 2018 03:38:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=jbSmUy/d0SgTsfXX5r9jNR5SW5KlMZViEsgXyihC4mY=; b=A2WDpFQrAdfFjj q2fGUpL5LlFur8FKmgrpzIHB+aiY3lbpH5fFEcGicvAOxGO0Onl9q/SMUn/Cr/8QbqdV4AbCjtLUT dvd+JJpZAevexLbajtJbiDK3nD3d6OpHhEfcKWXnWyyWT9lVTWuBXpNXNJKudFBaqAyeVgWQyxk6q QHgVKboLPr+A3LT8Hj0b8IA1XkV/O1Xs+g03N/iYsGHK52Erz2gX2ezPNeI8Nx/b8Z09a9kxu8bM+ pHGLV0F4F7vtpXXJxXmqIJcJ0n1kEhanUCmAxhtpkH4vRJxEKOPdjhnulSS6o0Ek3x0P8CxxJTZB6 vysJ3cIjrDcUHZDmTwTA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdfYG-0008Cu-L7; Thu, 12 Jul 2018 17:38:48 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdfY9-0007vq-W4 for openwrt-devel@lists.openwrt.org; Thu, 12 Jul 2018 17:38:47 +0000 Received: by mail-wr1-x42d.google.com with SMTP id s11-v6so22524801wra.13 for ; Thu, 12 Jul 2018 10:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=o7VeE+V6sx+ghYbBGNblyd8GCuBFUIh0WvJHgNTqss4=; b=VV4hMdY6ikG0X/Ll0eamHqsZR9jukx5upISnY1ka3SSMZ6qVlEtWvJOBqYIQuYl4tP Qs6dG92TmYXYeuYnIB6y/PAFP73rXemr31h9kdxYIyROU1NK/9ELmSq5uzrqnKc44yMb +0tPA48PiBpQQv7n0p0I8zY+RbxU24Izz5RSXuCG2Z31CMkGDvMwun55FK3gW2NLs142 nXiYzf7PjmAKlw+O69gWCL2myRL/Rv4VcGNSGuzv3jOUMtRuMirFHoBuvo15oX6WkhDH tpfO0tRXxJvJvuvJAN3uLTG3VaOJMdA6jQXgdfi1ZiOGTZSrbhQvHss6dklP48f+KQwo 16kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=o7VeE+V6sx+ghYbBGNblyd8GCuBFUIh0WvJHgNTqss4=; b=qRotxAzUnuk8kkzOoO0aC+OPgWxJOzQNIeGn79l1LpEfUV4zQKMqXEMN5tBxgVeH3n rtd/XFmrtzMJIl3JmnWeIlEvi9q/8y/BoNrD50A22Y7Qba6LKcSDW6cjDras9z+96FBB I2AoVEtKRjRvbiebM/5bTR8/bbXjrp6zBBwIPgbzdApn7FUFwCjy9K9F26Vo0qFoEwtK oAQhy425Cm9UtIuZziXbBfed3aYArbh/Ua4hNa/HlbJiWT5Fe3alNbllLH5M68idqP0R oEtZ5h4lerZhh7vasLT7tAZXZBUigSr6Gj9ra26jc5+GAj5Fp7ewO+SH2yZp6wvN+OSs c74g== X-Gm-Message-State: AOUpUlEFgwd53wnaBGrlC6YrvdNUTnGXYBD1/34Zx/H2FU0CE41JJRRf 74JXzDsXd0Bzm8gvazSONJ4z7nxL X-Google-Smtp-Source: AAOMgpflGwSt5TdOnubb/ZWaOxjazJHgZEVur2FSDZEVlOnDWB+Q8+q6KMqI8Gvlv3KTxOH9WXjFEA== X-Received: by 2002:adf:9a0b:: with SMTP id z11-v6mr2422970wrb.47.1531417109878; Thu, 12 Jul 2018 10:38:29 -0700 (PDT) Received: from desktop.wvd.kresin.me (p200300EC2BD4B5000D95041527C14A54.dip0.t-ipconnect.de. [2003:ec:2bd4:b500:d95:415:27c1:4a54]) by smtp.gmail.com with ESMTPSA id f6-v6sm11981945wrp.30.2018.07.12.10.38.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jul 2018 10:38:29 -0700 (PDT) From: Mathias Kresin To: openwrt-devel@lists.openwrt.org Date: Thu, 12 Jul 2018 19:33:47 +0200 Message-Id: <1531416828-29071-1-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180712_103842_591625_3309E4DA X-CRM114-Status: UNSURE ( 8.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:42d listed in] [list.dnswl.org] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender Subject: [OpenWrt-Devel] [PATCH 1/2] hostapd: cleanup package definition X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Move common variables and/or values to the package (variant) default. Add additional values in variant packages if necessary. Remove further duplicates by introducing new templates. Remove the ANY_[HOSTAPD|SUPPLICANT_PROVIDERS]_PROVIDERS. The are the same as the variables without the any prefix. No need to maintain both variables. Signed-off-by: Mathias Kresin --- package/network/services/hostapd/Makefile | 88 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index cf0b005..5d53cb0 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -45,8 +45,6 @@ EAPOL_TEST_PROVIDERS:=eapol-test eapol-test-openssl eapol-test-wolfssl SUPPLICANT_PROVIDERS:=$(WPAD_PROVIDERS) $(SUPPLICANT_ONLY_PROVIDERS) HOSTAPD_PROVIDERS:=$(WPAD_PROVIDERS) $(HOSTAPD_ONLY_PROVIDERS) -ANY_SUPPLICANT_PROVIDERS:=$(WPAD_PROVIDERS) $(SUPPLICANT_ONLY_PROVIDERS) -ANY_HOSTAPD_PROVIDERS:=$(WPAD_PROVIDERS) $(HOSTAPD_ONLY_PROVIDERS) ANY_PROVIDERS:=$(WPAD_PROVIDERS) $(SUPPLICANT_ONLY_PROVIDERS) $(HOSTAPD_ONLY_PROVIDERS) LOCAL_TYPE=$(strip \ @@ -147,12 +145,14 @@ endif DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny + define Package/hostapd/Default SECTION:=net CATEGORY:=Network TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus + PROVIDES:=hostapd endef define Package/hostapd @@ -161,30 +161,29 @@ $(call Package/hostapd/Default) VARIANT:=full-internal endef +define Package/hostapd/description + This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS + Authenticator. +endef + define Package/hostapd-openssl $(call Package/hostapd/Default) TITLE+= (full) VARIANT:=full-openssl DEPENDS+=+libopenssl CONFLICTS:=$(filter-out hostapd-openssl ,$(HOSTAPD_ONLY_PROVIDERS)) - PROVIDES:=hostapd endef +Package/hostapd-openssl/description = $(Package/hostapd/description) + define Package/hostapd-wolfssl $(call Package/hostapd/Default) TITLE+= (full) VARIANT:=full-wolfssl DEPENDS+=+libwolfssl CONFLICTS:=$(filter-out hostapd-openssl ,$(filter-out hostapd-wolfssl ,$(HOSTAPD_ONLY_PROVIDERS))) - PROVIDES:=hostapd -endef - -define Package/hostapd/description - This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS - Authenticator. endef -Package/hostapd-openssl/description = $(Package/hostapd/description) Package/hostapd-wolfssl/description = $(Package/hostapd/description) define Package/hostapd-mini @@ -192,18 +191,18 @@ $(call Package/hostapd/Default) TITLE+= (WPA-PSK only) VARIANT:=mini CONFLICTS:=$(filter-out hostapd-wolfssl ,$(filter-out hostapd-openssl ,$(filter-out hostapd-mini ,$(HOSTAPD_ONLY_PROVIDERS)))) - PROVIDES:=hostapd endef define Package/hostapd-mini/description This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only). endef - define Package/hostapd-utils - $(call Package/hostapd/Default) - TITLE+= (utils) - DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(ANY_HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) + SECTION:=net + CATEGORY:=Network + TITLE:=IEEE 802.1x Authenticator (utils) + URL:=http://hostap.epitest.fi/ + DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) endef define Package/hostapd-utils/description @@ -211,6 +210,7 @@ define Package/hostapd-utils/description IEEE 802.1x/WPA/EAP/RADIUS Authenticator. endef + define Package/wpad/Default SECTION:=net CATEGORY:=Network @@ -234,6 +234,11 @@ $(call Package/wpad/Default) )))))) endef +define Package/wpad/description + This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS + Authenticator and Supplicant +endef + define Package/wpad-openssl $(call Package/wpad/Default) TITLE+= (full) @@ -245,6 +250,8 @@ $(call Package/wpad/Default) $(ANY_PROVIDERS)))) endef +Package/wpad-openssl/description = $(Package/wpad/description) + define Package/wpad-wolfssl $(call Package/wpad/Default) TITLE+= (full) @@ -257,12 +264,6 @@ $(call Package/wpad/Default) $(ANY_PROVIDERS))))) endef -define Package/wpad/description - This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS - Authenticator and Supplicant -endef - -Package/wpad-openssl/description = $(Package/wpad/description) Package/wpad-wolfssl/description = $(Package/wpad/description) define Package/wpad-mini @@ -276,37 +277,43 @@ define Package/wpad-mini/description This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only). endef -define Package/wpad-mesh-openssl +define Package/wpad-mesh $(call Package/wpad/Default) TITLE+= (with 802.11s mesh and SAE support) - DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) +libopenssl + DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) + PROVIDES+=wpa-supplicant-mesh wpad-mesh +endef + +define Package/wpad-mesh/description + This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (with 802.11s mesh and SAE support). +endef + +define Package/wpad-mesh-openssl +$(call Package/wpad-mesh) + DEPENDS+=+libopenssl VARIANT:=wpad-mesh-openssl CONFLICTS:=$(filter-out wpad-mesh-openssl ,$(ANY_PROVIDERS)) - PROVIDES+=wpa-supplicant-mesh wpad-mesh endef +Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description) + define Package/wpad-mesh-wolfssl -$(call Package/wpad/Default) - TITLE+= (with 802.11s mesh and SAE support) - DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) +libwolfssl +$(call Package/wpad-mesh) + DEPENDS+=+libwolfssl VARIANT:=wpad-mesh-wolfssl CONFLICTS:=$(filter-out wpad-mesh-openssl ,$(filter-out wpad-mesh-wolfssl ,$(ANY_PROVIDERS))) - PROVIDES+=wpa-supplicant-mesh wpad-mesh -endef - -define Package/wpad-mesh/description - This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (with 802.11s mesh and SAE support). endef -Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description) Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description) + define Package/wpa-supplicant/Default SECTION:=net CATEGORY:=Network TITLE:=WPA Supplicant URL:=http://hostap.epitest.fi/wpa_supplicant/ DEPENDS:=$(DRV_DEPENDS) + PROVIDES:=wpa-supplicant endef define Package/wpa-supplicant @@ -325,7 +332,6 @@ define Package/wpa-supplicant-openssl )))) VARIANT:=supplicant-full-openssl DEPENDS+=+libopenssl - PROVIDES:=wpa-supplicant endef define Package/wpa-supplicant-wolfssl @@ -338,7 +344,6 @@ define Package/wpa-supplicant-wolfssl )))) VARIANT:=supplicant-full-wolfssl DEPENDS+=+libwolfssl - PROVIDES:=wpa-supplicant endef define Package/wpa-supplicant/config @@ -346,9 +351,9 @@ define Package/wpa-supplicant/config endef define Package/wpa-supplicant-p2p - $(Package/wpa-supplicant) + $(Package/wpa-supplicant/Default) TITLE:=WPA Supplicant (with Wi-Fi P2P support) - DEPENDS:=$(DRV_DEPENDS) @PACKAGE_kmod-cfg80211 + DEPENDS+=@PACKAGE_kmod-cfg80211 CONFLICTS:=$(filter-out wpa-supplicant-openssl ,\ $(filter-out wpa-supplicant-wolfssl ,\ $(filter-out wpa-supplicant-p2p ,\ @@ -357,14 +362,13 @@ define Package/wpa-supplicant-p2p $(SUPPLICANT_ONLY_PROVIDERS)\ ))))) VARIANT:=supplicant-p2p-internal - PROVIDES:=wpa-supplicant endef define Package/wpa-supplicant-mesh/Default $(Package/wpa-supplicant/Default) TITLE:=WPA Supplicant (with 802.11s and SAE) - DEPENDS:=$(DRV_DEPENDS) @PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) - PROVIDES:=wpa-supplicant wpa-supplicant-mesh + DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) + PROVIDES+=wpa-supplicant-mesh endef define Package/wpa-supplicant-mesh-openssl @@ -384,15 +388,13 @@ endef define Package/wpa-supplicant-mini $(Package/wpa-supplicant/Default) TITLE:=WPA Supplicant (minimal version) - DEPENDS:=$(DRV_DEPENDS) VARIANT:=supplicant-mini - PROVIDES:=wpa-supplicant endef define Package/wpa-cli SECTION:=net CATEGORY:=Network - DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(ANY_SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) + DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) TITLE:=WPA Supplicant command line control utility endef