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:47 +0100
commitdaa8aeed535b3584894426e7e76cd6ce77bb2e57 (patch)
treea0534049fb3fe1afd25640807cd5e86e7a68ff13
parentafb9b64fbd2b8e204295d9e79c5fee93a28be22a (diff)
downloadpoky-daa8aeed535b3584894426e7e76cd6ce77bb2e57.tar.gz
iputils: Adapt ${PN}-tftpd package dependency to PACKAGECONFIG
This avoids failures when recipes try and use the iptuils package. (From OE-Core rev: 5cf4ab54a03bf23e47f239ed89bd4dd36a66a697) 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"
46ALTERNATIVE_${PN}-ping = "ping" 46ALTERNATIVE_${PN}-ping = "ping"
47ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" 47ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
48 48
49SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ 49SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \
50 ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ 50 ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \
51 ${@bb.utils.contains('PACKAGECONFIG', 'tftpd', '${PN}-tftpd', '', d)} \
51 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" 52 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}"
52PACKAGES += "${SPLITPKGS}" 53PACKAGES += "${SPLITPKGS}"
53 54