From 6b8dace6fa76aedb597bd12b7b925b19ebec1cd5 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Wed, 13 Mar 2013 07:03:50 -0500 Subject: kernel bbclass: return to original directory in do_deploy * During the base kernel_do_deploy function the directory is changed to DEPLOYDIR in order to do some cleanup and symlinking. However, the directory is not changed back to the original starting directory ${S} at the end. For append functions this means that the starting directory is not ${S} as expected but instead ${DEPLOYDIR}. For functions like the do_deploy_append in recipes-kernel/linux/linux-dtb.inc there is an assumption that you are still in the source directory and not the DEPLOYDIR. Without this change the .dtb files are not copied because the check for the existence of ${DTS_FILE} which is a relative path from the ${S} directory fails. This means that the .dtb files are not copied into the deploy directory and subsequently the deploy/images directory. In the log.do_deploy file you will see lines like: Warning: arch/arm/boot/dts/xxxxx.dts is not available! (From OE-Core rev: cfac9cc41c98eb1858bd3b0dee3dcc672d53f78b) Signed-off-by: Chase Maupin Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 88ce5614f0..9691c25e5a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -529,6 +529,7 @@ kernel_do_deploy() { ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + cd - } do_deploy[dirs] = "${DEPLOYDIR} ${B}" -- cgit v1.2.3-54-g00ecf