X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=35a3f08c0c1f0370e41473c535ca1caa17c29ac3;hb=2e922579664feeadf722ce11d4f8b92ffffd3c0c;hp=8300711d7eb008142654a35099ac8222bce379ec;hpb=42f8585ebb8fffad19a89314659ab9129176c3e9;p=armband.git diff --git a/Makefile b/Makefile index 8300711d..35a3f08c 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ # - Fuel@OPNFV is made aware of an Armband type build by passing # the "ARMBAND_BASE" env var; +SHELL = /bin/sh + export ARMBAND_BASE := $(shell pwd) export OPNFV_GIT_SHA := $(shell git rev-parse HEAD) export REVSTATE @@ -88,7 +90,8 @@ patches-import: .submodules-init .submodules-patched SUB_FEATURE=$${p_dir#$$SUB_DIR} \ SUB_TAG=${A_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 \ + git tag $$SUB_TAG-root && \ + git am -3 --whitespace=nowarn --patch-format=mbox \ --committer-date-is-author-date $$SUB_PATCHES && \ git tag $$SUB_TAG || exit 1; \ fi \ @@ -113,10 +116,12 @@ patches-import: .submodules-init .submodules-patched done @touch $@ -# Pass down clean/deepclean/build to Fuel@OPNFV -.PHONY: clean +# Pass down debug/clean/deepclean/build to Fuel@OPNFV +.PHONY: clean debug clean: .submodules-init - $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} clean +debug: fuel-patches-import +clean debug: + $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} $@ .PHONY: deepclean deepclean: clean