diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:19 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 14:57:44 +0100 |
| commit | 6f4be55ca66b4470aa46c0ae356070ed166f44ce (patch) | |
| tree | 0fcb1948839bc7fec0cfa9be4bf2e279a0ca1906 | |
| parent | 0731fb03b5cc40502f90912fb2e72b54b777509d (diff) | |
| download | openembedded-core-contrib-6f4be55ca66b4470aa46c0ae356070ed166f44ce.tar.gz | |
glibc, packagegroup-self-hosted, packagegroup-core-lsb: Consider non-glibc libcs
Make skipping expression simpler to check for given libc
Make sure glibc specific items are covered with right override
Change-Id: I8b4a0b7cbfe38ffdc9320f798038c79c7220552b
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.21.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb index fcef4ff3e5..58a9601034 100644 --- a/meta/recipes-core/glibc/glibc_2.21.bb +++ b/meta/recipes-core/glibc/glibc_2.21.bb @@ -68,11 +68,9 @@ GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn # this helps in easing out parsing for non-glibc system libraries # python __anonymous () { - import re - 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)) + if d.getVar('TCLIBC', True) != "glibc": + raise bb.parse.SkipPackage("incompatible with %s C library" % + d.getVar('TCLIBC', True)) } EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 47589b6ad6..531f7291c1 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -62,7 +62,6 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-iptable-filter \ " -# glibc-utils: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk = "\ autoconf \ automake \ @@ -73,7 +72,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ cpp \ cpp-symlinks \ distcc \ - glibc-utils \ glibc-gconv-ibm850 \ file \ findutils \ @@ -98,7 +96,10 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ quilt \ sed \ " - +# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ + glibc-utils \ + " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index e0f32e0a1d..a07a6adb68 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -9,6 +9,15 @@ LICENSE = "MIT" inherit packagegroup +# +# We will skip parsing this packagegeoup for non-glibc systems +# +python __anonymous () { + if d.getVar('TCLIBC', True) != "glibc": + raise bb.parse.SkipPackage("incompatible with %s C library" % + d.getVar('TCLIBC', True)) +} + PACKAGES = "\ packagegroup-core-lsb \ packagegroup-core-sys-extended \ |