]> code.ossystems Code Review - openembedded-core.git/commitdiff
uboot-sign: do_concat_dtb(): cd to $B
authorGeorge McCollister <george.mccollister@gmail.com>
Mon, 8 Aug 2016 15:29:47 +0000 (10:29 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Aug 2016 09:45:33 +0000 (10:45 +0100)
Prior to running oe_runmake make sure $B is the cwd. This is required
due to bitbake commit 67a7b8b021badc17d8fdf447c250e79d291e75f7
"build: don't use $B as the default cwd for functions".

Without this change, do_concat_dtb fails with:
| ERROR: oe_runmake failed
| make: *** No targets specified and no makefile found.  Stop.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/uboot-sign.bbclass

index d56ad8e07cd9661f10d0dc58093b9e54080422cb..3c56db8872cd3c299f2ec22830b3f5c3873b181b 100644 (file)
@@ -66,6 +66,7 @@ do_concat_dtb () {
        if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then
                if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \
                        [ -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}