[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2925/8267] classes/populate_sdk_ext: add symlinks and unfsd to support Eclipse plugin

[Emmanuele Bassi <ebassi src gnome org>]

commit 35362715b1fa0bbdc052d81a327a0a36131be4d1
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Fri Oct 7 10:43:04 2016 +1300

    classes/populate_sdk_ext: add symlinks and unfsd to support Eclipse plugin
    
    The Yocto Project Eclipse plugin requires that runqemu and unfsd are
    accessible within the SDK, and indeed the standard SDK has these. This
    turns out to be fairly easy to do - we just need to add unfsd and symlink
    it, runqemu and a few other scripts into the SDK's bin directory.
    
    Fixes [YOCTO #10214].
    
    (From OE-Core rev: 9007e0e3fce7e09b043fead54b17f69c1661d162)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass           |   14 ++++++++++++--
 meta/recipes-core/meta/meta-extsdk-toolchain.bb |    2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 5402988..ddf3962 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -492,8 +492,18 @@ def get_sdk_required_utilities(buildtools_fn, d):
 
 install_tools() {
        install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
-       lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool 
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool
-       lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool 
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool
+       scripts="devtool recipetool oe-find-native-sysroot runqemu*"
+       for script in $scripts; do
+               for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name 
"$script"`; do
+                       lnr ${scriptfn} ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/`basename $scriptfn`
+               done
+       done
+       # We can't use the same method as above because files in the sysroot won't exist at this point
+       # (they get populated from sstate on installation)
+       if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" ] ; then
+               binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR', 
True))}
+               lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd 
${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd
+       fi
        touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
 
        # find latest buildtools-tarball and install it
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
index 886ff07..2bd9a5b 100644
--- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb
+++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native"
+DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native"
 
 do_populate_sysroot[deptask] = "do_populate_sysroot"