summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-10-11 08:30:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-12 16:57:21 +0100
commit25f0252d61fbbff97fab31d63c74a9b3c77fa7ce (patch)
tree9c4f6ec56708a8c3226f474b8d4ef1345036dca9 /meta/recipes-extended/ltp
parenta60029776d82ede444d1195a4c318a2a659b7662 (diff)
downloadpoky-25f0252d61fbbff97fab31d63c74a9b3c77fa7ce.tar.gz
ltp: use 'ping -6' if ping6 is not avaliable in netns_helper.sh
The iputils-ping6 was dropped since the 'ping6' command had been merged into ping command. Backport patch from upstream to let both 'ping6' and 'ping -6' work. (From OE-Core rev: 7257f209e317db62f92279fc2ff7d6d1e5eddf75) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch45
-rw-r--r--meta/recipes-extended/ltp/ltp_20180515.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
new file mode 100644
index 0000000000..32e7a0eb25
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
@@ -0,0 +1,45 @@
1From 76d8343ad300f6507233abcdf97629290e35848a Mon Sep 17 00:00:00 2001
2From: Lei Yang <Lei.Yang@windriver.com>
3Date: Wed, 29 Aug 2018 11:51:24 +0800
4Subject: [PATCH] netns_helper.sh: use 'ping -6' when ping6 is not avaliable
5
6ping6 has been merged into ping since 2015 by using "ping -6"
7in some distributions (e.g. OpenEmbedded) they dropped ping6 completely
8this patch will let both "ping -6" and ping6 work.
9
10[pvorel: change was done in s20150815:
11ebad35f ("ping: merge `ping6` command into `ping`"),
12before that release switch '-6' didn't exist.
13Upstream leaves ping6 symlink to distributions.]
14
15Upstream-Status: Backport
16[https://github.com/linux-test-project/ltp/commit/76d8343ad300f6507233abcdf97629290e35848a]
17
18Signed-off-by: Lei Yang <Lei.Yang@windriver.com>
19Signed-off-by: Petr Vorel <pvorel@suse.cz>
20Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21---
22 testcases/kernel/containers/netns/netns_helper.sh | 7 ++++++-
23 1 file changed, 6 insertions(+), 1 deletion(-)
24
25diff --git a/testcases/kernel/containers/netns/netns_helper.sh b/testcases/kernel/containers/netns/netns_helper.sh
26index 6aea10b..a9d0459 100755
27--- a/testcases/kernel/containers/netns/netns_helper.sh
28+++ b/testcases/kernel/containers/netns/netns_helper.sh
29@@ -168,7 +168,12 @@ netns_setup()
30 ipv6)
31 IFCONF_IN6_ARG="inet6 add"
32 IP0=$6; IP1=$7;
33- tping="ping6"; NETMASK=64
34+ if which ping6 >/dev/null 2>&1; then
35+ tping="ping6"
36+ else
37+ tping="ping -6"
38+ fi
39+ NETMASK=64
40 ;;
41 *)
42 tst_brkm TBROK "second argument must be an ip version (ipv4|ipv6)"
43--
442.7.4
45
diff --git a/meta/recipes-extended/ltp/ltp_20180515.bb b/meta/recipes-extended/ltp/ltp_20180515.bb
index ba0e6a60b4..643239f793 100644
--- a/meta/recipes-extended/ltp/ltp_20180515.bb
+++ b/meta/recipes-extended/ltp/ltp_20180515.bb
@@ -54,6 +54,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
54 file://0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch \ 54 file://0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch \
55 file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \ 55 file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \
56 file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \ 56 file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \
57 file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \
57 " 58 "
58 59
59S = "${WORKDIR}/git" 60S = "${WORKDIR}/git"