Skip to contentSkip to conversation

kernel-fitimage: Add missing dependency for UBOOT_ENV

PATCH In review Marek Vasut 1 participant 2 messages Jan 29, 2022 – Feb 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-fitimage: Add missing dependency for UBOOT_ENV

For $UBOOT_ENV file to appear in sysroot, virtual/bootloader must populate sysroot first. Add the missing dependency.

Cc Richard Purdie <[email protected]>
---
 meta/classes/kernel-fitimage.bbclass | 4 ++++
 1 file changed, 4 insertions(+)
meta/classes/kernel-fitimage.bbclass +4 -0
index 1e3bc21f1f..507e0a2213 100644
@@ -36,6 +36,10 @@ python __anonymous () {
         if image:
             d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
 
+        ubootenv = d.getVar('UBOOT_ENV')
+        if ubootenv:
+            d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/bootloader:do_populate_sysroot')
+
         #check if there are any dtb providers
         providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
         if providerdtb:
Signature · 1 line
2.34.1
#1 lore raw
Quoted 14 lines · Marek Vasut

For $UBOOT_ENV file to appear in sysroot, virtual/bootloader must populate sysroot first. Add the missing dependency.

Cc Richard Purdie <[email protected]>
---
  meta/classes/kernel-fitimage.bbclass | 4 ++++
  1 file changed, 4 insertions(+)
meta/classes/kernel-fitimage.bbclass +0 -0
index 1e3bc21f1f..507e0a2213 100644

meta/classes/kernel-fitimage.bbclass python __anonymous () { · line 45

Quoted 10 lines
meta/classes/kernel-fitimage.bbclass +4 -0
@@ -36,6 +36,10 @@ python __anonymous () {
          if image:
              d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
 
+        ubootenv = d.getVar('UBOOT_ENV')
+        if ubootenv:
+            d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/bootloader:do_populate_sysroot')
+
          #check if there are any dtb providers
          providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
          if providerdtb:

I think "bump" is in order by now.

Can you please pick this one ?