[oe-commits] [openembedded-core] 01/06: populate_sdk_ext.bbclass: avoid populating tools twice

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1ae9699132ccad3e1397a066372723cf85c96d19
Author: Jens Rehsack <sno at netbsd.org>
AuthorDate: Tue Oct 9 20:34:56 2018 +0200

    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- [...]
    
        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.
    
    Signed-off-by: Jens Rehsack <sno at netbsd.org>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/populate_sdk_ext.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 9c31d70..e30c492 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -531,7 +531,8 @@ install_tools() {
 	scripts="devtool recipetool oe-find-native-sysroot runqemu* wic"
 	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`
+			targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename $scriptfn)"
+			test -e ${targetscriptfn} || lnr ${scriptfn} ${targetscriptfn}
 		done
 	done
 	# We can't use the same method as above because files in the sysroot won't exist at this point

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.