summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-12-05 08:00:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 22:30:15 +0000
commit58446992de0f16a345f1f55b66d0d34d31dc341b (patch)
tree2f1238cc4fe984abaeaf7dc74cb44a45887625e6 /meta/conf
parent85240094175a8ea726bfba19c00d4556a62862fc (diff)
downloadopenembedded-core-contrib-58446992de0f16a345f1f55b66d0d34d31dc341b.tar.gz
packages: respect PACKAGE_NO_GCONV
PACKAGE_NO_GCONV is set in libc-package.bbclass if not all of 'libc-charsets libc-locale-code libc-locales' included in DISTRO_FEATURES. And then no packages glibc-gconv-* glibc-charmap-* and glibc-localedata-* is created. Update recipes and conf file which depend on these packages to check required distro features. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 8d1076440f..abe619aaac 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -32,7 +32,7 @@ LIBC_LOCALE_DEPENDENCIES = "\
glibc-gconv-iso8859-15"
def get_libc_locales_dependencies(d):
- if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() :
+ if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
else:
return ''