diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-04-25 09:40:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:36:02 +0100 |
commit | 720ae184031db33049f9be6326f9735224183492 (patch) | |
tree | a04f8a5f269b95ada1eda5696d2ff6da0e8da514 /scripts | |
parent | ae832446d963eb63078a90099284a279520664a4 (diff) | |
download | poky-720ae184031db33049f9be6326f9735224183492.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)
(From meta-yocto rev: e98cce42b8454545874a68979af70ca1813a7ad2)
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>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/bsp/kernel.py | 1 |
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() |