diff options
Diffstat (limited to 'mcp/patches/Makefile')
| -rw-r--r-- | mcp/patches/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile index fafa83f86..dc87832b8 100644 --- a/mcp/patches/Makefile +++ b/mcp/patches/Makefile @@ -32,7 +32,7 @@ FPATCHES = $(shell find ${F_PATCH_DIR} -name '*.patch') # To enable remote tracking, set the following var to any non-empty string. # Leaving this var empty will bind each git submodule to its saved commit. -FUEL_TRACK_REMOTES ?= yes +FUEL_TRACK_REMOTES ?= .PHONY: all all: release @@ -50,7 +50,7 @@ sub: .cachefuelinfo @if [ -n "${FUEL_TRACK_REMOTES}" ]; then \ cd ${F_GIT_ROOT} && git submodule update --init --remote 2>/dev/null; \ else \ - git submodule update --init 2>/dev/null; \ + cd ${F_GIT_ROOT} && git submodule update --init 2>/dev/null; \ fi @touch $@ @@ -87,7 +87,7 @@ patches-import: sub .cachepatched SUB_TAG=${F_OPNFV_TAG}-fuel$$SUB_FEATURE/patch; \ echo "`tput setaf 2`-- patching $$name ($$SUB_TAG)`tput sgr0`";\ git tag $$SUB_TAG-root && \ - git am -3 --whitespace=nowarn --patch-format=mbox \ + git am -3 --ignore-whitespace --patch-format=mbox \ --committer-date-is-author-date $$SUB_PATCHES && \ git tag $$SUB_TAG || exit 1; \ fi \ |