[openwrt/openwrt] config: don't define the same symbol twice

LEDE Commits lede-commits at lists.infradead.org
Wed Jan 17 02:07:27 PST 2018


blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/d29e47f19137775649dae06df8e8c7076cae2f70

commit d29e47f19137775649dae06df8e8c7076cae2f70
Author: Koen Vandeputte <koen.vandeputte at ncentric.com>
AuthorDate: Sat Jan 13 21:35:48 2018 +0100

    config: don't define the same symbol twice
    
    In commit fce35bce0f6e ("config: support new symbol intro'd in kernel
    4.12")
    I forgot to remove the initial debug test line.
    
    This clearly is wrong as the same symbol is defined conditionally in the
    line below as it should be.
    
    I looked over it as I just checked if the symbol was present now upon
    testing it.
    
    Fixes: fce35bce0f6e ("config: support new symbol intro'd in kernel
    4.12")
    
    Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
---
 include/kernel-defaults.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 33f3a82..5e905a2 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -63,7 +63,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 	$(call Kernel/SetInitramfs/PreConfigure)
 	echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config
 	echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_FORCE=y' >> $(LINUX_DIR)/.config
 	echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config
 	echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config
 	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config



More information about the lede-commits mailing list