From: Chase Maupin Date: Wed, 13 Mar 2013 12:03:50 +0000 (-0500) Subject: kernel bbclass: return to original directory in do_deploy X-Git-Tag: 2015-4~7194 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0;p=openembedded-core.git 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! Signed-off-by: Chase Maupin Signed-off-by: Saul Wold --- diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0a0430e266..d57d1f50b7 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -352,6 +352,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}"