summaryrefslogtreecommitdiffstats
path: root/core/tasks
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2016-01-04 01:12:28 +0200
committerSteve Kondik <shade@chemlab.org>2016-02-20 09:05:57 -0800
commitebddb95a1606b4ab5087e8ddbaf231ae3bf18c22 (patch)
tree02fff1f21ee8208a4d4fba6ad4377c1ca4053c6d /core/tasks
parentd12e3a1464e9d37cb1ad63defda2d75cde39fa09 (diff)
downloadbuild-ebddb95a1606b4ab5087e8ddbaf231ae3bf18c22.zip
build-ebddb95a1606b4ab5087e8ddbaf231ae3bf18c22.tar.gz
build-ebddb95a1606b4ab5087e8ddbaf231ae3bf18c22.tar.bz2
kernel: Don't use override config in kernel(x)config
* It defeats the whole purpose of using KERNEL_CONFIG_OVERRIDE Change-Id: Ia405562a0dcf623ae2bfca2803c2d3427d84bf0a
Diffstat (limited to 'core/tasks')
-rw-r--r--core/tasks/kernel.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
index 95c0f0e..87c6cd6 100644
--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -315,10 +315,7 @@ kerneltags: $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG)
kernelconfig: KERNELCONFIG_MODE := menuconfig
kernelxconfig: KERNELCONFIG_MODE := xconfig
kernelxconfig kernelconfig: $(KERNEL_OUT_STAMP)
- $(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
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
env KCONFIG_NOTIMESTAMP=true \
$(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNELCONFIG_MODE)
env KCONFIG_NOTIMESTAMP=true \