aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-15 22:29:44 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-16 02:17:01 +0000
commit1c2b035a35745911ec527365d483516dd12e2bbc (patch)
tree4bc3bd03257905a0e73d043bd4e2c0fdc1e885b2
parent17584b4b7b25e275b63c0de68e61d26049039f65 (diff)
Makefile: patches-import: Explicit patch format
While at it, add a sample license header, checking whether patch license addition won't break build/deploy procedures. JIRA: ARMBAND-236 Change-Id: Ica2792b606051b8bdd23832fec48925e238325a2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8772a6268ad0f4796d861f60d1f9321f97988e41)
-rw-r--r--Makefile3
-rw-r--r--patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch8
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9ba6d9c..35a3f08 100644
--- a/Makefile
+++ b/Makefile
@@ -90,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 \
diff --git a/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch b/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch
index 8a42f66..dcf3b15 100644
--- a/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch
+++ b/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 19 Nov 2016 20:39:35 +0100
Subject: [PATCH] f_odlpluginbuild: Armband prereq in packages.yaml