From ece9f78974128453067a92a9da0ac6f7e13cb183 Mon Sep 17 00:00:00 2001 From: Chris Austen Date: Sat, 30 Apr 2016 16:47:12 -0500 Subject: VERSION_ID is not granular Currently VERSION_ID is v0.6 Even when I am 30 commits past the tag. I am swapping the code's BUILD/VERSION populator to ensure we adhere to the reason why VERSION_ID exists in the first place... to know what level of code you have on the system Definition of what the VERSION_ID is for... https://www.freedesktop.org/software/systemd/man/os-release.html --- meta-phosphor/common/recipes-core/os-release/os-release.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend index b112c50d9c..3dd203b194 100644 --- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend @@ -6,11 +6,11 @@ def run_git(d, cmd): pass python() { - version_id = run_git(d, 'describe --abbrev=0') + version_id = run_git(d, 'describe --dirty') if version_id: d.setVar('VERSION_ID', version_id) - build_id = run_git(d, 'describe --dirty') + build_id = run_git(d, 'describe --abbrev=0') if build_id: d.setVar('BUILD_ID', build_id) } -- cgit v1.2.3