From c3a69061aef6716c10cfa56dd1819f52750a497d Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Fri, 12 Apr 2024 16:19:27 +0200
Subject: [PATCH] [no ci] XM: revert recent path changes (#1397)

---
 .../board/xm530/kernel/xm530.generic.config          |  2 +-
 .../xiongmai-osdrv-xm530/files/script/load_xiongmai  |  2 +-
 .../xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk     | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config b/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config
index 6b70c3cd..4596e8f6 100644
--- a/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config
+++ b/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config
@@ -28,7 +28,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="+"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
index 0b4bdcff..bfb85516 100755
--- a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
+++ b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
@@ -2,7 +2,7 @@
 chipid=$(ipcinfo --chip-name)
 [ "${chipid}" = "xm550" ] && MEM_ALL=128 || MEM_ALL=64
 
-MODULE=/lib/modules/3.10.103/xiongmai
+MODULE=/lib/modules/3.10.103+/xiongmai
 MEM_START=0x800
 MEM_SAMALL_LIN=0x1
 
diff --git a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
index 3ab57acf..5eb842b3 100644
--- a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
+++ b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
@@ -16,14 +16,14 @@ define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/firmware/hevcenc.fwb
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/xiongmai
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko
 
 	# Dirty hack
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/script/load*