| Message ID | 20220129005737.86270-1-marex@denx.de |
|---|---|
| State | Accepted, archived |
| Commit | 77d96b70f37b70dde65cf31f917c9f524fa7016a |
| Headers | show |
| Series | kernel-fitimage: Add missing dependency for UBOOT_ENV | expand |
On 1/29/22 01:57, Marek Vasut wrote: > For $UBOOT_ENV file to appear in sysroot, virtual/bootloader > must populate sysroot first. Add the missing dependency. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/classes/kernel-fitimage.bbclass | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass > index 1e3bc21f1f..507e0a2213 100644 > --- a/meta/classes/kernel-fitimage.bbclass > +++ b/meta/classes/kernel-fitimage.bbclass > @@ -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 ?
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 1e3bc21f1f..507e0a2213 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -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:
For $UBOOT_ENV file to appear in sysroot, virtual/bootloader must populate sysroot first. Add the missing dependency. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes/kernel-fitimage.bbclass | 4 ++++ 1 file changed, 4 insertions(+)