From: Daniel Semkowicz Date: Thu, 20 Jun 2024 13:03:31 +0000 (+0200) Subject: os-release: Fix VERSION_CODENAME in case it is empty X-Git-Tag: uninative-4.6~198 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a0b8bc1d846c857be90ce2e97e60c5ee32558e;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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. Signed-off-by: Daniel Semkowicz Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index 8906906bc3e..93af08c182d 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