[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7998/8267] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[Emmanuele Bassi <ebassi src gnome org>]

commit 7f64ac11f5aaee2d2b6f5bf52123906f98a22e1f
Author: Chen Qi <Qi Chen windriver com>
Date:   Sat Sep 30 16:15:42 2017 +0800

    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.
    
    (From OE-Core rev: 8ca61a5464743ff85b6d26886112750d6ddd13e0)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6f53b23..0eefb86 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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"