[gnome-continuous-yocto/gnomeostree-3.28-rocko: 555/8267] uboot-sign: rebuild u-boot.img with signed dtb

[Emmanuele Bassi <ebassi src gnome org>]

commit b426b2bc1a954e05e5fcbc40e6ff39251075305d
Author: George McCollister <george mccollister gmail com>
Date:   Thu May 26 12:27:56 2016 -0500

    uboot-sign: rebuild u-boot.img with signed dtb
    
    u-boot-nodtb.img doesn't exist so if UBOOT_SUFFIX = "img" is used
    u-boot.img must be rebuilt by running make with
    EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} then the resulting .img file must
    be install to the deploy directories.
    
    (From OE-Core rev: 4afee787e455ce1d4c002cd5c003182f1fc50028)
    
    Signed-off-by: George McCollister <george mccollister gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/uboot-sign.bbclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 82cec9e..57d4903 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -63,9 +63,13 @@ do_deploy_dtb () {
 do_concat_dtb () {
        # Concatenate U-Boot w/o DTB & DTB with public key
        # (cf. kernel-fitimage.bbclass for more details)
-       cd ${DEPLOYDIR}
        if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then
-               if [ -e "${UBOOT_NODTB_IMAGE}" -a -e "${UBOOT_DTB_IMAGE}" ]; then
+               if [ "x${UBOOT_SUFFIX}" = "ximg" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
+                       oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
+                       install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+                       install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+               elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
+                       cd ${DEPLOYDIR}
                        cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
                else
                        bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be 
available."