]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.bbclass: respect PACKAGE_NO_GCONV
authorKai Kang <kai.kang@windriver.com>
Wed, 5 Dec 2018 13:00:55 +0000 (08:00 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 5 Dec 2018 22:30:15 +0000 (22:30 +0000)
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>
meta/classes/image.bbclass

index 276d0d31f4a53ef4eb8a19ed2ebdc9078207c859..11927f39f5ca8b606a8316bce3d0f091aa81d1fa 100644 (file)
@@ -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}"