Revert "u-boot: fix extlinux creation race"

From: André Draszik <[email protected]>

This reverts commit 60c90398580998b2379bb438f0f75b29285135a5.

This causes circular dependencies when UBOOT_SIGN_ENABLE is active.

These are usually caused by circular dependencies and any circular dependency chains found will be printed below. Increase the debug level to see a list of unbuildable tasks.

Identifying dependency loops (this may take a short while)...

ERROR:
Dependency loop #1 found:
Task u-boot.bb:do_concat_dtb (dependent Tasks ['kernel.bb:do_assemble_fitimage'])
Task u-boot.bb:do_install (dependent Tasks ['u-boot.bb:do_concat_dtb', 'pseudo_1.8.2.bb:do_populate_sysroot', 'u-boot.bb:do_compile']) Task u-boot.bb:do_deploy (dependent Tasks ['u-boot.bb:do_deploy_dtb', 'u-boot.bb:do_install'])
Task .../recipes-kernel/linux/kernel.bb:do_assemble_fitimage (dependent Tasks ['kernel.bb:do_compile', 'u-boot.bb:do_deploy'])

---
 meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index aa21c0e556..c2bcf99840 100644
@@ -304,4 +304,4 @@ do_deploy () {
     fi
 }
 
-addtask deploy before do_build after do_install
+addtask deploy before do_build after do_compile

2.14.1

From: André Draszik <[email protected]>

Alternative solution to original commit 60c90398580998b2379bb438f0f75b29285135a5 ("u-boot: fix extlinux creation race")

(Untested)

---
 meta/classes/uboot-extlinux-config.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 8447a047ee..d60f8c6ae2 100644
@@ -68,7 +68,7 @@ UBOOT_EXTLINUX_MENU_DESCRIPTION_linux ??= "${DISTRO_NAME}"
 
 UBOOT_EXTLINUX_CONFIG = "${B}/extlinux.conf"
 
-python create_extlinux_config() {
+python do_create_extlinux_config() {
     if d.getVar("UBOOT_EXTLINUX") != "1":
       return
 

@@ -149,4 +149,4 @@ python create_extlinux_config() {
         bb.fatal('Unable to open %s' % (cfile))
 }
 
-do_install[prefuncs] += "create_extlinux_config"
+addtask create_extlinux_config before do_install after do_compile

2.14.1

From: André Draszik <[email protected]>

Alternative solution to original commit 60c90398580998b2379bb438f0f75b29285135a5 ("u-boot: fix extlinux creation race")

(Untested)

---
v2: also execute before do_deploy

---
 meta/classes/uboot-extlinux-config.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 8447a047ee..61dff14b7c 100644
@@ -68,7 +68,7 @@ UBOOT_EXTLINUX_MENU_DESCRIPTION_linux ??= "${DISTRO_NAME}"
 
 UBOOT_EXTLINUX_CONFIG = "${B}/extlinux.conf"
 
-python create_extlinux_config() {
+python do_create_extlinux_config() {
     if d.getVar("UBOOT_EXTLINUX") != "1":
       return
 

@@ -149,4 +149,4 @@ python create_extlinux_config() {
         bb.fatal('Unable to open %s' % (cfile))
 }
 
-do_install[prefuncs] += "create_extlinux_config"
+addtask create_extlinux_config before do_install do_deploy after do_compile

2.14.1

Hi,

I am not in a position to test this patch, but I believe that it should work...

Cheers,
Andre'