diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2015-02-20 12:03:43 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-23 13:18:03 -0600 |
| commit | a6fa07dacc102c62067e20f69a4c956ac6d1f625 (patch) | |
| tree | 898e70b27f33326ff59dd6eae3caa2a04c07189e /src | |
| parent | bda72dea7a63230c618efe32e3ee46fb3be6442c (diff) | |
| download | talos-hostboot-a6fa07dacc102c62067e20f69a4c956ac6d1f625.tar.gz talos-hostboot-a6fa07dacc102c62067e20f69a4c956ac6d1f625.zip | |
Check for HOSTBOOT_VERSION env variable when getting imageId
Change-Id: I3e51a754bed82370b6d25a508f1dfe8fd6a94784
RTC: 118253
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15870
Tested-by: Jenkins Server
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/build/tools/addimgid | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/build/tools/addimgid b/src/build/tools/addimgid index a8fae4178..34d633ea6 100755 --- a/src/build/tools/addimgid +++ b/src/build/tools/addimgid @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2011,2014 +# Contributors Listed Below - COPYRIGHT 2011,2015 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,7 +36,11 @@ $imgBase =~ s/.*\///; my $PREFIX = $ENV{'CROSS_PREFIX'}; my $address = hex `${PREFIX}nm $src -C | grep $imageIdSym | colrm 17`; -my $imageId = `git describe --dirty || echo Unknown-Image \`git rev-parse --short HEAD\``; +my $imageId = $ENV{'HOSTBOOT_VERSION'}; +if ($imageId eq '') +{ + $imageId = `git describe --dirty || echo Unknown-Image \`git rev-parse --short HEAD\``; +} chomp $imageId; $imageId = $imageId."/".$imgBase; |
