aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Maupin <Chase.Maupin@ti.com>2013-03-13 07:03:50 -0500
committerRoss Burton <ross.burton@intel.com>2013-04-23 10:40:50 +0100
commitcfac9cc41c98eb1858bd3b0dee3dcc672d53f78b (patch)
treecb1c6cae6e8a0ff5a9aff68f1843f57e3df8bee9
parent9a5ed565758a6fcc94bc85ce6205375d2fd282ea (diff)
downloadopenembedded-core-cfac9cc41c98eb1858bd3b0dee3dcc672d53f78b.zip
openembedded-core-cfac9cc41c98eb1858bd3b0dee3dcc672d53f78b.tar.gz
openembedded-core-cfac9cc41c98eb1858bd3b0dee3dcc672d53f78b.tar.bz2
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 <Chase.Maupin@ti.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/kernel.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 88ce561..9691c25 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}"