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>
BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
UBUNTU_ARCH="amd64 arm64" \
PRODNO="OPNFV_ARMBAND_FUEL" \
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 \
ASTUTE_REPO=${root}/upstream/fuel-astute \
ASTUTE_COMMIT=HEAD \
NAILGUN_REPO=${root}/upstream/fuel-web \
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 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)
# Store in /etc/fuel_build_id on fuel master
export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)