BUILD_ID: Fix build ID too long err

Previous change altered the BUILD_ID to include Armband commit info
instead of Fuel@OPNFV info, and also a marker to indicate it comes
from Armband repo.

This lead to the ISO volume ID becoming too long:

"Making ISO...
genisoimage: Volume ID string too long
make[1]: *** [iso] Error 255"

While at it, change our marker from "FUEL_AARCH64" to "ARMBAND_FUEL",
as our ISO should also support x86 in the future, not only arm64.

Fixes: ARMBAND-53

Change-Id: I52526f1f7861aca71d16d1e6b6b2a9566a6c7d3f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/Makefile b/Makefile
index 9bce877..2dbf769 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ build:
                make \
                        BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
                        UBUNTU_ARCH="amd64 arm64" \
-                       PRODNO="OPNFV_FUEL_AARCH64" \
+                       PRODNO="OPNFV_ARMBAND_FUEL" \
                        OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \
                        ASTUTE_REPO=${root}/upstream/fuel-astute \
                        ASTUTE_COMMIT=HEAD \

diff --git a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
index 1c9bd82..2bcc81d 100644 (file)
--- a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
+++ b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
@@ -29,7 +29,7 @@ index ec5d27a..ba117da 100644
  export USER ?= $(shell whoami)
  export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M)
 -export OPNFV_GIT_SHA = $(shell git rev-parse HEAD)
-+export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD)
++export OPNFV_GIT_SHA ?= $(shell git rev-parse --short HEAD)
  # Store in /etc/fuel_build_id on fuel master
  export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)