[openwrt/openwrt] hostapd: set VARIANT=* for wpa-cli, hostapd-utils

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 14 15:49:07 PST 2021


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5720ac8f4c0d17534a2cf8c9800c01fa7e2c785f

commit 5720ac8f4c0d17534a2cf8c9800c01fa7e2c785f
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Wed Nov 3 15:58:57 2021 -0300

    hostapd: set VARIANT=* for wpa-cli, hostapd-utils
    
    19aae94 [build: avoid rebuilds of unset VARIANT packages] builds
    packages defined without a VARIANT only once, using the first VARIANT
    defined in the Makefile.
    
    This caused problems with wpa-cli, as it is only built for variants that
    include supplicant support, and the first VARIANT defined may not build
    it.
    
    The same happens to hostapd-utils, which is not built for
    supplicant-only variants.
    
    To circumvent this, set VARIANT=* for both packages so that they get
    built for every defined variant.  This should not cause spurious
    rebuilds, since tey are not a dependency of any other package defined in
    this Makefile.
    
    Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
---
 package/network/services/hostapd/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 4930851780..d921df7f97 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -426,6 +426,7 @@ define Package/hostapd-utils
   TITLE:=IEEE 802.1x Authenticator (utils)
   URL:=http://hostap.epitest.fi/
   DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
+  VARIANT:=*
 endef
 
 define Package/hostapd-utils/description
@@ -439,6 +440,7 @@ define Package/wpa-cli
   SUBMENU:=WirelessAPD
   DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
   TITLE:=WPA Supplicant command line control utility
+  VARIANT:=*
 endef
 
 define Package/eapol-test/Default



More information about the lede-commits mailing list