Skip to contentSkip to conversation

classes: image: Set empty weak default IMAGE_LINGUAS

PATCH New Alex Kiernan 1 participant 2 messages Jan 3, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 classes: image: Set empty weak default IMAGE_LINGUAS

This is already set in default-distrovars.inc and so this assignment will almost never succeed. Rather than leaving it to confuse, set an empty weak default.

---

(no changes since v1)

 meta/classes-recipe/image.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/image.bbclass +1 -2
index e387645503ad..d4bf02784ab0 100644
@@ -182,8 +182,7 @@ python () {
 
 IMAGE_POSTPROCESS_COMMAND ?= ""
 
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
+IMAGE_LINGUAS ??= ""
 
 LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}"
 
Signature · 1 line
2.39.0
#1 lore raw

PATCH v2 2/2 default-distrovars: Include "c" in IMAGE_LINGUAS for glibc

glibc 2.35 introduced C.UTF-8, we should include this by default.

---

Changes in v2:
- Switch to DEFAULT_IMAGE_LINGUAS so that override ordering is obvious

 meta/conf/distro/include/default-distrovars.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +4 -1
index abf48f79f08a..d05390d3cc8c 100644
@@ -4,7 +4,10 @@ OEINCLUDELOGS ?= "yes"
 KERNEL_CONSOLE ?= "ttyS0"
 KEEPUIMAGE ??= "yes"
 
-IMAGE_LINGUAS ?= "en-us en-gb"
+DEFAULT_IMAGE_LINGUAS = "en-us en-gb"
+DEFAULT_IMAGE_LINGUAS:libc-glibc = "c en-us en-gb"
+IMAGE_LINGUAS ?= "${DEFAULT_IMAGE_LINGUAS}"
+
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 LOCALE_UTF8_ONLY ?= "0"
 LOCALE_UTF8_IS_DEFAULT ?= "1"
Signature · 1 line
2.39.0