projects / openwrt / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dced292)
kernel: r8125: add CONFLICT to rss variant
authorChukun Pan <[email protected]>
Sun, 15 Sep 2024 15:10:15 +0000 (23:10 +0800)
committerÁlvaro Fernández Rojas <[email protected]>
Tue, 24 Sep 2024 07:15:06 +0000 (09:15 +0200)
The rss variant should conflict with the default.

Signed-off-by: Chukun Pan <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16460
(cherry picked from d39078c785d37961e8b9a96ba3612bc67c10bf2f)
Signed-off-by: Álvaro Fernández Rojas <[email protected]>
package/kernel/r8125/Makefile patch | blob | history

diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile
index f05ec0d842b425ad1018ca69ec913bd49eae04f9..ef95b52e6795498d5a1cd9cee088cd217be15ae0 100644 (file)
--- a/package/kernel/r8125/Makefile
+++ b/package/kernel/r8125/Makefile
@@ -27,6 +27,7 @@ endef
 
 define KernelPackage/r8125-rss
 $(call KernelPackage/r8125)
+  CONFLICTS:=kmod-r8125
   TITLE+= (RSS)
   VARIANT:=rss
 endef
OpenWrt Source Repository