[oe-commits] [openembedded-core] branch pyro updated: bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

The following commit(s) were added to refs/heads/pyro by this push:
     new 189d828  bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally
189d828 is described below

commit 189d8282e82381d65c8cc9efe1896f628e9632bd
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Thu Feb 1 12:22:18 2018 +0000

    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.
    
    Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3ef7f7a..e2383d2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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 ssh sudo"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.