diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-05 05:16:10 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-02-05 05:16:10 (GMT) |
| commit | df68f203b4e7087beffb3a91dbae9278abd91c1c (patch) | |
| tree | 13a25e23bf7d82c7fb5a599fac4f8ab9a524f30d /scripts | |
| parent | 344d324d190158ffdab50657ff6cd81b38d2da5e (diff) | |
Use 'make olddefconfig' in uClibc/uClibc-ng configuration
instead of 'make oldconfig' and responding 'y'. This avoids 'Broken pipe'
errors in the log, as well as selects default setting for all options not
explicitly set.
This requires a small fix in the old uClibc. Won't have to maintain that fix
for long though :)
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 2 | ||||
| -rw-r--r-- | scripts/functions | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index e58912c..e87abaf 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -138,7 +138,7 @@ do_libc_backend_once() { fi manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" .config "${multi_flags}" - CT_DoYes | CT_DoExecLog ALL make "${make_args[@]}" oldconfig + CT_DoExecLog ALL make "${make_args[@]}" olddefconfig # Now filter the multilib flags. manage_uClibc_config did the opposite of # what Rules.mak in uClibc would do: by the multilib's CFLAGS, it determined diff --git a/scripts/functions b/scripts/functions index 9489f18..9f852b3 100644 --- a/scripts/functions +++ b/scripts/functions @@ -585,14 +585,6 @@ CT_DoForceRmdir() { done } -# Echoes the specified string on stdout until the pipe breaks. -# Doesn't fail -# $1: string to echo -# Usage: CT_DoYes "" |make oldconfig -CT_DoYes() { - yes "$1" || true -} - # Add the specified directory to LD_LIBRARY_PATH, and export it # If the specified patch is already present, just export # $1: path to add |