summaryrefslogtreecommitdiffstats
path: root/meta
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:19 +0000
commita0352216915da500536fbb73c1d999e90d999217 (patch)
tree31beee2e1ad4107d9041bbdb8e75130dc94aef4f /meta
parent3a439047bf51a0bae736d9dd6de91d8b8ab907cb (diff)
downloadpoky-a0352216915da500536fbb73c1d999e90d999217.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. (From OE-Core rev: 58446992de0f16a345f1f55b66d0d34d31dc341b) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.8.bb4
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.19.bb4
4 files changed, 10 insertions, 4 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 = "\
32 glibc-gconv-iso8859-15" 32 glibc-gconv-iso8859-15"
33 33
34def get_libc_locales_dependencies(d): 34def get_libc_locales_dependencies(d):
35 if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() : 35 if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
36 return d.getVar('LIBC_LOCALE_DEPENDENCIES') or '' 36 return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
37 else: 37 else:
38 return '' 38 return ''
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e8215da583..a868b6df23 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -29,7 +29,9 @@ PACKAGES += "${PN}-codegen ${PN}-utils"
29 29
30LEAD_SONAME = "libglib-2.0.*" 30LEAD_SONAME = "libglib-2.0.*"
31 31
32inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages 32inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
33
34REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}"
33 35
34S = "${WORKDIR}/glib-${PV}" 36S = "${WORKDIR}/glib-${PV}"
35 37
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index 740bf56a5a..0e2461154b 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb
@@ -38,10 +38,12 @@ PACKAGECONFIG ??= "python \
38PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" 38PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3"
39PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 39PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
40 40
41inherit autotools pkgconfig binconfig-disabled ptest 41inherit autotools pkgconfig binconfig-disabled ptest distro_features_check
42 42
43inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} 43inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
44 44
45REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}"
46
45RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" 47RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
46 48
47RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" 49RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}"
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.19.bb b/meta/recipes-devtools/mtools/mtools_4.0.19.bb
index 09742773e0..9972762b4e 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.19.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.19.bb
@@ -37,7 +37,9 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
37 37
38SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" 38SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch"
39 39
40inherit autotools texinfo 40inherit autotools texinfo distro_features_check
41
42REQUIRED_DISTRO_FEATURES_libc-glibc = "libc-charsets libc-locale-code libc-locales"
41 43
42EXTRA_OECONF = "--without-x" 44EXTRA_OECONF = "--without-x"
43 45