From 3d4c896b2a7585539fc60a465dd3781e93e4cc24 Mon Sep 17 00:00:00 2001 From: George McCollister Date: Thu, 27 Oct 2016 08:13:16 -0500 Subject: uboot-sign: fix do_concat_dtb for .img, .rom Now that out of tree building is enabled, ${B} must be used instead of ${S} as the path for UBOOT_BINARY. (From OE-Core rev: 1fe17c52e4d7ce1b9d69aaa2cd9d4b351a4b2603) Signed-off-by: George McCollister Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/uboot-sign.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/uboot-sign.bbclass') diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass index 3c56db8872..cef26b19be 100644 --- a/meta/classes/uboot-sign.bbclass +++ b/meta/classes/uboot-sign.bbclass @@ -68,8 +68,8 @@ do_concat_dtb () { [ -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then cd ${B} oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + install ${B}/${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} -- cgit v1.2.3-54-g00ecf