<div dir="ltr">Fails with security flags enabled:<div><br></div><div><div>| In file included from ../../../../include/old/test.h:47:0,</div><div>| from fchmodat01.c:44:</div><div>| fchmodat01.c: In function 'setup':</div><div>| ../../../../include/old/old_safe_file_ops.h:55:27: error: format not a string literal and no format arguments [-Werror=format-security]</div><div>| (path), (fmt), ## __VA_ARGS__)</div><div>| ^</div><div>| fchmodat01.c:130:2: note: in expansion of macro 'SAFE_FILE_PRINTF'</div><div>| SAFE_FILE_PRINTF(cleanup, testfile, testfile);</div><div>| ^~~~~~~~~~~~~~~~</div><div>| ../../../../include/old/old_safe_file_ops.h:55:27: error: format not a string literal and no format arguments [-Werror=format-security]</div><div>| (path), (fmt), ## __VA_ARGS__)</div><div>| ^</div><div>| fchmodat01.c:131:2: note: in expansion of macro 'SAFE_FILE_PRINTF'</div><div>| SAFE_FILE_PRINTF(cleanup, testfile2, testfile2);</div><div>| ^~~~~~~~~~~~~~~~</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 21 February 2017 at 05:13, Dengke Du <span dir="ltr"><<a href="mailto:dengke.du@windriver.com" target="_blank">dengke.du@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">1. Upgrade ltp from 20160126 to 20170116.<br>
<br>
2. Delete some patches because these have been integrated in upstream.<br>
<br>
0001-ltp-Don-t-link-against-<wbr>libfl.patch<br>
0006-sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch<br>
0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch<br>
0009-Guard-error.h-with-__<wbr>GLIBC__.patch<br>
0012-fsstress.c-Replace-__<wbr>int64_t-with-int64_t.patch<br>
0013-include-fcntl.h-for-<wbr>getting-O_-definitions.patch<br>
0014-hyperthreading-Include-<wbr>sys-types.h-for-pid_t-definit.<wbr>patch<br>
0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch<br>
0016-ustat-Change-header-from-<wbr>ustat.h-to-sys-ustat.h.patch<br>
0017-replace-sigval_t-with-<wbr>union-sigval.patch<br>
0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch<br>
0022-include-sys-types.h.patch<br>
0029-trace_shed-Fix-build-<wbr>with-musl.patch<br>
0031-vma03-fix-page-size-<wbr>offset-as-per-page-size-<wbr>alignmen.patch<br>
0032-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch<br>
0037-containers-netns_netlink-<wbr>Avoid-segmentation-fault.patch<br>
0038-run-posix-option-group-<wbr>test-replace-CWD-qith-PWD.<wbr>patch<br>
0040-containers-userns05-use-<wbr>unsigned-int-for-ns-id.patch<br>
<br>
3. Add new patch based on Khem Raj's 0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch<br>
<br>
0001-add-_GNU_SOURCE-to-pec_<wbr>listener.c.patch<br>
<br>
4. Add new patches fix building errors with musl:<br>
<br>
0006-fix-PATH_MAX-undeclared-<wbr>when-building-with-musl.patch<br>
0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
0009-fix-redefinition-of-<wbr>struct-msgbuf-error-building-<wbr>wit.patch<br>
<br>
5. Modify some patches because the upstream contains changes, those patches<br>
maybe failed when they apply to the new version of ltp.<br>
<br>
0011-Rename-sigset-variable-<wbr>to-sigset1.patch<br>
0027-sysconf01-Use-_SC_2_C_<wbr>VERSION-conditionally.patch<br>
0030-lib-Use-PTHREAD_MUTEX_<wbr>RECURSIVE-in-place-of-PTHREAD_<wbr>.patch<br>
0035-fix-test_proc_kill-hang.<wbr>patch<br>
<br>
6. Rename and modify this patch.<br>
<br>
fcntl-fix-the-time-def-to-use-<wbr>time_t.patch to<br>
0039-fcntl-fix-the-time-def-<wbr>to-use-time_t.patch<br>
<br>
7. The new version of ltp add the checking for ksh and csh, we doesn't support<br>
ksh and csh in oe-core, so remove the checking files when the system executes<br>
do_install function.<br>
<br>
Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
---<br>
.../0001-add-_GNU_SOURCE-to-<wbr>pec_listener.c.patch | 39 ++<br>
.../ltp/0001-ltp-Don-t-link-<wbr>against-libfl.patch | 30 --<br>
...TH_MAX-undeclared-when-<wbr>building-with-musl.patch | 30 ++<br>
...sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch | 31 --<br>
...RDSIZE-undeclared-when-<wbr>building-with-musl.patch | 30 ++<br>
.../ltp/ltp/0007-replace-<wbr>SIGCLD-with-SIGCHLD.patch | 394 ---------------------<br>
.../ltp/0009-Guard-error.h-<wbr>with-__GLIBC__.patch | 270 --------------<br>
...ition-of-struct-msgbuf-<wbr>error-building-wit.patch | 35 ++<br>
.../0011-Rename-sigset-<wbr>variable-to-sigset1.patch | 77 ++--<br>
...fsstress.c-Replace-__int64_<wbr>t-with-int64_t.patch | 351 ------------------<br>
...nclude-fcntl.h-for-getting-<wbr>O_-definitions.patch | 67 ----<br>
...ing-Include-sys-types.h-<wbr>for-pid_t-definit.patch | 56 ---<br>
...015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch | 64 ----<br>
...Change-header-from-ustat.h-<wbr>to-sys-ustat.h.patch | 45 ---<br>
.../0017-replace-sigval_t-<wbr>with-union-sigval.patch | 88 -----<br>
...lace-canonicalize_file_<wbr>name-with-realpath.patch | 32 --<br>
.../ltp/ltp/0022-include-sys-<wbr>types.h.patch | 29 --<br>
...sconf01-Use-_SC_2_C_<wbr>VERSION-conditionally.patch | 23 +-<br>
.../ltp/0029-trace_shed-Fix-<wbr>build-with-musl.patch | 32 --<br>
...READ_MUTEX_RECURSIVE-in-<wbr>place-of-PTHREAD_.patch | 26 +-<br>
...age-size-offset-as-per-<wbr>page-size-alignmen.patch | 33 --<br>
...-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch | 30 --<br>
.../ltp/ltp/0035-fix-test_<wbr>proc_kill-hang.patch | 27 +-<br>
...rs-netns_netlink-Avoid-<wbr>segmentation-fault.patch | 50 ---<br>
...ix-option-group-test-<wbr>replace-CWD-qith-PWD.patch | 44 ---<br>
...0039-fcntl-fix-the-time-<wbr>def-to-use-time_t.patch | 17 +-<br>
.../ltp/{<a href="http://ltp_20160126.bb" rel="noreferrer" target="_blank">ltp_20160126.bb</a> => <a href="http://ltp_20170116.bb" rel="noreferrer" target="_blank">ltp_20170116.bb</a>} | 34 +-<br>
27 files changed, 235 insertions(+), 1749 deletions(-)<br>
create mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0001-add-_GNU_SOURCE-to-pec_<wbr>listener.c.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0001-ltp-Don-t-link-against-<wbr>libfl.patch<br>
create mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0006-fix-PATH_MAX-undeclared-<wbr>when-building-with-musl.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0006-sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch<br>
create mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0009-Guard-error.h-with-__<wbr>GLIBC__.patch<br>
create mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0009-fix-redefinition-of-<wbr>struct-msgbuf-error-building-<wbr>wit.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0012-fsstress.c-Replace-__<wbr>int64_t-with-int64_t.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0013-include-fcntl.h-for-<wbr>getting-O_-definitions.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0014-hyperthreading-Include-<wbr>sys-types.h-for-pid_t-definit.<wbr>patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0016-ustat-Change-header-from-<wbr>ustat.h-to-sys-ustat.h.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0017-replace-sigval_t-with-<wbr>union-sigval.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0022-include-sys-types.h.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0029-trace_shed-Fix-build-<wbr>with-musl.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0031-vma03-fix-page-size-<wbr>offset-as-per-page-size-<wbr>alignmen.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0032-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0037-containers-netns_netlink-<wbr>Avoid-segmentation-fault.patch<br>
delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0038-run-posix-option-group-<wbr>test-replace-CWD-qith-PWD.<wbr>patch<br>
rename meta/recipes-extended/ltp/{<a href="http://ltp_20160126.bb" rel="noreferrer" target="_blank">ltp<wbr>_20160126.bb</a> => <a href="http://ltp_20170116.bb" rel="noreferrer" target="_blank">ltp_20170116.bb</a>} (77%)<br>
<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0001-add-_GNU_SOURCE-to-<wbr>pec_listener.c.patch b/meta/recipes-extended/ltp/<wbr>ltp/0001-add-_GNU_SOURCE-to-<wbr>pec_listener.c.patch<br>
new file mode 100644<br>
index 0000000..7ec66f8<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0001-add-_GNU_SOURCE-to-<wbr>pec_listener.c.patch<br>
@@ -0,0 +1,39 @@<br>
+From ae10245c15a617bd57337981bb42eb<wbr>36629f9b59 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Wed, 8 Feb 2017 15:53:31 +0800<br>
+Subject: [PATCH 01/26] add _GNU_SOURCE to pec_listener.c<br>
+<br>
+In previous patch 0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch made by Khem Raj<br>
+contains two aspects:<br>
+<br>
+ 1. replace SIGCLD with SIGCHLD<br>
+ 2. add _GNU_SOURCE to pec_listener.c<br>
+<br>
+The replace SIGCLD with SIGCHLD have been integrated upstream, so make a<br>
+another patch to add _GNU_SOURCE to pec_listener.c comply with Khem Raj's<br>
+previous patch.<br>
+<br>
+Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Upstream-Status: Pending<br>
+<br>
+%% original patch: 0001-add-_GNU_SOURCE-to-pec_<wbr>listener.c.patch<br>
+---<br>
+ testcases/kernel/connectors/<wbr>pec/pec_listener.c | 1 +<br>
+ 1 file changed, 1 insertion(+)<br>
+<br>
+diff --git a/testcases/kernel/connectors/<wbr>pec/pec_listener.c b/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
+index d11e4dc..b8b5e0d 100644<br>
+--- a/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
++++ b/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
+@@ -20,6 +20,7 @@<br>
+ /* */<br>
+ /*****************************<wbr>******************************<wbr>*******************/<br>
+<br>
++#define _GNU_SOURCE<br>
+ #include <sys/socket.h><br>
+ #include <sys/poll.h><br>
+ #include <sys/types.h><br>
+--<br>
+2.8.1<br>
+<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0001-ltp-Don-t-link-<wbr>against-libfl.patch b/meta/recipes-extended/ltp/<wbr>ltp/0001-ltp-Don-t-link-<wbr>against-libfl.patch<br>
deleted file mode 100644<br>
index 585b7cb..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0001-ltp-Don-t-link-<wbr>against-libfl.patch<br>
+++ /dev/null<br>
@@ -1,30 +0,0 @@<br>
-From 14985fccf7428eaa0b45decc22bfd2<wbr>0fd780f621 Mon Sep 17 00:00:00 2001<br>
-From: Chong Lu <<a href="mailto:Chong.Lu@windriver.com">Chong.Lu@windriver.com</a>><br>
-Date: Tue, 11 Mar 2014 14:47:22 +0800<br>
-Subject: [PATCH 01/32] ltp: Don't link against libfl<br>
-<br>
-We have already defined yywrap function in scan.l file. After this, we no longer need to<br>
-link against libfl and so no longer get errors about undefined references to yylex.<br>
-<br>
-Signed-off-by: Chong Lu <<a href="mailto:Chong.Lu@windriver.com">Chong.Lu@windriver.com</a>><br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- pan/Makefile | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/pan/Makefile b/pan/Makefile<br>
-index 4cc6466..a4b575b 100644<br>
---- a/pan/Makefile<br>
-+++ b/pan/Makefile<br>
-@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error<br>
-<br>
- CPPFLAGS += -I$(abs_srcdir)<br>
-<br>
--LDLIBS += -lm $(LEXLIB)<br>
-+LDLIBS += -lm<br>
-<br>
- LFLAGS += -l<br>
-<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0006-fix-PATH_MAX-<wbr>undeclared-when-building-with-<wbr>musl.patch b/meta/recipes-extended/ltp/<wbr>ltp/0006-fix-PATH_MAX-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
new file mode 100644<br>
index 0000000..8874b95<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0006-fix-PATH_MAX-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
@@ -0,0 +1,30 @@<br>
+From 32644bde4d33b677614534ec37030e<wbr>57883b8e15 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Thu, 9 Feb 2017 16:41:12 +0800<br>
+Subject: [PATCH 1/3] fix PATH_MAX undeclared when building with musl<br>
+<br>
+fix PATH_MAX undeclared when building with musl.<br>
+<br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Upstream-Status: Pending<br>
+---<br>
+ include/tst_test.h | 3 +++<br>
+ 1 file changed, 3 insertions(+)<br>
+<br>
+diff --git a/include/tst_test.h b/include/tst_test.h<br>
+index 7ff33b2..9779c0e 100644<br>
+--- a/include/tst_test.h<br>
++++ b/include/tst_test.h<br>
+@@ -19,6 +19,9 @@<br>
+ #define TST_TEST_H__<br>
+<br>
+ #include <unistd.h><br>
++#ifndef __GLIBC__<br>
++#include <limits.h><br>
++#endif<br>
+<br>
+ #include "tst_common.h"<br>
+ #include "tst_res_flags.h"<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0006-sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch b/meta/recipes-extended/ltp/<wbr>ltp/0006-sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch<br>
deleted file mode 100644<br>
index 56a48ab..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0006-sendfile-Use-off64_t-<wbr>instead-of-__off64_t.patch<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-From fb8b895385a641d74f2186fe5f20a8<wbr>72209692ed Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 18:24:20 +0000<br>
-Subject: [PATCH 06/32] sendfile: Use off64_t instead of __off64_t<br>
-<br>
-__off64_t is specific to glibc where as off64_t is widely available<br>
-Add _GNU_SOURCE for off64_t defines from sys/types.h<br>
-Fixes<br>
-<command-line>:0:7: error: unknown type name 'off64_t'<br>
-sendfile02.c:97:18: note: in expansion of macro 'OFF_T'<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/syscalls/<wbr>sendfile/Makefile | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>sendfile/Makefile b/testcases/kernel/syscalls/<wbr>sendfile/Makefile<br>
-index df7b63f..1bd1b57 100644<br>
---- a/testcases/kernel/syscalls/<wbr>sendfile/Makefile<br>
-+++ b/testcases/kernel/syscalls/<wbr>sendfile/Makefile<br>
-@@ -21,6 +21,6 @@ top_srcdir ?= ../../../..<br>
- include $(top_srcdir)/include/mk/<a href="http://testcases.mk" rel="noreferrer" target="_blank">testc<wbr>ases.mk</a><br>
- include $(abs_srcdir)/../utils/<a href="http://newer_64.mk" rel="noreferrer" target="_blank">newer_<wbr>64.mk</a><br>
-<br>
--%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=__off64_t<br>
-+%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=off64_t -D_GNU_SOURCE<br>
-<br>
- include $(top_srcdir)/include/mk/<a href="http://generic_leaf_target.mk" rel="noreferrer" target="_blank">gener<wbr>ic_leaf_target.mk</a><br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch b/meta/recipes-extended/ltp/<wbr>ltp/0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
new file mode 100644<br>
index 0000000..8d0e739<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch<br>
@@ -0,0 +1,30 @@<br>
+From a2639bd0f0d3f9f3049ee33e6710fe<wbr>d06225f54f Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Thu, 9 Feb 2017 18:20:58 +0800<br>
+Subject: [PATCH 1/2] fix __WORDSIZE undeclared when building with musl<br>
+<br>
+fix __WORDSIZE undeclared when building with musl.<br>
+<br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Upstream-Status: Pending<br>
+---<br>
+ include/old/test.h | 3 +++<br>
+ 1 file changed, 3 insertions(+)<br>
+<br>
+diff --git a/include/old/test.h b/include/old/test.h<br>
+index d492560..263e92e 100644<br>
+--- a/include/old/test.h<br>
++++ b/include/old/test.h<br>
+@@ -58,6 +58,9 @@<br>
+ #include "tst_clone.h"<br>
+ #include "old_device.h"<br>
+ #include "old_tmpdir.h"<br>
++#ifndef __GLIBC__<br>
++#include <bits/reg.h><br>
++#endif<br>
+<br>
+ /*<br>
+ * Ensure that NUMSIGS is defined.<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch b/meta/recipes-extended/ltp/<wbr>ltp/0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch<br>
deleted file mode 100644<br>
index 4be906e..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0007-replace-SIGCLD-with-<wbr>SIGCHLD.patch<br>
+++ /dev/null<br>
@@ -1,394 +0,0 @@<br>
-From 405c03171e4bf0edd698cb602cf7bd<wbr>7fe1d0401a Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 19:33:53 +0000<br>
-Subject: [PATCH 07/32] replace SIGCLD with SIGCHLD<br>
-<br>
-its defined to use SIGCHLD anyway in<br>
-<br>
-bits/signum.h:#define SIGCLD SIGCHLD /* Same as SIGCHLD<br>
-(System V). */<br>
-<br>
-plus it helps these tests compile with musl which adheres to posix<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- lib/tst_sig.c | 8 ++++----<br>
- testcases/kernel/connectors/<wbr>pec/pec_listener.c | 1 +<br>
- testcases/kernel/fs/doio/doio.<wbr>c | 4 ++--<br>
- testcases/kernel/fs/doio/<wbr>growfiles.c | 2 +-<br>
- testcases/kernel/syscalls/<wbr>fcntl/fcntl11.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>fcntl/fcntl17.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>fcntl/fcntl19.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>fcntl/fcntl20.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>fcntl/fcntl21.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>kill/kill02.c | 6 +++---<br>
- testcases/kernel/syscalls/<wbr>kill/kill12.c | 8 ++++----<br>
- testcases/kernel/syscalls/<wbr>mkdir/mkdir09.c | 12 ++++++------<br>
- testcases/kernel/syscalls/<wbr>sighold/sighold02.c | 2 +-<br>
- testcases/network/tcp_cmds/<wbr>perf_lan/pingpong.c | 2 +-<br>
- testcases/network/tcp_cmds/<wbr>perf_lan/pingpong6.c | 2 +-<br>
- 15 files changed, 44 insertions(+), 43 deletions(-)<br>
-<br>
-diff --git a/lib/tst_sig.c b/lib/tst_sig.c<br>
-index 3af5ffd..36565e1 100644<br>
---- a/lib/tst_sig.c<br>
-+++ b/lib/tst_sig.c<br>
-@@ -49,7 +49,7 @@<br>
- fork_flag - set to FORK or NOFORK depending upon whether the<br>
- calling program executes a fork() system call. It<br>
- is normally the case that the calling program treats<br>
-- SIGCLD as an expected signal if fork() is being used.<br>
-+ SIGCHLD as an expected signal if fork() is being used.<br>
-<br>
- handler - a pointer to the unexpected signal handler to<br>
- be executed after an unexpected signal has been<br>
-@@ -82,7 +82,7 @@ static void (*tst_setup_signal(int, void (*)(int))) (int);<br>
-<br>
- /*****************************<wbr>******************************<wbr>*****************<br>
- * tst_sig() : set-up to catch unexpected signals. fork_flag is set to NOFORK<br>
-- * if SIGCLD is to be an "unexpected signal", otherwise it is set to<br>
-+ * if SIGCHLD is to be an "unexpected signal", otherwise it is set to<br>
- * FORK. cleanup points to a cleanup routine to be executed before<br>
- * tst_exit is called (cleanup is set to NULL if no cleanup is desired).<br>
- * handler is a pointer to the signal handling routine (if handler is<br>
-@@ -117,7 +117,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())<br>
- for (sig = 1; sig < NSIG; sig++) {<br>
- /*<br>
- * SIGKILL is never unexpected.<br>
-- * SIGCLD is only unexpected when<br>
-+ * SIGCHLD is only unexpected when<br>
- * no forking is being done.<br>
- * SIGINFO is used for file quotas and should be expected<br>
- */<br>
-@@ -205,7 +205,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())<br>
- #endif<br>
- break;<br>
-<br>
-- case SIGCLD:<br>
-+ case SIGCHLD:<br>
- if (fork_flag == FORK)<br>
- continue;<br>
-<br>
-diff --git a/testcases/kernel/connectors/<wbr>pec/pec_listener.c b/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
-index a1beb13..002750a 100644<br>
---- a/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
-+++ b/testcases/kernel/connectors/<wbr>pec/pec_listener.c<br>
-@@ -20,6 +20,7 @@<br>
- /* */<br>
- /*****************************<wbr>******************************<wbr>*******************/<br>
-<br>
-+#define _GNU_SOURCE<br>
- #include <sys/socket.h><br>
- #include <sys/poll.h><br>
- #include <sys/types.h><br>
-diff --git a/testcases/kernel/fs/doio/<wbr>doio.c b/testcases/kernel/fs/doio/<wbr>doio.c<br>
-index 4b0dec5..5f65ef9 100644<br>
---- a/testcases/kernel/fs/doio/<wbr>doio.c<br>
-+++ b/testcases/kernel/fs/doio/<wbr>doio.c<br>
-@@ -573,7 +573,7 @@ int main(int argc, char **argv)<br>
- case SIGTSTP:<br>
- case SIGSTOP:<br>
- case SIGCONT:<br>
-- case SIGCLD:<br>
-+ case SIGCHLD:<br>
- case SIGBUS:<br>
- case SIGSEGV:<br>
- case SIGQUIT:<br>
-@@ -615,7 +615,7 @@ int main(int argc, char **argv)<br>
- }<br>
-<br>
- sigemptyset(&block_mask);<br>
-- sigaddset(&block_mask, SIGCLD);<br>
-+ sigaddset(&block_mask, SIGCHLD);<br>
- sigprocmask(SIG_BLOCK, &block_mask, &omask);<br>
-<br>
- /*<br>
-diff --git a/testcases/kernel/fs/doio/<wbr>growfiles.c b/testcases/kernel/fs/doio/<wbr>growfiles.c<br>
-index 09e7f35..bbad230 100644<br>
---- a/testcases/kernel/fs/doio/<wbr>growfiles.c<br>
-+++ b/testcases/kernel/fs/doio/<wbr>growfiles.c<br>
-@@ -1640,7 +1640,7 @@ int set_sig(void)<br>
- #ifdef SIGRESTART<br>
- case SIGRESTART:<br>
- #endif /* SIGRESTART */<br>
-- case SIGCLD:<br>
-+ case SIGCHLD:<br>
- break;<br>
-<br>
- default:<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl11.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl11.c<br>
-index fa6ce53..2de2b6c 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl11.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl11.c<br>
-@@ -105,10 +105,10 @@ void setup(void)<br>
- memset(&act, 0, sizeof(act));<br>
- act.sa_handler = catch_child;<br>
- sigemptyset(&act.sa_mask);<br>
-- sigaddset(&act.sa_mask, SIGCLD);<br>
-- if ((sigaction(SIGCLD, &act, NULL)) < 0)<br>
-+ sigaddset(&act.sa_mask, SIGCHLD);<br>
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0)<br>
- tst_brkm(TBROK | TERRNO, cleanup,<br>
-- "sigaction(SIGCLD, ..) failed");<br>
-+ "sigaction(SIGCHLD, ..) failed");<br>
- }<br>
-<br>
- void do_child(void)<br>
-@@ -227,7 +227,7 @@ void stop_child(void)<br>
- {<br>
- struct flock fl;<br>
-<br>
-- signal(SIGCLD, SIG_DFL);<br>
-+ signal(SIGCHLD, SIG_DFL);<br>
- fl.l_type = STOP;<br>
- parent_put(&fl);<br>
- wait(0);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl17.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl17.c<br>
-index 5b03e39..6598b20 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl17.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl17.c<br>
-@@ -150,9 +150,9 @@ int setup(void)<br>
- memset(&act, 0, sizeof(act));<br>
- act.sa_handler = catch_child;<br>
- sigemptyset(&act.sa_mask);<br>
-- sigaddset(&act.sa_mask, SIGCLD);<br>
-- if (sigaction(SIGCLD, &act, NULL) < 0) {<br>
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);<br>
-+ sigaddset(&act.sa_mask, SIGCHLD);<br>
-+ if (sigaction(SIGCHLD, &act, NULL) < 0) {<br>
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);<br>
- return 1;<br>
- }<br>
- return 0;<br>
-@@ -381,7 +381,7 @@ void stop_children(void)<br>
- {<br>
- int arg;<br>
-<br>
-- signal(SIGCLD, SIG_DFL);<br>
-+ signal(SIGCHLD, SIG_DFL);<br>
- arg = STOP;<br>
- child_free(child_pipe1[1], arg);<br>
- child_free(child_pipe2[1], arg);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl19.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl19.c<br>
-index a542cfc..88c91d6 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl19.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl19.c<br>
-@@ -112,9 +112,9 @@ void setup(void)<br>
- memset(&act, 0, sizeof(act));<br>
- act.sa_handler = catch_child;<br>
- sigemptyset(&act.sa_mask);<br>
-- sigaddset(&act.sa_mask, SIGCLD);<br>
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {<br>
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);<br>
-+ sigaddset(&act.sa_mask, SIGCHLD);<br>
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {<br>
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);<br>
- fail = 1;<br>
- }<br>
- }<br>
-@@ -265,7 +265,7 @@ void stop_child(void)<br>
- {<br>
- struct flock fl;<br>
-<br>
-- signal(SIGCLD, SIG_DFL);<br>
-+ signal(SIGCHLD, SIG_DFL);<br>
- fl.l_type = STOP;<br>
- parent_put(&fl);<br>
- wait(0);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl20.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl20.c<br>
-index aa06bab..99fd783 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl20.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl20.c<br>
-@@ -109,9 +109,9 @@ void setup(void)<br>
- memset(&act, 0, sizeof(act));<br>
- act.sa_handler = catch_child;<br>
- sigemptyset(&act.sa_mask);<br>
-- sigaddset(&act.sa_mask, SIGCLD);<br>
-- if (sigaction(SIGCLD, &act, NULL) == -1)<br>
-- tst_brkm(TFAIL | TERRNO, cleanup, "SIGCLD signal setup failed");<br>
-+ sigaddset(&act.sa_mask, SIGCHLD);<br>
-+ if (sigaction(SIGCHLD, &act, NULL) == -1)<br>
-+ tst_brkm(TFAIL | TERRNO, cleanup, "SIGCHLD signal setup failed");<br>
- }<br>
-<br>
- void cleanup(void)<br>
-@@ -264,7 +264,7 @@ void stop_child(void)<br>
- {<br>
- struct flock fl;<br>
-<br>
-- signal(SIGCLD, SIG_DFL);<br>
-+ signal(SIGCHLD, SIG_DFL);<br>
- fl.l_type = STOP;<br>
- parent_put(&fl);<br>
- wait(0);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl21.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl21.c<br>
-index 5307021..8f1a67c 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl21.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl21.c<br>
-@@ -110,9 +110,9 @@ void setup(void)<br>
- memset(&act, 0, sizeof(act));<br>
- act.sa_handler = catch_child;<br>
- sigemptyset(&act.sa_mask);<br>
-- sigaddset(&act.sa_mask, SIGCLD);<br>
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {<br>
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);<br>
-+ sigaddset(&act.sa_mask, SIGCHLD);<br>
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {<br>
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);<br>
- fail = 1;<br>
- }<br>
- }<br>
-@@ -272,7 +272,7 @@ void stop_child(void)<br>
- {<br>
- struct flock fl;<br>
-<br>
-- signal(SIGCLD, SIG_DFL);<br>
-+ signal(SIGCHLD, SIG_DFL);<br>
- fl.l_type = STOP;<br>
- parent_put(&fl);<br>
- wait(0);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>kill/kill02.c b/testcases/kernel/syscalls/<wbr>kill/kill02.c<br>
-index 9d6cc68..08360dd 100644<br>
---- a/testcases/kernel/syscalls/<wbr>kill/kill02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>kill/kill02.c<br>
-@@ -701,7 +701,7 @@ void setup(void)<br>
-<br>
- /*<br>
- * Set to catch unexpected signals.<br>
-- * SIGCLD is set to be ignored because we do not wait for termination status.<br>
-+ * SIGCHLD is set to be ignored because we do not wait for termination status.<br>
- * SIGUSR1 is set to be ignored because this is the signal we are using for<br>
- * the test and we are not concerned with the parent getting it.<br>
- */<br>
-@@ -713,9 +713,9 @@ void setup(void)<br>
- "signal(SIGUSR1, SIG_IGN) failed");<br>
- }<br>
-<br>
-- if (signal(SIGCLD, SIG_IGN) == SIG_ERR) {<br>
-+ if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {<br>
- tst_brkm(TBROK | TERRNO, NULL,<br>
-- "signal(SIGCLD, SIG_IGN) failed");<br>
-+ "signal(SIGCHLD, SIG_IGN) failed");<br>
- }<br>
-<br>
- TEST_PAUSE;<br>
-diff --git a/testcases/kernel/syscalls/<wbr>kill/kill12.c b/testcases/kernel/syscalls/<wbr>kill/kill12.c<br>
-index 7a47a4a..d7c4147 100644<br>
---- a/testcases/kernel/syscalls/<wbr>kill/kill12.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>kill/kill12.c<br>
-@@ -98,7 +98,7 @@ int main(int argc, char **argv)<br>
-<br>
- exno = 1;<br>
-<br>
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {<br>
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {<br>
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);<br>
- fail_exit();<br>
- }<br>
-@@ -128,7 +128,7 @@ int main(int argc, char **argv)<br>
- sleep(1);<br>
-<br>
- kill(pid, sig); /* child should ignroe this sig */<br>
-- kill(pid, SIGCLD); /* child should exit */<br>
-+ kill(pid, SIGCHLD); /* child should exit */<br>
-<br>
- #ifdef BCS<br>
- while ((npid = wait(&status)) != pid<br>
-@@ -222,14 +222,14 @@ void do_child(void)<br>
- int exno = 1;<br>
-<br>
- #ifdef UCLINUX<br>
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {<br>
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {<br>
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);<br>
- fail_exit();<br>
- }<br>
- #endif<br>
-<br>
- sigset(sig, SIG_IGN); /* set to ignore signal */<br>
-- kill(getppid(), SIGCLD); /* tell parent we are ready */<br>
-+ kill(getppid(), SIGCHLD); /* tell parent we are ready */<br>
- while (!chflag)<br>
- sleep(1); /* wait for parent */<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>mkdir/mkdir09.c b/testcases/kernel/syscalls/<wbr>mkdir/mkdir09.c<br>
-index 41c20e9..07b4fb8 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mkdir/mkdir09.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mkdir/mkdir09.c<br>
-@@ -122,10 +122,10 @@ int main(int argc, char *argv[])<br>
-<br>
- }<br>
-<br>
-- /* Set up to catch SIGCLD signal */<br>
-- if (signal(SIGCLD, chld) == SIG_ERR) {<br>
-+ /* Set up to catch SIGCHLD signal */<br>
-+ if (signal(SIGCHLD, chld) == SIG_ERR) {<br>
- tst_brkm(TFAIL, cleanup,<br>
-- "Error setting up SIGCLD signal, ERRNO = %d", errno);<br>
-+ "Error setting up SIGCHLD signal, ERRNO = %d", errno);<br>
-<br>
- }<br>
-<br>
-@@ -236,9 +236,9 @@ int runtest(void)<br>
- tst_brkm(TFAIL, cleanup,<br>
- "Error resetting SIGTERM signal, ERRNO = %d", errno);<br>
- }<br>
-- if (signal(SIGCLD, SIG_DFL) == SIG_ERR) {<br>
-+ if (signal(SIGCHLD, SIG_DFL) == SIG_ERR) {<br>
- tst_brkm(TFAIL, cleanup,<br>
-- "Error resetting SIGCLD signal, ERRNO = %d", errno);<br>
-+ "Error resetting SIGCHLD signal, ERRNO = %d", errno);<br>
- }<br>
-<br>
- if (test_time) {<br>
-@@ -372,7 +372,7 @@ void term(int sig)<br>
-<br>
- void chld(int sig)<br>
- {<br>
-- /* Routine to handle SIGCLD signal. */<br>
-+ /* Routine to handle SIGCHLD signal. */<br>
-<br>
- sigchld++;<br>
- if (jump) {<br>
-diff --git a/testcases/kernel/syscalls/<wbr>sighold/sighold02.c b/testcases/kernel/syscalls/<wbr>sighold/sighold02.c<br>
-index e3076fb..be01874 100644<br>
---- a/testcases/kernel/syscalls/<wbr>sighold/sighold02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>sighold/sighold02.c<br>
-@@ -77,7 +77,7 @@ static int sigs_map[NUMSIGS];<br>
- static int skip_sig(int sig)<br>
- {<br>
- switch (sig) {<br>
-- case SIGCLD:<br>
-+ case SIGCHLD:<br>
- case SIGKILL:<br>
- case SIGALRM:<br>
- case SIGSTOP:<br>
-diff --git a/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong.c b/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong.c<br>
-index 1196312..5b06798 100644<br>
---- a/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong.c<br>
-+++ b/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong.c<br>
-@@ -182,7 +182,7 @@ int main(int argc, char *argv[])<br>
-<br>
- /* Setup traps */<br>
- signal(SIGINT, finish);<br>
-- signal(SIGCLD, finish);<br>
-+ signal(SIGCHLD, finish);<br>
-<br>
- /* Fork a child process to continue sending packets */<br>
- tst_resm(TINFO, "Create a child process to continue to send packets");<br>
-diff --git a/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong6.c b/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong6.c<br>
-index 9747f58..0a0fb1d 100644<br>
---- a/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong6.c<br>
-+++ b/testcases/network/tcp_cmds/<wbr>perf_lan/pingpong6.c<br>
-@@ -153,7 +153,7 @@ char *argv[];<br>
-<br>
- /* Setup traps */<br>
- signal(SIGINT, finish);<br>
-- signal(SIGCLD, finish);<br>
-+ signal(SIGCHLD, finish);<br>
-<br>
- /* Fork a child process to continue sending packets */<br>
- printf("Create a child process to continue to send packets \n");<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0009-Guard-error.h-with-__<wbr>GLIBC__.patch b/meta/recipes-extended/ltp/<wbr>ltp/0009-Guard-error.h-with-__<wbr>GLIBC__.patch<br>
deleted file mode 100644<br>
index e58e5a9..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0009-Guard-error.h-with-__<wbr>GLIBC__.patch<br>
+++ /dev/null<br>
@@ -1,270 +0,0 @@<br>
-From 4ba19d64e95a874995d0b554b891b5<wbr>ec35bd9495 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 19:45:35 +0000<br>
-Subject: [PATCH 09/32] Guard error.h with __GLIBC__<br>
-<br>
-error API is specific to glibc so use the guard to make it conditional<br>
-on glibc<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/syscalls/<wbr>faccessat/faccessat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>fallocate/fallocate01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>fchmodat/fchmodat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>fchownat/fchownat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>fchownat/fchownat02.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>fstatat/fstatat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>futimesat/futimesat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>linkat/linkat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>linkat/linkat02.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>mkdirat/mkdirat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>mknodat/mknodat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>mknodat/mknodat02.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>openat/openat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>readlinkat/readlinkat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>renameat/renameat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>symlinkat/symlinkat01.c | 2 ++<br>
- testcases/kernel/syscalls/<wbr>unlinkat/unlinkat01.c | 2 ++<br>
- 17 files changed, 34 insertions(+)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>faccessat/faccessat01.c b/testcases/kernel/syscalls/<wbr>faccessat/faccessat01.c<br>
-index 7f0e87a..c72dcf0 100644<br>
---- a/testcases/kernel/syscalls/<wbr>faccessat/faccessat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>faccessat/faccessat01.c<br>
-@@ -37,7 +37,9 @@<br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>fallocate/fallocate01.c b/testcases/kernel/syscalls/<wbr>fallocate/fallocate01.c<br>
-index e72b123..643c0e2 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fallocate/fallocate01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fallocate/fallocate01.c<br>
-@@ -96,7 +96,9 @@<br>
- #include <fcntl.h><br>
- #include <sys/syscall.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <inttypes.h><br>
- #include <sys/utsname.h><br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>fchmodat/fchmodat01.c b/testcases/kernel/syscalls/<wbr>fchmodat/fchmodat01.c<br>
-index 19e9ad5..ae6d807 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fchmodat/fchmodat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fchmodat/fchmodat01.c<br>
-@@ -37,7 +37,9 @@<br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>fchownat/fchownat01.c b/testcases/kernel/syscalls/<wbr>fchownat/fchownat01.c<br>
-index b361253..a5218af 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fchownat/fchownat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fchownat/fchownat01.c<br>
-@@ -28,7 +28,9 @@<br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>fchownat/fchownat02.c b/testcases/kernel/syscalls/<wbr>fchownat/fchownat02.c<br>
-index 6b0304c..8d2863f 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fchownat/fchownat02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fchownat/fchownat02.c<br>
-@@ -26,7 +26,9 @@<br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>fstatat/fstatat01.c b/testcases/kernel/syscalls/<wbr>fstatat/fstatat01.c<br>
-index 61531c6..e99fbd2 100644<br>
---- a/testcases/kernel/syscalls/<wbr>fstatat/fstatat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>fstatat/fstatat01.c<br>
-@@ -48,7 +48,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>futimesat/futimesat01.c b/testcases/kernel/syscalls/<wbr>futimesat/futimesat01.c<br>
-index ae8d4fe..316dd78 100644<br>
---- a/testcases/kernel/syscalls/<wbr>futimesat/futimesat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>futimesat/futimesat01.c<br>
-@@ -37,7 +37,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>linkat/linkat01.c b/testcases/kernel/syscalls/<wbr>linkat/linkat01.c<br>
-index fc0687b..83cbfe7 100644<br>
---- a/testcases/kernel/syscalls/<wbr>linkat/linkat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>linkat/linkat01.c<br>
-@@ -49,7 +49,9 @@<br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>linkat/linkat02.c b/testcases/kernel/syscalls/<wbr>linkat/linkat02.c<br>
-index e9a752a..8d7e431 100644<br>
---- a/testcases/kernel/syscalls/<wbr>linkat/linkat02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>linkat/linkat02.c<br>
-@@ -23,7 +23,9 @@<br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
- #include <unistd.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>mkdirat/mkdirat01.c b/testcases/kernel/syscalls/<wbr>mkdirat/mkdirat01.c<br>
-index 7e15947..1dbc038 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mkdirat/mkdirat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mkdirat/mkdirat01.c<br>
-@@ -30,7 +30,9 @@<br>
- #include <sys/types.h><br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>mknodat/mknodat01.c b/testcases/kernel/syscalls/<wbr>mknodat/mknodat01.c<br>
-index 26e5538..f034f05 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mknodat/mknodat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mknodat/mknodat01.c<br>
-@@ -29,7 +29,9 @@<br>
- #include <sys/types.h><br>
- #include <fcntl.h><br>
- #include <sys/stat.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>mknodat/mknodat02.c b/testcases/kernel/syscalls/<wbr>mknodat/mknodat02.c<br>
-index f6368fa..7d0f7c0 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mknodat/mknodat02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mknodat/mknodat02.c<br>
-@@ -29,7 +29,9 @@<br>
- #include <sys/types.h><br>
- #include <fcntl.h><br>
- #include <sys/stat.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>openat/openat01.c b/testcases/kernel/syscalls/<wbr>openat/openat01.c<br>
-index 85f9a91..4ee0117 100644<br>
---- a/testcases/kernel/syscalls/<wbr>openat/openat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>openat/openat01.c<br>
-@@ -29,7 +29,9 @@<br>
- #include <sys/types.h><br>
- #include <sys/stat.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>readlinkat/readlinkat01.c b/testcases/kernel/syscalls/<wbr>readlinkat/readlinkat01.c<br>
-index 97a49e8..b162853 100644<br>
---- a/testcases/kernel/syscalls/<wbr>readlinkat/readlinkat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>readlinkat/readlinkat01.c<br>
-@@ -29,7 +29,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>renameat/renameat01.c b/testcases/kernel/syscalls/<wbr>renameat/renameat01.c<br>
-index f4cd51b..105a05b 100644<br>
---- a/testcases/kernel/syscalls/<wbr>renameat/renameat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>renameat/renameat01.c<br>
-@@ -42,7 +42,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>symlinkat/symlinkat01.c b/testcases/kernel/syscalls/<wbr>symlinkat/symlinkat01.c<br>
-index 5c238d8..cb7a7e8 100644<br>
---- a/testcases/kernel/syscalls/<wbr>symlinkat/symlinkat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>symlinkat/symlinkat01.c<br>
-@@ -37,7 +37,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>unlinkat/unlinkat01.c b/testcases/kernel/syscalls/<wbr>unlinkat/unlinkat01.c<br>
-index 31fe4e7..26f6d9a 100644<br>
---- a/testcases/kernel/syscalls/<wbr>unlinkat/unlinkat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>unlinkat/unlinkat01.c<br>
-@@ -37,7 +37,9 @@<br>
- #include <sys/stat.h><br>
- #include <sys/time.h><br>
- #include <fcntl.h><br>
-+#ifdef __GLIBC__<br>
- #include <error.h><br>
-+#endif<br>
- #include <stdlib.h><br>
- #include <errno.h><br>
- #include <string.h><br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0009-fix-redefinition-of-<wbr>struct-msgbuf-error-building-<wbr>wit.patch b/meta/recipes-extended/ltp/<wbr>ltp/0009-fix-redefinition-of-<wbr>struct-msgbuf-error-building-<wbr>wit.patch<br>
new file mode 100644<br>
index 0000000..6886c55<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0009-fix-redefinition-of-<wbr>struct-msgbuf-error-building-<wbr>wit.patch<br>
@@ -0,0 +1,35 @@<br>
+From 2d7ea67e8eaa41cbd6816f7ab65425<wbr>4b40b530a1 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Thu, 9 Feb 2017 17:17:37 +0800<br>
+Subject: [PATCH] fix redefinition of 'struct msgbuf' error building with musl<br>
+<br>
+When building with musl the file "sys/msg.h" already contain 'struct msgbuf'<br>
+<br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Upstream-Status: Pending<br>
+---<br>
+ testcases/kernel/syscalls/ipc/<wbr>msgrcv/msgrcv08.c | 4 +++-<br>
+ 1 file changed, 3 insertions(+), 1 deletion(-)<br>
+<br>
+diff --git a/testcases/kernel/syscalls/<wbr>ipc/msgrcv/msgrcv08.c b/testcases/kernel/syscalls/<wbr>ipc/msgrcv/msgrcv08.c<br>
+index a757c0d..e023114 100644<br>
+--- a/testcases/kernel/syscalls/<wbr>ipc/msgrcv/msgrcv08.c<br>
++++ b/testcases/kernel/syscalls/<wbr>ipc/msgrcv/msgrcv08.c<br>
+@@ -47,11 +47,13 @@ const char *TCID = "msgrcv08";<br>
+ const int TST_TOTAL = 1;<br>
+<br>
+ #if __WORDSIZE == 32<br>
+-<br>
++#ifdef __GLIBC__<br>
+ struct msgbuf {<br>
+ long mtype; /* message type, must be > 0 */<br>
+ char mtext[16]; /* message data */<br>
+ };<br>
++#else<br>
++#endif<br>
+<br>
+ static void msr(int msqid)<br>
+ {<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0011-Rename-sigset-<wbr>variable-to-sigset1.patch b/meta/recipes-extended/ltp/<wbr>ltp/0011-Rename-sigset-<wbr>variable-to-sigset1.patch<br>
index 945280c..4ac14dc 100644<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0011-Rename-sigset-<wbr>variable-to-sigset1.patch<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0011-Rename-sigset-<wbr>variable-to-sigset1.patch<br>
@@ -1,11 +1,12 @@<br>
-From aff0e2a8f011fa80b472355355a7e8<wbr>cdacd50189 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 19:53:30 +0000<br>
-Subject: [PATCH 11/32] Rename sigset variable to sigset1<br>
+From dc1905b6d972f9176b40da270c83d8<wbr>fb4d1751b5 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Wed, 8 Feb 2017 16:12:34 +0800<br>
+Subject: [PATCH 2/5] Rename sigset variable to sigset1<br>
<br>
sigset API from signal.h is shadowed by this name conflict<br>
<br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
---<br>
testcases/kernel/mem/shmt/<wbr>shmt04.c | 10 +++++-----<br>
testcases/kernel/mem/shmt/<wbr>shmt06.c | 10 +++++-----<br>
@@ -13,15 +14,15 @@ Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
3 files changed, 15 insertions(+), 15 deletions(-)<br>
<br>
diff --git a/testcases/kernel/mem/shmt/<wbr>shmt04.c b/testcases/kernel/mem/shmt/<wbr>shmt04.c<br>
-index 7203e9e..fce87d6 100644<br>
+index b2682da..3f35fad 100644<br>
--- a/testcases/kernel/mem/shmt/<wbr>shmt04.c<br>
+++ b/testcases/kernel/mem/shmt/<wbr>shmt04.c<br>
@@ -56,7 +56,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */<br>
/**************/<br>
<br>
key_t key;<br>
--sigset_t sigset;<br>
-+sigset_t sigset1;<br>
+-sigset_t set;<br>
++sigset_t set1;<br>
<br>
#define SIZE 16*1024<br>
<br>
@@ -29,12 +30,12 @@ index 7203e9e..fce87d6 100644<br>
<br>
key = (key_t) getpid();<br>
<br>
-- sigemptyset(&sigset);<br>
-- sigaddset(&sigset, SIGUSR1);<br>
-- sigprocmask(SIG_BLOCK, &sigset, NULL);<br>
-+ sigemptyset(&sigset1);<br>
-+ sigaddset(&sigset1, SIGUSR1);<br>
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);<br>
+- sigemptyset(&set);<br>
+- sigaddset(&set, SIGUSR1);<br>
+- sigprocmask(SIG_BLOCK, &set, NULL);<br>
++ sigemptyset(&set1);<br>
++ sigaddset(&set1, SIGUSR1);<br>
++ sigprocmask(SIG_BLOCK, &set1, NULL);<br>
<br>
pid = fork();<br>
switch (pid) {<br>
@@ -42,21 +43,21 @@ index 7203e9e..fce87d6 100644<br>
char *cp;<br>
int sig;<br>
<br>
-- sigwait(&sigset, &sig);<br>
-+ sigwait(&sigset1, &sig);<br>
+- sigwait(&set, &sig);<br>
++ sigwait(&set1, &sig);<br>
chld_pid = getpid();<br>
/*----------------------------<wbr>----------------------------*/<br>
<br>
diff --git a/testcases/kernel/mem/shmt/<wbr>shmt06.c b/testcases/kernel/mem/shmt/<wbr>shmt06.c<br>
-index a3c9ca3..77b0fc9 100644<br>
+index dd69de7..56fb1da 100644<br>
--- a/testcases/kernel/mem/shmt/<wbr>shmt06.c<br>
+++ b/testcases/kernel/mem/shmt/<wbr>shmt06.c<br>
@@ -57,7 +57,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */<br>
/**************/<br>
<br>
key_t key;<br>
--sigset_t sigset;<br>
-+sigset_t sigset1;<br>
+-sigset_t set;<br>
++sigset_t set1;<br>
<br>
int child();<br>
static int rm_shm(int);<br>
@@ -64,12 +65,12 @@ index a3c9ca3..77b0fc9 100644<br>
<br>
key = (key_t) getpid();<br>
<br>
-- sigemptyset(&sigset);<br>
-- sigaddset(&sigset, SIGUSR1);<br>
-- sigprocmask(SIG_BLOCK, &sigset, NULL);<br>
-+ sigemptyset(&sigset1);<br>
-+ sigaddset(&sigset1, SIGUSR1);<br>
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);<br>
+- sigemptyset(&set);<br>
+- sigaddset(&set, SIGUSR1);<br>
+- sigprocmask(SIG_BLOCK, &set, NULL);<br>
++ sigemptyset(&set1);<br>
++ sigaddset(&set1, SIGUSR1);<br>
++ sigprocmask(SIG_BLOCK, &set1, NULL);<br>
<br>
pid = fork();<br>
switch (pid) {<br>
@@ -77,21 +78,21 @@ index a3c9ca3..77b0fc9 100644<br>
char *cp;<br>
int sig;<br>
<br>
-- sigwait(&sigset, &sig);<br>
-+ sigwait(&sigset1, &sig);<br>
+- sigwait(&set, &sig);<br>
++ sigwait(&set1, &sig);<br>
chld_pid = getpid();<br>
<br>
if ((shmid = shmget(key, SIZE, 0)) < 0) {<br>
diff --git a/testcases/kernel/syscalls/<wbr>sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/<wbr>sigprocmask/sigprocmask01.c<br>
-index 20fca52..6fb1d57 100644<br>
+index 232d25a..06d902f 100644<br>
--- a/testcases/kernel/syscalls/<wbr>sigprocmask/sigprocmask01.c<br>
+++ b/testcases/kernel/syscalls/<wbr>sigprocmask/sigprocmask01.c<br>
@@ -91,7 +91,7 @@ int TST_TOTAL = 1;<br>
int sig_catch = 0; /* variable to blocked/unblocked signals */<br>
<br>
struct sigaction sa_new; /* struct to hold signal info */<br>
--sigset_t sigset; /* signal set to hold signal lists */<br>
-+sigset_t sigset1; /* signal set to hold signal lists */<br>
+-sigset_t set; /* signal set to hold signal lists */<br>
++sigset_t set1; /* signal set to hold signal lists */<br>
sigset_t sigset2;<br>
<br>
int main(int ac, char **av)<br>
@@ -99,8 +100,8 @@ index 20fca52..6fb1d57 100644<br>
* so that, signal will not be delivered to<br>
* the test process.<br>
*/<br>
-- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));<br>
-+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));<br>
+- TEST(sigprocmask(SIG_BLOCK, &set, 0));<br>
++ TEST(sigprocmask(SIG_BLOCK, &set1, 0));<br>
<br>
/* Get the process id of test process */<br>
my_pid = getpid();<br>
@@ -108,8 +109,8 @@ index 20fca52..6fb1d57 100644<br>
*/<br>
errno = 0;<br>
if (sigprocmask(SIG_UNBLOCK,<br>
-- &sigset, 0) == -1) {<br>
-+ &sigset1, 0) == -1) {<br>
+- &set, 0) == -1) {<br>
++ &set1, 0) == -1) {<br>
tst_brkm(TFAIL, cleanup,<br>
"sigprocmask() failed "<br>
"to unblock signal, "<br>
@@ -117,8 +118,8 @@ index 20fca52..6fb1d57 100644<br>
* Initialise the signal sets with the list that<br>
* excludes/includes all system-defined signals.<br>
*/<br>
-- if (sigemptyset(&sigset) == -1) {<br>
-+ if (sigemptyset(&sigset1) == -1) {<br>
+- if (sigemptyset(&set) == -1) {<br>
++ if (sigemptyset(&set1) == -1) {<br>
tst_brkm(TFAIL, cleanup,<br>
"sigemptyset() failed, errno=%d : %s",<br>
errno, strerror(errno));<br>
@@ -126,11 +127,11 @@ index 20fca52..6fb1d57 100644<br>
* Add specified signal (SIGINT) to the signal set<br>
* which excludes system-defined signals.<br>
*/<br>
-- if (sigaddset(&sigset, SIGINT) == -1) {<br>
-+ if (sigaddset(&sigset1, SIGINT) == -1) {<br>
+- if (sigaddset(&set, SIGINT) == -1) {<br>
++ if (sigaddset(&set1, SIGINT) == -1) {<br>
tst_brkm(TFAIL, cleanup,<br>
"sigaddset() failed, errno=%d : %s",<br>
errno, strerror(errno));<br>
--<br>
-2.7.0<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0012-fsstress.c-Replace-__<wbr>int64_t-with-int64_t.patch b/meta/recipes-extended/ltp/<wbr>ltp/0012-fsstress.c-Replace-__<wbr>int64_t-with-int64_t.patch<br>
deleted file mode 100644<br>
index e1532c1..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0012-fsstress.c-Replace-__<wbr>int64_t-with-int64_t.patch<br>
+++ /dev/null<br>
@@ -1,351 +0,0 @@<br>
-From 54e098a366a1d773c4d7d4124f2f5a<wbr>ab976681c3 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 19:58:08 +0000<br>
-Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t<br>
-<br>
-int64_t is defined in ISO C99<br>
-include limits.h to get defintions of PATH_MAX<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/fs/fsstress/<wbr>fsstress.c | 31 +++++++++---------<br>
- testcases/network/nfs/nfs_<wbr>fsstress/fsstress.c | 47 ++++++++++++++-------------<br>
- 2 files changed, 40 insertions(+), 38 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/fs/<wbr>fsstress/fsstress.c b/testcases/kernel/fs/<wbr>fsstress/fsstress.c<br>
-index 2f89903..89f0b19 100644<br>
---- a/testcases/kernel/fs/<wbr>fsstress/fsstress.c<br>
-+++ b/testcases/kernel/fs/<wbr>fsstress/fsstress.c<br>
-@@ -36,6 +36,7 @@<br>
- #ifdef HAVE_SYS_PRCTL_H<br>
- # include <sys/prctl.h><br>
- #endif<br>
-+#include <limits.h><br>
-<br>
- #define XFS_ERRTAG_MAX 17<br>
-<br>
-@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)<br>
- __u64 last;<br>
- __s32 nent;<br>
- xfs_bstat_t *t;<br>
-- __int64_t total;<br>
-+ int64_t total;<br>
- xfs_fsop_bulkreq_t bsr;<br>
-<br>
- last = 0;<br>
-@@ -1764,14 +1765,14 @@ int setdirect(int fd)<br>
-<br>
- void dread_f(int opno, long r)<br>
- {<br>
-- __int64_t align;<br>
-+ int64_t align;<br>
- char *buf = NULL;<br>
- struct dioattr diob;<br>
- int e;<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)<br>
- return;<br>
- }<br>
- #endif<br>
-- align = (__int64_t) diob.d_miniosz;<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ align = (int64_t) diob.d_miniosz;<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % stb.st_size);<br>
- off -= (off % align);<br>
- lseek64(fd, off, SEEK_SET);<br>
-@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)<br>
-<br>
- void dwrite_f(int opno, long r)<br>
- {<br>
-- __int64_t align;<br>
-+ int64_t align;<br>
- char *buf = NULL;<br>
- struct dioattr diob;<br>
- int e;<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)<br>
- return;<br>
- }<br>
- #endif<br>
-- align = (__int64_t) diob.d_miniosz;<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ align = (int64_t) diob.d_miniosz;<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off -= (off % align);<br>
- lseek64(fd, off, SEEK_SET);<br>
-@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % stb.st_size);<br>
- lseek64(fd, off, SEEK_SET);<br>
- len = (random() % (getpagesize() * 32)) + 1;<br>
-@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)<br>
- {<br>
- int e;<br>
- pathname_t f;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)<br>
- free_pathname(&f);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);<br>
- off %= maxfsize;<br>
- e = truncate64_path(&f, off) < 0 ? errno : 0;<br>
-@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- lseek64(fd, off, SEEK_SET);<br>
-diff --git a/testcases/network/nfs/nfs_<wbr>fsstress/fsstress.c b/testcases/network/nfs/nfs_<wbr>fsstress/fsstress.c<br>
-index ac91262..a34c416 100644<br>
---- a/testcases/network/nfs/nfs_<wbr>fsstress/fsstress.c<br>
-+++ b/testcases/network/nfs/nfs_<wbr>fsstress/fsstress.c<br>
-@@ -31,6 +31,7 @@<br>
- */<br>
-<br>
- #include "global.h"<br>
-+#include <limits.h><br>
-<br>
- #define XFS_ERRTAG_MAX 17<br>
-<br>
-@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- struct flock64 fl;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- fl.l_whence = SEEK_SET;<br>
-@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)<br>
- __uint64_t last;<br>
- int nent;<br>
- xfs_bstat_t *t;<br>
-- __int64_t total;<br>
-+ int64_t total;<br>
- xfs_fsop_bulkreq_t bsr;<br>
-<br>
- last = 0;<br>
-@@ -1708,14 +1709,14 @@ int setdirect(int fd)<br>
-<br>
- void dread_f(int opno, long r)<br>
- {<br>
-- __int64_t align;<br>
-+ int64_t align;<br>
- char *buf;<br>
- struct dioattr diob;<br>
- int e;<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)<br>
- return;<br>
- }<br>
- #endif<br>
-- align = (__int64_t) diob.d_miniosz;<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ align = (int64_t) diob.d_miniosz;<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % stb.st_size);<br>
- off -= (off % align);<br>
- lseek64(fd, off, SEEK_SET);<br>
-@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)<br>
-<br>
- void dwrite_f(int opno, long r)<br>
- {<br>
-- __int64_t align;<br>
-+ int64_t align;<br>
- char *buf;<br>
- struct dioattr diob;<br>
- int e;<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)<br>
- return;<br>
- }<br>
- #endif<br>
-- align = (__int64_t) diob.d_miniosz;<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ align = (int64_t) diob.d_miniosz;<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off -= (off % align);<br>
- lseek64(fd, off, SEEK_SET);<br>
-@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- struct flock64 fl;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- fl.l_whence = SEEK_SET;<br>
-@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % stb.st_size);<br>
- lseek64(fd, off, SEEK_SET);<br>
- len = (random() % (getpagesize() * 32)) + 1;<br>
-@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- struct flock64 fl;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- fl.l_whence = SEEK_SET;<br>
-@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)<br>
- {<br>
- int e;<br>
- pathname_t f;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)<br>
- free_pathname(&f);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- e = truncate64_path(&f, off) < 0 ? errno : 0;<br>
-@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- struct flock64 fl;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- fl.l_whence = SEEK_SET;<br>
-@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)<br>
- pathname_t f;<br>
- int fd;<br>
- size_t len;<br>
-- __int64_t lr;<br>
-+ int64_t lr;<br>
- off64_t off;<br>
- struct stat64 stb;<br>
- int v;<br>
-@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)<br>
- close(fd);<br>
- return;<br>
- }<br>
-- lr = ((__int64_t) random() << 32) + random();<br>
-+ lr = ((int64_t) random() << 32) + random();<br>
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));<br>
- off %= maxfsize;<br>
- lseek64(fd, off, SEEK_SET);<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0013-include-fcntl.h-for-<wbr>getting-O_-definitions.patch b/meta/recipes-extended/ltp/<wbr>ltp/0013-include-fcntl.h-for-<wbr>getting-O_-definitions.patch<br>
deleted file mode 100644<br>
index 4266e4f..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0013-include-fcntl.h-for-<wbr>getting-O_-definitions.patch<br>
+++ /dev/null<br>
@@ -1,67 +0,0 @@<br>
-From 1ef8c32317064438ec3b37a114f5d8<wbr>2957f4e0c6 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 20:05:54 +0000<br>
-Subject: [PATCH 13/32] include fcntl.h for getting O_* definitions<br>
-<br>
-musl exposes this issue, with glibc fcntl.h is included via some other<br>
-header and this problem remained latent<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_03.c | 1 +<br>
- testcases/kernel/syscalls/mq_<wbr>notify/mq_notify01.c | 1 +<br>
- testcases/network/tcp_cmds/<wbr>sendfile/testsf_c.c | 1 +<br>
- testcases/network/tcp_cmds/<wbr>sendfile/testsf_s.c | 1 +<br>
- 4 files changed, 4 insertions(+)<br>
-<br>
-diff --git a/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_03.c b/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_03.c<br>
-index c1b11fd..8be156f 100644<br>
---- a/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_03.c<br>
-+++ b/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_03.c<br>
-@@ -72,6 +72,7 @@<br>
- #include <string.h><br>
- #include <unistd.h><br>
- #include <limits.h><br>
-+#include <fcntl.h><br>
- #include <sys/file.h><br>
- #include <sys/ipc.h><br>
- #include <sys/mman.h><br>
-diff --git a/testcases/kernel/syscalls/<wbr>mq_notify/mq_notify01.c b/testcases/kernel/syscalls/<wbr>mq_notify/mq_notify01.c<br>
-index 4728c70..5c7846c 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mq_notify/mq_notify01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mq_notify/mq_notify01.c<br>
-@@ -41,6 +41,7 @@<br>
- #include <mqueue.h><br>
- #include <signal.h><br>
- #include <stdlib.h><br>
-+#include <fcntl.h><br>
-<br>
- #include "../utils/include_j_h.h"<br>
-<br>
-diff --git a/testcases/network/tcp_cmds/<wbr>sendfile/testsf_c.c b/testcases/network/tcp_cmds/<wbr>sendfile/testsf_c.c<br>
-index 449784f..38d3274 100644<br>
---- a/testcases/network/tcp_cmds/<wbr>sendfile/testsf_c.c<br>
-+++ b/testcases/network/tcp_cmds/<wbr>sendfile/testsf_c.c<br>
-@@ -9,6 +9,7 @@<br>
- #include <sys/types.h><br>
- #include <stdlib.h><br>
- #include <string.h><br>
-+#include <fcntl.h><br>
- #include <sys/file.h><br>
- #include <arpa/inet.h><br>
- #include <netinet/in.h><br>
-diff --git a/testcases/network/tcp_cmds/<wbr>sendfile/testsf_s.c b/testcases/network/tcp_cmds/<wbr>sendfile/testsf_s.c<br>
-index 17e98ad..bce8dd1 100644<br>
---- a/testcases/network/tcp_cmds/<wbr>sendfile/testsf_s.c<br>
-+++ b/testcases/network/tcp_cmds/<wbr>sendfile/testsf_s.c<br>
-@@ -6,6 +6,7 @@<br>
- #include <stdio.h><br>
- #include <stdlib.h><br>
- #include <unistd.h><br>
-+#include <fcntl.h><br>
- #include <sys/file.h><br>
- #include <errno.h><br>
- #include <sys/signal.h><br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0014-hyperthreading-<wbr>Include-sys-types.h-for-pid_t-<wbr>definit.patch b/meta/recipes-extended/ltp/<wbr>ltp/0014-hyperthreading-<wbr>Include-sys-types.h-for-pid_t-<wbr>definit.patch<br>
deleted file mode 100644<br>
index 84d81e9..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0014-hyperthreading-<wbr>Include-sys-types.h-for-pid_t-<wbr>definit.patch<br>
+++ /dev/null<br>
@@ -1,56 +0,0 @@<br>
-From d63fefa86dac437c47b9ebbea0a82a<wbr>1240aaba2c Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 20:09:56 +0000<br>
-Subject: [PATCH 14/32] hyperthreading: Include sys/types.h for pid_t<br>
- definition<br>
-<br>
-If sys/types.h is not included then it will not define pid_t_needed<br>
-and therefore typedef wont be included and we get errors about pid_t<br>
-being not known<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/sched/<wbr>hyperthreading/ht_affinity/ht_<wbr>utils.h | 1 +<br>
- testcases/kernel/sched/<wbr>hyperthreading/ht_enabled/ht_<wbr>utils.h | 1 +<br>
- testcases/kernel/sched/<wbr>hyperthreading/ht_interrupt/<wbr>ht_utils.h | 1 +<br>
- 3 files changed, 3 insertions(+)<br>
-<br>
-diff --git a/testcases/kernel/sched/<wbr>hyperthreading/ht_affinity/ht_<wbr>utils.h b/testcases/kernel/sched/<wbr>hyperthreading/ht_affinity/ht_<wbr>utils.h<br>
-index 1ec9794..9084aa7 100644<br>
---- a/testcases/kernel/sched/<wbr>hyperthreading/ht_affinity/ht_<wbr>utils.h<br>
-+++ b/testcases/kernel/sched/<wbr>hyperthreading/ht_affinity/ht_<wbr>utils.h<br>
-@@ -3,6 +3,7 @@<br>
- #define _HTUTILS_H_<br>
-<br>
- #include <stdlib.h><br>
-+#include <sys/types.h><br>
-<br>
- int is_cmdline_para(const char *para);<br>
-<br>
-diff --git a/testcases/kernel/sched/<wbr>hyperthreading/ht_enabled/ht_<wbr>utils.h b/testcases/kernel/sched/<wbr>hyperthreading/ht_enabled/ht_<wbr>utils.h<br>
-index 1ec9794..c03a124 100644<br>
---- a/testcases/kernel/sched/<wbr>hyperthreading/ht_enabled/ht_<wbr>utils.h<br>
-+++ b/testcases/kernel/sched/<wbr>hyperthreading/ht_enabled/ht_<wbr>utils.h<br>
-@@ -2,6 +2,7 @@<br>
- #ifndef _HTUTILS_H_<br>
- #define _HTUTILS_H_<br>
-<br>
-+#include <sys/types.h><br>
- #include <stdlib.h><br>
-<br>
- int is_cmdline_para(const char *para);<br>
-diff --git a/testcases/kernel/sched/<wbr>hyperthreading/ht_interrupt/<wbr>ht_utils.h b/testcases/kernel/sched/<wbr>hyperthreading/ht_interrupt/<wbr>ht_utils.h<br>
-index 2977ad0..6b484e1 100644<br>
---- a/testcases/kernel/sched/<wbr>hyperthreading/ht_interrupt/<wbr>ht_utils.h<br>
-+++ b/testcases/kernel/sched/<wbr>hyperthreading/ht_interrupt/<wbr>ht_utils.h<br>
-@@ -3,6 +3,7 @@<br>
- #define _HTUTILS_H_<br>
-<br>
- #include <stdlib.h><br>
-+#include <sys/types.h><br>
-<br>
- int is_cmdline_para(const char *para);<br>
-<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch b/meta/recipes-extended/ltp/<wbr>ltp/0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch<br>
deleted file mode 100644<br>
index 963536f..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch<br>
+++ /dev/null<br>
@@ -1,64 +0,0 @@<br>
-From f091839532f3afe0a58e8ba0b45615<wbr>c899a43a47 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 20:12:09 +0000<br>
-Subject: [PATCH 15/32] mincore01: Rename PAGESIZE to pagesize<br>
-<br>
-PAGESIZE conflicts with system headers on musl<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/syscalls/<wbr>mincore/mincore01.c | 10 +++++-----<br>
- 1 file changed, 5 insertions(+), 5 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>mincore/mincore01.c b/testcases/kernel/syscalls/<wbr>mincore/mincore01.c<br>
-index 97a3d95..fa426d1 100644<br>
---- a/testcases/kernel/syscalls/<wbr>mincore/mincore01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>mincore/mincore01.c<br>
-@@ -45,7 +45,7 @@<br>
- #include "test.h"<br>
- #include "safe_macros.h"<br>
-<br>
--static int PAGESIZE;<br>
-+static int pagesize;<br>
- static rlim_t STACK_LIMIT = 10485760;<br>
-<br>
- static void cleanup(void);<br>
-@@ -146,7 +146,7 @@ static void setup4(struct test_case_t *tc)<br>
- }<br>
-<br>
- tc->addr = global_pointer;<br>
-- tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + PAGESIZE;<br>
-+ tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + pagesize;<br>
- tc->vector = global_vec;<br>
-<br>
- /*<br>
-@@ -161,7 +161,7 @@ static void setup(void)<br>
- char *buf;<br>
- int fd;<br>
-<br>
-- PAGESIZE = getpagesize();<br>
-+ pagesize = getpagesize();<br>
-<br>
- tst_sig(NOFORK, DEF_HANDLER, cleanup);<br>
-<br>
-@@ -170,7 +170,7 @@ static void setup(void)<br>
- TEST_PAUSE;<br>
-<br>
- /* global_pointer will point to a mmapped area of global_len bytes */<br>
-- global_len = PAGESIZE * 2;<br>
-+ global_len = pagesize * 2;<br>
-<br>
- buf = SAFE_MALLOC(cleanup, global_len);<br>
- memset(buf, 42, global_len);<br>
-@@ -186,7 +186,7 @@ static void setup(void)<br>
- PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);<br>
-<br>
- global_vec = SAFE_MALLOC(cleanup,<br>
-- (global_len + PAGESIZE - 1) / PAGESIZE);<br>
-+ (global_len + pagesize - 1) / pagesize);<br>
-<br>
- SAFE_CLOSE(cleanup, fd);<br>
- }<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0016-ustat-Change-header-<wbr>from-ustat.h-to-sys-ustat.h.<wbr>patch b/meta/recipes-extended/ltp/<wbr>ltp/0016-ustat-Change-header-<wbr>from-ustat.h-to-sys-ustat.h.<wbr>patch<br>
deleted file mode 100644<br>
index 1b5b93a..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0016-ustat-Change-header-<wbr>from-ustat.h-to-sys-ustat.h.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,45 +0,0 @@<br>
-From 2b9be924bbad8a1f84ae553fdd1aa8<wbr>391aa8d2f4 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 20:15:07 +0000<br>
-Subject: [PATCH 16/32] ustat: Change header from ustat.h to sys/ustat.h<br>
-<br>
-makes it portable for musl, on glibc ustat.h is just including<br>
-sys/ustat.h too<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/syscalls/<wbr>ustat/ustat01.c | 2 +-<br>
- testcases/kernel/syscalls/<wbr>ustat/ustat02.c | 2 +-<br>
- 2 files changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>ustat/ustat01.c b/testcases/kernel/syscalls/<wbr>ustat/ustat01.c<br>
-index 01b7688..494647b 100644<br>
---- a/testcases/kernel/syscalls/<wbr>ustat/ustat01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>ustat/ustat01.c<br>
-@@ -20,8 +20,8 @@<br>
- */<br>
-<br>
- #include <unistd.h><br>
--#include <ustat.h><br>
- #include <errno.h><br>
-+#include <sys/ustat.h><br>
- #include <sys/types.h><br>
- #include <sys/stat.h><br>
- #include "test.h"<br>
-diff --git a/testcases/kernel/syscalls/<wbr>ustat/ustat02.c b/testcases/kernel/syscalls/<wbr>ustat/ustat02.c<br>
-index 4e66236..edada31 100644<br>
---- a/testcases/kernel/syscalls/<wbr>ustat/ustat02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>ustat/ustat02.c<br>
-@@ -21,8 +21,8 @@<br>
- */<br>
-<br>
- #include <unistd.h><br>
--#include <ustat.h><br>
- #include <errno.h><br>
-+#include <sys/ustat.h><br>
- #include <sys/stat.h><br>
- #include <sys/types.h><br>
- #include "test.h"<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0017-replace-sigval_t-<wbr>with-union-sigval.patch b/meta/recipes-extended/ltp/<wbr>ltp/0017-replace-sigval_t-<wbr>with-union-sigval.patch<br>
deleted file mode 100644<br>
index ed25802..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0017-replace-sigval_t-<wbr>with-union-sigval.patch<br>
+++ /dev/null<br>
@@ -1,88 +0,0 @@<br>
-From c882bcd18820b44a685f0d5edd7aaf<wbr>f77a88c912 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Thu, 7 Jan 2016 20:17:55 +0000<br>
-Subject: [PATCH 17/32] replace sigval_t with union sigval<br>
-<br>
-This makes it compatible across musl and glibc<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/syscalls/<wbr>timer_getoverrun/timer_<wbr>getoverrun01.c | 2 +-<br>
- testcases/kernel/syscalls/<wbr>timer_gettime/timer_gettime01.<wbr>c | 2 +-<br>
- testcases/kernel/timers/timer_<wbr>create/timer_create02.c | 4 ++--<br>
- testcases/kernel/timers/timer_<wbr>create/timer_create03.c | 4 ++--<br>
- 4 files changed, 6 insertions(+), 6 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/syscalls/<wbr>timer_getoverrun/timer_<wbr>getoverrun01.c b/testcases/kernel/syscalls/<wbr>timer_getoverrun/timer_<wbr>getoverrun01.c<br>
-index d186c1f..bc03544 100644<br>
---- a/testcases/kernel/syscalls/<wbr>timer_getoverrun/timer_<wbr>getoverrun01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>timer_getoverrun/timer_<wbr>getoverrun01.c<br>
-@@ -54,7 +54,7 @@ int main(int ac, char **av)<br>
-<br>
- setup();<br>
-<br>
-- ev.sigev_value = (sigval_t) 0;<br>
-+ ev.sigev_value = (union sigval) 0;<br>
- ev.sigev_signo = SIGALRM;<br>
- ev.sigev_notify = SIGEV_SIGNAL;<br>
- TEST(ltp_syscall(__NR_timer_<wbr>create, CLOCK_REALTIME, &ev, &timer));<br>
-diff --git a/testcases/kernel/syscalls/<wbr>timer_gettime/timer_gettime01.<wbr>c b/testcases/kernel/syscalls/<wbr>timer_gettime/timer_gettime01.<wbr>c<br>
-index b583aee..9371a6a 100644<br>
---- a/testcases/kernel/syscalls/<wbr>timer_gettime/timer_gettime01.<wbr>c<br>
-+++ b/testcases/kernel/syscalls/<wbr>timer_gettime/timer_gettime01.<wbr>c<br>
-@@ -55,7 +55,7 @@ int main(int ac, char **av)<br>
-<br>
- setup();<br>
-<br>
-- ev.sigev_value = (sigval_t) 0;<br>
-+ ev.sigev_value = (union sigval) 0;<br>
- ev.sigev_signo = SIGALRM;<br>
- ev.sigev_notify = SIGEV_SIGNAL;<br>
- TEST(ltp_syscall(__NR_timer_<wbr>create, CLOCK_REALTIME, &ev, &timer));<br>
-diff --git a/testcases/kernel/timers/<wbr>timer_create/timer_create02.c b/testcases/kernel/timers/<wbr>timer_create/timer_create02.c<br>
-index 7f528ed..1127400 100644<br>
---- a/testcases/kernel/timers/<wbr>timer_create/timer_create02.c<br>
-+++ b/testcases/kernel/timers/<wbr>timer_create/timer_create02.c<br>
-@@ -142,7 +142,7 @@ void setup_test(int option)<br>
- {<br>
- switch (option) {<br>
- case 0:<br>
-- evp.sigev_value = (sigval_t) 0;<br>
-+ evp.sigev_value = (union sigval) 0;<br>
- evp.sigev_signo = SIGALRM;<br>
- evp.sigev_notify = SIGEV_SIGNAL;<br>
- evp_ptr = &evp;<br>
-@@ -151,7 +151,7 @@ void setup_test(int option)<br>
- evp_ptr = NULL;<br>
- break;<br>
- case 2:<br>
-- evp.sigev_value = (sigval_t) 0;<br>
-+ evp.sigev_value = (union sigval) 0;<br>
- evp.sigev_signo = SIGALRM; /* any will do */<br>
- evp.sigev_notify = SIGEV_NONE;<br>
- evp_ptr = &evp;<br>
-diff --git a/testcases/kernel/timers/<wbr>timer_create/timer_create03.c b/testcases/kernel/timers/<wbr>timer_create/timer_create03.c<br>
-index 291fcfa..8b01bf7 100644<br>
---- a/testcases/kernel/timers/<wbr>timer_create/timer_create03.c<br>
-+++ b/testcases/kernel/timers/<wbr>timer_create/timer_create03.c<br>
-@@ -129,7 +129,7 @@ void setup_test(int option)<br>
- {<br>
- switch (option) {<br>
- case 0:<br>
-- evp.sigev_value = (sigval_t) 0;<br>
-+ evp.sigev_value = (union sigval) 0;<br>
- evp.sigev_signo = SIGALRM;<br>
- evp.sigev_notify = SIGEV_SIGNAL;<br>
- evp_ptr = &evp;<br>
-@@ -138,7 +138,7 @@ void setup_test(int option)<br>
- evp_ptr = NULL;<br>
- break;<br>
- case 2:<br>
-- evp.sigev_value = (sigval_t) 0;<br>
-+ evp.sigev_value = (union sigval) 0;<br>
- evp.sigev_signo = SIGALRM; /* any will do */<br>
- evp.sigev_notify = SIGEV_NONE;<br>
- evp_ptr = &evp;<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch b/meta/recipes-extended/ltp/<wbr>ltp/0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch<br>
deleted file mode 100644<br>
index 0a4c5f0..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch<br>
+++ /dev/null<br>
@@ -1,32 +0,0 @@<br>
-From 721e94985b9cff3e2724af7ea5be7d<wbr>005bc12dec Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 06:55:27 +0000<br>
-Subject: [PATCH 19/32] tomoyo: Replace canonicalize_file_name() with<br>
- realpath()<br>
-<br>
-canonicalize_file_name() API is specific to glibc<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/security/<wbr>tomoyo/tomoyo_filesystem_test.<wbr>c | 4 ++--<br>
- 1 file changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/security/<wbr>tomoyo/tomoyo_filesystem_test.<wbr>c b/testcases/kernel/security/<wbr>tomoyo/tomoyo_filesystem_test.<wbr>c<br>
-index da4af0f..5c1a3ca 100644<br>
---- a/testcases/kernel/security/<wbr>tomoyo/tomoyo_filesystem_test.<wbr>c<br>
-+++ b/testcases/kernel/security/<wbr>tomoyo/tomoyo_filesystem_test.<wbr>c<br>
-@@ -274,9 +274,9 @@ int main(int argc, char *argv[])<br>
- /* Test mount(). */<br>
- {<br>
- static char buf[4096];<br>
-- char *dev_ram_path = canonicalize_file_name("/dev/<wbr>ram0");<br>
-+ char *dev_ram_path = realpath("/dev/ram0", NULL);<br>
- if (!dev_ram_path)<br>
-- dev_ram_path = canonicalize_file_name("/dev/<wbr>ram");<br>
-+ dev_ram_path = realpath("/dev/ram", NULL);<br>
- if (!dev_ram_path) {<br>
- dev_ram_path = "/dev/ram0";<br>
- mknod(dev_ram_path, S_IFBLK, MKDEV(1, 0));<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0022-include-sys-types.h.<wbr>patch b/meta/recipes-extended/ltp/<wbr>ltp/0022-include-sys-types.h.<wbr>patch<br>
deleted file mode 100644<br>
index 413b44a..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0022-include-sys-types.h.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,29 +0,0 @@<br>
-From 7ac6fd51991ac61d1d7594f601d878<wbr>42060ee284 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 07:06:11 +0000<br>
-Subject: [PATCH 22/32] include sys/types.h<br>
-<br>
-Fixes<br>
-<br>
-error: unknown type name 'uint'<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_04.c | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_04.c b/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_04.c<br>
-index 72c2e60..e7e5f61 100644<br>
---- a/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_04.c<br>
-+++ b/testcases/kernel/ipc/ipc_<wbr>stress/shmem_test_04.c<br>
-@@ -65,6 +65,7 @@<br>
- #include <signal.h><br>
- #include <stdint.h><br>
- #include <sys/mman.h><br>
-+#include <sys/types.h><br>
-<br>
- #ifdef _LINUX_<br>
- typedef unsigned long ulong_t;<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0027-sysconf01-Use-_SC_2_<wbr>C_VERSION-conditionally.patch b/meta/recipes-extended/ltp/<wbr>ltp/0027-sysconf01-Use-_SC_2_<wbr>C_VERSION-conditionally.patch<br>
index b47d097..f75e33b 100644<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0027-sysconf01-Use-_SC_2_<wbr>C_VERSION-conditionally.patch<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0027-sysconf01-Use-_SC_2_<wbr>C_VERSION-conditionally.patch<br>
@@ -1,29 +1,30 @@<br>
-From 4a74b275acc8158850f2500928a146<wbr>7c3482c986 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 07:23:11 +0000<br>
-Subject: [PATCH 27/32] sysconf01: Use _SC_2_C_VERSION conditionally<br>
+From 1471012164ba8f26046d4b1ce5531a<wbr>0d92805ef5 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Wed, 8 Feb 2017 16:21:16 +0800<br>
+Subject: [PATCH 4/5] sysconf01: Use _SC_2_C_VERSION conditionally<br>
<br>
_SC_2_C_VERSION is not available on musl<br>
<br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
---<br>
testcases/kernel/syscalls/<wbr>sysconf/sysconf01.c | 2 ++<br>
1 file changed, 2 insertions(+)<br>
<br>
diff --git a/testcases/kernel/syscalls/<wbr>sysconf/sysconf01.c b/testcases/kernel/syscalls/<wbr>sysconf/sysconf01.c<br>
-index 8542e77..e806943 100644<br>
+index 583deef..de93695 100644<br>
--- a/testcases/kernel/syscalls/<wbr>sysconf/sysconf01.c<br>
+++ b/testcases/kernel/syscalls/<wbr>sysconf/sysconf01.c<br>
-@@ -102,7 +102,9 @@ int main(void)<br>
- test_sysconf(_SC_ATEXIT_MAX);<br>
+@@ -103,7 +103,9 @@ int main(void)<br>
test_sysconf(_SC_2_C_BIND);<br>
test_sysconf(_SC_2_C_DEV);<br>
+ #ifdef _SC_2_C_VERSION<br>
+#ifdef __GLIBC__<br>
test_sysconf(_SC_2_C_VERSION);<br>
+#endif<br>
- /* 21 - 25 */<br>
- test_sysconf(_SC_2_CHAR_TERM);<br>
- test_sysconf(_SC_2_FORT_DEV);<br>
+ #else<br>
+ tst_resm(TCONF, "_SC_2_C_VERSION not defined");<br>
+ #endif<br>
--<br>
-2.7.0<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0029-trace_shed-Fix-build-<wbr>with-musl.patch b/meta/recipes-extended/ltp/<wbr>ltp/0029-trace_shed-Fix-build-<wbr>with-musl.patch<br>
deleted file mode 100644<br>
index f7ece9e..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0029-trace_shed-Fix-build-<wbr>with-musl.patch<br>
+++ /dev/null<br>
@@ -1,32 +0,0 @@<br>
-From 2f8a57f66a94210d34dd0361659a82<wbr>97cf3d813f Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 07:29:24 +0000<br>
-Subject: [PATCH 29/32] trace_shed: Fix build with musl<br>
-<br>
-Errors on musl are<br>
-<br>
-trace_sched.c:425:16: error: invalid operands to binary & (have<br>
-'thread_sched_t * {aka struct <anonymous> *}' and 'int')<br>
- thrd_ndx, WEXITSTATUS(status));<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/sched/tool/<wbr>trace_sched.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/kernel/sched/tool/<wbr>trace_sched.c b/testcases/kernel/sched/tool/<wbr>trace_sched.c<br>
-index 7815686..30dca5f 100644<br>
---- a/testcases/kernel/sched/tool/<wbr>trace_sched.c<br>
-+++ b/testcases/kernel/sched/tool/<wbr>trace_sched.c<br>
-@@ -422,7 +422,7 @@ int main(int argc, /* number of input parameters. */<br>
- if (status == (thread_sched_t *) - 1) {<br>
- fprintf(stderr,<br>
- "thread [%d] - process exited with errors %d\n",<br>
-- thrd_ndx, WEXITSTATUS(status));<br>
-+ thrd_ndx, WEXITSTATUS((int)status));<br>
- exit(-1);<br>
- } else {<br>
- exp_prio[thrd_ndx] = status->exp_prio;<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0030-lib-Use-PTHREAD_<wbr>MUTEX_RECURSIVE-in-place-of-<wbr>PTHREAD_.patch b/meta/recipes-extended/ltp/<wbr>ltp/0030-lib-Use-PTHREAD_<wbr>MUTEX_RECURSIVE-in-place-of-<wbr>PTHREAD_.patch<br>
index d2d6d76..c5fac9b 100644<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0030-lib-Use-PTHREAD_<wbr>MUTEX_RECURSIVE-in-place-of-<wbr>PTHREAD_.patch<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0030-lib-Use-PTHREAD_<wbr>MUTEX_RECURSIVE-in-place-of-<wbr>PTHREAD_.patch<br>
@@ -1,33 +1,33 @@<br>
-From 77c95dacffe90382a1f131c801ac56<wbr>9120d95949 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 07:32:24 +0000<br>
-Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of<br>
+From 00ba7cdd0608b1507027428f9f87b1<wbr>cb9747372b Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Thu, 9 Feb 2017 15:54:53 +0800<br>
+Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of<br>
PTHREAD_RECURSIVE_MUTEX_<wbr>INITIALIZER_NP for non-glibc<br>
<br>
e.g. musl does not implement the _NP mutex types<br>
<br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
---<br>
- lib/tst_res.c | 5 ++++-<br>
- 1 file changed, 4 insertions(+), 1 deletion(-)<br>
+ lib/tst_res.c | 4 ++++<br>
+ 1 file changed, 4 insertions(+)<br>
<br>
diff --git a/lib/tst_res.c b/lib/tst_res.c<br>
-index 5c1c58c..3244b5e 100644<br>
+index 61daaeb..435224f 100644<br>
--- a/lib/tst_res.c<br>
+++ b/lib/tst_res.c<br>
-@@ -104,8 +104,11 @@ int TEST_ERRNO;<br>
+@@ -79,7 +79,11 @@ int TEST_ERRNO;<br>
assert(strlen(buf) > 0); \<br>
} while (0)<br>
<br>
+#ifdef __GLIBC__<br>
static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_<wbr>INITIALIZER_NP;<br>
--<br>
+#else<br>
+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };<br>
+#endif<br>
- /*<br>
- * Define local function prototypes.<br>
- */<br>
+<br>
+ static void check_env(void);<br>
+ static void tst_condense(int tnum, int ttype, const char *tmesg);<br>
--<br>
-2.7.0<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0031-vma03-fix-page-size-<wbr>offset-as-per-page-size-<wbr>alignmen.patch b/meta/recipes-extended/ltp/<wbr>ltp/0031-vma03-fix-page-size-<wbr>offset-as-per-page-size-<wbr>alignmen.patch<br>
deleted file mode 100644<br>
index 473ca4c..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0031-vma03-fix-page-size-<wbr>offset-as-per-page-size-<wbr>alignmen.patch<br>
+++ /dev/null<br>
@@ -1,33 +0,0 @@<br>
-From 293ff1da06748ed4c69be6ece262d4<wbr>2e562e7298 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 07:36:19 +0000<br>
-Subject: [PATCH 31/32] vma03: fix page size offset as per page size alignment<br>
-<br>
-the offset the param of mmap2() doesn't align the page size, but,<br>
-this param allow must be a multiple of the page size as returned<br>
-by sysconf(_SC_PAGE_SIZE).<wbr>meanwhile offset * 4096 must be a<br>
-multiple of the system page size, so modify the input param of offset<br>
-pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));<br>
-<br>
-Signed-off-by: Chuang Dong <<a href="mailto:Chuang.Dong@windriver.com">Chuang.Dong@windriver.com</a>><br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/mem/vma/<wbr>vma03.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/kernel/mem/vma/<wbr>vma03.c b/testcases/kernel/mem/vma/<wbr>vma03.c<br>
-index ad8a7b4..a539233 100644<br>
---- a/testcases/kernel/mem/vma/<wbr>vma03.c<br>
-+++ b/testcases/kernel/mem/vma/<wbr>vma03.c<br>
-@@ -85,7 +85,7 @@ int main(int argc, char *argv[])<br>
- if (fd == -1)<br>
- tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);<br>
-<br>
-- pgoff = ULONG_MAX - 1;<br>
-+ pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));<br>
- map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,<br>
- fd, pgoff);<br>
- if (map == MAP_FAILED)<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0032-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch b/meta/recipes-extended/ltp/<wbr>ltp/0032-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch<br>
deleted file mode 100644<br>
index 5c6bf91..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0032-regen.sh-Include-asm-<wbr>unistd.h-explicitly.patch<br>
+++ /dev/null<br>
@@ -1,30 +0,0 @@<br>
-From 4f1905ff09c730091674818bd1b48e<wbr>e221347101 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Fri, 8 Jan 2016 08:30:29 +0000<br>
-Subject: [PATCH 32/32] regen.sh: Include asm/unistd.h explicitly<br>
-<br>
-on musl this is not included indirectly and it results in errors like<br>
-testcases/kernel/include/<wbr>linux_syscall_numbers.h:1035:<wbr>25: error:<br>
-'__NR_SYSCALL_BASE' undeclared (first use in this function)<br>
-| # define __NR_readdir (__NR_SYSCALL_BASE+ 89)<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- testcases/kernel/include/<wbr>regen.sh | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/testcases/kernel/include/<wbr>regen.sh b/testcases/kernel/include/<wbr>regen.sh<br>
-index f93f49b..ee790af 100755<br>
---- a/testcases/kernel/include/<wbr>regen.sh<br>
-+++ b/testcases/kernel/include/<wbr>regen.sh<br>
-@@ -32,6 +32,7 @@ cat << EOF > "${output_pid}"<br>
-<br>
- #include <errno.h><br>
- #include <sys/syscall.h><br>
-+#include <asm/unistd.h><br>
- #include "cleanup.c"<br>
-<br>
- #define ltp_syscall(NR, ...) ({ \\<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0035-fix-test_proc_kill-<wbr>hang.patch b/meta/recipes-extended/ltp/<wbr>ltp/0035-fix-test_proc_kill-<wbr>hang.patch<br>
index 32ae8aa..71e32a5 100644<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0035-fix-test_proc_kill-<wbr>hang.patch<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0035-fix-test_proc_kill-<wbr>hang.patch<br>
@@ -1,23 +1,32 @@<br>
-Fix test_proc_kill hanging<br>
+From f7c602b639db0d118e07d3fa7b6dee<wbr>ad0be0c72b Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Wed, 8 Feb 2017 16:17:17 +0800<br>
+Subject: [PATCH 3/5] Fix test_proc_kill hanging<br>
<br>
Sometimes the signal is delivered to memcg_process before the framework took<br>
into consideration its pid entered in the tasks. Fixed by delaying the signal<br>
send command.<br>
<br>
Signed-off-by: George Nita <<a href="mailto:george.nita@enea.com">george.nita@enea.com</a>><br>
-Upstream-Status: Pending<br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+<br>
+Upstream-Status: Pending<br>
+---<br>
+ testcases/kernel/controllers/<wbr>memcg/functional/memcg_lib.sh | 1 +<br>
+ 1 file changed, 1 insertion(+)<br>
<br>
diff --git a/testcases/kernel/<wbr>controllers/memcg/functional/<wbr>memcg_lib.sh b/testcases/kernel/<wbr>controllers/memcg/functional/<wbr>memcg_lib.sh<br>
-index ffbe006..e81bf74 100755<br>
+index b785fe3..2918cc5 100755<br>
--- a/testcases/kernel/<wbr>controllers/memcg/functional/<wbr>memcg_lib.sh<br>
+++ b/testcases/kernel/<wbr>controllers/memcg/functional/<wbr>memcg_lib.sh<br>
-@@ -220,8 +220,8 @@ test_proc_kill()<br>
-<br>
- $TEST_PATH/memcg_process $2 -s $3 &<br>
+@@ -283,6 +283,7 @@ test_proc_kill()<br>
pid=$!<br>
-- sleep 1<br>
+ TST_CHECKPOINT_WAIT 0<br>
echo $pid > tasks<br>
+ sleep 1<br>
<br>
- kill -s USR1 $pid 2> /dev/null<br>
- sleep 1<br>
+ signal_memcg_process $pid $3<br>
+<br>
+--<br>
+2.7.4<br>
+<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0037-containers-netns_<wbr>netlink-Avoid-segmentation-<wbr>fault.patch b/meta/recipes-extended/ltp/<wbr>ltp/0037-containers-netns_<wbr>netlink-Avoid-segmentation-<wbr>fault.patch<br>
deleted file mode 100644<br>
index 18d1f72..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0037-containers-netns_<wbr>netlink-Avoid-segmentation-<wbr>fault.patch<br>
+++ /dev/null<br>
@@ -1,50 +0,0 @@<br>
-From 193ce739b2a5174269a958b00c3a55<wbr>90de944e0d Mon Sep 17 00:00:00 2001<br>
-From: Huacai Chen <<a href="mailto:chenhc@lemote.com">chenhc@lemote.com</a>><br>
-Date: Thu, 27 Oct 2016 14:45:52 +0800<br>
-Subject: [PATCH] containers/netns_netlink: Avoid segmentation fault<br>
-<br>
-In order to avoid segmentation fault (use NULL as a function pointer),<br>
-this patch modify check_netns() by passing a dummy function pointer to<br>
-do_clone_unshare_test().<br>
-<br>
-Signed-off-by: Huacai Chen <<a href="mailto:chenhc@lemote.com">chenhc@lemote.com</a>><br>
-Signed-off-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz">chrubis@suse.cz</a>><br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
----<br>
- testcases/kernel/containers/<wbr>netns/netns_helper.h | 10 ++++++++--<br>
- 1 file changed, 8 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/testcases/kernel/containers/<wbr>netns/netns_helper.h b/testcases/kernel/containers/<wbr>netns/netns_helper.h<br>
-index 2a331ae..7df6dcb 100644<br>
---- a/testcases/kernel/containers/<wbr>netns/netns_helper.h<br>
-+++ b/testcases/kernel/containers/<wbr>netns/netns_helper.h<br>
-@@ -56,6 +56,12 @@ static void check_iproute(unsigned int spe_ipver)<br>
- pclose(ipf);<br>
- }<br>
-<br>
-+static int dummy(void *arg)<br>
-+{<br>
-+ (void) arg;<br>
-+ return 0;<br>
-+}<br>
-+<br>
- static void check_netns(void)<br>
- {<br>
- int pid, status;<br>
-@@ -64,8 +70,8 @@ static void check_netns(void)<br>
- tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported",<br>
- CLONE_NEWNS);<br>
-<br>
-- pid = do_clone_unshare_test(T_<wbr>UNSHARE, CLONE_NEWNET | CLONE_NEWNS, NULL,<br>
-- NULL);<br>
-+ pid = do_clone_unshare_test(T_<wbr>UNSHARE, CLONE_NEWNET | CLONE_NEWNS,<br>
-+ dummy, NULL);<br>
- if (pid == -1)<br>
- tst_brkm(TCONF | TERRNO, NULL,<br>
- "unshare syscall smoke test failed");<br>
---<br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0038-run-posix-option-<wbr>group-test-replace-CWD-qith-<wbr>PWD.patch b/meta/recipes-extended/ltp/<wbr>ltp/0038-run-posix-option-<wbr>group-test-replace-CWD-qith-<wbr>PWD.patch<br>
deleted file mode 100644<br>
index 8034152..0000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0038-run-posix-option-<wbr>group-test-replace-CWD-qith-<wbr>PWD.patch<br>
+++ /dev/null<br>
@@ -1,44 +0,0 @@<br>
-From f356775c400f40e3803d80a7bd295b<wbr>4265959c45 Mon Sep 17 00:00:00 2001<br>
-From: Vineet Gupta <<a href="mailto:Vineet.Gupta1@synopsys.com">Vineet.Gupta1@synopsys.com</a>><br>
-Date: Mon, 29 Feb 2016 14:34:40 +0530<br>
-Subject: [PATCH] run-posix-option-group-test: replace CWD qith PWD<br>
-<br>
-When running LTP Open Posix Testsuite there is lot of messages as:<br>
-<br>
-| Usage: basename FILE [SUFFIX]<br>
-|<br>
-| Strip directory path and .SUFFIX from FILE<br>
-|<br>
-| *******************<br>
-| Testing<br>
-| *******************<br>
-<br>
-This is because there is no $CWD defined in shell and it looks like $PWD<br>
-was intended instead.<br>
-<br>
-Signed-off-by: Vineet Gupta <<a href="mailto:vgupta@synopsys.com">vgupta@synopsys.com</a>><br>
-Signed-off-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz">chrubis@suse.cz</a>><br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
----<br>
- testcases/open_posix_<wbr>testsuite/bin/run-tests.sh | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/open_posix_<wbr>testsuite/bin/run-tests.sh b/testcases/open_posix_<wbr>testsuite/bin/run-tests.sh<br>
-index d4bd988..5ee5687 100755<br>
---- a/testcases/open_posix_<wbr>testsuite/bin/run-tests.sh<br>
-+++ b/testcases/open_posix_<wbr>testsuite/bin/run-tests.sh<br>
-@@ -29,7 +29,7 @@ run_test_loop() {<br>
-<br>
- cat <<EOF<br>
- *******************<br>
--Testing $(basename $CWD)<br>
-+Testing $(basename $PWD)<br>
- *******************<br>
- $(printf "PASS\t\t%3d" $NUM_PASS)<br>
- $(printf "FAIL\t\t%3d" $NUM_FAIL)<br>
---<br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0039-fcntl-fix-the-time-<wbr>def-to-use-time_t.patch b/meta/recipes-extended/ltp/<wbr>ltp/0039-fcntl-fix-the-time-<wbr>def-to-use-time_t.patch<br>
index f7e805a..c0c1dad 100644<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0039-fcntl-fix-the-time-<wbr>def-to-use-time_t.patch<br>
+++ b/meta/recipes-extended/ltp/<wbr>ltp/0039-fcntl-fix-the-time-<wbr>def-to-use-time_t.patch<br>
@@ -1,28 +1,29 @@<br>
-From 9590d073d3abe02fe0783ef8c530ae<wbr>f2e873ba9b Mon Sep 17 00:00:00 2001<br>
-From: Christopher Larson <<a href="mailto:chris_larson@mentor.com">chris_larson@mentor.com</a>><br>
-Date: Tue, 13 Dec 2016 12:48:29 -0700<br>
-Subject: [PATCH] fcntl: fix the time() def to use time_t<br>
+From 7bce3d223494803cb32897cabe6611<wbr>9076e53d89 Mon Sep 17 00:00:00 2001<br>
+From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
+Date: Wed, 8 Feb 2017 16:23:51 +0800<br>
+Subject: [PATCH 5/5] fcntl: fix the time() def to use time_t<br>
<br>
This fixes the build on X32, where long is 32-bit rather than 64-bit.<br>
<br>
Signed-off-by: Christopher Larson <<a href="mailto:chris_larson@mentor.com">chris_larson@mentor.com</a>><br>
+Signed-off-by: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
---<br>
testcases/kernel/syscalls/<wbr>fcntl/fcntl14.c | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/testcases/kernel/syscalls/<wbr>fcntl/fcntl14.c b/testcases/kernel/syscalls/<wbr>fcntl/fcntl14.c<br>
-index 3b36572..65ac8fa 100644<br>
+index c61eb24..99e3867 100644<br>
--- a/testcases/kernel/syscalls/<wbr>fcntl/fcntl14.c<br>
+++ b/testcases/kernel/syscalls/<wbr>fcntl/fcntl14.c<br>
-@@ -789,7 +789,7 @@ void dochild(void)<br>
+@@ -775,7 +775,7 @@ void dochild(void)<br>
<br>
void run_test(int file_flag, int file_mode, int seek, int start, int end)<br>
{<br>
- extern long time();<br>
+ extern time_t time();<br>
<br>
- /* reset fail to 0 for each run_test call */<br>
fail = 0;<br>
+<br>
--<br>
-2.8.0<br>
+2.7.4<br>
<br>
diff --git a/meta/recipes-extended/ltp/<a href="http://ltp_20160126.bb" rel="noreferrer" target="_blank">lt<wbr>p_20160126.bb</a> b/meta/recipes-extended/ltp/<a href="http://ltp_20170116.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170116.bb</a><br>
similarity index 77%<br>
rename from meta/recipes-extended/ltp/<a href="http://ltp_20160126.bb" rel="noreferrer" target="_blank">ltp_<wbr>20160126.bb</a><br>
rename to meta/recipes-extended/ltp/<a href="http://ltp_20170116.bb" rel="noreferrer" target="_blank">ltp_<wbr>20170116.bb</a><br>
index aaa63c2..81c11ee 100644<br>
--- a/meta/recipes-extended/ltp/<a href="http://ltp_20160126.bb" rel="noreferrer" target="_blank">lt<wbr>p_20160126.bb</a><br>
+++ b/meta/recipes-extended/ltp/<a href="http://ltp_20170116.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170116.bb</a><br>
@@ -11,9 +11,6 @@ LIC_FILES_CHKSUM = "\<br>
file://testcases/kernel/<wbr>hotplug/cpu_hotplug/COPYING;<wbr>md5=<wbr>e04a2e542b2b8629bf9cd2ba29b0fe<wbr>41 \<br>
file://testcases/open_posix_<wbr>testsuite/COPYING;md5=<wbr>216e43b72efbe4ed9017cc19c4c68b<wbr>01 \<br>
file://testcases/realtime/<wbr>COPYING;md5=<wbr>12f884d2ae1ff87c09e5b7ccc2c4ca<wbr>7e \<br>
- file://tools/netpipe-2.4/<wbr>COPYING;md5=<wbr>9e3781bb5fe787aa80e1f51f5006b6<wbr>fa \<br>
- file://tools/netpipe-2.4-ipv6/<wbr>COPYING;md5=<wbr>9e3781bb5fe787aa80e1f51f5006b6<wbr>fa \<br>
- file://tools/top-LTP/proc/<wbr>COPYING;md5=<wbr>aefc88eb8a41672fbfcfe6b69ab8c4<wbr>9c \<br>
file://tools/pounder21/<wbr>COPYING;md5=<wbr>94d55d512a9ba36caa9b7df079bae1<wbr>9f \<br>
file://utils/benchmark/<wbr>kernbench-0.42/COPYING;md5=<wbr>94d55d512a9ba36caa9b7df079bae1<wbr>9f \<br>
file://utils/ffsb-6.0-rc2/<wbr>COPYING;md5=<wbr>c46082167a314d785d012a244748d8<wbr>03 \<br>
@@ -24,49 +21,35 @@ DEPENDS_append_libc-musl = " fts "<br>
EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "<br>
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"<br>
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"<br>
-SRCREV = "<wbr>fce797676b14f50406718e7ef640b5<wbr>0da66c9b36"<br>
+SRCREV = "<wbr>2c8457b0769fc026e4e1772f4c2a6d<wbr>a0be63a631"<br>
<br>
SRC_URI = "git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-<wbr>project/ltp.git</a> \<br>
- file://0001-ltp-Don-t-link-<wbr>against-libfl.patch \<br>
+ file://0001-add-_GNU_SOURCE-<wbr>to-pec_listener.c.patch \<br>
file://0002-Add-knob-to-<wbr>control-whether-numa-support-<wbr>should-be-c.patch \<br>
file://0003-Add-knob-to-<wbr>control-tirpc-support.patch \<br>
file://0004-build-Add-option-<wbr>to-select-libc-implementation.<wbr>patch \<br>
file://0005-kernel-<wbr>controllers-Link-with-libfts-<wbr>explicitly-on-mu.patch \<br>
- file://0006-sendfile-Use-<wbr>off64_t-instead-of-__off64_t.<wbr>patch \<br>
- file://0007-replace-SIGCLD-<wbr>with-SIGCHLD.patch \<br>
+ file://0006-fix-PATH_MAX-<wbr>undeclared-when-building-with-<wbr>musl.patch \<br>
+ file://0007-fix-__WORDSIZE-<wbr>undeclared-when-building-with-<wbr>musl.patch \<br>
file://0008-Check-if-__GLIBC_<wbr>PREREQ-is-defined-before-<wbr>using-it.patch \<br>
- file://0009-Guard-error.h-<wbr>with-__GLIBC__.patch \<br>
+ file://0009-fix-redefinition-<wbr>of-struct-msgbuf-error-<wbr>building-wit.patch \<br>
file://0010-replace-__BEGIN_<wbr>DECLS-and-__END_DECLS.patch \<br>
file://0011-Rename-sigset-<wbr>variable-to-sigset1.patch \<br>
- file://0012-fsstress.c-<wbr>Replace-__int64_t-with-int64_<wbr>t.patch \<br>
- file://0013-include-fcntl.h-<wbr>for-getting-O_-definitions.<wbr>patch \<br>
- file://0014-hyperthreading-<wbr>Include-sys-types.h-for-pid_t-<wbr>definit.patch \<br>
- file://0015-mincore01-Rename-<wbr>PAGESIZE-to-pagesize.patch \<br>
- file://0016-ustat-Change-<wbr>header-from-ustat.h-to-sys-<wbr>ustat.h.patch \<br>
- file://0017-replace-sigval_t-<wbr>with-union-sigval.patch \<br>
file://0018-guard-mallocopt-<wbr>with-__GLIBC__.patch \<br>
- file://0019-tomoyo-Replace-<wbr>canonicalize_file_name-with-<wbr>realpath.patch \<br>
file://0020-getdents-define-<wbr>getdents-getdents64-only-for-<wbr>glibc.patch \<br>
file://0021-Define-_GNU_<wbr>SOURCE-for-MREMAP_MAYMOVE-<wbr>definition.patch \<br>
- file://0022-include-sys-types.<wbr>h.patch \<br>
file://0023-ptrace-Use-int-<wbr>instead-of-enum-__ptrace_<wbr>request.patch \<br>
file://0024-rt_sigaction-rt_<wbr>sigprocmark-Define-_GNU_<wbr>SOURCE.patch \<br>
file://0025-mc_gethost-<wbr>include-sys-types.h.patch \<br>
file://0026-crash01-Define-_<wbr>GNU_SOURCE.patch \<br>
file://0027-sysconf01-Use-_SC_<wbr>2_C_VERSION-conditionally.<wbr>patch \<br>
file://0028-rt_sigaction.h-<wbr>Use-sighandler_t-instead-of-__<wbr>sighand.patch \<br>
- file://0029-trace_shed-Fix-<wbr>build-with-musl.patch \<br>
file://0030-lib-Use-PTHREAD_<wbr>MUTEX_RECURSIVE-in-place-of-<wbr>PTHREAD_.patch \<br>
- file://0031-vma03-fix-page-<wbr>size-offset-as-per-page-size-<wbr>alignmen.patch \<br>
- file://0032-regen.sh-Include-<wbr>asm-unistd.h-explicitly.patch \<br>
file://0033-shmat1-Cover-GNU-<wbr>specific-code-under-__USE_GNU.<wbr>patch \<br>
file://0034-periodic_output.<wbr>patch \<br>
file://0035-fix-test_proc_<wbr>kill-hang.patch \<br>
file://0036-testcases-network-<wbr>nfsv4-acl-acl1.c-Security-fix-<wbr>on-s.patch \<br>
- file://0037-containers-netns_<wbr>netlink-Avoid-segmentation-<wbr>fault.patch \<br>
- file://0038-run-posix-option-<wbr>group-test-replace-CWD-qith-<wbr>PWD.patch \<br>
file://0039-fcntl-fix-the-<wbr>time-def-to-use-time_t.patch \<br>
- file://0040-containers-<wbr>userns05-use-unsigned-int-for-<wbr>ns-id.patch \<br>
"<br>
<br>
S = "${WORKDIR}/git"<br>
@@ -104,13 +87,16 @@ do_install(){<br>
# OSDL's Scaleable Test Platform, but now <a href="http://khack.osdl.org" rel="noreferrer" target="_blank">http://khack.osdl.org</a> unaccessible<br>
rm -rf ${D}/opt/ltp/bin/STPfailure_<wbr><a href="http://report.pl">report.pl</a><br>
<br>
+ # In oe-core, we doesn't support ksh and csh now, so remove in.csh and in.ksh.<br>
+ rm ${D}/opt/ltp/testcases/data/<wbr>file01/in.csh<br>
+ rm ${D}/opt/ltp/testcases/data/<wbr>file01/in.ksh<br>
# Copy POSIX test suite into ${D}/opt/ltp/testcases by manual<br>
cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases<br>
}<br>
<br>
-RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect ldd"<br>
+RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect ldd unzip gzip cpio cronie logrotate which at"<br>
<br>
-FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a"<br>
+FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/<wbr>lib.a"<br>
<br>
FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_<wbr>testsuite/* /opt/ltp/testcases/open_posix_<wbr>testsuite/conformance/* /opt/ltp/testcases/open_posix_<wbr>testsuite/Documentation/* /opt/ltp/testcases/open_posix_<wbr>testsuite/functional/* /opt/ltp/testcases/open_posix_<wbr>testsuite/include/* /opt/ltp/testcases/open_posix_<wbr>testsuite/scripts/* /opt/ltp/testcases/open_posix_<wbr>testsuite/stress/* /opt/ltp/testcases/open_posix_<wbr>testsuite/tools/*"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.8.1<br>
<br>
</font></span></blockquote></div><br></div>