summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-core
diff options
context:
space:
mode:
authorRatan Gupta <ratagupt@in.ibm.com>2016-08-04 05:48:55 -0500
committerPatrick Williams <patrick@stwcx.xyz>2016-08-05 15:56:38 +0000
commit0c0d27e22e30982ab23adfbfece86233dad5aa33 (patch)
tree0dd306843ee6163c31e6fee52b7fdb8748e6e74a /meta-phosphor/common/recipes-core
parentb522635806018634897697006541a187b1256360 (diff)
downloadtalos-openbmc-0c0d27e22e30982ab23adfbfece86233dad5aa33.tar.gz
talos-openbmc-0c0d27e22e30982ab23adfbfece86233dad5aa33.zip
/etc/os-release version should match the Firmaware version.
eg:-Currently it is being displayed as following. VERSION="0.1.0 (krogoth)" VERSION_ID="v0.6-157-gd011f68-dirty" Expected is :- VERSION="v0.6-157" Fixes openbmc/openbmc#483 Change-Id: Idffe553da0e31fd505e31a954bb071a140613e91 Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-core')
-rw-r--r--meta-phosphor/common/recipes-core/os-release/os-release.bbappend3
1 files changed, 3 insertions, 0 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 f9befa67c..bfdf94c4d 100644
--- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
+++ b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
@@ -9,6 +9,9 @@ python() {
version_id = run_git(d, 'describe --dirty')
if version_id:
d.setVar('VERSION_ID', version_id)
+ versionList = version_id.split('-')
+ version = versionList[0] + "-" + versionList[1]
+ d.setVar('VERSION', version)
build_id = run_git(d, 'describe --abbrev=0')
if build_id:
OpenPOWER on IntegriCloud