kernel-fitimage: uboot-sign: fix missing signature

u-boot.bin with dtb & signature should be placed in ${B} so that
it can be deployed by u-boot as expected. Otherwise, the version
without signature is installed.

(From OE-Core rev: bfc8c964a9760a2c4a1d1902918908a1e7361c17)

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index de81ad1b38..982ed46d01 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -66,7 +66,7 @@ concat_dtb_helper() {
                 install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
         elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
                 cd ${DEPLOYDIR}
-                cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${UBOOT_BINARY} > ${UBOOT_IMAGE}
+                cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
         else
                 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
         fi
@@ -77,10 +77,12 @@ concat_dtb() {
                 mkdir -p ${DEPLOYDIR}
                 if [ -n "${UBOOT_CONFIG}" ]; then
                         for config in ${UBOOT_MACHINE}; do
+                                CONFIG_B_PATH="${config}"
                                 cd ${B}/${config}
                                 concat_dtb_helper
                         done
                 else
+                        CONFIG_B_PATH=""
                         cd ${B}
                         concat_dtb_helper
                 fi