From 6b87729e4b16975138d67ec01a0aa6b925a06245 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 9 Oct 2016 19:04:28 +0200 Subject: 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 --- build/f_repos/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/f_repos/Makefile') 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 -- cgit 1.2.3-korg