[PATCH openbmc] os-release VERSION always points at v0.1

OpenBMC Patches openbmc-patches at stwcx.xyz
Sat Dec 19 07:40:22 AEDT 2015


From: Brad Bishop <bradleyb at us.ibm.com>

Use git-describe rather than git-tag.
Make os-release do_compile run every time.
---
 meta-phosphor/common/recipes-core/os-release/os-release.bbappend | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ba6a772..b112c50 100644
--- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
+++ b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
@@ -6,7 +6,7 @@ def run_git(d, cmd):
                 pass
 
 python() {
-        version_id = run_git(d, 'tag')
+        version_id = run_git(d, 'describe --abbrev=0')
         if version_id:
                 d.setVar('VERSION_ID', version_id)
 
@@ -16,3 +16,4 @@ python() {
 }
 
 OS_RELEASE_FIELDS_append = " BUILD_ID"
+do_compile[nostamp] = "1"
-- 
2.6.3




More information about the openbmc mailing list