[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3328/8267] populate_sdk_ext.bbclass: check unfsd before create it



commit 16011c5d4f25760dae2d56e7f58e35f0aced9338
Author: Robert Yang <liezhi yang windriver com>
Date:   Mon Nov 7 00:03:22 2016 -0800

    populate_sdk_ext.bbclass: check unfsd before create it
    
    Fixed when nativesdk-unfs3 is installed:
    $ bitbake <image> -c populate_sdk_ext
    | Traceback (most recent call last):
    |   File "/path/to/oe-core/scripts/lnr", line 21, in <module>
    |     os.symlink(target, linkname)
    | FileExistsError: [Errno 17] File exists: '../../../../tmp/sysroots/x86_64-linux/usr/bin/unfsd' -> 
'/path/to/9.0/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/unfsd'
    
    (From OE-Core rev: a400c130037497f08a1645984129c5ddba76c031)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index a0856d4..26b5ca6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -502,9 +502,10 @@ install_tools() {
        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
+       unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd"
+       if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; 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
+               lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path
        fi
        touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]