[openwrt/openwrt] kernel: kmod-can-slcan: Fix can-slcan.ko location

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 14 13:04:00 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/712cda13514f593f0d6b82ac7056442291fce14a

commit 712cda13514f593f0d6b82ac7056442291fce14a
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Wed Mar 13 20:35:19 2024 +0100

    kernel: kmod-can-slcan: Fix can-slcan.ko location
    
    The slcan.ko file was moved in upstream Linux:
    https://git.kernel.org/linus/98b12064591d635db86da4957b547067dc6897cc
    This fixes the build with kernel >= 6.0. This module was never build
    with kernel 6.1 before.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/kernel/linux/modules/can.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk
index 4ff85d1c01..e6c5db7135 100644
--- a/package/kernel/linux/modules/can.mk
+++ b/package/kernel/linux/modules/can.mk
@@ -182,7 +182,9 @@ $(eval $(call KernelPackage,can-raw))
 define KernelPackage/can-slcan
   TITLE:=Serial / USB serial CAN Adaptors (slcan)
   KCONFIG:=CONFIG_CAN_SLCAN
-  FILES:=$(LINUX_DIR)/drivers/net/can/slcan.ko
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/can/slcan.ko at lt6.0 \
+	$(LINUX_DIR)/drivers/net/can/slcan/slcan.ko at ge6.0
   AUTOLOAD:=$(call AutoProbe,slcan)
   $(call AddDepends/can)
 endef




More information about the lede-commits mailing list