summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-07-06 21:09:16 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-07-06 21:09:26 +0200
commit82ba6bc84f59c7eeba9564f10c7703f0f82c35b1 (patch)
tree7fa8c9cfbc45bf6c36a837ce550b725b68f43584
parent2aa4f6212ba086465a617fb071fcd534dd940ac1 (diff)
use depmod only when udev is choosen by the user
-rw-r--r--mk/kernel-build.mk8
-rw-r--r--target/config/Config.in.runtime1
-rw-r--r--target/config/Config.in.tools2
3 files changed, 8 insertions, 3 deletions
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 78f92f3b8..029d3802d 100644
--- a/mk/kernel-build.mk
+++ b/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)
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 3eb234a44..926fb71a9 100644
--- a/target/config/Config.in.runtime
+++ b/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"
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 858e57ea3..06c2b544c 100644
--- a/target/config/Config.in.tools
+++ b/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"