[oe-commits] [openembedded-core] 03/10: image.bbclass: respect PACKAGE_NO_GCONV

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d84637ff87067240467b3d47811eeb14fbb4e1e1
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Dec 5 08:00:55 2018 -0500

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/image.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 276d0d3..11927f3 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}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.