Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

build: 提交

build


Commit MetaInfo

修订版2cdc4ca5535f194bb229d4727345c2d075890969 (tree)
时间2016-09-08 02:16:28
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

kernel.mk: refine extra modules building rules

更改概述

差异

--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -56,17 +56,18 @@ ifneq ($(MOD_ENABLED),)
5656 KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules.dep))
5757 KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
5858
59-$(TARGET_OUT_INTERMEDIATES)/%.kmodule: $(INSTALLED_KERNEL_TARGET)
60- $(hide) cp -an $(EXTRA_KERNEL_MODULE_PATH_$*) $(TARGET_OUT_INTERMEDIATES)/$*.kmodule
59+ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
60+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(INSTALLED_KERNEL_TARGET)
6161 @echo Building additional kernel module $*
62+ $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
6263 $(mk_kernel) M=$(abspath $@) modules
6364
64-$(KERNEL_MODULES_DEP): $(INSTALLED_KERNEL_TARGET) $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/%.kmodule,$(TARGET_EXTRA_KERNEL_MODULES))
65+$(KERNEL_MODULES_DEP): $(INSTALLED_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
6566 $(hide) rm -rf $(TARGET_OUT)/lib/modules
6667 $(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) modules_install
6768 + $(hide) for kmod in $(TARGET_EXTRA_KERNEL_MODULES) ; do \
6869 echo Installing additional kernel module $${kmod} ; \
69- $(subst +,,$(subst $(hide),,$(mk_kernel))) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/$${kmod}.kmodule modules_install ; \
70+ $(subst +,,$(subst $(hide),,$(mk_kernel))) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kmodule/$${kmod} modules_install ; \
7071 done
7172 $(hide) rm -f $(TARGET_OUT)/lib/modules/*/{build,source}
7273 endif
Show on old repository browser