From a173dfa93937d835b10f3b460faaa652a017f035 Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Tue, 10 Nov 2015 15:09:20 -0800 Subject: uClibc: Fall back to default configs if not provided I've added the .config files to contrib/uClibc-defconfigs from buildroot to use as default configs if they are not provided in the sample. If a particular architecture really needs an option set, it should be either updated in the manange_uClibc_config function in scripts/build/libc/uClibc.sh or a custom ${uclibc_name}.config should be added to the sample (usually via `ct-ng saveconfig`). Signed-off-by: Bryan Hundven --- scripts/build/libc/uClibc.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 0f7db19d..f49fd082 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -63,7 +63,10 @@ do_libc_extract() { do_libc_check_config() { CT_DoStep INFO "Checking C library configuration" - CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}" + # Use the default config if the user did not provide one. + if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then + CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/contrib/uClibc-defconfigs/${uclibc_name}.config" + fi if ${grep} -E '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad." -- cgit v1.2.3