[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1778/8267] uboot-sign: Handle .rom signing the same as .img

[Emmanuele Bassi <ebassi src gnome org>]

commit c1a6945d7e911cfee415a2fce677f1f4708284c4
Author: George McCollister <george mccollister gmail com>
Date:   Fri Jul 15 16:30:21 2016 -0500

    uboot-sign: Handle .rom signing the same as .img
    
    Handle u-boot.rom signing (U-Boot as x86 BIOS replacement) the same way
    that u-boot.img signing is handled.
    
    (From OE-Core rev: 94e3f427bbeb005d8443e9d822c3182f280df470)
    
    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 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 57d4903..d56ad8e 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -64,7 +64,8 @@ do_concat_dtb () {
        # Concatenate U-Boot w/o DTB & DTB with public key
        # (cf. kernel-fitimage.bbclass for more details)
        if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then
-               if [ "x${UBOOT_SUFFIX}" = "ximg" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
+               if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \
+                       [ -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}