[OE-core] [OE-Core][PATCH] uboot-sign.bbclass: silence warnings when UBOOT_DTB_BINARY is empty

Alex Kiernan alex.kiernan at gmail.com
Wed Dec 12 20:18:46 UTC 2018


When UBOOT_DTB_BINARY is set to "", the keys for signed booting are
expected to be already present in U-Boot's DTB, so don't issue warnings
for this.

Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
---

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

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 03100b8a5fa1..9e3d1d6fc1ad 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -70,7 +70,7 @@ concat_dtb() {
 		elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
 			cd ${DEPLOYDIR}
 			cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
-		else
+		elif [ -n "${UBOOT_DTB_BINARY}" ]; then
 			bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
 		fi
 	fi
@@ -86,7 +86,7 @@ do_install_append() {
 			# need both of them.
 			install ${B}/${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE}
 			ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY}
-		else
+		elif [ -n "${UBOOT_DTB_BINARY}" ]; then
 			bbwarn "${B}/${UBOOT_DTB_BINARY} not found"
 		fi
 	fi
-- 
2.7.4



More information about the Openembedded-core mailing list