summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-01-30 14:12:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:27 +0000
commit863df3c81f3f9786924c98aad01d1219c540fb26 (patch)
tree45d9e42a5c0b7e20df75a40e30b094355c7ef020 /meta/recipes-extended
parent98c4f485f0dd1d7448a1977c03d1e9e10173642c (diff)
downloadpoky-863df3c81f3f9786924c98aad01d1219c540fb26.tar.gz
ltp: remove patches that already have fixes upstream
The following patches has already fixes for the issues they are solving in upstream. - 0001-add-_GNU_SOURCE-to-pec_listener.c.patch - 0011-Rename-sigset-variable-to-sigset1.patch - 0025-mc_gethost-include-sys-types.h.patch - 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch - 0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch Suggested-by: Yi Zhao <yi.zhao@windriver.com> (From OE-Core rev: 88e12a14540e10718fb2e68f27834d9b7565ab7e) Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch39
-rw-r--r--meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch139
-rw-r--r--meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch30
-rw-r--r--meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch32
-rw-r--r--meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch41
-rw-r--r--meta/recipes-extended/ltp/ltp_20180118.bb5
6 files changed, 0 insertions, 286 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch b/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch
deleted file mode 100644
index 7ec66f8147..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From ae10245c15a617bd57337981bb42eb36629f9b59 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 8 Feb 2017 15:53:31 +0800
4Subject: [PATCH 01/26] add _GNU_SOURCE to pec_listener.c
5
6In previous patch 0007-replace-SIGCLD-with-SIGCHLD.patch made by Khem Raj
7contains two aspects:
8
9 1. replace SIGCLD with SIGCHLD
10 2. add _GNU_SOURCE to pec_listener.c
11
12The replace SIGCLD with SIGCHLD have been integrated upstream, so make a
13another patch to add _GNU_SOURCE to pec_listener.c comply with Khem Raj's
14previous patch.
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Dengke Du <dengke.du@windriver.com>
18Upstream-Status: Pending
19
20%% original patch: 0001-add-_GNU_SOURCE-to-pec_listener.c.patch
21---
22 testcases/kernel/connectors/pec/pec_listener.c | 1 +
23 1 file changed, 1 insertion(+)
24
25diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c
26index d11e4dc..b8b5e0d 100644
27--- a/testcases/kernel/connectors/pec/pec_listener.c
28+++ b/testcases/kernel/connectors/pec/pec_listener.c
29@@ -20,6 +20,7 @@
30 /* */
31 /******************************************************************************/
32
33+#define _GNU_SOURCE
34 #include <sys/socket.h>
35 #include <sys/poll.h>
36 #include <sys/types.h>
37--
382.8.1
39
diff --git a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
deleted file mode 100644
index 25f6ba78ad..0000000000
--- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
+++ /dev/null
@@ -1,139 +0,0 @@
1From dc1905b6d972f9176b40da270c83d8fb4d1751b5 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 8 Feb 2017 16:12:34 +0800
4Subject: [PATCH 2/5] Rename sigset variable to sigset1
5
6sigset API from signal.h is shadowed by this name conflict
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Dengke Du <dengke.du@windriver.com>
10
11Upstream-Status: Pending
12---
13 testcases/kernel/mem/shmt/shmt04.c | 10 +++++-----
14 testcases/kernel/mem/shmt/shmt06.c | 10 +++++-----
15 testcases/kernel/syscalls/sigprocmask/sigprocmask01.c | 10 +++++-----
16 3 files changed, 15 insertions(+), 15 deletions(-)
17
18diff --git a/testcases/kernel/mem/shmt/shmt04.c b/testcases/kernel/mem/shmt/shmt04.c
19index b2682da..3f35fad 100644
20--- a/testcases/kernel/mem/shmt/shmt04.c
21+++ b/testcases/kernel/mem/shmt/shmt04.c
22@@ -56,7 +56,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */
23 /**************/
24
25 key_t key;
26-sigset_t set;
27+sigset_t set1;
28
29 #define SIZE 16*1024
30
31@@ -71,9 +71,9 @@ int main(void)
32
33 key = (key_t) getpid();
34
35- sigemptyset(&set);
36- sigaddset(&set, SIGUSR1);
37- sigprocmask(SIG_BLOCK, &set, NULL);
38+ sigemptyset(&set1);
39+ sigaddset(&set1, SIGUSR1);
40+ sigprocmask(SIG_BLOCK, &set1, NULL);
41
42 pid = fork();
43 switch (pid) {
44@@ -148,7 +148,7 @@ int child(void)
45 char *cp;
46 int sig;
47
48- sigwait(&set, &sig);
49+ sigwait(&set1, &sig);
50 chld_pid = getpid();
51 /*--------------------------------------------------------*/
52
53diff --git a/testcases/kernel/mem/shmt/shmt06.c b/testcases/kernel/mem/shmt/shmt06.c
54index dd69de7..56fb1da 100644
55--- a/testcases/kernel/mem/shmt/shmt06.c
56+++ b/testcases/kernel/mem/shmt/shmt06.c
57@@ -57,7 +57,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */
58 /**************/
59
60 key_t key;
61-sigset_t set;
62+sigset_t set1;
63
64 int child();
65 static int rm_shm(int);
66@@ -70,9 +70,9 @@ int main(void)
67
68 key = (key_t) getpid();
69
70- sigemptyset(&set);
71- sigaddset(&set, SIGUSR1);
72- sigprocmask(SIG_BLOCK, &set, NULL);
73+ sigemptyset(&set1);
74+ sigaddset(&set1, SIGUSR1);
75+ sigprocmask(SIG_BLOCK, &set1, NULL);
76
77 pid = fork();
78 switch (pid) {
79@@ -147,7 +147,7 @@ int child(void)
80 char *cp;
81 int sig;
82
83- sigwait(&set, &sig);
84+ sigwait(&set1, &sig);
85 chld_pid = getpid();
86
87 if ((shmid = shmget(key, SIZE, 0)) < 0) {
88diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
89index 232d25a..06d902f 100644
90--- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
91+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
92@@ -91,7 +91,7 @@ int TST_TOTAL = 1;
93 int sig_catch = 0; /* variable to blocked/unblocked signals */
94
95 struct sigaction sa_new; /* struct to hold signal info */
96-sigset_t set; /* signal set to hold signal lists */
97+sigset_t set1; /* signal set to hold signal lists */
98 sigset_t sigset2;
99
100 int main(int ac, char **av)
101@@ -112,7 +112,7 @@ int main(int ac, char **av)
102 * so that, signal will not be delivered to
103 * the test process.
104 */
105- TEST(sigprocmask(SIG_BLOCK, &set, 0));
106+ TEST(sigprocmask(SIG_BLOCK, &set1, 0));
107
108 /* Get the process id of test process */
109 my_pid = getpid();
110@@ -165,7 +165,7 @@ int main(int ac, char **av)
111 */
112 errno = 0;
113 if (sigprocmask(SIG_UNBLOCK,
114- &set, 0) == -1) {
115+ &set1, 0) == -1) {
116 tst_brkm(TFAIL, cleanup,
117 "sigprocmask() failed "
118 "to unblock signal, "
119@@ -212,7 +212,7 @@ void setup(void)
120 * Initialise the signal sets with the list that
121 * excludes/includes all system-defined signals.
122 */
123- if (sigemptyset(&set) == -1) {
124+ if (sigemptyset(&set1) == -1) {
125 tst_brkm(TFAIL, cleanup,
126 "sigemptyset() failed, errno=%d : %s",
127 errno, strerror(errno));
128@@ -235,7 +235,7 @@ void setup(void)
129 * Add specified signal (SIGINT) to the signal set
130 * which excludes system-defined signals.
131 */
132- if (sigaddset(&set, SIGINT) == -1) {
133+ if (sigaddset(&set1, SIGINT) == -1) {
134 tst_brkm(TFAIL, cleanup,
135 "sigaddset() failed, errno=%d : %s",
136 errno, strerror(errno));
137--
1382.7.4
139
diff --git a/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch b/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch
deleted file mode 100644
index afcba63e15..0000000000
--- a/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 9d14edfc12eefac900dd54729a88b3ccf91c1c43 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Jan 2016 07:18:15 +0000
4Subject: [PATCH 25/32] mc_gethost: include sys/types.h
5
6Fix build on musl
7error: unknown type name 'u_char'
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12---
13 testcases/network/multicast/mc_gethost/mc_gethost.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c b/testcases/network/multicast/mc_gethost/mc_gethost.c
17index 5b9a790..c799e2a 100644
18--- a/testcases/network/multicast/mc_gethost/mc_gethost.c
19+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c
20@@ -6,6 +6,7 @@
21
22 #include <sys/param.h>
23 #include <sys/socket.h>
24+#include <sys/types.h>
25 #include <netinet/in.h>
26 #include <arpa/inet.h>
27 #include <arpa/nameser.h>
28--
292.7.0
30
diff --git a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch b/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
deleted file mode 100644
index adf6f27418..0000000000
--- a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 1471012164ba8f26046d4b1ce5531a0d92805ef5 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 8 Feb 2017 16:21:16 +0800
4Subject: [PATCH 4/5] sysconf01: Use _SC_2_C_VERSION conditionally
5
6_SC_2_C_VERSION is not available on musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Dengke Du <dengke.du@windriver.com>
10
11Upstream-Status: Pending
12---
13 testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c b/testcases/kernel/syscalls/sysconf/sysconf01.c
17index 583deef..de93695 100644
18--- a/testcases/kernel/syscalls/sysconf/sysconf01.c
19+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c
20@@ -103,7 +103,9 @@ int main(void)
21 test_sysconf(_SC_2_C_BIND);
22 test_sysconf(_SC_2_C_DEV);
23 #ifdef _SC_2_C_VERSION
24+#ifdef __GLIBC__
25 test_sysconf(_SC_2_C_VERSION);
26+#endif
27 #else
28 tst_resm(TCONF, "_SC_2_C_VERSION not defined");
29 #endif
30--
312.7.4
32
diff --git a/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch b/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch
deleted file mode 100644
index 868e1cf1fa..0000000000
--- a/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 5e3dea669e5b0b769f322d54a3bb9f320b5327da Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 22 Mar 2016 15:47:14 +0000
4Subject: [PATCH 26/26] shmat1: Cover GNU specific code under __USE_GNU
5
6on x86, we use uc_mcontext element from sigcontext
7which is marked gnu-specific in glibc, this patch
8adds this condition around the code
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 testcases/kernel/mem/mtest06/shmat1.c | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/testcases/kernel/mem/mtest06/shmat1.c b/testcases/kernel/mem/mtest06/shmat1.c
18index 0d6d7a4..bee69f6 100644
19--- a/testcases/kernel/mem/mtest06/shmat1.c
20+++ b/testcases/kernel/mem/mtest06/shmat1.c
21@@ -111,7 +111,7 @@ int done_shmat = 0; /* disallow read and writes before shmat */
22 static void sig_handler(int signal, /* signal number, set to handle SIGALRM */
23 int code, struct ucontext *ut)
24 { /* contains pointer to sigcontext structure */
25-#ifdef __i386__
26+#if defined(__i386__) && defined(__USE_GNU)
27 unsigned long except; /* exception type. */
28 int ret = 0; /* exit code from signal handler. */
29 struct sigcontext *scp = /* pointer to sigcontext structure */
30@@ -122,7 +122,7 @@ static void sig_handler(int signal, /* signal number, set to handle SIGALRM
31 fprintf(stdout, "Test ended, success\n");
32 exit(0);
33 }
34-#ifdef __i386__
35+#if defined(__i386__) && defined(__USE_GNU)
36 else {
37 except = scp->trapno;
38 fprintf(stderr, "signal caught - [%d] ", signal);
39--
401.9.1
41
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index a4a2724b00..369b98df9b 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -24,7 +24,6 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
24SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1" 24SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1"
25 25
26SRC_URI = "git://github.com/linux-test-project/ltp.git \ 26SRC_URI = "git://github.com/linux-test-project/ltp.git \
27 file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \
28 file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \ 27 file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \
29 file://0003-Add-knob-to-control-tirpc-support.patch \ 28 file://0003-Add-knob-to-control-tirpc-support.patch \
30 file://0004-build-Add-option-to-select-libc-implementation.patch \ 29 file://0004-build-Add-option-to-select-libc-implementation.patch \
@@ -33,17 +32,13 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
33 file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ 32 file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
34 file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ 33 file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \
35 file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \ 34 file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \
36 file://0011-Rename-sigset-variable-to-sigset1.patch \
37 file://0018-guard-mallocopt-with-__GLIBC__.patch \ 35 file://0018-guard-mallocopt-with-__GLIBC__.patch \
38 file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \ 36 file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \
39 file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \ 37 file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \
40 file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \ 38 file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \
41 file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \ 39 file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \
42 file://0025-mc_gethost-include-sys-types.h.patch \
43 file://0026-crash01-Define-_GNU_SOURCE.patch \ 40 file://0026-crash01-Define-_GNU_SOURCE.patch \
44 file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \
45 file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \ 41 file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \
46 file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
47 file://0034-periodic_output.patch \ 42 file://0034-periodic_output.patch \
48 file://0035-fix-test_proc_kill-hang.patch \ 43 file://0035-fix-test_proc_kill-hang.patch \
49 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 44 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \