Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

build: 提交

build


Commit MetaInfo

修订版b5f6b4a9e6d3d4d13438d746cd53027b3399987d (tree)
时间2009-11-09 14:16:40
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

kernel.mk: fix a dependency issue

If the config update only affects modules, the kernel image will not
be updated, so the updated modules will not be installed to /system.
The fix let the final kernel image depends on the config directly.

更改概述

差异

--- a/core/kernel.mk
+++ b/core/kernel.mk
@@ -26,14 +26,12 @@ FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FI
2626 # but I don't want to write a complex Android.mk to build kernel.
2727 # This is the simplest way I can think.
2828 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
29-$(BUILT_KERNEL_TARGET): $(KERNEL_CONFIG_FILE) | $(KBUILD_OUTPUT)
29+$(INSTALLED_KERNEL_TARGET): $(KERNEL_CONFIG_FILE) | $(KBUILD_OUTPUT) $(ACP)
3030 $(mk_kernel) $(TARGET_KERNEL_CONFIG)
3131 $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
32-
33-$(INSTALLED_KERNEL_TARGET): $(BUILT_KERNEL_TARGET) | $(ACP)
34- $(copy-file-to-new-target)
32+ $(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@
3533 ifdef TARGET_PREBUILT_MODULES
36- $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib
34+ $(hide) $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib
3735 else
3836 ifneq ($(MOD_ENABLED),)
3937 $(mk_kernel) INSTALL_MOD_PATH=$(CURDIR)/$(TARGET_OUT) modules_install
Show on old repository browser