projects
/
openwrt
/
staging
/
blocktrron.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f4bd69
)
kernel: r8125: add CONFLICT to rss variant
author
Chukun Pan
<amadeus@jmu.edu.cn>
Sun, 15 Sep 2024 15:10:15 +0000
(23:10 +0800)
committer
Álvaro Fernández Rojas
<noltari@gmail.com>
Tue, 24 Sep 2024 07:11:58 +0000
(09:11 +0200)
The rss variant should conflict with the default.
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Link:
https://github.com/openwrt/openwrt/pull/16460
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
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