diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch | 2 | ||||
| m--------- | upstream/fuel | 0 | ||||
| m--------- | upstream/yardstick | 0 |
4 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_ARMBAND_FUEL" \ + PRODNO="OPNFV_A_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 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) diff --git a/upstream/fuel b/upstream/fuel -Subproject 6d01c223e8bab2f5bab4941d12a1f09c5d5123b +Subproject 9c78f17d3bf2aeab4e705eb6206f01d400f280f diff --git a/upstream/yardstick b/upstream/yardstick -Subproject 6ce3a97548e95a62cf39f37c76bf5b618f5575c +Subproject 3efdee16739e3660c28c6f6b48d331e350ae4a0 |