summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
diff options
context:
space:
mode:
authorJens Rehsack <sno@netbsd.org>2018-10-09 20:34:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:47:35 +0100
commit2499589fb60ca4fce0b425bc239532378886feb7 (patch)
tree5c56807591738640adf8665c6f389b5469d85a1c /meta/classes/populate_sdk_ext.bbclass
parent38a4f6e4f88978f86e1efec8d25ced0a19241664 (diff)
downloadpoky-2499589fb60ca4fce0b425bc239532378886feb7.tar.gz
populate_sdk_ext.bbclass: avoid populating tools twice
When running `bitbake -c populate_sdk_ext ...` for an image recipe inheriting populate_sdk_qt5, `nativesdk-qemu-helper` is deployed via `nativesdk-packagegroup-sdk-host`, which already contains some of the tools (by name: "oe-find-native-sysroot runqemu*"). To avoid error like: Configuring nativesdk-packagegroup-qt5-toolchain-host. NOTE: Running intercept scripts: NOTE: > Executing update_gio_module_cache-nativesdk intercept ... NOTE: + [ True = False ] + qemu-x86_64 -r 3.2.0 -E LD_LIBRARY_PATH=/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib:/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/lib -L /home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image /home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/libexec/nativesdk-gio-querymodules /home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image/opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/lib/gio/modules/ NOTE: Executing copy_buildsystem ... DEBUG: Executing python function copy_buildsystem NOTE: Generating sstate task list... NOTE: Generating sstate-cache... NOTE: Generating sstate-cache... DEBUG: Python function copy_buildsystem finished NOTE: Executing install_tools ... DEBUG: Executing shell function install_tools Traceback (most recent call last): File "/home/sno/gpw-community-bsp/sources/poky/scripts/lnr", line 21, in <module> os.symlink(target, linkname) FileExistsError: [Errno 17] File exists: '../../../../layers/poky/scripts/oe-find-native-sysroot' -> '/home/sno/gpw-community-bsp/mops-yocto-platform/tmp/work/fischer-poky-linux/updatable-app-image/1.0-r0/sdk-ext/image//opt/mops/2.5+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/oe-find-native-sysroot' WARNING: exit code 1 from a shell command. DEBUG: Python function do_populate_sdk_ext finished only add those tools unpackaged to the deployment which are still missing. (From OE-Core rev: 3274819ce3bb64316853c6f0bb7840c38635c26c) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 9c31d70f2a..e30c49296d 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -531,7 +531,8 @@ install_tools() {
531 scripts="devtool recipetool oe-find-native-sysroot runqemu* wic" 531 scripts="devtool recipetool oe-find-native-sysroot runqemu* wic"
532 for script in $scripts; do 532 for script in $scripts; do
533 for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do 533 for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do
534 lnr ${scriptfn} ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/`basename $scriptfn` 534 targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename $scriptfn)"
535 test -e ${targetscriptfn} || lnr ${scriptfn} ${targetscriptfn}
535 done 536 done
536 done 537 done
537 # We can't use the same method as above because files in the sysroot won't exist at this point 538 # We can't use the same method as above because files in the sysroot won't exist at this point