diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 11:40:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:47 +0100 |
commit | daa8aeed535b3584894426e7e76cd6ce77bb2e57 (patch) | |
tree | a0534049fb3fe1afd25640807cd5e86e7a68ff13 | |
parent | afb9b64fbd2b8e204295d9e79c5fee93a28be22a (diff) | |
download | poky-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.bb | 3 |
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" | |||
46 | ALTERNATIVE_${PN}-ping = "ping" | 46 | ALTERNATIVE_${PN}-ping = "ping" |
47 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 47 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
48 | 48 | ||
49 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ | 49 | SPLITPKGS = "${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)}" |
52 | PACKAGES += "${SPLITPKGS}" | 53 | PACKAGES += "${SPLITPKGS}" |
53 | 54 | ||