diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-11-07 00:03:22 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:54 +0000 |
commit | 16011c5d4f25760dae2d56e7f58e35f0aced9338 (patch) | |
tree | c7a563aa8160c1e3a56447211746ac6df38a2012 | |
parent | 1baf4a47ad2bb7365f969ca99d6eba41547e4b63 (diff) | |
download | poky-16011c5d4f25760dae2d56e7f58e35f0aced9338.tar.gz |
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>
-rw-r--r-- | 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 a0856d44f7..26b5ca61d8 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -502,9 +502,10 @@ install_tools() { | |||
502 | done | 502 | done |
503 | # We can't use the same method as above because files in the sysroot won't exist at this point | 503 | # We can't use the same method as above because files in the sysroot won't exist at this point |
504 | # (they get populated from sstate on installation) | 504 | # (they get populated from sstate on installation) |
505 | if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" ] ; then | 505 | unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" |
506 | if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then | ||
506 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR', True))} | 507 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR', True))} |
507 | lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd | 508 | lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path |
508 | fi | 509 | fi |
509 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase | 510 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase |
510 | 511 | ||