From 203452e81ef83217d1c24b9bc46ff294c2da8c1e Mon Sep 17 00:00:00 2001
From: BALATON Zoltan <balaton@eik.bme.hu>
Date: Thu, 2 Jul 2015 15:07:36 +0200
Subject: [PATCH] do depmod during modules_install (trying to fix linux-git
 with udev)

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 mk/kernel-build.mk            | 3 ++-
 target/Makefile               | 6 +++---
 target/config/Config.in.tools | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 7f3b4ccc9..78f92f3b8 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -46,7 +46,8 @@ $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
 $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
 	rm -rf $(LINUX_BUILD_DIR)/modules
-	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} \
+		DEPMOD=$(STAGING_HOST_DIR)/usr/bin/depmod \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)
diff --git a/target/Makefile b/target/Makefile
index e0fb607b2..a2934682e 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -136,10 +136,10 @@ clean: $(ADK_TARGET_ARCH)-clean $(ADK_TARGET_ARCH)-imageclean
 %-imageprepare:
 	$(TRACE) target/$(patsubst %-imageprepare,%,$@)-imageprepare
 ifeq ($(ADK_RUNTIME_DEV_UDEV),y)
+	# This should be made a package instead
 	$(CP) -a $(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)/modules/lib $(TARGET_DIR)
-	rm -f "$(TARGET_DIR)/lib/modules/$(ADK_KERNEL_VERSION)/build" \
-	      "$(TARGET_DIR)/lib/modules/$(ADK_KERNEL_VERSION)/source"
-	$(STAGING_HOST_DIR)/usr/bin/depmod -a -b $(TARGET_DIR) $(ADK_KERNEL_VERSION)
+	rm -f "$(TARGET_DIR)"/lib/modules/*/build \
+	      "$(TARGET_DIR)"/lib/modules/*/source
 endif
 	@for x in $$(ls $(ADK_TOPDIR)/scripts/preimage/*.sh 2>/dev/null); do \
 		[[ -x "$$x" ]] && $$x; \
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 901751ff2..858e57ea3 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -207,6 +207,10 @@ config ADK_HOST_BUILD_PCRE
 	default y if ADK_HOST_DARWIN
 	default n
 
+config ADK_HOST_BUILD_KMOD
+	bool
+	default y
+
 source "target/config/Config.in.prereq"
 
 config ADK_COMPRESSION_TOOL
-- 
2.11.4.GIT