diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-12-05 08:00:55 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-05 22:30:19 +0000 |
commit | 3a439047bf51a0bae736d9dd6de91d8b8ab907cb (patch) | |
tree | 88069619a83313677676ce9dd9f19d90e7c17e23 | |
parent | 7291426ed5eee92ba0eafc85a40a00f3c77da3f2 (diff) | |
download | poky-3a439047bf51a0bae736d9dd6de91d8b8ab907cb.tar.gz |
image.bbclass: respect PACKAGE_NO_GCONV
It installs locale-base-* packages according to var IMAGE_LINGUAS.
Packages locale-base-* are split in libc-package.bbclass if variable
PACKAGE_NO_GCONV is not set. When none of ditro features libc-charsets
libc-locales and libc-locale-code is set, PACKAGE_NO_GCONV is set. Then
no locale-base-* is created and fails to create image.
Clear IMAGE_LINGUAS in such situation.
(From OE-Core rev: 85240094175a8ea726bfba19c00d4556a62862fc)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 276d0d31f4..11927f39f5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -176,6 +176,11 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb" | |||
176 | 176 | ||
177 | LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" | 177 | LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" |
178 | 178 | ||
179 | python () { | ||
180 | if not bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d): | ||
181 | d.setVar('IMAGE_LINGUAS', '') | ||
182 | } | ||
183 | |||
179 | # Prefer image, but use the fallback files for lookups if the image ones | 184 | # Prefer image, but use the fallback files for lookups if the image ones |
180 | # aren't yet available. | 185 | # aren't yet available. |
181 | PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" | 186 | PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" |