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

kernel: r8126: 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
(cherry picked from b83c7448d3ecd82d6c9e02aded784d6bc3c9ce3c)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/package/kernel/r8126/Makefile b/package/kernel/r8126/Makefile
index 3cd77294b1..c269cdcadc 100644
--- 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