From 58446992de0f16a345f1f55b66d0d34d31dc341b Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 5 Dec 2018 08:00:56 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-glibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf') 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 '' -- cgit 1.2.3-korg