summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-06-12 14:40:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 11:58:46 +0100
commitcf781e2f9b406075d97d363443eba4a74171a8c0 (patch)
treedc715beffe51216741876400da275d0023474632 /scripts
parente707865a6ac2ffc729c929df580cc3ba30cef484 (diff)
downloadpoky-cf781e2f9b406075d97d363443eba4a74171a8c0.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 #10674] (From meta-yocto rev: 4f3cd59d76e3d8a43a4460528082c0086bdbba41) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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 a3ee325a8f..32cab3b642 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -331,6 +331,7 @@ def write_patch_items(scripts_path, machine, patch_items):
331 patch list [${machine}-user-patches.scc]. 331 patch list [${machine}-user-patches.scc].
332 """ 332 """
333 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w") 333 f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w")
334 f.write("mark patching start\n")
334 for item in patch_items: 335 for item in patch_items:
335 f.write("patch " + item + "\n") 336 f.write("patch " + item + "\n")
336 f.close() 337 f.close()