Browse Source

do depmod during modules_install (trying to fix linux-git with udev)

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
BALATON Zoltan 8 years ago
parent
commit
203452e81e
3 changed files with 9 additions and 4 deletions
  1. 2 1
      mk/kernel-build.mk
  2. 3 3
      target/Makefile
  3. 4 0
      target/config/Config.in.tools

+ 2 - 1
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)

+ 3 - 3
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; \

+ 4 - 0
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