diff options
| author | Matt Wagantall <mwagantall@cyngn.com> | 2015-10-16 16:32:33 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
| commit | 4a9a7c4618641b6708b6f0ed10b854c9701cfeed (patch) | |
| tree | 7a1696f18a0777056393929290bb76a0bfb299c5 /core/tasks | |
| parent | 0db12370e9552627dfdb69ee2a2d54f01e4b6448 (diff) | |
| download | build-4a9a7c4618641b6708b6f0ed10b854c9701cfeed.zip build-4a9a7c4618641b6708b6f0ed10b854c9701cfeed.tar.gz build-4a9a7c4618641b6708b6f0ed10b854c9701cfeed.tar.bz2 | |
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.
Change-Id: I920be0338bb8afc87f6061c55aafb27ba658974d
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/kernel.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index ce05153..d43e8e1 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -264,7 +264,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 \ |