diff options
author | Chase Maupin <Chase.Maupin@ti.com> | 2013-03-18 12:50:28 -0500 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2013-03-28 21:50:17 +0100 |
commit | 316a873ace7f17a00dd1c7474829554bbee50e5e (patch) | |
tree | 98f89f9f3aa302fbc4324ce1f26e939716cc4a01 | |
parent | 1c28aecfa418879a7d8c6a9e0cc5e2346043ec78 (diff) | |
download | meta-openembedded-316a873ace7f17a00dd1c7474829554bbee50e5e.tar.gz |
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!
This fix has also been picked up in the oe-core kernel.bbclass:
http://cgit.openembedded.org/openembedded-core/commit/?id=fd5d80ab1a405cb4ef94f2cde25f8c251da490f0
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r-- | meta-oe/classes/kernel.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass index 25c5f6460..a0f67f93f 100644 --- a/meta-oe/classes/kernel.bbclass +++ b/meta-oe/classes/kernel.bbclass | |||
@@ -546,6 +546,7 @@ kernel_do_deploy() { | |||
546 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} | 546 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE} |
547 | 547 | ||
548 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | 548 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt |
549 | cd - | ||
549 | } | 550 | } |
550 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" | 551 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" |
551 | 552 | ||