From 83856ec0dd7d8bf61a1e6da2c71bb0f693d13dfe Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 8 Jul 2020 22:10:03 +0500 Subject: [PATCH] external-common.bbclass: skip kernel version for non-external builds Signed-off-by: Christopher Larson --- classes/external-common.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/classes/external-common.bbclass b/classes/external-common.bbclass index 2d83361..aefc5c8 100644 --- a/classes/external-common.bbclass +++ b/classes/external-common.bbclass @@ -48,7 +48,7 @@ EXTERNAL_IMPORTED := "${@fixed_oe_import(d, ['oe.external'])}" EXTERNAL_TOOLCHAIN_SYSROOT ?= "${@external_run(d, '${EXTERNAL_CC}', *(TARGET_CC_ARCH.split() + ['-print-sysroot'])).rstrip()}" EXTERNAL_TOOLCHAIN_LIBROOT ?= "${@external_run(d, '${EXTERNAL_CC}', *(TARGET_CC_ARCH.split() + ['-print-file-name=crtbegin.o'])).rstrip().replace('/crtbegin.o', '')}" EXTERNAL_HEADERS_MULTILIB_SUFFIX ?= "${@external_run(d, '${EXTERNAL_CC}', *(TARGET_CC_ARCH.split() + ['-print-sysroot-headers-suffix'])).rstrip()}" -EXTERNAL_LIBC_KERNEL_VERSION ?= "${@external_get_kernel_version("${EXTERNAL_TOOLCHAIN_SYSROOT}${prefix}")}" +EXTERNAL_LIBC_KERNEL_VERSION ?= "${@external_get_kernel_version(d, "${EXTERNAL_TOOLCHAIN_SYSROOT}${prefix}")}" EXTERNAL_INSTALL_SOURCE_PATHS = "\ ${EXTERNAL_TOOLCHAIN_SYSROOT} \ @@ -83,7 +83,11 @@ def external_run(d, *args): import oe.external return oe.external.run(d, *args) -def external_get_kernel_version(p): +def external_get_kernel_version(d, p): + if (not d.getVar('TCMODE', True).startswith('external') or + not d.getVar('EXTERNAL_TOOLCHAIN', True)): + return 'UNKNOWN' + import re for fn in ['include/linux/utsrelease.h', 'include/generated/utsrelease.h', 'include/linux/version.h']: