diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-17 21:56:22 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-10 18:08:22 +0000 |
| commit | 3e102a940811ccd9d08eb8362f739394334eda91 (patch) | |
| tree | b686dda4e424b51cfdb898855fe1dabd53af87ca /build/install | |
| parent | 3e469e46e9766b1b4d443167e64e2887140c107c (diff) | |
build: Use OPNFV_GIT_SHA for ISO preparer ID
isoinfo -i lists the following information for Fuel@OPNFV ISO:
"Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
where the SHA hash is Fuel git repo HEAD SHA.
For Armband's build system, using only the Fuel commit ID is not
enough to fully describe the state of the source code, as patches
are also applied to other fuel modules (as git submodules).
Instead, a pointer to a valid Armband commit ID should be used.
However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
commit hash, so the ISO metadata should also reflect this.
While at it, allow product name to be overriden, to signal the
commit ID should be looked up inside the Armband repository.
Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 94ea115c36d5f5c79823692ac80626cf8959b35d)
Diffstat (limited to 'build/install')
| -rwxr-xr-x | build/install/install.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/install/install.sh b/build/install/install.sh index c63241974..866d30419 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -196,8 +196,12 @@ make_iso_image() { find . -name TRANS.TBL -exec rm {} \; rm -rf rr_moved + if [[ -z "$OPNFV_GIT_SHA" ]]; then + OPNFV_GIT_SHA=$(git rev-parse --verify HEAD) + fi + mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \ - -p `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \ + -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \ -no-emul-boot \ -boot-load-size 4 -boot-info-table \ --hide-rr-moved \ |