[source] toolchain/uclibc: Fix unmanned configuration with "V=s"

LEDE Commits lede-commits at lists.infradead.org
Sat Feb 11 06:39:17 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/eed6c85b7fbe35ac35df6d481510a239de456a68

commit eed6c85b7fbe35ac35df6d481510a239de456a68
Author: Alexey Brodkin <Alexey.Brodkin at synopsys.com>
AuthorDate: Fri Feb 10 21:59:54 2017 +0300

    toolchain/uclibc: Fix unmanned configuration with "V=s"
    
    Currently on attempt to configure uClibc with "V=s" user is prompted
    to answer on configuration questions. Major inconvenience here is
    build procedure get paused until user answers all questions.
    That happens because not all symbols are defined in our .config.
    
    Solution is as simple as usage of "olddefconfig" target instead of
    simple "oldconfig". In that case default values get silently set
    for symbols not defined by our .config explicitly.
    
    We haven't noticed that subtle issue before because without "V=s"
    what we do is "make oldconfig < /dev/null" which automatically
    answers all questions :)
    
    Signed-off-by: Alexey Brodkin <Alexey.Brodkin at synopsys.com>
---
 toolchain/uClibc/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index efcbde8..0e3f560 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -83,7 +83,7 @@ define Host/Configure
 		$(HOST_BUILD_DIR)/.config.new
 	cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
 		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \
-		$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
+		$(MAKE) -C $(HOST_BUILD_DIR) olddefconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
 		$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
 		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last; \
 	}



More information about the lede-commits mailing list