]> code.ossystems Code Review - openembedded-core.git/commitdiff
correct do_patch for kernel bbappend in sdk
authorYann CARDAILLAC <yann.cardaillac@smile.fr>
Mon, 11 Mar 2019 12:08:37 +0000 (13:08 +0100)
committerArmin Kuster <akuster808@gmail.com>
Sat, 13 Apr 2019 19:33:48 +0000 (12:33 -0700)
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

Signed-off-by: Yann CARDAILLAC <yann.cardaillac@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/lib/devtool/standard.py

index b7d4d47dfc64979a35ee85b802257bc4790081e5..ea09bbff312857a2da298c085f17ab1fe3e8141f 100644 (file)
@@ -849,9 +849,7 @@ def modify(args, config, basepath, workspace):
             if bb.data.inherits_class('kernel', rd):
                 f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout '
                         'do_fetch do_unpack do_kernel_configme do_kernel_configcheck"\n')
-                f.write('\ndo_patch() {\n'
-                        '    :\n'
-                        '}\n')
+                f.write('\ndo_patch[noexec] = "1"\n')
                 f.write('\ndo_configure_append() {\n'
                         '    cp ${B}/.config ${S}/.config.baseline\n'
                         '    ln -sfT ${B}/.config ${S}/.config.new\n'