diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/recipes-core/os-release | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-core/os-release')
-rw-r--r-- | meta-phosphor/recipes-core/os-release/os-release.bbappend | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index c01014643..0f938c392 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -13,22 +13,11 @@ def run_git(d, cmd): except: pass -python() { - version_id = run_git(d, 'describe --dirty --long') - if version_id: - d.setVar('VERSION_ID', version_id) - versionList = version_id.split('-') - version = versionList[0] + "-" + versionList[1] - d.setVar('VERSION', version) +VERSION_ID := "${@run_git(d, 'describe --dirty --long')}" +VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" - build_id = run_git(d, 'describe --abbrev=0') - if build_id: - d.setVar('BUILD_ID', build_id) - - target_machine = d.getVar('MACHINE', True) - if target_machine: - d.setVar('OPENBMC_TARGET_MACHINE', target_machine) -} +BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" +OPENBMC_TARGET_MACHINE = "${MACHINE}" OS_RELEASE_FIELDS_append = " BUILD_ID OPENBMC_TARGET_MACHINE" |