From 672c1df70b8cafe61a3edaa66fbf9e8dba2b12e2 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 16 Mar 2017 00:20:01 +0100
Subject: f_repos: Set git patch format explicitly

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>
---
 build/f_repos/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index be6f82909..5dd1c1e7f 100644
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -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 \
-- 
cgit