# HG changeset patch # User "Yann E. MORIN" # Date 1271868898 -7200 # Node ID f5d5e279af95a3e2fe2322716bda7e1d9f48224e # Parent 0535b588679af21e6958b78851c97d363c6e18c5 libc/glibc: fix kernel version check Since we log the test strings, it is no longer possible to call the CT_Test* functions from sub-functions that print results to their stdout. diff -r 0535b588679a -r f5d5e279af95 scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Tue Apr 20 09:58:41 2010 +0200 +++ b/scripts/build/libc/glibc.sh Wed Apr 21 18:54:58 2010 +0200 @@ -578,7 +578,9 @@ # version installed in "usr/include/linux/version.h" in the sys-root. # Parse that instead of having two code-paths. version_code_file="${CT_SYSROOT_DIR}/usr/include/linux/version.h" - CT_TestOrAbort "Linux version is unavailable in installed headers files" -f "${version_code_file}" -a -r "${version_code_file}" + if [ ! -f "${version_code_file}" -o ! -r "${version_code_file}" ]; then + CT_Abort "Linux version is unavailable in installed headers files" + fi version_code=$(grep -E LINUX_VERSION_CODE "${version_code_file}" |cut -d ' ' -f 3) version=$(((version_code>>16)&0xFF)) patchlevel=$(((version_code>>8)&0xFF))