diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-22 13:46:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-22 13:46:28 +0000 |
| commit | 8729c530665164205678e18afdbe6706fe93588d (patch) | |
| tree | c3d0019200ef2205eca678e3b523c8ac8c629bef | |
| parent | b824fbf3886311289ceb003060b4b9fb5517494c (diff) | |
| parent | 16984fb6d4432ba9deae152d62879b724492b931 (diff) | |
Merge "BUILD_ID: Fix build ID too long err"
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 1c9bd82a..2bcc81dd 100644 --- 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) |