summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-07-22 20:45:57 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-07-22 18:51:04 +0000
commit956c18d86b3b9073933c6d43a80ac36187864539 (patch)
treec1d350cecf331c7460327fcccefcbc2e40d3e9db
parent9a88998b7ec205b9bef193b4a75ad8af81092bb1 (diff)
Makefile: Trim OPNFV_PRODNO to fit in ISO volid
genisoimage has a limit of 32 chars for volume ID, which was reached during Jenkins builds (which sets REVSTATE to a datestring), but not while building outside Jenkins (in which case REVSTATE was simply set to "P000"), hence the recent broken builds despite manully testing the changes beforehand. Shorten the product name (PRODNO var), and revert git SHA to full format, as that was not the culprit. Related-bug: ARMBAND-53 Change-Id: I0a530982893af1b6a0243b55f6b1d2eea66ac5bf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b5723679..922b72ea 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,8 @@ build:
make \
BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
UBUNTU_ARCH="amd64 arm64" \
- PRODNO="OPNFV_ARMBAND_FUEL" \
- OPNFV_GIT_SHA=$(shell git rev-parse --short HEAD) \
+ PRODNO="OPNFV_A_FUEL" \
+ OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \
ASTUTE_REPO=${root}/upstream/fuel-astute \
ASTUTE_COMMIT=HEAD \
NAILGUN_REPO=${root}/upstream/fuel-web \