Browse Source

use depmod only when udev is choosen by the user

Waldemar Brodkorb 8 years ago
parent
commit
82ba6bc84f
3 changed files with 8 additions and 3 deletions
  1. 7 1
      mk/kernel-build.mk
  2. 0 1
      target/config/Config.in.runtime
  3. 1 1
      target/config/Config.in.tools

+ 7 - 1
mk/kernel-build.mk

@@ -25,6 +25,12 @@ KERNEL_FILE:=vmlinux
 KERNEL_TARGET:=$(ADK_TARGET_KERNEL)
 endif
 
+ifeq ($(ADK_RUNTIME_DEV_UDEV),y)
+ADK_DEPMOD:=$(STAGING_HOST_DIR)/usr/bin/depmod
+else
+ADK_DEPMOD:=true
+endif
+
 $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
 	$(TRACE) target/kernel-prepare
 	ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) $(LINUX_DIR)
@@ -47,7 +53,7 @@ $(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=$(STAGING_HOST_DIR)/usr/bin/depmod \
+		DEPMOD=$(ADK_DEPMOD) \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)

+ 0 - 1
target/config/Config.in.runtime

@@ -12,7 +12,6 @@ prompt "System for /dev management"
 
 config ADK_RUNTIME_DEV_MDEV
 	bool "Use mdev"
-	select BUSYBOX_MDEV
 
 config ADK_RUNTIME_DEV_UDEV
 	bool "Use udev"

+ 1 - 1
target/config/Config.in.tools

@@ -209,7 +209,7 @@ config ADK_HOST_BUILD_PCRE
 
 config ADK_HOST_BUILD_KMOD
 	bool
-	default y
+	default y if ADK_RUNTIME_DEV_UDEV
 
 source "target/config/Config.in.prereq"