diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 19:04:28 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 19:07:11 +0200 |
| commit | 6b87729e4b16975138d67ec01a0aa6b925a06245 (patch) | |
| tree | 9f5b86cd51a7c4acb00dea8e5867e64b21d83a27 | |
| parent | 4d4faf44dc1380b1ca731c49be9705635b840738 (diff) | |
build/f_repos: Allow out-of-tree .git dir
ArmbandFuel@OPNFV uses Fuel@OPNFV git repo as a submodule, so
its .git dir is located outside work tree root (F_GIT_ROOT).
Allow this setup by parsing `git rev-parse --git-dir` intead of
harcoding git dir path.
Fixes: FUEL-200
Change-Id: Ia7f3b23e9333356fe05b9ed0565218f2c7ec8eba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | build/config.mk | 1 | ||||
| -rw-r--r-- | build/f_repos/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/config.mk b/build/config.mk index ab30518b5..b9be44f0a 100644 --- a/build/config.mk +++ b/build/config.mk @@ -22,6 +22,7 @@ FUEL_TRACK_REMOTES = # git submodule & patch locations for Fuel components F_GIT_ROOT := $(shell git rev-parse --show-toplevel) +F_GIT_DIR := $(shell git rev-parse --git-dir) F_SUBMOD_DIR := ${F_GIT_ROOT}/build/f_repos/sub F_PATCH_DIR := ${F_GIT_ROOT}/build/f_repos/patch F_OPNFV_TAG := ${FUEL_MAIN_TAG}-opnfv diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile index 66abf2d71..2d2d0bf40 100644 --- a/build/f_repos/Makefile +++ b/build/f_repos/Makefile @@ -149,7 +149,7 @@ get-cache: .cacheid @if $(CACHETOOL) check $(shell cat .cacheid); then \ $(MAKE) clean && \ $(CACHETOOL) get $(shell cat .cacheid) | \ - tar xf - -C ${F_GIT_ROOT}/.git; \ + tar xf - -C ${F_GIT_DIR}; \ else \ echo "No cache item found for $(shell cat .cacheid)" ;\ exit 0;\ @@ -160,6 +160,6 @@ get-cache: .cacheid put-cache: .cacheid @if ! $(CACHETOOL) check $(shell cat .cacheid); then \ $(MAKE) clean && \ - tar cf - -C ${F_GIT_ROOT}/.git modules | \ + tar cf - -C ${F_GIT_DIR} modules | \ $(CACHETOOL) put $(shell cat .cacheid); \ fi |