diff options
| author | Eric Fahlgren | 2026-01-04 00:04:51 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-01-04 17:42:42 +0000 |
| commit | eed0ab3e4767564f54104388408aa83546f8dac4 (patch) | |
| tree | 01396641987b0949f062588d491599d85f65aaec | |
| parent | ed2d3b143c4d065a22b4eed11edc45275cbe686b (diff) | |
| download | openwrt-eed0ab3e4767564f54104388408aa83546f8dac4.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>
(cherry picked from commit ded99c2984b245ee3885bdf10bd1797e838abf54)
| -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 883954db22..e8850671fc 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:=http://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 5da0c0edb3..e75e8d1225 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:=http://wireless.kernel.org/en/users/Documentation/iw 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 |