aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-11-06 23:18:05 -0800
committerRobert Yang <liezhi.yang@windriver.com>2016-11-07 00:02:30 -0800
commit26722d4430b38c5c98db776a22b007d065f86fb9 (patch)
treeb15dccca2888fe901cc65fd3b3fcd6474cc5751c
parent58de12eaaac9c60bb8fc84a3a965ef86d2a39ae0 (diff)
downloadopenembedded-core-contrib-26722d4430b38c5c98db776a22b007d065f86fb9.tar.gz
openembedded-core-contrib-26722d4430b38c5c98db776a22b007d065f86fb9.tar.bz2
openembedded-core-contrib-26722d4430b38c5c98db776a22b007d065f86fb9.zip
populate_sdk_ext.bbclass: check unfsd before create itrbt/ext
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' Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index a0856d44f7..26b5ca61d8 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