summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2016-04-25 09:40:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-06 10:32:24 +0100
commit912e372bd3097b1475df2689f9aec88dd3198976 (patch)
treefbbf8cee192a218f49ae1474bfd2a3689a2f8ea1 /scripts/lib/bsp
parent3cdecde23d76196954d549228af01a2a0622a94d (diff)
downloadpoky-912e372bd3097b1475df2689f9aec88dd3198976.tar.gz
scripts/lib/bsp/kernel.py: force patching when branch is machine branch is re-use
When a branch is re-used, the kernel tools turns off any patch pushing unless 'mark patching' is explicitly set. [YOCTO #9120] (From meta-yocto rev: 427f5473722e15e288cbce251a9ce18989c23548) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp')
-rw-r--r--scripts/lib/bsp/kernel.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index ba68b60fcb..07832282c3 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -333,6 +333,7 @@ def write_patch_items(scripts_path, machine, patch_items):
333 patch list [${machine}-user-patches.scc]. 333 patch list [${machine}-user-patches.scc].
334 """ 334 """
335 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w") 335 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w")
336 f.write("mark patching start\n")
336 for item in patch_items: 337 for item in patch_items:
337 f.write("patch " + item + "\n") 338 f.write("patch " + item + "\n")
338 f.close() 339 f.close()