From bbf517c1c97a219cd3b0500e0124cc72a2672c80 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 5 Nov 2009 16:49:33 +0800 Subject: [PATCH] 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. --- core/kernel.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/kernel.mk b/core/kernel.mk index e1ee3aa19..e5f21646b 100644 --- a/core/kernel.mk +++ b/core/kernel.mk @@ -26,14 +26,12 @@ FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FI # but I don't want to write a complex Android.mk to build kernel. # This is the simplest way I can think. BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET) -$(BUILT_KERNEL_TARGET): $(KERNEL_CONFIG_FILE) | $(KBUILD_OUTPUT) +$(INSTALLED_KERNEL_TARGET): $(KERNEL_CONFIG_FILE) | $(KBUILD_OUTPUT) $(ACP) $(mk_kernel) $(TARGET_KERNEL_CONFIG) $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules) - -$(INSTALLED_KERNEL_TARGET): $(BUILT_KERNEL_TARGET) | $(ACP) - $(copy-file-to-new-target) + $(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@ ifdef TARGET_PREBUILT_MODULES - $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib + $(hide) $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib else ifneq ($(MOD_ENABLED),) $(mk_kernel) INSTALL_MOD_PATH=$(CURDIR)/$(TARGET_OUT) modules_install -- 2.11.0