]> code.ossystems Code Review - openembedded-core.git/commitdiff
iputils: Adapt ${PN}-tftpd package dependency to PACKAGECONFIG
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 2 Sep 2020 10:40:22 +0000 (11:40 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 2 Sep 2020 15:00:40 +0000 (16:00 +0100)
This avoids failures when recipes try and use the iptuils package.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/iputils/iputils_s20200821.bb

index 87891140e7ee59b6be1269ca85db1996ca881dfb..28dd194a12b3a47592e0d818ef0a004a5019fb1d 100644 (file)
@@ -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}"