From 5577bf45a23118c3d5e34fd35921c59985641c95 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 25 Oct 2021 15:16:00 +0000 Subject: os-release: Set BUILD_ID to DATETIME In the community it was discussed having a field that would contain the date of when an image was built (timestamp) so that it could be used to generate a unique version id during firmware updates, and that could also be used to display the specific date of a build such as when it was released or the general availability date. The yocto recipe for os-release sets BUILD_ID to DATETIME by default. The current implementation of BUILD_ID duplicates the output of VERSION, therefore remove the openbmc implementation of BUILD_ID to pick up the default value of DATETIME. The value can be overwritten in a machine's conf file, or set to what it was before in an os-release.bbappend in a meta layer. Tested: - The os-release BUILD_ID has a timestamp value by default, ex: BUILD_ID="20211025151654". - The os-release BUILD_ID is set to the value specified in a machine conf file, ex: Ex: In: meta-ibm/conf/machine/p10bmc.conf BUILD_ID = "20211231120000" - The os-release BUILD_ID is set to the value specified in a meta-layer os-release bbappend: Ex: In: meta-ibm/recipes-core/os-release/os-release.bbappend BUILD_ID = "${@run_git(d, 'describe --abbrev=0')}" Change-Id: If5238c53e0c3463c181788afc713c560fb5fe034 Signed-off-by: Adriana Kobylak --- meta-phosphor/recipes-core/os-release/os-release.bbappend | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-phosphor/recipes-core') diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 7e90ab3fbb..c1dda480ff 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -28,7 +28,6 @@ DISTRO_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" -BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" OPENBMC_TARGET_MACHINE = "${MACHINE}" OS_RELEASE_FIELDS:append = " BUILD_ID OPENBMC_TARGET_MACHINE EXTENDED_VERSION" -- cgit v1.2.3