summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
diff options
context:
space:
mode:
authorjmbills <jason.m.bills@intel.com>2021-11-05 18:45:06 +0300
committerGitHub <noreply@github.com>2021-11-05 18:45:06 +0300
commit4dac5fcd49b5e2de1074f1363775ec0f19041072 (patch)
tree5aadf91080299b1583caed86a31da368dfcda2da /meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
parent0c9e31989c615598b5d042ffab385606660c93c0 (diff)
parent61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff)
downloadopenbmc-4dac5fcd49b5e2de1074f1363775ec0f19041072.tar.xz
Merge pull request #74 from Intel-BMC/update2021-0.771-0.77
Update
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
index 95061a570..872e78eba 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
+++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
@@ -53,12 +53,12 @@ python() {
'describe --long --abbrev=6 ' +
'--match \'{}-[0-9]*\.[0-9]*\''.format(gen))
- # If no tag in meta-openbmc-mods, provide default version
+ # If no tag, provide default version
if meta_vers.startswith('fatal:'):
- meta_vers = '{}-0.0-0'.format(gen)
+ meta_vers = '{}-0.0-0-g0'.format(gen)
meta_hash = irun_git(d, mibase, 'rev-parse HEAD')
- # If no hash from meta-openbmc-mods, provide default
+ # If no hash, provide default
if meta_hash.startswith('fatal:'):
meta_hash = '00000000'
version_id = '{}-{}'.format(meta_vers, obmc_hash[0:7])