Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b6aaec2 authored by Scott Mertz's avatar Scott Mertz Committed by Gerrit Code Review
Browse files

build: force .config update if additional kernel config changes 

This patch forces a regeneration of the .config if either the
contents of TARGET_KERNEL_ADDITIONAL_CONFIG changes or the value
of TARGET_KERNEL_ADDITIONAL_CONFIG changes.

OPO-360
Change-Id: Ide28be3fab01b9f9ad72aa9d8706131e2b9ac0c7
parent 30ca83f1

core/tasks/kernel.mk

+14 −1
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ endif 


ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),)

KERNEL_ADDITIONAL_CONFIG := $(TARGET_KERNEL_ADDITIONAL_CONFIG)

KERNEL_ADDITIONAL_CONFIG_SRC := $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(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

    endif

else

    KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null

endif



## Do be discontinued in a future version. Notify builder about target
@@ -228,7 +235,13 @@ $(KERNEL_OUT_STAMP): 
	$(hide) mkdir -p $(KERNEL_MODULES_OUT)

	$(hide) touch $@



$(KERNEL_CONFIG): $(KERNEL_OUT_STAMP) $(KERNEL_DEFCONFIG_SRC)

KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config



.PHONY: force_additional_config

$(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config

	$(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;



$(KERNEL_CONFIG): $(KERNEL_OUT_STAMP) $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)

	$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG)

	$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \

			echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \