diff options
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.inc | 5 |
1 files changed, 4 insertions, 1 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 0c8f3be56..95061a570 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,11 +53,14 @@ python() { 'describe --long --abbrev=6 ' + '--match \'{}-[0-9]*\.[0-9]*\''.format(gen)) - # Until tags in meta-openbmc-mods, interim measure keep builds working. + # If no tag in meta-openbmc-mods, provide default version if meta_vers.startswith('fatal:'): meta_vers = '{}-0.0-0'.format(gen) meta_hash = irun_git(d, mibase, 'rev-parse HEAD') + # If no hash from meta-openbmc-mods, provide default + if meta_hash.startswith('fatal:'): + meta_hash = '00000000' version_id = '{}-{}'.format(meta_vers, obmc_hash[0:7]) if version_id: d.setVar('VERSION_ID', version_id) |