From 90d98a13c2a6e17ddd02a463fe598890b8d4ccd8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 27 Oct 2020 10:04:38 -0500 Subject: Revert "os-release: only run bbappend on do_compile" This reverts commit f2b07859cc9586f96b072678d1f5f4586e77850b. This turned out to only help hide the issue. Builds would pass but the os-release value in the flash image would not be correct when this bug hit. (From meta-phosphor rev: aae84925dc578f2025aa19c90a718d012aee2577) Change-Id: I4d6c436297687469116709ebc535bf1d343936f4 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-core/os-release/os-release.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 1c98781c8..c01014643 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -13,7 +13,7 @@ def run_git(d, cmd): except: pass -python do_compile_prepend() { +python() { version_id = run_git(d, 'describe --dirty --long') if version_id: d.setVar('VERSION_ID', version_id) -- cgit v1.2.3