From bf8655e116a93e37d5767de7f251db8c4f773930 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Mon, 24 Oct 2022 12:32:23 +0300 Subject: os-release: replace DISTRO_CODENAME with VERSION_CODENAME Latter is the /etc/os-release standard to report distro codenames like "langdale". https://www.freedesktop.org/software/systemd/man/os-release.html#VERSION_CODENAME= (From OE-Core rev: 2565b435176a16aca5b747044cc3643d845f6486) Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/os-release/os-release.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index caa2ed25aa..15194df61b 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb @@ -13,7 +13,7 @@ do_configure[noexec] = "1" # Other valid fields: BUILD_ID ID_LIKE ANSI_COLOR CPE_NAME # HOME_URL SUPPORT_URL BUG_REPORT_URL OS_RELEASE_FIELDS = "\ - ID ID_LIKE NAME VERSION VERSION_ID PRETTY_NAME DISTRO_CODENAME \ + ID ID_LIKE NAME VERSION VERSION_ID VERSION_CODENAME PRETTY_NAME \ " OS_RELEASE_UNQUOTED_FIELDS = "ID VERSION_ID VARIANT_ID" @@ -21,6 +21,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}" PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" BUILD_ID ?= "${DATETIME}" BUILD_ID[vardepsexclude] = "DATETIME" -- cgit v1.2.3-54-g00ecf