From 4b1967cd356cc371723cf2702df3c4c20b87ff14 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Fri, 21 Apr 2017 14:44:55 +0100 Subject: u-boot: adapt to change in build directory in morty In YP 2.2 (Morty) {B} is no longer the default working directory for tasks [1]. Adapt the deploy task so it finds the srec. [1] http://www.yoctoproject.org/docs/2.2.1/ref-manual/ref-manual.html#migration-2.2-B-no-longer-default-working-directory-for-tasks (cherry picked from commit 08383820f1b5b7a39be5f9e47925026abeb26463) Signed-off-by: Stephen Lawrence --- meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb index 5af3632..e92a6b5 100644 --- a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb +++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb @@ -19,7 +19,7 @@ UBOOT_SREC_IMAGE ?= "u-boot-elf-${MACHINE}-${PV}-${PR}.srec" UBOOT_SREC_SYMLINK ?= "u-boot-elf-${MACHINE}.srec" do_deploy_append() { - install -m 644 ${S}/${UBOOT_SREC} ${DEPLOYDIR}/${UBOOT_SREC_IMAGE} + install -m 644 ${B}/${UBOOT_SREC} ${DEPLOYDIR}/${UBOOT_SREC_IMAGE} cd ${DEPLOYDIR} rm -f ${UBOOT_SREC} ${UBOOT_SREC_SYMLINK} ln -sf ${UBOOT_SREC_IMAGE} ${UBOOT_SREC_SYMLINK} -- cgit 1.2.3-korg