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

Commit ebddb95a authored by Michael Bestas's avatar Michael Bestas Committed by Steve Kondik
Browse files

kernel: Don't use override config in kernel(x)config 

* It defeats the whole purpose of using KERNEL_CONFIG_OVERRIDE

Change-Id: Ia405562a0dcf623ae2bfca2803c2d3427d84bf0a
parent d12e3a14

core/tasks/kernel.mk

+1 −4
Original line number Diff line number Diff line
@@ -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 \