Revert "kernel: prevent additional config from being always rebuilt"
This reverts commit 70d5cc42e0a681768d07e47a767d891993d165cb.
Reason for revert: Mismatch module/kernel
Change-Id: I2ae2df476f6cc06c8732336f325822cc2214ef79
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 23806d9..bdf264d 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -89,13 +89,10 @@
ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),)
KERNEL_ADDITIONAL_CONFIG := $(TARGET_KERNEL_ADDITIONAL_CONFIG)
-KERNEL_ADDITIONAL_CONFIG_DEPENDENCY :=
KERNEL_ADDITIONAL_CONFIG_SRC := $(KERNEL_DEFCONFIG_DIR)/$(KERNEL_ADDITIONAL_CONFIG)
ifeq ("$(wildcard $(KERNEL_ADDITIONAL_CONFIG_SRC))","")
$(warning TARGET_KERNEL_ADDITIONAL_CONFIG '$(TARGET_KERNEL_ADDITIONAL_CONFIG)' doesn't exist)
KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null
- else
- KERNEL_ADDITIONAL_CONFIG_DEPENDENCY := $(KERNEL_ADDITIONAL_CONFIG_SRC)
endif
else
KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null
@@ -242,8 +239,10 @@
$(call internal-make-kernel-target,$(DTB_OUT),$(1))
endef
-$(KERNEL_ADDITIONAL_CONFIG_OUT): $(KERNEL_ADDITIONAL_CONFIG_DEPENDENCY)
+$(KERNEL_OUT):
mkdir -p $(KERNEL_OUT)
+
+$(KERNEL_ADDITIONAL_CONFIG_OUT): $(KERNEL_OUT)
$(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
$(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
@@ -289,15 +288,13 @@
.PHONY: kernelsavedefconfig alldefconfig
-kernelsavedefconfig:
- mkdir -p $(KERNEL_OUT)
+kernelsavedefconfig: $(KERNEL_OUT)
$(call make-kernel-target,$(KERNEL_DEFCONFIG))
env KCONFIG_NOTIMESTAMP=true \
$(call make-kernel-target,savedefconfig)
cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
-alldefconfig:
- mkdir -p $(KERNEL_OUT)
+alldefconfig: $(KERNEL_OUT)
env KCONFIG_NOTIMESTAMP=true \
$(call make-kernel-target,alldefconfig)