diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-12 19:39:31 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-10-12 19:39:31 +0000 |
commit | 38b2256753f0fe358b8b3eecae117ba3b9e20076 (patch) | |
tree | 78c7535b15351b2d86fe192a426bf96d766726ff /build/Makefile | |
parent | b47042641c215adcdce8ddaf587f23aa2215c71a (diff) | |
parent | 3e102a940811ccd9d08eb8362f739394334eda91 (diff) |
Merge "build: Use OPNFV_GIT_SHA for ISO preparer ID" into stable/colorado
Diffstat (limited to 'build/Makefile')
-rw-r--r-- | build/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index 59d9096c6..661505d9b 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) |