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

Commit a9722d4c authored by Matt Wagantall's avatar Matt Wagantall
Browse files

kernel: Don't update defconfig with KERNEL_ADDITIONAL_CONFIG options 

If 'make kernelconfig' is run in an environment where
KERNEL_ADDITIONAL_CONFIG is set, the options in the additional
defconfig will be saved back to the defconfig when savedefconfig
is performed.

While not really a bug, this increases the likelihood of someone
accidentally committing these changes or getting confused by
unexpected deltas added to their defconfigs.

Fix this by skipping the merge-config.sh step for the 'kernelconfig'
make target. As a side-effect, options in KERNEL_ADDITIONAL_CONFIG
will also not be displayed in menuconfig. This is not easily
avoidable, and arguably not wrong anyway.

SAMBAR-1000
Change-Id: I920be0338bb8afc87f6061c55aafb27ba658974d
parent 50277f74

core/tasks/kernel.mk

+5 −1
Original line number Diff line number Diff line
@@ -260,7 +260,11 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) 
kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) tags



kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)

kernelconfig: $(KERNEL_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)'"; \

			echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; fi

	env KCONFIG_NOTIMESTAMP=true \

		 $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) menuconfig

	env KCONFIG_NOTIMESTAMP=true \