summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 11:40:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:00:40 +0100
commit5cf4ab54a03bf23e47f239ed89bd4dd36a66a697 (patch)
tree669f513e6230c4afcc61b5243ebbf9f4b549fb58
parent18a4086652562e061d728a83c97151f5c7552ece (diff)
downloadopenembedded-core-contrib-5cf4ab54a03bf23e47f239ed89bd4dd36a66a697.tar.gz
openembedded-core-contrib-5cf4ab54a03bf23e47f239ed89bd4dd36a66a697.tar.bz2
openembedded-core-contrib-5cf4ab54a03bf23e47f239ed89bd4dd36a66a697.zip
iputils: Adapt ${PN}-tftpd package dependency to PACKAGECONFIG
This avoids failures when recipes try and use the iptuils package. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/iputils/iputils_s20200821.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/iputils/iputils_s20200821.bb b/meta/recipes-extended/iputils/iputils_s20200821.bb
index 87891140e7..28dd194a12 100644
--- a/meta/recipes-extended/iputils/iputils_s20200821.bb
+++ b/meta/recipes-extended/iputils/iputils_s20200821.bb
@@ -46,8 +46,9 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'tftpd', '${PN}-tftpd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}"
PACKAGES += "${SPLITPKGS}"