summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-07-03 23:36:21 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:15 +0100
commit20dcf0c1ef299dbba2d1f4baeb8f5bb0755748a0 (patch)
tree6e378166d79123ff9909e39739c48c61266d60a6 /meta/recipes-extended/ltp
parentb18a0f56edbb61e78d6c71722233aaa50970a9bd (diff)
downloadpoky-20dcf0c1ef299dbba2d1f4baeb8f5bb0755748a0.tar.gz
ltp: Reduce local Pending patches
Rebase the patch on latest ltp upstream: 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch [Yocto #11548] (From OE-Core rev: 69bd27d9d268d4c52aa521a0ceed0eb5a259a516) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.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/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch15
-rw-r--r--meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch23
-rw-r--r--meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch9
3 files changed, 25 insertions, 22 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
index 8874b95749..020ddfe3bf 100644
--- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
+++ b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
@@ -1,22 +1,23 @@
1From 32644bde4d33b677614534ec37030e57883b8e15 Mon Sep 17 00:00:00 2001 1From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Thu, 9 Feb 2017 16:41:12 +0800 3Date: Thu, 9 Feb 2017 16:41:12 +0800
4Subject: [PATCH 1/3] fix PATH_MAX undeclared when building with musl 4Subject: [PATCH] fix PATH_MAX undeclared when building with musl
5 5
6fix PATH_MAX undeclared when building with musl. 6fix PATH_MAX undeclared when building with musl.
7 7
8Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176]
9
8Signed-off-by: Dengke Du <dengke.du@windriver.com> 10Signed-off-by: Dengke Du <dengke.du@windriver.com>
9Upstream-Status: Pending
10--- 11---
11 include/tst_test.h | 3 +++ 12 include/tst_test.h | 3 +++
12 1 file changed, 3 insertions(+) 13 1 file changed, 3 insertions(+)
13 14
14diff --git a/include/tst_test.h b/include/tst_test.h 15diff --git a/include/tst_test.h b/include/tst_test.h
15index 7ff33b2..9779c0e 100644 16index 335c82684..4dfa1511b 100644
16--- a/include/tst_test.h 17--- a/include/tst_test.h
17+++ b/include/tst_test.h 18+++ b/include/tst_test.h
18@@ -19,6 +19,9 @@ 19@@ -23,6 +23,9 @@
19 #define TST_TEST_H__ 20 #endif /* __TEST_H__ */
20 21
21 #include <unistd.h> 22 #include <unistd.h>
22+#ifndef __GLIBC__ 23+#ifndef __GLIBC__
@@ -26,5 +27,5 @@ index 7ff33b2..9779c0e 100644
26 #include "tst_common.h" 27 #include "tst_common.h"
27 #include "tst_res_flags.h" 28 #include "tst_res_flags.h"
28-- 29--
292.7.4 302.11.0
30 31
diff --git a/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
index 8d0e73992f..2f4ca63750 100644
--- a/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
+++ b/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
@@ -1,30 +1,31 @@
1From a2639bd0f0d3f9f3049ee33e6710fed06225f54f Mon Sep 17 00:00:00 2001 1From d1a27570457fb6e1d6bafe81bfa0f3507b137e32 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Thu, 9 Feb 2017 18:20:58 +0800 3Date: Thu, 9 Feb 2017 18:20:58 +0800
4Subject: [PATCH 1/2] fix __WORDSIZE undeclared when building with musl 4Subject: [PATCH] fix __WORDSIZE undeclared when building with musl
5 5
6fix __WORDSIZE undeclared when building with musl. 6fix __WORDSIZE undeclared when building with musl.
7 7
8Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/177]
9
8Signed-off-by: Dengke Du <dengke.du@windriver.com> 10Signed-off-by: Dengke Du <dengke.du@windriver.com>
9Upstream-Status: Pending
10--- 11---
11 include/old/test.h | 3 +++ 12 include/old/test.h | 3 +++
12 1 file changed, 3 insertions(+) 13 1 file changed, 3 insertions(+)
13 14
14diff --git a/include/old/test.h b/include/old/test.h 15diff --git a/include/old/test.h b/include/old/test.h
15index d492560..263e92e 100644 16index b36764d83..cc6f1b551 100644
16--- a/include/old/test.h 17--- a/include/old/test.h
17+++ b/include/old/test.h 18+++ b/include/old/test.h
18@@ -58,6 +58,9 @@ 19@@ -44,6 +44,9 @@
19 #include "tst_clone.h" 20 #include <string.h>
20 #include "old_device.h" 21 #include <stdlib.h>
21 #include "old_tmpdir.h" 22 #include <stdint.h>
22+#ifndef __GLIBC__ 23+#ifndef __GLIBC__
23+#include <bits/reg.h> 24+#include <bits/reg.h>
24+#endif 25+#endif
25 26
26 /* 27 #include "usctest.h"
27 * Ensure that NUMSIGS is defined. 28
28-- 29--
292.7.4 302.11.0
30 31
diff --git a/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch b/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
index 6886c55e72..dd7d28319c 100644
--- a/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
+++ b/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
@@ -1,18 +1,19 @@
1From 2d7ea67e8eaa41cbd6816f7ab654254b40b530a1 Mon Sep 17 00:00:00 2001 1From bf5dd2932200e0199a38f3028d3bef2253f32e38 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Thu, 9 Feb 2017 17:17:37 +0800 3Date: Thu, 9 Feb 2017 17:17:37 +0800
4Subject: [PATCH] fix redefinition of 'struct msgbuf' error building with musl 4Subject: [PATCH] fix redefinition of 'struct msgbuf' error building with musl
5 5
6When building with musl the file "sys/msg.h" already contain 'struct msgbuf' 6When building with musl the file "sys/msg.h" already contain 'struct msgbuf'
7 7
8Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/177]
9
8Signed-off-by: Dengke Du <dengke.du@windriver.com> 10Signed-off-by: Dengke Du <dengke.du@windriver.com>
9Upstream-Status: Pending
10--- 11---
11 testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c | 4 +++- 12 testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c | 4 +++-
12 1 file changed, 3 insertions(+), 1 deletion(-) 13 1 file changed, 3 insertions(+), 1 deletion(-)
13 14
14diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c 15diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c
15index a757c0d..e023114 100644 16index a757c0d18..e023114d2 100644
16--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c 17--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c
17+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c 18+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c
18@@ -47,11 +47,13 @@ const char *TCID = "msgrcv08"; 19@@ -47,11 +47,13 @@ const char *TCID = "msgrcv08";
@@ -31,5 +32,5 @@ index a757c0d..e023114 100644
31 static void msr(int msqid) 32 static void msr(int msqid)
32 { 33 {
33-- 34--
342.7.4 352.11.0
35 36