Skip to content

Commit

Permalink
[bbclass] fix do_vigiles_uboot_config hang issue on external u-boot c…
Browse files Browse the repository at this point in the history
…onfig

Root Cause: parallel running tasks do_vigiles_uboot_config (t1) and
do_vigiles_pkg (t2) [invoked by t1 while t1 was running] tries to take hold of single.lock,
which is needed to execute any task, This creates deadlock state and can be prevented
by sequential task execution.
  • Loading branch information
Manish Kumar authored and iancampbell committed Oct 24, 2022
1 parent ad680fe commit 442d186
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions classes/vigiles.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,6 @@ def _get_uboot_pf(d):
python do_vigiles_uboot_config() {
import shutil

bb.build.exec_func("do_vigiles_pkg", d)

if not bb.data.inherits_class('uboot-config', d):
return

Expand Down Expand Up @@ -678,7 +676,7 @@ python() {
d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or ''

if pn == boot_pn:
bb.build.addtask('do_vigiles_uboot_config', 'do_rm_work', 'do_compile', d)
bb.build.addtask('do_vigiles_uboot_config', 'do_rm_work', 'do_compile do_vigiles_pkg', d)
d.appendVarFlag('do_vigiles_uboot_config', 'depends', ' %s:do_compile' % pn)
}

Expand Down

0 comments on commit 442d186

Please sign in to comment.