From patchwork Tue Jan 3 08:23:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17534 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BE4AC3DA7D for ; Tue, 3 Jan 2023 08:23:50 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web11.58946.1672734226836632637 for ; Tue, 03 Jan 2023 00:23:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J/PWPj53; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id gh17so71919382ejb.6 for ; Tue, 03 Jan 2023 00:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=K7x2l41MuRa8uR7OCSZTkd4MNbH6D56E55kIqkULEWI=; b=J/PWPj53DEqQjZy0P19wStp2yFp5dF9d+UsuA0PwJ4Wee6BAJEOh+20GGtcnN65LWy jBEqiF9NLd0Pnd8+rtbAcpLUCAl89nS4P6tO8qrgUt2yzM+/ZOmXXNAWx1zna5epiIb5 exCHmng35W60l+A1r3xlHeBz0/d+NO/biZlMIOCHjIdUetT3YY0H9BCdK0zouiPyZ0yV c3RwDE7UDlDe7sxqD6CcAK8niAA1HgQhczZR/BWZOSiOb6w1blBDUOmnNkogLwXh2upT xjR4YOXpOOTpbfMBg/wSNIDAoqJG8QNTvDlntfVt3QpKHU3ZhQIrD3FLpUeczVdai8RZ OaMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K7x2l41MuRa8uR7OCSZTkd4MNbH6D56E55kIqkULEWI=; b=YpzKjHcXXUYcI4CigkVyy+8bhipJSgSVSXEHhRKj6DSTEMsfVeNbDf3A2clfEP0LjK 6vJtTEyMIndGMT67FUnLJQYUz6OdpTJrM4xl8tObiY+rVpIH6WBhsOvrPo6shAuvlUUg DXqA7LNmwsiKJVtmrkga4Yb45JNMWtLa09rEJACQ+7XU4Eql6G392padNWkwSe8d9Fm1 T2y6c9NIaoaWocr1zJehXGA6bX3Z5oayMqeAq6nsHMqbJ5hhz2CdWNHn2S9nNXsuovY4 ZP9TgP90w3kRi6E9vorpxDkdA/izbe+OVsN9BY9mczXoY8rfQZR8BL0uqwZIPjaXZNSW /6vA== X-Gm-Message-State: AFqh2kodbN1dEEfGryk9ZMAQ9LHAdfyNNrQICuz2MJxWNNvlI7yU9x1/ OigV/TAarkSO1wdKKbVo8tspA+BOaxU= X-Google-Smtp-Source: AMrXdXv9m6kTjsGJrJBs3kufnF8lCfcJNwqbSJ+eeu2G0iG/G4cKLoGbY9KPXMT6EcU6HzObO/DGgw== X-Received: by 2002:a17:907:8312:b0:7c1:bb4:ea20 with SMTP id mq18-20020a170907831200b007c10bb4ea20mr35548575ejc.71.1672734224080; Tue, 03 Jan 2023 00:23:44 -0800 (PST) Received: from localhost.localdomain (ip-185-104-136-29.ptr.icomera.net. [185.104.136.29]) by smtp.gmail.com with ESMTPSA id g3-20020a170906538300b0082535e2da13sm13861040ejo.6.2023.01.03.00.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 00:23:41 -0800 (PST) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH v2 1/2] classes: image: Set empty weak default IMAGE_LINGUAS Date: Tue, 3 Jan 2023 08:23:33 +0000 Message-Id: <20230103082334.288617-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 03 Jan 2023 08:23:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175337 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. Signed-off-by: Alex Kiernan --- (no changes since v1) meta/classes-recipe/image.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index e387645503ad..d4bf02784ab0 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -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()))}" From patchwork Tue Jan 3 08:23:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 17535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BFBAC3DA7D for ; Tue, 3 Jan 2023 08:24:00 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web10.59376.1672734230045236831 for ; Tue, 03 Jan 2023 00:23:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=R4VKXpLS; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kiernan@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id fy8so7920395ejc.13 for ; Tue, 03 Jan 2023 00:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/2YC82x2QKTaqxZW9+AhXOI1cSQlSYetjRkT4kHL/J8=; b=R4VKXpLSMgdIpRtcYnSWUJ6W/yWYFCXKmcOC98HBH7LZzIPUbUJUg39hoIPD/9loRp r71EgK5bPgUld2NemBsFTzrAQX3faXFxLhgNed+Q5s3Z+H+k7WWJsIqaoyny7MIIXskJ HrJi6Joh+E90QkcT+78/DhMS4qRtJH7wvufKmf3UzjQxh3gnKY3akwZ2XpLPuqr/DtPV 3ybFs8+WEeuosZwPG7utCkwf7e9qMlR4cMm+KqWDwDPozBeDXppMTi5frtXGY0PfO1zd 7DdR1zxrvIqT3xdudlNDtYnjZT4BEf49FW6C47/h9UKpAad2Gr0i493/Q6Mq2Miv3DvQ p0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/2YC82x2QKTaqxZW9+AhXOI1cSQlSYetjRkT4kHL/J8=; b=1SQquY2toj/pFFziSOGAAOJE/6SrkietD4UqY+alkuwH3mtcD4raSacnULt0zBokZc 4nabSrHNqcnNi+QsvLS6g+yAjOpHKwJE2KxufVmzS2uVglRauQ+rHefe43GiHO7WnEPL FXBbiw1KSCYypgTBicC86M0fCck7jRwPlWllTn9oZtfGbDPtU6duFY9YKRIQQCCEEBDZ HWDnkPBDUvJS6PKmtnqo5Sl9OOzfUKViiOX6wjvnIDf+xuI5hlDLXK8dX4uOZvJRrCjm jpBbVxSQ+6GWk5MI5j/XEbrCdT5CtomOVEwuPlhSFwJueE1S6Ypb/6Ku+6zvINbkuQiq MVZw== X-Gm-Message-State: AFqh2kq5/nyUpNy1DH+zEMP6ED9iit/JmWrUbTaKVXFAemTL/bETRCgs 7TmBjI/QE9dO6rQ3aTWKX/56TFvrOXo= X-Google-Smtp-Source: AMrXdXuAC87ws3Lqry8smk4sosZjdZn5fuOGMAf02EtUkBF18JkiK3kwjXLl8TPI2WLLdxyqIEO7KA== X-Received: by 2002:a17:907:c717:b0:7c1:ad6:638a with SMTP id ty23-20020a170907c71700b007c10ad6638amr40036741ejc.17.1672734227238; Tue, 03 Jan 2023 00:23:47 -0800 (PST) Received: from localhost.localdomain (ip-185-104-136-29.ptr.icomera.net. [185.104.136.29]) by smtp.gmail.com with ESMTPSA id g3-20020a170906538300b0082535e2da13sm13861040ejo.6.2023.01.03.00.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 00:23:45 -0800 (PST) From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [OE-Core][PATCH v2 2/2] default-distrovars: Include "c" in IMAGE_LINGUAS for glibc Date: Tue, 3 Jan 2023 08:23:34 +0000 Message-Id: <20230103082334.288617-2-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230103082334.288617-1-alex.kiernan@gmail.com> References: <20230103082334.288617-1-alex.kiernan@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 03 Jan 2023 08:24:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175338 glibc 2.35 introduced C.UTF-8, we should include this by default. Signed-off-by: Alex Kiernan --- 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(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index abf48f79f08a..d05390d3cc8c 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -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"