[oe-commits] Chase Maupin : kernel bbclass: return to original directory in do_deploy

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: danny-next
Commit: 316a873ace7f17a00dd1c7474829554bbee50e5e
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=316a873ace7f17a00dd1c7474829554bbee50e5e

Author: Chase Maupin <Chase.Maupin at ti.com>
Date:   Mon Mar 18 12:50:28 2013 -0500

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 at ti.com>
Signed-off-by: Eric Bénard <eric at eukrea.com>

---

 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 25c5f64..a0f67f9 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -546,6 +546,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}"