]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc_2.21.bb: Fix condition to skip parsing the recipe for non-glibc libc
authorKhem Raj <raj.khem@gmail.com>
Fri, 27 Feb 2015 17:19:55 +0000 (17:19 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 9 Mar 2015 16:00:17 +0000 (16:00 +0000)
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/glibc/glibc_2.21.bb

index 6e540462cba0960c06d414af1d008f15b2469d3b..693d93734502ba64f32c3ee41c2584180d5039bd 100644 (file)
@@ -67,7 +67,7 @@ GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn
 #
 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))