From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Date: Mon, 25 Apr 2016 09:40:22 +0000 (+0000)
Subject: scripts/lib/bsp/kernel.py: force patching when branch is machine branch is re-use
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=427f5473722e15e288cbce251a9ce18989c23548;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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]

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>
---

diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index ba68b60fcb1..07832282c38 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):
     patch list [${machine}-user-patches.scc].
     """
     f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w")
+    f.write("mark patching start\n")
     for item in patch_items:
         f.write("patch " + item + "\n")
     f.close()