From 672957a7dad8347a986f1a220913c2567005184f Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Thu, 13 Oct 2022 22:11:46 +0200
Subject: [PATCH] fix depmod

---
 make/drivers.mk    |  1 +
 make/kernel-arm.mk | 13 ++++++++++---
 make/kernel.mk     |  4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/make/drivers.mk b/make/drivers.mk
index 78f86f6..883a4c8 100755
--- a/make/drivers.mk
+++ b/make/drivers.mk
@@ -3,6 +3,7 @@
 $(D)/driver:
 	$(MAKE) driver-$(BOXTYPE)
 	$(MAKE) firmware-wireless
+	$(MAKE) depmod
 
 $(D)/driver-coolstream:
 	$(START_BUILD)
diff --git a/make/kernel-arm.mk b/make/kernel-arm.mk
index 71754da..1cf23f4 100644
--- a/make/kernel-arm.mk
+++ b/make/kernel-arm.mk
@@ -2,8 +2,6 @@
 # KERNEL
 #
 ifeq ($(BOXTYPE), armbox)
-
-DEPMOD = $(HOSTPREFIX)/bin/depmod -a -b $(TARGETPREFIX) $(KERNEL_VER)
 #
 # Patches Kernel
 #
@@ -100,6 +98,7 @@ KERNEL_DTB_VER         = hi3798mv200.dtb
 BOOT_PARTITION         = 4
 endif
 
+TARGET_MODULE = $(TARGETPREFIX)/lib/modules/$(KERNEL_VER)
 # -----------------------------------------------------------------------------
 
 # Older versions break on gcc 10+ because of redefined symbols
@@ -219,7 +218,7 @@ endif
 ifeq ($(BOXSERIES),hd6x)
 	make hd6x-mali-drivers
 endif
-	$(DEPMOD)
+	$(MAKE) depmod
 	$(TOUCH)
 
 kernel-distclean:
@@ -238,6 +237,14 @@ kernel-clean:
 #
 # Helper
 #
+depmod:
+	$(HOSTPREFIX)/bin/depmod -a -b $(TARGETPREFIX) $(KERNEL_VER)
+	mv $(TARGET_MODULE)/modules.alias $(TARGET_MODULE)/.modules.alias
+	mv $(TARGET_MODULE)/modules.dep $(TARGET_MODULE)/.modules.dep
+	rm $(TARGET_MODULE)/modules.*
+	mv $(TARGET_MODULE)/.modules.alias $(TARGET_MODULE)/modules.alias
+	mv $(TARGET_MODULE)/.modules.dep $(TARGET_MODULE)/modules.dep
+
 kernel.menuconfig kernel.xconfig: \
 kernel.%: $(D)/kernel-armbox
 	$(MAKE) -C $(BUILD_TMP)/$(KERNEL_DIR) ARCH=arm CROSS_COMPILE=$(TARGET)- $*
diff --git a/make/kernel.mk b/make/kernel.mk
index 954e15b..ba21c82 100644
--- a/make/kernel.mk
+++ b/make/kernel.mk
@@ -98,9 +98,11 @@ kernel-clean:
 
 # helper target...
 depmod:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KVERSION_FULL)
+	$(HOSTPREFIX)/bin/depmod -a -b $(TARGETPREFIX) $(KVERSION_FULL)
 	mv $(TARGET_MODULE)/modules.dep $(TARGET_MODULE)/.modules.dep
+	mv $(TARGET_MODULE)/modules.alias $(TARGET_MODULE)/.modules.alias
 	rm $(TARGET_MODULE)/modules.*
 	mv $(TARGET_MODULE)/.modules.dep $(TARGET_MODULE)/modules.dep
+	mv $(TARGET_MODULE)/.modules.alias $(TARGET_MODULE)/modules.alias
 
 endif # ($(BOXTYPE), coolstream)
-- 
2.39.5