Locate toplevel for git submodule 79/39979/1
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 23 Aug 2017 10:31:48 +0000 (14:31 +0400)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 23 Aug 2017 10:37:03 +0000 (14:37 +0400)
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>
mcp/patches/Makefile

index 6a176db..fafa83f 100644 (file)
@@ -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 && \