summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMylène Josserand <mylene.josserand@free-electrons.com>2017-04-12 22:03:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-12 23:55:53 +0100
commite5a6ee0d0655827d06a6030380277ee61a6db0ef (patch)
treea4b7eebbe7ec303e8c6d773b7c14bcd3cc5adde2
parent66b7f495bb000c043ae24176dcdec0cb087eeecf (diff)
downloadopenembedded-core-e5a6ee0d0655827d06a6030380277ee61a6db0ef.tar.gz
openembedded-core-e5a6ee0d0655827d06a6030380277ee61a6db0ef.tar.bz2
openembedded-core-e5a6ee0d0655827d06a6030380277ee61a6db0ef.zip
meta: classes: Add building dir to uImage creation
On the do_uboot_mkimage task from kernel-uimage.bbclass, in case KEEPUIMAGE is different than the default "yes" value, the uboot-mkimage command fails because the path of the created uImage does not exist. On this task, we are under the BUILDDIR so there is no folder arch/<ARCH>/boot. Add the ${B} (for kernel build directory) as prefix to this folder fixes the problem. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-uimage.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
index e2e9b63110..19c6ade507 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -28,7 +28,7 @@ do_uboot_mkimage() {
awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
fi
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${B}/arch/${ARCH}/boot/uImage
rm -f linux.bin
fi
fi