[openwrt/openwrt] packages: ethtool: restore CONFLICTS
LEDE Commits
lede-commits at lists.infradead.org
Sun Jan 4 09:44:22 PST 2026
hauke pushed a commit to openwrt/openwrt.git, branch openwrt-25.12:
https://git.openwrt.org/66662fae9117e7383ef16a9cd21b793dfb939026
commit 66662fae9117e7383ef16a9cd21b793dfb939026
Author: Eric Fahlgren <ericfahlgren at gmail.com>
AuthorDate: Sun Jan 4 09:35:11 2026 -0800
packages: ethtool: restore CONFLICTS
Inadvertent removal of 'CONFLICTS' breaks kconfig selection.
Restore it.
Fixes: ded99c2984b2 ("treewide: add explicit default variant part 2")
Signed-off-by: Eric Fahlgren <ericfahlgren at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21388
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
(cherry picked from commit 8630fa09c7b69817b160289e15d48acf66369bc7)
---
package/network/utils/ethtool/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile
index e8850671fc..23af175911 100644
--- a/package/network/utils/ethtool/Makefile
+++ b/package/network/utils/ethtool/Makefile
@@ -36,6 +36,7 @@ endef
define Package/ethtool
$(call Package/ethtool/Default)
VARIANT:=tiny
+ CONFLICTS:=ethtool-full
DEFAULT_VARIANT:=1
endef
More information about the lede-commits
mailing list