projects / openwrt / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eed0ab3)
packages: ethtool: restore CONFLICTS
authorEric Fahlgren <ericfahlgren@gmail.com>
Sun, 4 Jan 2026 17:35:11 +0000 (09:35 -0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 4 Jan 2026 17:43:37 +0000 (18:43 +0100)
Inadvertent removal of 'CONFLICTS' breaks kconfig selection.
Restore it.

Fixes: ded99c2984b2 ("treewide: add explicit default variant part 2")
Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21388
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 8630fa09c7b69817b160289e15d48acf66369bc7)

package/network/utils/ethtool/Makefile patch | blob | history

diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile
index e8850671fc886485bae39cf48820fa325bbc4a7b..23af1759114058d268961fe16182f238f54108e3 100644 (file)
--- 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
 
OpenWrt Source Repository