summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2016-10-27 08:13:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-16 10:37:56 +0000
commit3d471b811dca0894a49da746b6e2e3203d66dae0 (patch)
treecec66c4831c0406e5c437d5454e81c99f3e8cd40 /meta/classes
parent8b84b31dc275aa96d79d816980559cc9786e2fb0 (diff)
downloadpoky-3d471b811dca0894a49da746b6e2e3203d66dae0.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) (From OE-Core rev: 87705ab8f7224dbc1f397f9c388260a6370a06d9) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/uboot-sign.bbclass4
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}