summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-02-27 17:19:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:43 +0000
commit6e539bf7a5ed1af7f379880d54ce7de1c0988f02 (patch)
treea8211a8a4613554948ee42c728fb5bf4dd9ae4b7
parentbd193a0115c564d8c16bd09a7df6ae9867b51445 (diff)
downloadpoky-6e539bf7a5ed1af7f379880d54ce7de1c0988f02.tar.gz
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: Ifc48e81fd0b3c18d8e1ef76a18c216dc6acda092 (From OE-Core rev: 6feef44751d98c55a2764d70c26d170f90b73f9d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 6e540462cb..693d937345 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -67,7 +67,7 @@ GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn
67# 67#
68python __anonymous () { 68python __anonymous () {
69 import re 69 import re
70 notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) 70 notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None)
71 if notglibc: 71 if notglibc:
72 raise bb.parse.SkipPackage("incompatible with target %s" % 72 raise bb.parse.SkipPackage("incompatible with target %s" %
73 d.getVar('TARGET_OS', True)) 73 d.getVar('TARGET_OS', True))