summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-23 14:31:48 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-23 14:37:03 +0400
commitf3f8c094a817fa0f4a60ed25185b6ca226c630d1 (patch)
treea64f0f77f016c81b1d31fedf4c87556a145a8f73 /mcp/patches
parent82b0ce54c84b0b20c3d3c7c686218bb6aa06e5bb (diff)
Locate toplevel for git submodule
Prior to git 1.8.4 the current working dir has to be at top-level to run git submodule update. Change-Id: I4d6c052364863f965e8140e56af17c09ee39ed59 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile
index 6a176db8d..fafa83f86 100644
--- a/mcp/patches/Makefile
+++ b/mcp/patches/Makefile
@@ -48,7 +48,7 @@ sub: .cachefuelinfo
.cachefuelinfo:
@if [ -n "${FUEL_TRACK_REMOTES}" ]; then \
- git submodule update --init --remote 2>/dev/null; \
+ cd ${F_GIT_ROOT} && git submodule update --init --remote 2>/dev/null; \
else \
git submodule update --init 2>/dev/null; \
fi
@@ -76,7 +76,7 @@ patches-import: sub .cachepatched
.cachepatched: ${FPATCHES}
@$(MAKE) clean
- @git submodule -q foreach ' \
+ @cd ${F_GIT_ROOT} && git submodule -q foreach ' \
SUB_DIR=${F_PATCH_DIR}/$$name; mkdir -p $$SUB_DIR && \
git tag ${F_OPNFV_TAG}-root && \
git checkout -q -b opnfv-fuel && \