diff options
| author | George McCollister <george.mccollister@gmail.com> | 2016-10-27 08:13:16 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:32 +0000 |
| commit | 3d4c896b2a7585539fc60a465dd3781e93e4cc24 (patch) | |
| tree | a08ed643602e031a2b2d1574d182b1c4ee76975b | |
| parent | 4c0d288642b329f5b5998b406ba5f89ec36db6ed (diff) | |
| download | poky-3d4c896b2a7585539fc60a465dd3781e93e4cc24.tar.gz | |
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 <george.mccollister@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/uboot-sign.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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 () { | |||
| 68 | [ -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then | 68 | [ -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then |
| 69 | cd ${B} | 69 | cd ${B} |
| 70 | oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} | 70 | oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} |
| 71 | install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} | 71 | install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} |
| 72 | install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} | 72 | install ${B}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} |
| 73 | elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then | 73 | elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then |
| 74 | cd ${DEPLOYDIR} | 74 | cd ${DEPLOYDIR} |
| 75 | cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE} | 75 | cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE} |
