summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-07-21 11:59:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-21 11:59:30 +0000
commit5ab00927ecd4f0259a28bac0e527d4d71e767118 (patch)
treed1cb060a0bf5e31b25a58a4363ab5a28ad297fd3
parent94e1cd2189a7b594b44c491f157bc3232fc94f94 (diff)
parenteea876bcb845c48630d7b035fadcfff49c1b0763 (diff)
Merge "BUILD_ID: Fix incomplete git build info"
-rw-r--r--Makefile2
-rw-r--r--patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch35
2 files changed, 37 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 748b58df..9bce8773 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ build:
make \
BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
UBUNTU_ARCH="amd64 arm64" \
+ PRODNO="OPNFV_FUEL_AARCH64" \
+ OPNFV_GIT_SHA=$(shell git rev-parse 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
new file mode 100644
index 00000000..1c9bd82a
--- /dev/null
+++ b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
@@ -0,0 +1,35 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Mon, 18 Jul 2016 23:50:30 +0200
+Subject: [PATCH] build/Makefile: Overrideable product, commit hash.
+
+For Armband's build system, using only the Fuel commit ID is not
+enough to fully describe the state of the source code, as patches
+are also applied to other fuel modules (as git submodules).
+Instead, a pointer to a valid Armband commit ID should be used.
+
+While at it, allow product name to be overriden, to signal the
+commit ID should be looked up inside the Armband repository.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ build/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index ec5d27a..ba117da 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -21,11 +21,11 @@ SHELL = /bin/bash
+ export MOSVERSION = 9.0
+ export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
+ export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
+-export PRODNO = "OPNFV_FUEL"
++export PRODNO ?= "OPNFV_FUEL"
+ export REVSTATE = "P0000"
+ 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)
+ # Store in /etc/fuel_build_id on fuel master
+ export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)
+