commit 03557a0e589bee836a989d59906da5c1bd91149c
author Fabio Ponciroli <ponch78@gmail.com> Thu May 28 16:23:37 2020 +0200
committer Luca Milanesio <luca.milanesio@gmail.com> Thu May 28 19:40:24 2020 +0000
tree 359d7cc9549f4a235ea40f2331a18dd183aa0e20
parent 501b5cbd4441c1262c001048852e201c09b8cb71

Fix Gerrit root directory

The common.env file is included from different Makefiles, depending on
the target. Depending on the caller, MAKEFILE_LIST has different values,
hence it is not possible to always get the last value to determine the
Gerrit directory.

The invocation will always happen for sure from a subdirectory of root.
The '../gerrit' directory change will ensure the Gerrit directory value
will be added to the root one.

Change-Id: I62b85097007c45709419848a47802c35f8850a94

common.env

diff --git a/common.env b/common.env
index 592a4ea..2e34ee3 100644
--- a/common.env
+++ b/common.env
@@ -13,7 +13,7 @@
 LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins
 
 # Image version
-IMAGE_DIR=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))gerrit
+IMAGE_DIR:=$(shell pwd)/../gerrit
 HEAD_SHA1=$(shell find $(IMAGE_DIR) -type f -exec cat {} \; | shasum | cut -c 1-20)
 IMAGE_TAG=$(GERRIT_VERSION).$(GERRIT_PATCH)-$(HEAD_SHA1)
 HAPROXY_IMAGE_DIR=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))haproxy