treewide: add explicit default variant part 2

Add 'DEFAULT_VARIANT' to two packages, 'iw' and 'eapol-test',
that were missed in the first pass.  Refactor 'iw' and 'ethtool'
package definitions to be consistent with the pattern used in most
other packages.

Fixes: https://github.com/openwrt/openwrt/commit/f4fdb996
Fixes: https://github.com/openwrt/openwrt/commit/7a78dc4a
Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21380
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index de24064160d6bb39a08ecf236880191b3d3f980d..d46be1c6cbff29440db429d4d11fbec627afaf58 100644 (file)
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -544,6 +544,7 @@ define Package/eapol-test
   $(call Package/eapol-test/Default,$(1))
   TITLE+= (built-in full)
   VARIANT:=supplicant-full-internal
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/eapol-test-openssl

diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile
index a62c47e7e84492f45acc752becb982ce4cb11fbc..2086ce6a903c8b8f8e5367fb05e3edd54a949f47 100644 (file)
--- a/package/network/utils/ethtool/Makefile
+++ b/package/network/utils/ethtool/Makefile
@@ -26,24 +26,25 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ethtool
+define Package/ethtool/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Display or change ethernet card settings
   URL:=https://www.kernel.org/pub/software/network/ethtool/
+endef
+
+define Package/ethtool
+$(call Package/ethtool/Default)
   VARIANT:=tiny
-  CONFLICTS:=ethtool-full
   DEFAULT_VARIANT:=1
 endef
 
 define Package/ethtool-full
-  $(Package/ethtool)
+$(call Package/ethtool/Default)
   TITLE += (full)
   VARIANT:=full
   PROVIDES:=ethtool
   DEPENDS:=+libmnl
-  CONFLICTS:=
-  DEFAULT_VARIANT:=
 endef
 
 define Package/ethtool/description

diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
index d6aaa78394759ec9d08d7950ed734e31aa855cb1..a4f56c7d66efbe77baf83ef1e4d3899f4faaba37 100644 (file)
--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -23,17 +23,22 @@ PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/iw
+define Package/iw/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
   URL:=https://wireless.kernel.org/en/latest/en/users/documentation/iw.html
   DEPENDS:= +libnl-tiny
+endef
+
+define Package/iw
+$(call Package/iw/Default)
   VARIANT:=tiny
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/iw-full
-  $(Package/iw)
+$(call Package/iw/Default)
   TITLE += (full version)
   VARIANT:=full
   PROVIDES:=iw