From 0ed32141fe26810e205943fe01735c3380b331a4 Mon Sep 17 00:00:00 2001 From: Daniel Semkowicz Date: Thu, 20 Jun 2024 15:03:31 +0200 Subject: os-release: Fix VERSION_CODENAME in case it is empty If DISTRO_CODENAME was not set, VERSION_CODENAME field was populated with unparsed string. This resulted in the following line in os-release file: VERSION_CODENAME="${DISTRO_CODENAME}" According to systemd documentation, this field is optional. Fix the problem by setting VERSION_CODENAME conditionally, only if DISTRO_CODENAME was set. (From OE-Core rev: 70a0b8bc1d846c857be90ce2e97e60c5ee32558e) Signed-off-by: Daniel Semkowicz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/os-release/os-release.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index 8906906bc3..93af08c182 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb @@ -24,7 +24,7 @@ ID = "${DISTRO}" NAME = "${DISTRO_NAME}" VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}" VERSION_ID = "${DISTRO_VERSION}" -VERSION_CODENAME = "${DISTRO_CODENAME}" +VERSION_CODENAME = "${@d.getVar('DISTRO_CODENAME') or ''}" PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" # The vendor field is hardcoded to "openembedded" deliberately. We'd -- cgit v1.2.3-54-g00ecf