f_repos: Set git patch format explicitly 93/30893/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Mar 2017 23:20:01 +0000 (00:20 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 17 Mar 2017 23:18:22 +0000 (23:18 +0000)
Skip patch format auto-detection, by setting it explicitly to "mbox".
This allows adding license headers to patch files.

JIRA: ARMBAND-236

Change-Id: I2b19ced80984ea98e220935c9d36836e62203bb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 672c1df70b8cafe61a3edaa66fbf9e8dba2b12e2)

build/f_repos/Makefile

index be6f829..5dd1c1e 100644 (file)
@@ -89,7 +89,8 @@ patches-import: sub .cachepatched
                                SUB_FEATURE=$${p_dir#$$SUB_DIR}; \
                                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 \
+                               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 \