diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2019-06-12 09:15:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-12 21:08:52 +0100 |
commit | 2fca533f60d451c6f50bd9a531bf34120ec88427 (patch) | |
tree | 75ef2e9a79aba89bde8fccc3d6c217cad0ecf9ce /meta/classes/kernel-fitimage.bbclass | |
parent | 508269e4bad91713ed816c2509f8c74e3e259c97 (diff) | |
download | poky-2fca533f60d451c6f50bd9a531bf34120ec88427.tar.gz |
kernel-fitimage: uboot-sign: Check UBOOT_DTB_BINARY before adding deps
Since UBOOT_DTB_BINARY empty means we don't need to inject signatures
into the U-Boot DTB, we can remove the dependencies between consumers of
these two classes and resolve a circular dependency between u-boot and
kernel.
(From OE-Core rev: c6b49cb75285e71909d1f9e4bf636f186941b519)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 2820ff9689..9e224daf05 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -42,7 +42,7 @@ python __anonymous () { | |||
42 | # Verified boot will sign the fitImage and append the public key to | 42 | # Verified boot will sign the fitImage and append the public key to |
43 | # U-Boot dtb. We ensure the U-Boot dtb is deployed before assembling | 43 | # U-Boot dtb. We ensure the U-Boot dtb is deployed before assembling |
44 | # the fitImage: | 44 | # the fitImage: |
45 | if d.getVar('UBOOT_SIGN_ENABLE') == "1": | 45 | if d.getVar('UBOOT_SIGN_ENABLE') == "1" and d.getVar('UBOOT_DTB_BINARY'): |
46 | uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' | 46 | uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' |
47 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_populate_sysroot' % uboot_pn) | 47 | d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_populate_sysroot' % uboot_pn) |
48 | } | 48 | } |