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:
d39078c
)
kernel: r8126: add CONFLICT to rss variant
author
Chukun Pan
<amadeus@jmu.edu.cn>
Mon, 16 Sep 2024 15:10:20 +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/r8126/Makefile
patch
|
blob
|
history
diff --git
a/package/kernel/r8126/Makefile
b/package/kernel/r8126/Makefile
index 3cd77294b1485b4d30c84b5994098f40d5a30e0a..c269cdcadc4ba6d43a3f5d2c901abb243263e9a6 100644
(file)
--- a/
package/kernel/r8126/Makefile
+++ b/
package/kernel/r8126/Makefile
@@
-27,6
+27,7
@@
endef
define KernelPackage/r8126-rss
$(call KernelPackage/r8126)
+ CONFLICTS:=kmod-r8126
TITLE+= (RSS)
VARIANT:=rss
endef