Skip to contentSkip to conversation

bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

PATCH In review Chen Qi 3 participants 5 messages Sep 30, 2017 – Oct 15, 2017

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

The following changes since commit fcdfe09d9cc4e2977bd602dfd18f729cd9f6d73d:

poky.conf: Fix typo (2017-09-26 16:56:10 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/hosttools_testimage
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/hosttools_testimage

Chen Qi (1):
bitbake.conf: add tools required by testimage to HOSTTOOLS
conditionally

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

Add tools required by testimage to HOSTTOOLS only when testimage is inherited. These tools, as described in the comment, are only required by the testimage task. So this change should not have negtive effect. This would also solve build error on hosts which miss some tool such as scp.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index f41680b..94c1f27 100644
@@ -484,7 +484,7 @@ HOSTTOOLS += " \
 "
 
 # Tools needed to run testimage runtime image testing
-HOSTTOOLS += "ip ping ps scp ssh stty"
+HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
 HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
Signature · 1 line
1.9.1
#2 lore raw
Quoted 26 lines · Chen Qi

Add tools required by testimage to HOSTTOOLS only when testimage is inherited. These tools, as described in the comment, are only required by the testimage task. So this change should not have negtive effect. This would also solve build error on hosts which miss some tool such as scp.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -2
index f41680b..94c1f27 100644
@@ -484,7 +484,7 @@ HOSTTOOLS += " \
 "
 
 # Tools needed to run testimage runtime image testing
-HOSTTOOLS += "ip ping ps scp ssh stty"
+HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
 HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
--

1.9.1

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

This one is breaking any recipe that fetches from git repo with 'protocol=ssh' in its SRC_URI... I verified that reverting this one restores the usual fetcher behaviour. Should ssh be added to HOSTTOOLS unconditionally or is there any other way to approach it?

#3 lore raw
Quoted 27 lines · Andrea Galbusera
Quoted 26 lines · Chen Qi

Add tools required by testimage to HOSTTOOLS only when testimage is inherited. These tools, as described in the comment, are only required by the testimage task. So this change should not have negtive effect. This would also solve build error on hosts which miss some tool such as scp.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -2
index f41680b..94c1f27 100644
@@ -484,7 +484,7 @@ HOSTTOOLS += " \
 "
 
 # Tools needed to run testimage runtime image testing
-HOSTTOOLS += "ip ping ps scp ssh stty"
+HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
 HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
--

1.9.1

Quoted 10 lines
Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

This one is breaking any recipe that fetches from git repo with 'protocol=ssh' in its SRC_URI... I verified that reverting this one restores the usual fetcher behaviour. Should ssh be added to HOSTTOOLS unconditionally or is there any other way to approach it?

There's an entire thread discussing it here:
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143279.html

#4 lore raw
Quoted 39 lines · Denys Dmytriyenko
Quoted 27 lines · Andrea Galbusera
Quoted 26 lines · Chen Qi

Add tools required by testimage to HOSTTOOLS only when testimage is inherited. These tools, as described in the comment, are only required by the testimage task. So this change should not have negtive effect. This would also solve build error on hosts which miss some tool such as scp.

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -2
index f41680b..94c1f27 100644
@@ -484,7 +484,7 @@ HOSTTOOLS += " \
 "
 
 # Tools needed to run testimage runtime image testing
-HOSTTOOLS += "ip ping ps scp ssh stty"
+HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
 HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
--

1.9.1

Quoted 10 lines
Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

This one is breaking any recipe that fetches from git repo with 'protocol=ssh' in its SRC_URI... I verified that reverting this one restores the usual fetcher behaviour. Should ssh be added to HOSTTOOLS unconditionally or is there any other way to approach it?

Quoted 2 lines

There's an entire thread discussing it here:
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143279.html

Thank you Denys for pointing to the full discussion: it was not threaded together with the initial mail that submitted the patch, then I missed it... :-/