diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/uboot-sign.bbclass | 2 |
2 files changed, 2 insertions, 2 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 | } |
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass index 8beafff7c0..de81ad1b38 100644 --- a/meta/classes/uboot-sign.bbclass +++ b/meta/classes/uboot-sign.bbclass | |||
@@ -116,7 +116,7 @@ do_install_append() { | |||
116 | } | 116 | } |
117 | 117 | ||
118 | python () { | 118 | python () { |
119 | if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == d.getVar('UBOOT_PN'): | 119 | if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == d.getVar('UBOOT_PN') and d.getVar('UBOOT_DTB_BINARY'): |
120 | kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel') | 120 | kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel') |
121 | 121 | ||
122 | # Make "bitbake u-boot -cdeploy" deploys the signed u-boot.dtb | 122 | # Make "bitbake u-boot -cdeploy" deploys the signed u-boot.dtb |