external-poky-toolchain: Add include and lib files to the staging sysroot removing the need to link against two trees at the same time

1 files changed, 6 insertions, 0 deletions

diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 7b6fd1a084..acdf29c4a8 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -25,9 +25,15 @@ do_stage() {
         install -d ${DEPLOY_DIR}/ipk/
         install -d ${STAGING_DIR}/pkgdata/
         install -d ${STAGING_DIR_TARGET}/shlibs/
+        install -d ${STAGING_DIR_TARGET}/${layout_base_libdir}/
+        install -d ${STAGING_DIR_TARGET}/${layout_libdir}/
+        install -d ${STAGING_DIR_TARGET}/${layout_includedir}/
 
         cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
         cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
         cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+        cp -ar ${prefix}/${TARGET_SYS}/lib/* ${STAGING_DIR_TARGET}/${layout_base_libdir}/
+        cp -ar ${prefix}/${TARGET_SYS}/usr/include/* ${STAGING_DIR_TARGET}/${layout_includedir}/
+        cp -ar ${prefix}/${TARGET_SYS}/usr/lib/* ${STAGING_DIR_TARGET}/${layout_libdir}/
 }