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

PATCH In review Martin Jansa 3 participants 8 messages Feb 1, 2018 – Mar 4, 2018

lore

Share & tools

lore

Martin Jansa

author

2018-02-01 12:22 UTC #0 lore raw

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

From: Chen Qi <[email protected]>

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.

Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0

Signed-off-by Chen Qi <[email protected]>

Signed-off-by Ross Burton <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/conf/bitbake.conf +1 -1

index 2dac3a1481..f3994fc642 100644
@@ -469,7 +469,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

2.15.1

Martin Jansa

author

2018-02-11 16:44 UTC #1 lore raw

50e7619aebae5351e9a41fe1b909a31b9e383f0a bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

should be cherry-picked together with this one.

Quoted 37 lines · Martin Jansa

From: Chen Qi <[email protected]>
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.
Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Ross Burton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 2dac3a1481..f3994fc642 100644
@@ -469,7 +469,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"
--
2.15.1

Martin Jansa

author

2018-02-12 10:19 UTC #2 lore raw

PATCH 1/1 bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

From: Chen Qi <[email protected]>

We changed to make tools required by testimage to be included conditionally. This resulted in users who use ssh for git fetching having failures.

Add ssh to HOSTTOOLS_NONFATAL to make things work for the above situation.

[YOCTO #12227]

Signed-off-by Chen Qi <[email protected]>

Signed-off-by Ross Burton <[email protected]>

---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/conf/bitbake.conf +1 -1

index f3994fc642..e2383d2709 100644
@@ -472,7 +472,7 @@ HOSTTOOLS += " \
 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"
+HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"
 
 # Temporary add few more detected in bitbake world
 HOSTTOOLS_NONFATAL += "join nl size yes zcat"

Signature · 1 line

2.15.1

Martin Jansa

author

2018-03-04 11:41 UTC #3 lore raw

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

ping

Quoted 36 lines · Martin Jansa

From: Chen Qi <[email protected]>
We changed to make tools required by testimage to be included conditionally.
This resulted in users who use ssh for git fetching having failures.
Add ssh to HOSTTOOLS_NONFATAL to make things work for the above situation.
[YOCTO #12227]
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Ross Burton <[email protected]>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +0 -0
index f3994fc642..e2383d2709 100644
@@ -472,7 +472,7 @@ HOSTTOOLS += " \
 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"
+HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"
# Temporary add few more detected in bitbake world HOSTTOOLS_NONFATAL += "join nl size yes zcat"
--
2.15.1

Richard Purdie

2018-03-04 13:20 UTC #4 lore raw

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

Quoted 1 line · Martin Jansa

ping

I've merged this.

Cheers,

Richard

Martin Jansa

author

2018-03-04 13:24 UTC #5 lore raw

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

Thanks,

please don't forget to include
[pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally
as well (currently missing in pyro-next).

Quoted 9 lines · Richard Purdie

Quoted 1 line · Martin Jansa
ping
I've merged this.
Cheers,
Richard

Patchwork

2018-02-12 10:34 UTC #6 lore raw

✗ patchtest: failure for bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3)

In reply to Martin Jansa

== Series Details ==

Series: bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/9179/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch pyro (currently at 2c61e60cc5)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Martin Jansa

author

2018-03-04 11:41 UTC #7 lore raw

In reply to Martin Jansa

ping

Quoted 37 lines · Martin Jansa

From: Chen Qi <[email protected]>
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.
Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Ross Burton <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 2dac3a1481..f3994fc642 100644
@@ -469,7 +469,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"
--
2.15.1