fix depmod

diff --git a/make/drivers.mk b/make/drivers.mk
index 78f86f6967ff7e4afb89dde30d2d90a118a06eb9..883a4c86b7b92a7aacb4a2e438f97c3332ad3c14 100755 (executable)
--- 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 71754da1b07f330d3db48b7273611412df46e8c4..1cf23f408af0df503147b5ae56e3a1026ba69da2 100644 (file)
--- 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 954e15b874079ae7619843f11c420521d25ebd73..ba21c82e6e8e366d2d14d06878429d02a3d43b6b 100644 (file)
--- 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)