summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-12-05 08:00:55 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 22:30:15 +0000
commit85240094175a8ea726bfba19c00d4556a62862fc (patch)
tree4a9cb5c7e7d26bdf52c9b5ef67adfa4613b8b03d
parent39840ed10af559bbcc306b378baa4723921668f5 (diff)
downloadopenembedded-core-contrib-85240094175a8ea726bfba19c00d4556a62862fc.tar.gz
openembedded-core-contrib-85240094175a8ea726bfba19c00d4556a62862fc.tar.bz2
openembedded-core-contrib-85240094175a8ea726bfba19c00d4556a62862fc.zip
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. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass5
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"
LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}"
+python () {
+ if not bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
+ d.setVar('IMAGE_LINGUAS', '')
+}
+
# Prefer image, but use the fallback files for lookups if the image ones
# aren't yet available.
PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"