[PATCH 1/2] distro/poky-tiny: don't put translations into images

[PATCH 1/2] distro/poky-tiny: don't put translations into images

[Ross Burton]

IMAGE_LINGUAS has a default value, "en-us en-gb" in
default-distrovars.inc and "de-de fr-fr en-gb" in image.bbclass. However,
poky-tiny sets USE_NLS=no so IMAGE_LINGUAS can't really be used in a tiny
context, and previously musl hasn't supported locales so this hasn't
been a problem.

However, now that musl-locales exists, poky-tiny images will try to pull
in translations.  As we've disabled NLS these simply take up disk space
and cannot be used, and currently musl-locales fails to build if
USE_NLS=no.

Set IMAGE_LINGUAS to "" in poky-tiny.conf so that images don't have
locales added.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-poky/conf/distro/poky-tiny.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index 9c9f6f192f..2fe0d478ff 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -63,6 +63,8 @@ ENABLE_WIDEC:class-native = "true"
 # Drop native language support. This removes the
 # eglibc->bash->gettext->libc-posix-clang-wchar dependency.
 USE_NLS="no"
+# As we don't have native language support, don't install locales into images
+IMAGE_LINGUAS = ""
 
 # Comment out any of the lines below to disable them in the build
 # DISTRO_FEATURES options:
-- 
2.25.1

[PATCH 2/2] musl-locales: explicitly depend on gettext-native

[Ross Burton]

The gettext class is designed for use by applications with optional NLS
support: depending on the value of USE_NLS it will either depend on
gettext-minimal-native (just the autoconf macros) or gettext-native, and
will pass --enable-nls/--disable-nls as appropriate.

However, musl-locales specifically needs to run msgfmt at runtime,
so explicitly depend on gettext-native instead.

Also remove the redundant EXTRA_OECMAKE assignment.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-core/musl/musl-locales_git.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/musl/musl-locales_git.bb b/meta/recipes-core/musl/musl-locales_git.bb
index fa814d2bd9..40b20e250d 100644
--- a/meta/recipes-core/musl/musl-locales_git.bb
+++ b/meta/recipes-core/musl/musl-locales_git.bb
@@ -14,14 +14,12 @@ SRCREV = "1101fb2bcdd189cd9415b8bd1c775eb43527d25c"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "virtual/libintl"
+DEPENDS = "virtual/libintl gettext-native"
 
 PROVIDES = "virtual/libc-locale"
 
-inherit cmake gettext
+inherit cmake
 
-EXTRA_OECMAKE = ""
-#
 # We will skip parsing for non-musl systems
 python () {
     if d.getVar('TCLIBC') != "musl":
-- 
2.25.1