From: Chukun Pan <amadeus@jmu.edu.cn>
Date: Sun, 15 Sep 2024 15:10:15 +0000 (+0800)
Subject: kernel: r8125: add CONFLICT to rss variant
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d39078c785d37961e8b9a96ba3612bc67c10bf2f;p=openwrt%2Fstaging%2Fblocktrron.git

kernel: r8125: add CONFLICT to rss variant

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>
---

diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile
index f05ec0d842..ef95b52e67 100644
--- 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