summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-07 10:43:04 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-07 16:52:54 +0100
commit35362715b1fa0bbdc052d81a327a0a36131be4d1 (patch)
treed979bef1e7c8f17a6c01c0b36a7cac8c3e4f8853
parent78c01995e34b8e044913c4ab8646932c00fd6560 (diff)
downloadpoky-35362715b1fa0bbdc052d81a327a0a36131be4d1.tar.gz
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>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass14
-rw-r--r--meta/recipes-core/meta/meta-extsdk-toolchain.bb2
2 files changed, 13 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 5402988ba9..ddf3962fa4 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):
492 492
493install_tools() { 493install_tools() {
494 install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk} 494 install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
495 lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool 495 scripts="devtool recipetool oe-find-native-sysroot runqemu*"
496 lnr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool 496 for script in $scripts; do
497 for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do
498 lnr ${scriptfn} ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/`basename $scriptfn`
499 done
500 done
501 # We can't use the same method as above because files in the sysroot won't exist at this point
502 # (they get populated from sstate on installation)
503 if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" ] ; then
504 binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR', True))}
505 lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd
506 fi
497 touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase 507 touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
498 508
499 # find latest buildtools-tarball and install it 509 # 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 886ff076dc..2bd9a5b328 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"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6 6
7DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native" 7DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native"
8 8
9do_populate_sysroot[deptask] = "do_populate_sysroot" 9do_populate_sysroot[deptask] = "do_populate_sysroot"
10 10