aboutsummaryrefslogtreecommitdiffstats
path: root/build/install
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-17 21:56:22 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-08 21:56:04 +0200
commit94ea115c36d5f5c79823692ac80626cf8959b35d (patch)
tree05a2b901cff1995119313dfe36d0afa17ce6e260 /build/install
parent4d4faf44dc1380b1ca731c49be9705635b840738 (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>
Diffstat (limited to 'build/install')
-rwxr-xr-xbuild/install/install.sh6
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 \