build
| Revisión | b5f6b4a9e6d3d4d13438d746cd53027b3399987d (tree) |
|---|---|
| Tiempo | 2009-11-09 14:16:40 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
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 (diff)| @@ -26,14 +26,12 @@ FIRMWARE_ENABLED := $(shell grep ^CONFIG_FIRMWARE_IN_KERNEL=y $(KERNEL_CONFIG_FI | ||
| 26 | 26 | # but I don't want to write a complex Android.mk to build kernel. |
| 27 | 27 | # This is the simplest way I can think. |
| 28 | 28 | 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) | |
| 30 | 30 | $(mk_kernel) $(TARGET_KERNEL_CONFIG) |
| 31 | 31 | $(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) $@ | |
| 35 | 33 | ifdef TARGET_PREBUILT_MODULES |
| 36 | - $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib | |
| 34 | + $(hide) $(ACP) -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib | |
| 37 | 35 | else |
| 38 | 36 | ifneq ($(MOD_ENABLED),) |
| 39 | 37 | $(mk_kernel) INSTALL_MOD_PATH=$(CURDIR)/$(TARGET_OUT) modules_install |
Fork