[gnome-continuous-yocto/gnomeostree-3.28-rocko: 191/218] populate_sdk: install UTF-8 locales in SDKs

[Emmanuele Bassi <ebassi src gnome org>]

commit 58cfc175c4aee2755f2327a22bcc3487585160b3
Author: Ross Burton <ross burton intel com>
Date:   Thu Mar 1 18:26:32 2018 +0000

    populate_sdk: install UTF-8 locales in SDKs
    
    As glibc 2.27 can't read older locale-archives, SDKs using glibc 2.27 on hosts
    using glibc earlier than 2.27 won't be able to find any locales, so bitbake
    won't start and Python can't use UTF-8.
    
    So by default install all locales into the SDK.  Special-case Extensible SDKs by
    installing no locales as they ship glibc in a buildtools, and that will have the
    locales.
    
    Locale installation requires cross-localedef, so add that to DEPENDS.
    
    Also remove the explicit en_US addition in buildtools-tarball as it is now
    redundant.
    
    (From OE-Core rev: 96896568d197cd06302713c24c0f7d91bfaea6c1)
    
    (From OE-Core rev: 8327d50ef66c94592d76b42e147011daafc6a7c3)
    
    (From OE-Core rev: 8859d60d48918d763213470429288553adaa419c)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_base.bbclass       |    5 ++++-
 meta/classes/populate_sdk_ext.bbclass        |    3 ++-
 meta/recipes-core/meta/buildtools-tarball.bb |    1 -
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 424c63c..4d4b14f 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -20,6 +20,9 @@ def complementary_globs(featurevar, d):
 SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 
'doc-pkgs', '', d)}"
 SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
 
+# List of locales to install, or "all" for all of them, or unset for none.
+SDKIMAGE_LINGUAS ?= "all"
+
 inherit rootfs_${IMAGE_PKGTYPE}
 
 SDK_DIR = "${WORKDIR}/sdk"
@@ -39,7 +42,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
 
 SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
-SDK_DEPENDS = "virtual/fakeroot-native pixz-native"
+SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native"
 
 # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it
 # could be set to the MACHINE_ARCH
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index c79ddbb..2dd2123 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -657,7 +657,8 @@ fakeroot python do_populate_sdk_ext() {
     d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))
     d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
     d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
-
+    # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice
+    d.delVar('SDKIMAGE_LINGUAS')
     populate_sdk_common(d)
 }
 
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index be37c44..d98a9c9 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -21,7 +21,6 @@ TOOLCHAIN_HOST_TASK ?= "\
     nativesdk-wget \
     nativesdk-ca-certificates \
     nativesdk-texinfo \
-    nativesdk-locale-base-en-us \
     "
 
 MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"