1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Wed, 17 Aug 2016 21:56:22 +0200
3 Subject: [PATCH] build: Use OPNFV_GIT_SHA for ISO preparer ID
5 isoinfo -i lists the following information for Fuel@OPNFV ISO:
6 "Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
7 where the SHA hash is Fuel git repo HEAD SHA.
9 However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
10 commit hash, so the ISO metadata should also reflect this.
12 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
14 build/docker/runcontext | 2 +-
15 build/install/install.sh | 6 +++++-
16 2 files changed, 6 insertions(+), 2 deletions(-)
18 diff --git a/build/docker/runcontext b/build/docker/runcontext
19 index e4874df..07b0dc1 100755
20 --- a/build/docker/runcontext
21 +++ b/build/docker/runcontext
22 @@ -119,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
23 -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
24 -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
25 -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
26 - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE \
27 + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE -e OPNFV_GIT_SHA \
28 -u $USER_ID:$GROUP_ID -w $PWD \
29 -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
31 diff --git a/build/install/install.sh b/build/install/install.sh
32 index f6308fb..9e003bb 100755
33 --- a/build/install/install.sh
34 +++ b/build/install/install.sh
35 @@ -210,8 +210,12 @@ make_iso_image() {
36 find . -name TRANS.TBL -exec rm {} \;
39 + if [[ -z "$OPNFV_GIT_SHA" ]]; then
40 + OPNFV_GIT_SHA=$(git rev-parse --verify HEAD)
43 mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \
44 - -p `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \
45 + -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \
47 -boot-load-size 4 -boot-info-table \