summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glibc/glibc_2.21.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb7
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb9
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
68# this helps in easing out parsing for non-glibc system libraries 68# this helps in easing out parsing for non-glibc system libraries
69# 69#
70python __anonymous () { 70python __anonymous () {
71 import re 71 if d.getVar('TCLIBC', True) != "glibc":
72 notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) 72 raise bb.parse.SkipPackage("incompatible with %s C library" %
73 if notglibc: 73 d.getVar('TCLIBC', True))
74 raise bb.parse.SkipPackage("incompatible with target %s" %
75 d.getVar('TARGET_OS', True))
76} 74}
77 75
78EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 76EXTRA_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 = "\
62 kernel-module-iptable-filter \ 62 kernel-module-iptable-filter \
63 " 63 "
64 64
65# glibc-utils: for rpcgen
66RDEPENDS_packagegroup-self-hosted-sdk = "\ 65RDEPENDS_packagegroup-self-hosted-sdk = "\
67 autoconf \ 66 autoconf \
68 automake \ 67 automake \
@@ -73,7 +72,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
73 cpp \ 72 cpp \
74 cpp-symlinks \ 73 cpp-symlinks \
75 distcc \ 74 distcc \
76 glibc-utils \
77 glibc-gconv-ibm850 \ 75 glibc-gconv-ibm850 \
78 file \ 76 file \
79 findutils \ 77 findutils \
@@ -98,7 +96,10 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
98 quilt \ 96 quilt \
99 sed \ 97 sed \
100 " 98 "
101 99# glibc-utils: for rpcgen
100RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\
101 glibc-utils \
102 "
102RDEPENDS_packagegroup-self-hosted-debug = " \ 103RDEPENDS_packagegroup-self-hosted-debug = " \
103 gdb \ 104 gdb \
104 gdbserver \ 105 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"
9 9
10inherit packagegroup 10inherit packagegroup
11 11
12#
13# We will skip parsing this packagegeoup for non-glibc systems
14#
15python __anonymous () {
16 if d.getVar('TCLIBC', True) != "glibc":
17 raise bb.parse.SkipPackage("incompatible with %s C library" %
18 d.getVar('TCLIBC', True))
19}
20
12PACKAGES = "\ 21PACKAGES = "\
13 packagegroup-core-lsb \ 22 packagegroup-core-lsb \
14 packagegroup-core-sys-extended \ 23 packagegroup-core-sys-extended \