From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 2 Sep 2020 10:40:22 +0000 (+0100)
Subject: iputils: Adapt ${PN}-tftpd package dependency to PACKAGECONFIG
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~10172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf4ab54a03bf23e47f239ed89bd4dd36a66a697;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/recipes-extended/iputils/iputils_s20200821.bb b/meta/recipes-extended/iputils/iputils_s20200821.bb
index 87891140e7e..28dd194a12b 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}"