Merge remote branch 'denzil' into master

* freescale/denzil:
  linux-imx (2.6.35.3): fix sysroot populate with backward compatibility

1 files changed, 7 insertions, 3 deletions

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index c8498ff..552c9a8 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -66,11 +66,15 @@ do_install_append() {
 }
 
 sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}/kernel
+        # denzil does not have KERNEL_SRC_PATH so we default to /kernel
+        destdir=${KERNEL_SRC_PATH}
+        if [ -z "$destdir" ]; then
+                destdir=/kernel
+        fi
 
         # Copy native binaries need for imx-test build onto sysroot
         mkdir -p ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic \
                  ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
-        cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic
-        cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
+        cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}$destdir/scripts/basic
+        cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}$destdir/scripts/mod
 }