From e4e31890e377a45f43c111cd7f82a57dd5993d29 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 26 Feb 2015 07:59:15 +0000 Subject: glibc_2.21.bb: Fix condition to skip parsing the recipe for non-glibc libc The condition should be uclibc 'or' musl then we know its not glibc right now it checks with 'and' operator, that condition will never be true Change-Id: Ia7fd11ac5a64c5c6dd6e632540e33234d519a179 Signed-off-by: Khem Raj --- meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb | 2 +- .../external-linaro-toolchain/external-linaro-toolchain.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-linaro-toolchain') diff --git a/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb b/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb index 63f03833..485b4a2c 100644 --- a/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb +++ b/meta-linaro-toolchain/recipes-core/glibc/glibc_linaro-2.20.bb @@ -104,7 +104,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRN python __anonymous () { import re - notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) + notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) if notglibc: raise bb.parse.SkipPackage("incompatible with target %s" % d.getVar('TARGET_OS', True)) diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 28ab4d78..8b207689 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -410,7 +410,7 @@ python () { if not d.getVar("ELT_VER_MAIN"): raise bb.parse.SkipPackage("External Linaro toolchain not configured (ELT_VER_MAIN not set).") import re - notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) + notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) if notglibc: raise bb.parse.SkipPackage("incompatible with target %s" % d.getVar('TARGET_OS', True)) -- cgit v1.2.3