[oe-commits] [openembedded-core] 20/40: uboot-sign.bbclass: silence warnings when UBOOT_DTB_BINARY is empty

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 04656f5df326a72747fc5878ce201b636a2a419c
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Wed Dec 12 20:18:46 2018 +0000

    uboot-sign.bbclass: silence warnings when UBOOT_DTB_BINARY is empty
    
    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>
    Signed-off-by: Ross Burton <ross.burton at intel.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 03100b8..9e3d1d6 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.