diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-22 18:19:14 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-22 18:20:52 +0200 |
| commit | 9a88998b7ec205b9bef193b4a75ad8af81092bb1 (patch) | |
| tree | d52741348b8453a6289ac03ef82c9d45c2f7d8fe | |
| parent | 8729c530665164205678e18afdbe6706fe93588d (diff) | |
BUILD_ID: Fix git SHA one last time.
Previous commit which was supposed to fix the BUILD_ID being too
long mistakenly altered the submodule code for computing the
short SHA, instead of altering the Makefile.
Fixes: ARMBAND-53
Change-Id: Ib1c1b3dc9592714fd86a59ae1a64001bd2930bd3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -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
@@ -65,7 +65,7 @@ build: BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \ UBUNTU_ARCH="amd64 arm64" \ PRODNO="OPNFV_ARMBAND_FUEL" \ - OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \ + OPNFV_GIT_SHA=$(shell git rev-parse --short HEAD) \ ASTUTE_REPO=${root}/upstream/fuel-astute \ ASTUTE_COMMIT=HEAD \ NAILGUN_REPO=${root}/upstream/fuel-web \ 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 2bcc81dd..1c9bd82a 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 --short HEAD) ++export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD) # Store in /etc/fuel_build_id on fuel master export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA) |