Skip to contentSkip to conversation

populate_sdk_ext.bbclass: check unfsd before create it

PATCH In review Robert Yang 2 participants 3 messages Nov 7, 2016 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

cover populate_sdk_ext.bbclass: check unfsd before create it

The following changes since commit 58de12eaaac9c60bb8fc84a3a965ef86d2a39ae0:

distro_check: partial rewrite to make it work again (2016-11-06 23:35:23 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/ext
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/ext

Robert Yang (1):
populate_sdk_ext.bbclass: check unfsd before create it

 meta/classes/populate_sdk_ext.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/1 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'
---
 meta/classes/populate_sdk_ext.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/populate_sdk_ext.bbclass +3 -2
index a0856d4..26b5ca6 100644
@@ -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
 
Signature · 1 line
2.9.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Re: ✗ patchtest: failure for populate_sdk_ext.bbclass: check unfsd before create it

On 7 November 2016 at 08:55, Patchwork <[email protected]

Quoted 6 lines

wrote:

Test Name        test_signed_off_by_presence
Proposed Fix     Sign off the patch
Commit shortlog  populate_sdk_ext.bbclass: check unfsd before create it

The patch has a s-o-b, so this is a false positive. Is this checking the cover letter instead of the patch?

Ross