]> code.ossystems Code Review - openembedded-core.git/commitdiff
uboot-sign.bbclass: silence warnings when UBOOT_DTB_BINARY is empty
authorAlex Kiernan <alex.kiernan@gmail.com>
Wed, 12 Dec 2018 20:18:46 +0000 (20:18 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 11 Jan 2019 10:38:21 +0000 (10:38 +0000)
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@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/uboot-sign.bbclass

index 03100b8a5fa1510f31967ffda1aee8b3e634ee6b..9e3d1d6fc1adb78bcb8a5fe27c13f3b89fa817c0 100644 (file)
@@ -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