summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiangyu Chen <xiangyu.chen@windriver.com>2024-04-09 14:58:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-22 22:05:57 +0100
commitf86fe44d837f7252d0d3fb7f0a486c0fba0396cd (patch)
treec862912ea317e99e624ec3b29cc05c4797fcc13b
parente9bd212ac39d31baf93964ffc7634464bac89562 (diff)
downloadpoky-f86fe44d837f7252d0d3fb7f0a486c0fba0396cd.tar.gz
iputils: splitting the ping6 as a package
The iputils merged the ping4 and ping6 command into the ping since the commit ebad35fe[1], currently, iputils ping support being called using "ping -6" or "ping6" symlinks. In oe-core, there are two packages provide ipv6 ping, inetutils and iputils, the inetutils-ping6 doesn't support "-I" option to bind the interface, that cause some of scripts(e.g. LTP test[2]) which was based on iputils-ping6 fails. If someone or a package needs iputils-ping6, they can enable it in local.conf or add it into rdepends directly. Ref: [1] https://github.com/iputils/iputils/commit/e3de851b809c7b72ccc654a72b6af61d [2] https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/ \ containers/netns/netns_comm.sh#L25 (From OE-Core rev: 50025e4c2157de4052b55278fe368576c2d9433d) Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/iputils/iputils_20240117.bb13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240117.bb
index 5a5e15528e..3880689742 100644
--- a/meta/recipes-extended/iputils/iputils_20240117.bb
+++ b/meta/recipes-extended/iputils/iputils_20240117.bb
@@ -35,7 +35,11 @@ ALTERNATIVE_PRIORITY = "100"
35ALTERNATIVE:${PN}-ping = "ping" 35ALTERNATIVE:${PN}-ping = "ping"
36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" 36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
37 37
38SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" 38ALTERNATIVE:${PN}-ping6 = "ping6"
39ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
40
41SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
42 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}"
39PACKAGES += "${SPLITPKGS}" 43PACKAGES += "${SPLITPKGS}"
40 44
41ALLOW_EMPTY:${PN} = "1" 45ALLOW_EMPTY:${PN} = "1"
@@ -43,6 +47,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}"
43 47
44FILES:${PN} = "" 48FILES:${PN} = ""
45FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" 49FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
50FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
46FILES:${PN}-arping = "${base_bindir}/arping" 51FILES:${PN}-arping = "${base_bindir}/arping"
47FILES:${PN}-tracepath = "${base_bindir}/tracepath" 52FILES:${PN}-tracepath = "${base_bindir}/tracepath"
48FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" 53FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
54
55do_install:append() {
56 if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then
57 ln -sf ping ${D}/${base_bindir}/ping6
58 fi
59}