diff options
| author | Eric Fahlgren | 2026-01-04 00:04:51 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-01-04 10:25:12 +0000 |
| commit | ded99c2984b245ee3885bdf10bd1797e838abf54 (patch) | |
| tree | afbeb9db1495685a40e48afd5093178f1e06188f | |
| parent | a10d10edd72e17a26f8b3c16cfc72984375844d2 (diff) | |
| download | openwrt-ded99c2984b245ee3885bdf10bd1797e838abf54.tar.gz | |
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>
| -rw-r--r-- | package/network/services/hostapd/Makefile | 1 | ||||
| -rw-r--r-- | package/network/utils/ethtool/Makefile | 11 | ||||
| -rw-r--r-- | package/network/utils/iw/Makefile | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index de24064160..d46be1c6cb 100644 --- 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 a62c47e7e8..2086ce6a90 100644 --- 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 d6aaa78394..a4f56c7d66 100644 --- 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 |