diff options
author | Yann CARDAILLAC <yann.cardaillac@smile.fr> | 2019-03-11 13:08:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-12 11:57:41 -0700 |
commit | 7a6a5dcf9c5cefaccd2e4b0741bfba88eb8125d1 (patch) | |
tree | 455658c0b68b593699b48044751a4c2e1f91a3a4 /scripts/lib/devtool | |
parent | 09923bbf467612a481a058d35f3717189b72477f (diff) | |
download | poky-7a6a5dcf9c5cefaccd2e4b0741bfba88eb8125d1.tar.gz |
correct do_patch for kernel bbappend in sdk
do_patch rule of SDK's workspace/appends/linux-*.bbhappend may fail if script are not written in Python
that was the case with Phytec's BSP, the fix was to replace the do_patch rule with :
do_patch[noexec]="1" when the file was generated in scripts/lib/devtool/standard.py
(From OE-Core rev: e51cb385e5573c7069de6e8308b9b68eb4a3a162)
Signed-off-by: Yann CARDAILLAC <yann.cardaillac@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index b7d4d47dfc..ea09bbff31 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -849,9 +849,7 @@ def modify(args, config, basepath, workspace): | |||
849 | if bb.data.inherits_class('kernel', rd): | 849 | if bb.data.inherits_class('kernel', rd): |
850 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' | 850 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' |
851 | 'do_fetch do_unpack do_kernel_configme do_kernel_configcheck"\n') | 851 | 'do_fetch do_unpack do_kernel_configme do_kernel_configcheck"\n') |
852 | f.write('\ndo_patch() {\n' | 852 | f.write('\ndo_patch[noexec] = "1"\n') |
853 | ' :\n' | ||
854 | '}\n') | ||
855 | f.write('\ndo_configure_append() {\n' | 853 | f.write('\ndo_configure_append() {\n' |
856 | ' cp ${B}/.config ${S}/.config.baseline\n' | 854 | ' cp ${B}/.config ${S}/.config.baseline\n' |
857 | ' ln -sfT ${B}/.config ${S}/.config.new\n' | 855 | ' ln -sfT ${B}/.config ${S}/.config.new\n' |