* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-25 12:07 UTC (permalink / raw)
To: Patrick Ohly; +Cc: openembedded-core
In-Reply-To: <1480069993.6873.98.camel@intel.com>
On 25/11/16 11:33, Patrick Ohly wrote:
> On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
>> + if os.stat(real_rootfs_dir).st_dev ==
>> os.stat(cr_workdir).st_dev:
>> + # Optimization if both directories are on the same
>> file system:
>> + # copy using hardlinks.
>> + cp_args = "-al"
>> + else:
>> + cp_args = "-a"
>> + exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
>> new_rootfs))
>
> Not a full review (I'll leave that to Ed), just one thing which caught
> my eye: when the rootfs contains xattrs, they get lost here.
>
> Use oe.path.copyhardlinktree() instead, it also does the hardlinking
> trick.
Thanks, that's a good tip! I'll include that in the next patchset.
--
Kristian
^ permalink raw reply
* [PATCH] ltp: 20160126 -> 20160920
From: huangqy @ 2016-11-25 19:58 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Xin
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
1)Upgrade ltp from 20160126 to 20160920. 2)Delete some
patches, since they are integrated upstream.
0001-ltp-Don-t-link-against-libfl.patch
0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
0007-replace-SIGCLD-with-SIGCHLD.patch
0009-Guard-error.h-with-__GLIBC__.patch
0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
0013-include-fcntl.h-for-getting-O_-definitions.patch
0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
0017-replace-sigval_t-with-union-sigval.patch
0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
0022-include-sys-types.h.patch
0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
0029-trace_shed-Fix-build-with-musl.patch
0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
0032-regen.sh-Include-asm-unistd.h-explicitly.patch
0035-fix-test_proc_kill-hang.patch 3)Modify one patch, since the data has
been changed. 0011-Rename-sigset-variable-to-sigset1.patch 4)Add some new
patches. 0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
0002-initialize-recursive-mutex-in-a-portable-way.patch
0003-lapi-Use-sig_t-instead-of-sighandler_t.patch
0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
0005-Fix-test_proc_kill-hanging.patch
0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
.../ltp/0001-ltp-Don-t-link-against-libfl.patch | 30 --
...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
.../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 ---------------------
.../ltp/0009-Guard-error.h-with-__GLIBC__.patch | 270 --------------
.../0011-Rename-sigset-variable-to-sigset1.patch | 60 ++--
...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 ------------------
...nclude-fcntl.h-for-getting-O_-definitions.patch | 67 ----
...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64 ----
| 45 ---
.../0017-replace-sigval_t-with-union-sigval.patch | 88 -----
...lace-canonicalize_file_name-with-realpath.patch | 32 --
.../ltp/ltp/0022-include-sys-types.h.patch | 29 --
...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 29 --
...n.h-Use-sighandler_t-instead-of-__sighand.patch | 43 ---
.../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 33 --
...age-size-offset-as-per-page-size-alignmen.patch | 33 --
...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
.../ltp/ltp/0035-fix-test_proc_kill-hang.patch | 23 --
meta/recipes-extended/ltp/ltp_20160126.bb | 118 ------
21 files changed, 30 insertions(+), 1828 deletions(-)
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
delete mode 100644 meta/recipes-extended/ltp/ltp_20160126.bb
diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch b/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
deleted file mode 100644
index 585b7cb..0000000
--- a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 14985fccf7428eaa0b45decc22bfd20fd780f621 Mon Sep 17 00:00:00 2001
-From: Chong Lu <Chong.Lu@windriver.com>
-Date: Tue, 11 Mar 2014 14:47:22 +0800
-Subject: [PATCH 01/32] ltp: Don't link against libfl
-
-We have already defined yywrap function in scan.l file. After this, we no longer need to
-link against libfl and so no longer get errors about undefined references to yylex.
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- pan/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pan/Makefile b/pan/Makefile
-index 4cc6466..a4b575b 100644
---- a/pan/Makefile
-+++ b/pan/Makefile
-@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
-
- CPPFLAGS += -I$(abs_srcdir)
-
--LDLIBS += -lm $(LEXLIB)
-+LDLIBS += -lm
-
- LFLAGS += -l
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch b/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
deleted file mode 100644
index 56a48ab..0000000
--- a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fb8b895385a641d74f2186fe5f20a872209692ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 18:24:20 +0000
-Subject: [PATCH 06/32] sendfile: Use off64_t instead of __off64_t
-
-__off64_t is specific to glibc where as off64_t is widely available
-Add _GNU_SOURCE for off64_t defines from sys/types.h
-Fixes
-<command-line>:0:7: error: unknown type name 'off64_t'
-sendfile02.c:97:18: note: in expansion of macro 'OFF_T'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sendfile/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/sendfile/Makefile b/testcases/kernel/syscalls/sendfile/Makefile
-index df7b63f..1bd1b57 100644
---- a/testcases/kernel/syscalls/sendfile/Makefile
-+++ b/testcases/kernel/syscalls/sendfile/Makefile
-@@ -21,6 +21,6 @@ top_srcdir ?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- include $(abs_srcdir)/../utils/newer_64.mk
-
--%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=__off64_t
-+%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=off64_t -D_GNU_SOURCE
-
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch b/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
deleted file mode 100644
index 4be906e..0000000
--- a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-From 405c03171e4bf0edd698cb602cf7bd7fe1d0401a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:33:53 +0000
-Subject: [PATCH 07/32] replace SIGCLD with SIGCHLD
-
-its defined to use SIGCHLD anyway in
-
-bits/signum.h:#define SIGCLD SIGCHLD /* Same as SIGCHLD
-(System V). */
-
-plus it helps these tests compile with musl which adheres to posix
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_sig.c | 8 ++++----
- testcases/kernel/connectors/pec/pec_listener.c | 1 +
- testcases/kernel/fs/doio/doio.c | 4 ++--
- testcases/kernel/fs/doio/growfiles.c | 2 +-
- testcases/kernel/syscalls/fcntl/fcntl11.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl17.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl19.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl20.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl21.c | 8 ++++----
- testcases/kernel/syscalls/kill/kill02.c | 6 +++---
- testcases/kernel/syscalls/kill/kill12.c | 8 ++++----
- testcases/kernel/syscalls/mkdir/mkdir09.c | 12 ++++++------
- testcases/kernel/syscalls/sighold/sighold02.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong6.c | 2 +-
- 15 files changed, 44 insertions(+), 43 deletions(-)
-
-diff --git a/lib/tst_sig.c b/lib/tst_sig.c
-index 3af5ffd..36565e1 100644
---- a/lib/tst_sig.c
-+++ b/lib/tst_sig.c
-@@ -49,7 +49,7 @@
- fork_flag - set to FORK or NOFORK depending upon whether the
- calling program executes a fork() system call. It
- is normally the case that the calling program treats
-- SIGCLD as an expected signal if fork() is being used.
-+ SIGCHLD as an expected signal if fork() is being used.
-
- handler - a pointer to the unexpected signal handler to
- be executed after an unexpected signal has been
-@@ -82,7 +82,7 @@ static void (*tst_setup_signal(int, void (*)(int))) (int);
-
- /****************************************************************************
- * tst_sig() : set-up to catch unexpected signals. fork_flag is set to NOFORK
-- * if SIGCLD is to be an "unexpected signal", otherwise it is set to
-+ * if SIGCHLD is to be an "unexpected signal", otherwise it is set to
- * FORK. cleanup points to a cleanup routine to be executed before
- * tst_exit is called (cleanup is set to NULL if no cleanup is desired).
- * handler is a pointer to the signal handling routine (if handler is
-@@ -117,7 +117,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- for (sig = 1; sig < NSIG; sig++) {
- /*
- * SIGKILL is never unexpected.
-- * SIGCLD is only unexpected when
-+ * SIGCHLD is only unexpected when
- * no forking is being done.
- * SIGINFO is used for file quotas and should be expected
- */
-@@ -205,7 +205,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- #endif
- break;
-
-- case SIGCLD:
-+ case SIGCHLD:
- if (fork_flag == FORK)
- continue;
-
-diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c
-index a1beb13..002750a 100644
---- a/testcases/kernel/connectors/pec/pec_listener.c
-+++ b/testcases/kernel/connectors/pec/pec_listener.c
-@@ -20,6 +20,7 @@
- /* */
- /******************************************************************************/
-
-+#define _GNU_SOURCE
- #include <sys/socket.h>
- #include <sys/poll.h>
- #include <sys/types.h>
-diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
-index 4b0dec5..5f65ef9 100644
---- a/testcases/kernel/fs/doio/doio.c
-+++ b/testcases/kernel/fs/doio/doio.c
-@@ -573,7 +573,7 @@ int main(int argc, char **argv)
- case SIGTSTP:
- case SIGSTOP:
- case SIGCONT:
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGBUS:
- case SIGSEGV:
- case SIGQUIT:
-@@ -615,7 +615,7 @@ int main(int argc, char **argv)
- }
-
- sigemptyset(&block_mask);
-- sigaddset(&block_mask, SIGCLD);
-+ sigaddset(&block_mask, SIGCHLD);
- sigprocmask(SIG_BLOCK, &block_mask, &omask);
-
- /*
-diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
-index 09e7f35..bbad230 100644
---- a/testcases/kernel/fs/doio/growfiles.c
-+++ b/testcases/kernel/fs/doio/growfiles.c
-@@ -1640,7 +1640,7 @@ int set_sig(void)
- #ifdef SIGRESTART
- case SIGRESTART:
- #endif /* SIGRESTART */
-- case SIGCLD:
-+ case SIGCHLD:
- break;
-
- default:
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c
-index fa6ce53..2de2b6c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl11.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
-@@ -105,10 +105,10 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0)
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0)
- tst_brkm(TBROK | TERRNO, cleanup,
-- "sigaction(SIGCLD, ..) failed");
-+ "sigaction(SIGCHLD, ..) failed");
- }
-
- void do_child(void)
-@@ -227,7 +227,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c
-index 5b03e39..6598b20 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl17.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
-@@ -150,9 +150,9 @@ int setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- return 1;
- }
- return 0;
-@@ -381,7 +381,7 @@ void stop_children(void)
- {
- int arg;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- arg = STOP;
- child_free(child_pipe1[1], arg);
- child_free(child_pipe2[1], arg);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c
-index a542cfc..88c91d6 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl19.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
-@@ -112,9 +112,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -265,7 +265,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c
-index aa06bab..99fd783 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl20.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
-@@ -109,9 +109,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) == -1)
-- tst_brkm(TFAIL | TERRNO, cleanup, "SIGCLD signal setup failed");
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) == -1)
-+ tst_brkm(TFAIL | TERRNO, cleanup, "SIGCHLD signal setup failed");
- }
-
- void cleanup(void)
-@@ -264,7 +264,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c
-index 5307021..8f1a67c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl21.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
-@@ -110,9 +110,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -272,7 +272,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/kill/kill02.c b/testcases/kernel/syscalls/kill/kill02.c
-index 9d6cc68..08360dd 100644
---- a/testcases/kernel/syscalls/kill/kill02.c
-+++ b/testcases/kernel/syscalls/kill/kill02.c
-@@ -701,7 +701,7 @@ void setup(void)
-
- /*
- * Set to catch unexpected signals.
-- * SIGCLD is set to be ignored because we do not wait for termination status.
-+ * SIGCHLD is set to be ignored because we do not wait for termination status.
- * SIGUSR1 is set to be ignored because this is the signal we are using for
- * the test and we are not concerned with the parent getting it.
- */
-@@ -713,9 +713,9 @@ void setup(void)
- "signal(SIGUSR1, SIG_IGN) failed");
- }
-
-- if (signal(SIGCLD, SIG_IGN) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
- tst_brkm(TBROK | TERRNO, NULL,
-- "signal(SIGCLD, SIG_IGN) failed");
-+ "signal(SIGCHLD, SIG_IGN) failed");
- }
-
- TEST_PAUSE;
-diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c
-index 7a47a4a..d7c4147 100644
---- a/testcases/kernel/syscalls/kill/kill12.c
-+++ b/testcases/kernel/syscalls/kill/kill12.c
-@@ -98,7 +98,7 @@ int main(int argc, char **argv)
-
- exno = 1;
-
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
-@@ -128,7 +128,7 @@ int main(int argc, char **argv)
- sleep(1);
-
- kill(pid, sig); /* child should ignroe this sig */
-- kill(pid, SIGCLD); /* child should exit */
-+ kill(pid, SIGCHLD); /* child should exit */
-
- #ifdef BCS
- while ((npid = wait(&status)) != pid
-@@ -222,14 +222,14 @@ void do_child(void)
- int exno = 1;
-
- #ifdef UCLINUX
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
- #endif
-
- sigset(sig, SIG_IGN); /* set to ignore signal */
-- kill(getppid(), SIGCLD); /* tell parent we are ready */
-+ kill(getppid(), SIGCHLD); /* tell parent we are ready */
- while (!chflag)
- sleep(1); /* wait for parent */
-
-diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c
-index 41c20e9..07b4fb8 100644
---- a/testcases/kernel/syscalls/mkdir/mkdir09.c
-+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
-@@ -122,10 +122,10 @@ int main(int argc, char *argv[])
-
- }
-
-- /* Set up to catch SIGCLD signal */
-- if (signal(SIGCLD, chld) == SIG_ERR) {
-+ /* Set up to catch SIGCHLD signal */
-+ if (signal(SIGCHLD, chld) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error setting up SIGCLD signal, ERRNO = %d", errno);
-+ "Error setting up SIGCHLD signal, ERRNO = %d", errno);
-
- }
-
-@@ -236,9 +236,9 @@ int runtest(void)
- tst_brkm(TFAIL, cleanup,
- "Error resetting SIGTERM signal, ERRNO = %d", errno);
- }
-- if (signal(SIGCLD, SIG_DFL) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_DFL) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error resetting SIGCLD signal, ERRNO = %d", errno);
-+ "Error resetting SIGCHLD signal, ERRNO = %d", errno);
- }
-
- if (test_time) {
-@@ -372,7 +372,7 @@ void term(int sig)
-
- void chld(int sig)
- {
-- /* Routine to handle SIGCLD signal. */
-+ /* Routine to handle SIGCHLD signal. */
-
- sigchld++;
- if (jump) {
-diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c
-index e3076fb..be01874 100644
---- a/testcases/kernel/syscalls/sighold/sighold02.c
-+++ b/testcases/kernel/syscalls/sighold/sighold02.c
-@@ -77,7 +77,7 @@ static int sigs_map[NUMSIGS];
- static int skip_sig(int sig)
- {
- switch (sig) {
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGKILL:
- case SIGALRM:
- case SIGSTOP:
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong.c b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-index 1196312..5b06798 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- tst_resm(TINFO, "Create a child process to continue to send packets");
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong6.c b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-index 9747f58..0a0fb1d 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-@@ -153,7 +153,7 @@ char *argv[];
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- printf("Create a child process to continue to send packets \n");
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
deleted file mode 100644
index e58e5a9..0000000
--- a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 4ba19d64e95a874995d0b554b891b5ec35bd9495 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:45:35 +0000
-Subject: [PATCH 09/32] Guard error.h with __GLIBC__
-
-error API is specific to glibc so use the guard to make it conditional
-on glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/faccessat/faccessat01.c | 2 ++
- testcases/kernel/syscalls/fallocate/fallocate01.c | 2 ++
- testcases/kernel/syscalls/fchmodat/fchmodat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat02.c | 2 ++
- testcases/kernel/syscalls/fstatat/fstatat01.c | 2 ++
- testcases/kernel/syscalls/futimesat/futimesat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat02.c | 2 ++
- testcases/kernel/syscalls/mkdirat/mkdirat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat02.c | 2 ++
- testcases/kernel/syscalls/openat/openat01.c | 2 ++
- testcases/kernel/syscalls/readlinkat/readlinkat01.c | 2 ++
- testcases/kernel/syscalls/renameat/renameat01.c | 2 ++
- testcases/kernel/syscalls/symlinkat/symlinkat01.c | 2 ++
- testcases/kernel/syscalls/unlinkat/unlinkat01.c | 2 ++
- 17 files changed, 34 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
-index 7f0e87a..c72dcf0 100644
---- a/testcases/kernel/syscalls/faccessat/faccessat01.c
-+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
-index e72b123..643c0e2 100644
---- a/testcases/kernel/syscalls/fallocate/fallocate01.c
-+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
-@@ -96,7 +96,9 @@
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <inttypes.h>
- #include <sys/utsname.h>
-
-diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-index 19e9ad5..ae6d807 100644
---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
-index b361253..a5218af 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat01.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
-@@ -28,7 +28,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c
-index 6b0304c..8d2863f 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat02.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
-@@ -26,7 +26,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c
-index 61531c6..e99fbd2 100644
---- a/testcases/kernel/syscalls/fstatat/fstatat01.c
-+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
-@@ -48,7 +48,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
-index ae8d4fe..316dd78 100644
---- a/testcases/kernel/syscalls/futimesat/futimesat01.c
-+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
-index fc0687b..83cbfe7 100644
---- a/testcases/kernel/syscalls/linkat/linkat01.c
-+++ b/testcases/kernel/syscalls/linkat/linkat01.c
-@@ -49,7 +49,9 @@
- #include <sys/time.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c
-index e9a752a..8d7e431 100644
---- a/testcases/kernel/syscalls/linkat/linkat02.c
-+++ b/testcases/kernel/syscalls/linkat/linkat02.c
-@@ -23,7 +23,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-index 7e15947..1dbc038 100644
---- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
-index 26e5538..f034f05 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat01.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c
-index f6368fa..7d0f7c0 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat02.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
-index 85f9a91..4ee0117 100644
---- a/testcases/kernel/syscalls/openat/openat01.c
-+++ b/testcases/kernel/syscalls/openat/openat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-index 97a49e8..b162853 100644
---- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-@@ -29,7 +29,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
-index f4cd51b..105a05b 100644
---- a/testcases/kernel/syscalls/renameat/renameat01.c
-+++ b/testcases/kernel/syscalls/renameat/renameat01.c
-@@ -42,7 +42,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-index 5c238d8..cb7a7e8 100644
---- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-index 31fe4e7..26f6d9a 100644
---- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
index 945280c..6eace63 100644
--- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
+++ b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
@@ -20,8 +20,8 @@ index 7203e9e..fce87d6 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
#define SIZE 16*1024
@@ -29,12 +29,12 @@ index 7203e9e..fce87d6 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -42,8 +42,8 @@ index 7203e9e..fce87d6 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
/*--------------------------------------------------------*/
@@ -55,8 +55,8 @@ index a3c9ca3..77b0fc9 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
int child();
static int rm_shm(int);
@@ -64,12 +64,12 @@ index a3c9ca3..77b0fc9 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -77,8 +77,8 @@ index a3c9ca3..77b0fc9 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
if ((shmid = shmget(key, SIZE, 0)) < 0) {
@@ -90,8 +90,8 @@ index 20fca52..6fb1d57 100644
int sig_catch = 0; /* variable to blocked/unblocked signals */
struct sigaction sa_new; /* struct to hold signal info */
--sigset_t sigset; /* signal set to hold signal lists */
-+sigset_t sigset1; /* signal set to hold signal lists */
+-sigset_t set; /* signal set to hold signal lists */
++sigset_t set1; /* signal set to hold signal lists */
sigset_t sigset2;
int main(int ac, char **av)
@@ -99,8 +99,8 @@ index 20fca52..6fb1d57 100644
* so that, signal will not be delivered to
* the test process.
*/
-- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));
-+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));
+- TEST(sigprocmask(SIG_BLOCK, &set, 0));
++ TEST(sigprocmask(SIG_BLOCK, &set1, 0));
/* Get the process id of test process */
my_pid = getpid();
@@ -108,8 +108,8 @@ index 20fca52..6fb1d57 100644
*/
errno = 0;
if (sigprocmask(SIG_UNBLOCK,
-- &sigset, 0) == -1) {
-+ &sigset1, 0) == -1) {
+- &set, 0) == -1) {
++ &set1, 0) == -1) {
tst_brkm(TFAIL, cleanup,
"sigprocmask() failed "
"to unblock signal, "
@@ -117,8 +117,8 @@ index 20fca52..6fb1d57 100644
* Initialise the signal sets with the list that
* excludes/includes all system-defined signals.
*/
-- if (sigemptyset(&sigset) == -1) {
-+ if (sigemptyset(&sigset1) == -1) {
+- if (sigemptyset(&set) == -1) {
++ if (sigemptyset(&set1) == -1) {
tst_brkm(TFAIL, cleanup,
"sigemptyset() failed, errno=%d : %s",
errno, strerror(errno));
@@ -126,8 +126,8 @@ index 20fca52..6fb1d57 100644
* Add specified signal (SIGINT) to the signal set
* which excludes system-defined signals.
*/
-- if (sigaddset(&sigset, SIGINT) == -1) {
-+ if (sigaddset(&sigset1, SIGINT) == -1) {
+- if (sigaddset(&set, SIGINT) == -1) {
++ if (sigaddset(&set1, SIGINT) == -1) {
tst_brkm(TFAIL, cleanup,
"sigaddset() failed, errno=%d : %s",
errno, strerror(errno));
diff --git a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch b/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
deleted file mode 100644
index e1532c1..0000000
--- a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-From 54e098a366a1d773c4d7d4124f2f5aab976681c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:58:08 +0000
-Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t
-
-int64_t is defined in ISO C99
-include limits.h to get defintions of PATH_MAX
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/fs/fsstress/fsstress.c | 31 +++++++++---------
- testcases/network/nfs/nfs_fsstress/fsstress.c | 47 ++++++++++++++-------------
- 2 files changed, 40 insertions(+), 38 deletions(-)
-
-diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
-index 2f89903..89f0b19 100644
---- a/testcases/kernel/fs/fsstress/fsstress.c
-+++ b/testcases/kernel/fs/fsstress/fsstress.c
-@@ -36,6 +36,7 @@
- #ifdef HAVE_SYS_PRCTL_H
- # include <sys/prctl.h>
- #endif
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)
- __u64 last;
- __s32 nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1764,14 +1765,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
-diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
-index ac91262..a34c416 100644
---- a/testcases/network/nfs/nfs_fsstress/fsstress.c
-+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
-@@ -31,6 +31,7 @@
- */
-
- #include "global.h"
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)
- __uint64_t last;
- int nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1708,14 +1709,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch b/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
deleted file mode 100644
index 4266e4f..0000000
--- a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1ef8c32317064438ec3b37a114f5d82957f4e0c6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:05:54 +0000
-Subject: [PATCH 13/32] include fcntl.h for getting O_* definitions
-
-musl exposes this issue, with glibc fcntl.h is included via some other
-header and this problem remained latent
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_03.c | 1 +
- testcases/kernel/syscalls/mq_notify/mq_notify01.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_c.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_s.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-index c1b11fd..8be156f 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-@@ -72,6 +72,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <sys/ipc.h>
- #include <sys/mman.h>
-diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-index 4728c70..5c7846c 100644
---- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-@@ -41,6 +41,7 @@
- #include <mqueue.h>
- #include <signal.h>
- #include <stdlib.h>
-+#include <fcntl.h>
-
- #include "../utils/include_j_h.h"
-
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_c.c b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-index 449784f..38d3274 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_c.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-@@ -9,6 +9,7 @@
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_s.c b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-index 17e98ad..bce8dd1 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_s.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-@@ -6,6 +6,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <errno.h>
- #include <sys/signal.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch b/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
deleted file mode 100644
index 84d81e9..0000000
--- a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d63fefa86dac437c47b9ebbea0a82a1240aaba2c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:09:56 +0000
-Subject: [PATCH 14/32] hyperthreading: Include sys/types.h for pid_t
- definition
-
-If sys/types.h is not included then it will not define pid_t_needed
-and therefore typedef wont be included and we get errors about pid_t
-being not known
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-index 1ec9794..9084aa7 100644
---- a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-index 1ec9794..c03a124 100644
---- a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-@@ -2,6 +2,7 @@
- #ifndef _HTUTILS_H_
- #define _HTUTILS_H_
-
-+#include <sys/types.h>
- #include <stdlib.h>
-
- int is_cmdline_para(const char *para);
-diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-index 2977ad0..6b484e1 100644
---- a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch b/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
deleted file mode 100644
index 963536f..0000000
--- a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f091839532f3afe0a58e8ba0b45615c899a43a47 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:12:09 +0000
-Subject: [PATCH 15/32] mincore01: Rename PAGESIZE to pagesize
-
-PAGESIZE conflicts with system headers on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/mincore/mincore01.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/mincore/mincore01.c b/testcases/kernel/syscalls/mincore/mincore01.c
-index 97a3d95..fa426d1 100644
---- a/testcases/kernel/syscalls/mincore/mincore01.c
-+++ b/testcases/kernel/syscalls/mincore/mincore01.c
-@@ -45,7 +45,7 @@
- #include "test.h"
- #include "safe_macros.h"
-
--static int PAGESIZE;
-+static int pagesize;
- static rlim_t STACK_LIMIT = 10485760;
-
- static void cleanup(void);
-@@ -146,7 +146,7 @@ static void setup4(struct test_case_t *tc)
- }
-
- tc->addr = global_pointer;
-- tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + PAGESIZE;
-+ tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + pagesize;
- tc->vector = global_vec;
-
- /*
-@@ -161,7 +161,7 @@ static void setup(void)
- char *buf;
- int fd;
-
-- PAGESIZE = getpagesize();
-+ pagesize = getpagesize();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-@@ -170,7 +170,7 @@ static void setup(void)
- TEST_PAUSE;
-
- /* global_pointer will point to a mmapped area of global_len bytes */
-- global_len = PAGESIZE * 2;
-+ global_len = pagesize * 2;
-
- buf = SAFE_MALLOC(cleanup, global_len);
- memset(buf, 42, global_len);
-@@ -186,7 +186,7 @@ static void setup(void)
- PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
- global_vec = SAFE_MALLOC(cleanup,
-- (global_len + PAGESIZE - 1) / PAGESIZE);
-+ (global_len + pagesize - 1) / pagesize);
-
- SAFE_CLOSE(cleanup, fd);
- }
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch b/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
deleted file mode 100644
index 1b5b93a..0000000
--- a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b9be924bbad8a1f84ae553fdd1aa8391aa8d2f4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:15:07 +0000
-Subject: [PATCH 16/32] ustat: Change header from ustat.h to sys/ustat.h
-
-makes it portable for musl, on glibc ustat.h is just including
-sys/ustat.h too
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/ustat/ustat01.c | 2 +-
- testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
-index 01b7688..494647b 100644
---- a/testcases/kernel/syscalls/ustat/ustat01.c
-+++ b/testcases/kernel/syscalls/ustat/ustat01.c
-@@ -20,8 +20,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "test.h"
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index 4e66236..edada31 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -21,8 +21,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include "test.h"
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch b/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
deleted file mode 100644
index ed25802..0000000
--- a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c882bcd18820b44a685f0d5edd7aaff77a88c912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:17:55 +0000
-Subject: [PATCH 17/32] replace sigval_t with union sigval
-
-This makes it compatible across musl and glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c | 2 +-
- testcases/kernel/syscalls/timer_gettime/timer_gettime01.c | 2 +-
- testcases/kernel/timers/timer_create/timer_create02.c | 4 ++--
- testcases/kernel/timers/timer_create/timer_create03.c | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-index d186c1f..bc03544 100644
---- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-@@ -54,7 +54,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-index b583aee..9371a6a 100644
---- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-@@ -55,7 +55,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c
-index 7f528ed..1127400 100644
---- a/testcases/kernel/timers/timer_create/timer_create02.c
-+++ b/testcases/kernel/timers/timer_create/timer_create02.c
-@@ -142,7 +142,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -151,7 +151,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
-diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c
-index 291fcfa..8b01bf7 100644
---- a/testcases/kernel/timers/timer_create/timer_create03.c
-+++ b/testcases/kernel/timers/timer_create/timer_create03.c
-@@ -129,7 +129,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -138,7 +138,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch b/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
deleted file mode 100644
index 0a4c5f0..0000000
--- a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 721e94985b9cff3e2724af7ea5be7d005bc12dec Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 06:55:27 +0000
-Subject: [PATCH 19/32] tomoyo: Replace canonicalize_file_name() with
- realpath()
-
-canonicalize_file_name() API is specific to glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-index da4af0f..5c1a3ca 100644
---- a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-+++ b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
- /* Test mount(). */
- {
- static char buf[4096];
-- char *dev_ram_path = canonicalize_file_name("/dev/ram0");
-+ char *dev_ram_path = realpath("/dev/ram0", NULL);
- if (!dev_ram_path)
-- dev_ram_path = canonicalize_file_name("/dev/ram");
-+ dev_ram_path = realpath("/dev/ram", NULL);
- if (!dev_ram_path) {
- dev_ram_path = "/dev/ram0";
- mknod(dev_ram_path, S_IFBLK, MKDEV(1, 0));
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch b/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
deleted file mode 100644
index 413b44a..0000000
--- a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7ac6fd51991ac61d1d7594f601d87842060ee284 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:06:11 +0000
-Subject: [PATCH 22/32] include sys/types.h
-
-Fixes
-
-error: unknown type name 'uint'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_04.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-index 72c2e60..e7e5f61 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-@@ -65,6 +65,7 @@
- #include <signal.h>
- #include <stdint.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
-
- #ifdef _LINUX_
- typedef unsigned long ulong_t;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch b/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
deleted file mode 100644
index b47d097..0000000
--- a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a74b275acc8158850f2500928a1467c3482c986 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:23:11 +0000
-Subject: [PATCH 27/32] sysconf01: Use _SC_2_C_VERSION conditionally
-
-_SC_2_C_VERSION is not available on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c b/testcases/kernel/syscalls/sysconf/sysconf01.c
-index 8542e77..e806943 100644
---- a/testcases/kernel/syscalls/sysconf/sysconf01.c
-+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c
-@@ -102,7 +102,9 @@ int main(void)
- test_sysconf(_SC_ATEXIT_MAX);
- test_sysconf(_SC_2_C_BIND);
- test_sysconf(_SC_2_C_DEV);
-+#ifdef __GLIBC__
- test_sysconf(_SC_2_C_VERSION);
-+#endif
- /* 21 - 25 */
- test_sysconf(_SC_2_CHAR_TERM);
- test_sysconf(_SC_2_FORT_DEV);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch b/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
deleted file mode 100644
index fc82ff9..0000000
--- a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 94557fb7e1293c61145c959b8c5ffecf4a2b1069 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:24:44 +0000
-Subject: [PATCH 28/32] rt_sigaction.h: Use sighandler_t instead of
- __sighandler_t
-
-When _GNU_SOURCE is used then both typedefs are same and using
-sighandler_t makes it work on musl too
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/lapi/rt_sigaction.h | 2 +-
- testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/include/lapi/rt_sigaction.h b/include/lapi/rt_sigaction.h
-index 3a5a763..870918c 100644
---- a/include/lapi/rt_sigaction.h
-+++ b/include/lapi/rt_sigaction.h
-@@ -34,7 +34,7 @@
- #define INVAL_SA_PTR ((void *)-1)
-
- struct kernel_sigaction {
-- __sighandler_t k_sa_handler;
-+ sighandler_t k_sa_handler;
- unsigned long sa_flags;
- void (*sa_restorer) (void);
- sigset_t sa_mask;
-diff --git a/testcases/kernel/syscalls/rt_sigsuspend/Makefile b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
-index 37bc3a9..2ca7f7c 100644
---- a/testcases/kernel/syscalls/rt_sigsuspend/Makefile
-+++ b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
-@@ -19,4 +19,7 @@
- top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-+
-+CFLAGS += -D_GNU_SOURCE
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch b/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
deleted file mode 100644
index f7ece9e..0000000
--- a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2f8a57f66a94210d34dd0361659a8297cf3d813f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:29:24 +0000
-Subject: [PATCH 29/32] trace_shed: Fix build with musl
-
-Errors on musl are
-
-trace_sched.c:425:16: error: invalid operands to binary & (have
-'thread_sched_t * {aka struct <anonymous> *}' and 'int')
- thrd_ndx, WEXITSTATUS(status));
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/tool/trace_sched.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/sched/tool/trace_sched.c b/testcases/kernel/sched/tool/trace_sched.c
-index 7815686..30dca5f 100644
---- a/testcases/kernel/sched/tool/trace_sched.c
-+++ b/testcases/kernel/sched/tool/trace_sched.c
-@@ -422,7 +422,7 @@ int main(int argc, /* number of input parameters. */
- if (status == (thread_sched_t *) - 1) {
- fprintf(stderr,
- "thread [%d] - process exited with errors %d\n",
-- thrd_ndx, WEXITSTATUS(status));
-+ thrd_ndx, WEXITSTATUS((int)status));
- exit(-1);
- } else {
- exp_prio[thrd_ndx] = status->exp_prio;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
deleted file mode 100644
index d2d6d76..0000000
--- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 77c95dacffe90382a1f131c801ac569120d95949 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:32:24 +0000
-Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc
-
-e.g. musl does not implement the _NP mutex types
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_res.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/tst_res.c b/lib/tst_res.c
-index 5c1c58c..3244b5e 100644
---- a/lib/tst_res.c
-+++ b/lib/tst_res.c
-@@ -104,8 +104,11 @@ int TEST_ERRNO;
- assert(strlen(buf) > 0); \
- } while (0)
-
-+#ifdef __GLIBC__
- static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
--
-+#else
-+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };
-+#endif
- /*
- * Define local function prototypes.
- */
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch b/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
deleted file mode 100644
index 473ca4c..0000000
--- a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 293ff1da06748ed4c69be6ece262d42e562e7298 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:36:19 +0000
-Subject: [PATCH 31/32] vma03: fix page size offset as per page size alignment
-
-the offset the param of mmap2() doesn't align the page size, but,
-this param allow must be a multiple of the page size as returned
-by sysconf(_SC_PAGE_SIZE).meanwhile offset * 4096 must be a
-multiple of the system page size, so modify the input param of offset
-pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
-
-Signed-off-by: Chuang Dong <Chuang.Dong@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/mem/vma/vma03.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c
-index ad8a7b4..a539233 100644
---- a/testcases/kernel/mem/vma/vma03.c
-+++ b/testcases/kernel/mem/vma/vma03.c
-@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
- if (fd == -1)
- tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);
-
-- pgoff = ULONG_MAX - 1;
-+ pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
- map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
- fd, pgoff);
- if (map == MAP_FAILED)
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch b/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
deleted file mode 100644
index 5c6bf91..0000000
--- a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4f1905ff09c730091674818bd1b48ee221347101 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 08:30:29 +0000
-Subject: [PATCH 32/32] regen.sh: Include asm/unistd.h explicitly
-
-on musl this is not included indirectly and it results in errors like
-testcases/kernel/include/linux_syscall_numbers.h:1035:25: error:
-'__NR_SYSCALL_BASE' undeclared (first use in this function)
-| # define __NR_readdir (__NR_SYSCALL_BASE+ 89)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/include/regen.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/include/regen.sh b/testcases/kernel/include/regen.sh
-index f93f49b..ee790af 100755
---- a/testcases/kernel/include/regen.sh
-+++ b/testcases/kernel/include/regen.sh
-@@ -32,6 +32,7 @@ cat << EOF > "${output_pid}"
-
- #include <errno.h>
- #include <sys/syscall.h>
-+#include <asm/unistd.h>
- #include "cleanup.c"
-
- #define ltp_syscall(NR, ...) ({ \\
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
deleted file mode 100644
index 32ae8aa..0000000
--- a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix test_proc_kill hanging
-
-Sometimes the signal is delivered to memcg_process before the framework took
-into consideration its pid entered in the tasks. Fixed by delaying the signal
-send command.
-
-Signed-off-by: George Nita <george.nita@enea.com>
-Upstream-Status: Pending
-
-diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-index ffbe006..e81bf74 100755
---- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-@@ -220,8 +220,8 @@ test_proc_kill()
-
- $TEST_PATH/memcg_process $2 -s $3 &
- pid=$!
-- sleep 1
- echo $pid > tasks
-+ sleep 1
-
- kill -s USR1 $pid 2> /dev/null
- sleep 1
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
deleted file mode 100644
index 7ee84e3..0000000
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ /dev/null
@@ -1,118 +0,0 @@
-SUMMARY = "Linux Test Project"
-DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features."
-HOMEPAGE = "http://ltp.sourceforge.net"
-SECTION = "console/utils"
-LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
-LIC_FILES_CHKSUM = "\
- file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \
- file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
- file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
- file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \
- file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
- file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \
- file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \
- file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \
- file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://utils/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \
-"
-
-DEPENDS = "attr libaio libcap acl openssl zip-native"
-DEPENDS_append_libc-musl = " fts "
-EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
-CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "fce797676b14f50406718e7ef640b50da66c9b36"
-
-SRC_URI = "git://github.com/linux-test-project/ltp.git \
- file://0001-ltp-Don-t-link-against-libfl.patch \
- file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \
- file://0003-Add-knob-to-control-tirpc-support.patch \
- file://0004-build-Add-option-to-select-libc-implementation.patch \
- file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \
- file://0006-sendfile-Use-off64_t-instead-of-__off64_t.patch \
- file://0007-replace-SIGCLD-with-SIGCHLD.patch \
- file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
- file://0009-Guard-error.h-with-__GLIBC__.patch \
- file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \
- file://0011-Rename-sigset-variable-to-sigset1.patch \
- file://0012-fsstress.c-Replace-__int64_t-with-int64_t.patch \
- file://0013-include-fcntl.h-for-getting-O_-definitions.patch \
- file://0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch \
- file://0015-mincore01-Rename-PAGESIZE-to-pagesize.patch \
- file://0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch \
- file://0017-replace-sigval_t-with-union-sigval.patch \
- file://0018-guard-mallocopt-with-__GLIBC__.patch \
- file://0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch \
- file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \
- file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \
- file://0022-include-sys-types.h.patch \
- file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \
- file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \
- file://0025-mc_gethost-include-sys-types.h.patch \
- file://0026-crash01-Define-_GNU_SOURCE.patch \
- file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \
- file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \
- file://0029-trace_shed-Fix-build-with-musl.patch \
- file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \
- file://0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch \
- file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch \
- file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
- file://0034-periodic_output.patch \
- file://0035-fix-test_proc_kill-hang.patch \
- file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
- "
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-export prefix = "/opt/ltp"
-export exec_prefix = "/opt/ltp"
-
-PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl,"
-EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4"
-EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite "
-# ltp network/rpc test cases ftbfs when libtirpc is found
-EXTRA_OECONF += " --without-tirpc "
-
-# The makefiles make excessive use of make -C and several include testcases.mk
-# which triggers a build of the syscall header. To reproduce, build ltp,
-# then delete the header, then "make -j XX" and watch regen.sh run multiple
-# times. Its easier to generate this once here instead.
-do_compile_prepend () {
- ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h )
-}
-
-do_install(){
- install -d ${D}/opt/ltp/
- oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
-
- # fixup not deploy STPfailure_report.pl to avoid confusing about it fails to run
- # as it lacks dependency on some perl moudle such as LWP::Simple
- # And this script previously works as a tool for analyzing failures from LTP
- # runs on the OSDL's Scaleable Test Platform (STP) and it mainly accesses
- # http://khack.osdl.org to retrieve ltp test results run on
- # OSDL's Scaleable Test Platform, but now http://khack.osdl.org unaccessible
- rm -rf ${D}/opt/ltp/bin/STPfailure_report.pl
-
- # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
- cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
-}
-
-RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect ldd"
-
-FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a"
-
-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_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*"
-
-# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# However, test_arch_stripped is already stripped, so...
-INSANE_SKIP_${PN} += "already-stripped"
-
--
2.7.4
^ permalink raw reply related
* YAPQ: Perl RPM2 module versus rpm's PACKAGECONFIG[perl]?
From: Robert P. J. Day @ 2016-11-25 11:03 UTC (permalink / raw)
To: OE Core mailing list
ok, this should be the last perl issue i have for a bit ... the last
OE perl module i was after was RPM2 (Perl bindings for the RPM Package
Manager API):
https://metacpan.org/pod/RPM2
but a side question -- i can see the OE rpm recipe file, including
this snippet:
# Perl modules are not built, but they could be enabled fairly easily
# the perl module creation and installation would need to be patched.
# (currently has host perl contamination issues)
WITH_PERL = "--with-perl --without-perlembed --without-perl-urpm"
WITHOUT_PERL = "--without-perl --without-perl-urpm"
PACKAGECONFIG[perl] = "${WITH_PERL},${WITHOUT_PERL},perl,"
so ...
1) i know nothing about RPM2's API, is that the same as what i would
get from rpm being PACKAGECONFIG'ed with perl?
2) in any event, is rpm's PACKAGECONFIG[perl] still broken so that i
can't use it, anyway?
that's about it.
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* YAPQ: OE recipe for Perl module Crypt::OpenSSL::X509?
From: Robert P. J. Day @ 2016-11-25 10:47 UTC (permalink / raw)
To: OE Core mailing list
(side note: if there's a better place to ask about
finding/tweaking/writing perl modules for an OE image, let me know.
i've almost cleared my list of essential perl recipes, just a couple
more i need pretty badly, so a couple more posts coming.)
for my qemuppc image, i need a (obviously cross-compiled version of)
Crypt::OpenSSL::X509, which i can see at CPAN:
https://metacpan.org/pod/Crypt::OpenSSL::X509
which has absolutely no hope of being cross-compiled based on the
boilerplate recipe i threw together:
$ make libcrypt-openssl-x509-perl
... snip ...
| cc1: error: include location "/usr/include/openssl" is unsafe for
cross-compilation [-Werror=poison-system-directories]
| cc1: all warnings being treated as errors
| Makefile:346: recipe for target 'X509.o' failed
| make: *** [X509.o] Error 1
| ERROR: oe_runmake failed
... snip ...
not at all surprising given this in Makefile.PL:
... snip ...
requires_external_cc();
inc '-I/usr/include/openssl -I/usr/local/include/ssl -I/usr/local/ssl/include';
libs '-L/usr/lib -L/usr/local/lib -L/usr/local/ssl/lib -lcrypto';
... snip ...
so, clearly, i need to hack that source to support cross-compilation;
i guess i can find another module to use as a template and take it
from there, so two questions:
1) i'm willing to take a stab at rewriting that source to support
cross-compiling (for the educational experience), any
recommendation for a well-written reference module to use as a
starting point?
2) if someone already *has* such a recipe, hey, i'm more than happy
to use it, but i'll still take the time to figure out how to
write things like that properly.
any assistance gratefully accepted. one more perl question coming
...
rday
p.s. i'm still poring over jens rehsack's guide to cross compiling
perl:
http://www.netbsd.org/~sno/talks/nrpm/Cross-Compiling-For-Perl-Hackers-Handout.pdf
because, you know, copious free time. :-P
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* Re: [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Patrick Ohly @ 2016-11-25 10:33 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
In-Reply-To: <1480068955-17053-1-git-send-email-kristian.amlie@mender.io>
Hi!
Wow, that was fast :-)
On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
> + if os.stat(real_rootfs_dir).st_dev ==
> os.stat(cr_workdir).st_dev:
> + # Optimization if both directories are on the same
> file system:
> + # copy using hardlinks.
> + cp_args = "-al"
> + else:
> + cp_args = "-a"
> + exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
> new_rootfs))
Not a full review (I'll leave that to Ed), just one thing which caught
my eye: when the rootfs contains xattrs, they get lost here.
Use oe.path.copyhardlinktree() instead, it also does the hardlinking
trick.
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.
From: Kristian Amlie @ 2016-11-25 10:15 UTC (permalink / raw)
To: openembedded-core
It will omit the given path from the resulting partition, and if the
given path ends in a slash, it will only delete the content, and keep
the directory.
Since mkfs only accepts whole directories as input, we need to copy
the rootfs directory to the workdir so that we can selectively delete
files from it.
Signed-off-by: Kristian Amlie <kristian.amlie@mender.io>
---
scripts/lib/wic/help.py | 6 ++++
scripts/lib/wic/ksparser.py | 1 +
scripts/lib/wic/partition.py | 1 +
scripts/lib/wic/plugins/source/rootfs.py | 51 +++++++++++++++++++++++++++++++-
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index e5347ec..9dab670 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -715,6 +715,12 @@ DESCRIPTION
partition table. It may be useful for
bootloaders.
+ --exclude-path: This option is specific to wic. It excludes the given
+ absolute path from the resulting image. If the path
+ ends with a slash, only the content of the directory
+ is omitted, not the directory itself. This option only
+ has an effect with the rootfs source plugin.
+
--extra-space: This option is specific to wic. It adds extra
space after the space filled by the content
of the partition. The final size can go
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 0894e2b..17b97fd0 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -127,6 +127,7 @@ class KickStart():
part.add_argument('mountpoint', nargs='?')
part.add_argument('--active', action='store_true')
part.add_argument('--align', type=int)
+ part.add_argument('--exclude-path', nargs='+')
part.add_argument("--extra-space", type=sizetype, default=10*1024)
part.add_argument('--fsoptions', dest='fsopts')
part.add_argument('--fstype')
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index ac4c836..cba78a5 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -45,6 +45,7 @@ class Partition():
self.align = args.align
self.disk = args.disk
self.extra_space = args.extra_space
+ self.exclude_path = args.exclude_path
self.fsopts = args.fsopts
self.fstype = args.fstype
self.label = args.label
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 425da8b..d97d99c 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -26,10 +26,11 @@
#
import os
+import shutil
from wic import msger
from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import get_bitbake_var
+from wic.utils.oe.misc import get_bitbake_var, exec_cmd
class RootfsPlugin(SourcePlugin):
"""
@@ -78,6 +79,54 @@ class RootfsPlugin(SourcePlugin):
real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
+ # Handle excluded paths.
+ if part.exclude_path is not None:
+ # We need a new rootfs directory we can delete files from. Copy to
+ # workdir.
+ new_rootfs = os.path.join(cr_workdir, "rootfs")
+
+ if os.path.lexists(new_rootfs):
+ shutil.rmtree(os.path.join(new_rootfs))
+
+ if os.stat(real_rootfs_dir).st_dev == os.stat(cr_workdir).st_dev:
+ # Optimization if both directories are on the same file system:
+ # copy using hardlinks.
+ cp_args = "-al"
+ else:
+ cp_args = "-a"
+ exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir, new_rootfs))
+
+ real_rootfs_dir = new_rootfs
+
+ for orig_path in part.exclude_path:
+ path = orig_path
+ if not os.path.isabs(path):
+ msger.error("Must be absolute: --exclude-path=%s" % orig_path)
+
+ while os.path.isabs(path):
+ path = path[1:]
+
+ # Disallow '..', because doing so could be quite disastrous
+ # (we will delete the directory).
+ remaining = path
+ while True:
+ (head, tail) = os.path.split(remaining)
+ if tail == '..':
+ msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
+ elif head == "":
+ break
+ remaining = head
+
+ full_path = os.path.join(new_rootfs, path)
+
+ if path.endswith(os.sep):
+ # Delete content only.
+ for entry in os.listdir(full_path):
+ shutil.rmtree(os.path.join(full_path, entry))
+ else:
+ # Delete whole directory.
+ shutil.rmtree(full_path)
+
part.rootfs_dir = real_rootfs_dir
part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot)
--
2.7.4
^ permalink raw reply related
* meta-perl vs meta-cpan: [lib]module-build-perl-native
From: Robert P. J. Day @ 2016-11-25 9:28 UTC (permalink / raw)
To: OE Core mailing list
about to go back and try to follow that thread about OE and perl
modules, but one question about quick and dirty workarounds ... i just
ran into the (inevitable) situation where the "standard" OE layers and
meta-cpan have different naming conventions for modules, as in:
meta-perl: DEPENDS += "libmodule-build-perl-native
meta-cpan: DEPENDS += "module-build-perl-native"
which finally bit me when i wanted to add to an image the one (the
*only* one) meta-perl recipe that contains:
$ grep -r "module-build-perl-native" *
meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb:DEPENDS += "libmodule-build-perl-native \
$
which clashed trying to install files into a shared area when those
files already exist, given that numerous recipes from meta-cpan
already contain:
$ grep -hr "module-build-perl-native" *
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
DEPENDS += "module-build-perl-native"
$
i'm actually surprised there is just the one recipe that eventually
got me into trouble, and while i understand there's a long-term plan
to standardize this, what is the best short-term hack to get around
this? reproduce the recipe? .bbappend and override DEPENDS? blacklist
the one from meta-cpan and replace it?
and in the long term, unless there's a common naming convention, how
can meta-cpan be listed as an OE layer at
https://layers.openembedded.org/layerindex/branch/master/layers/?
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* [PATCH] systemd.bbclass: don't block on service restart
From: Mark Asselstine @ 2016-11-25 4:17 UTC (permalink / raw)
To: openembedded-core
The current class works fine when a recipe uses SYSTEMD_AUTO_ENABLE
'enable' and has no on device pkg_postinst(), ie when the postinst is
run as part of rootfs creation. However, when there is a component of
pkg_postinst() that is run on device the 'systemctl restart' is run as
part of the run_postinsts.service at boot. This results in the boot
spinning indefinitely with:
[ *** ] A start job is running for Run pending postinsts (7s / no limit)
The issue could potentially be that the packages service has an
'After' clause which comes later in the boot, beyond
run_postinsts.service, creating a chicken before the egg
scenario. Even service files without an 'After' clause cause this
situation however. Despite this not being the cause of the issue this
fix will prevent this scenario from happenning.
Using strace we are able to find that during boot, when
run_postinsts.service is running attempting to start or restart any
service will result in the call get stuck on poll(). Since the
run_postinsts.service does not monitor the outcome of the call to
restart we can work around this by using '--no-block'.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
meta/classes/systemd.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 7e51ed6..99a08a0 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -36,7 +36,7 @@ if type systemctl >/dev/null 2>/dev/null; then
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
- systemctl restart ${SYSTEMD_SERVICE}
+ systemctl --no-block restart ${SYSTEMD_SERVICE}
fi
fi
}
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] ltp: 20160126 -> 20160920
From: Lei, Maohui @ 2016-11-25 3:29 UTC (permalink / raw)
To: lyang0, Robert Yang, openembedded-core@lists.openembedded.org
In-Reply-To: <b355789c-3456-b3b2-7d00-524731c3dba4@windriver.com>
Hi yang
> any update for it ?
I'm sorry for late reply. Today, I will submit an update patch.
Best regards
Lei
> -----Original Message-----
> From: lyang0 [mailto:lei.yang@windriver.com]
> Sent: Wednesday, November 16, 2016 7:26 AM
> To: Robert Yang; Lei, Maohui/雷 茂慧; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] ltp: 20160126 -> 20160920
>
> any update for it ?
>
> Lei
>
>
>
> On 2016年10月17日 17:44, Robert Yang wrote:
> > Hi Maohui,
> >
> > Oe-core will release morty branch recently, so the package upgrades
> > is pending atm.
> >
> > // Robert
> >
> > On 10/17/2016 05:05 PM, Lei, Maohui wrote:
> >> Ping.
> >>
> >>
> >>
> >>> -----Original Message-----
> >>> From: openembedded-core-bounces@lists.openembedded.org
> >>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> >>> Wang Xin
> >>> Sent: Monday, September 26, 2016 4:18 PM
> >>> To: openembedded-core@lists.openembedded.org
> >>> Subject: [OE-core] [PATCH] ltp: 20160126 -> 20160920
> >>>
> >>> 1)Upgrade ltp from 20160126 to 20160920.
> >>> 2)Delete some patches, since they are integrated upstream.
> >>> 0001-ltp-Don-t-link-against-libfl.patch
> >>> 0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
> >>> 0007-replace-SIGCLD-with-SIGCHLD.patch
> >>> 0009-Guard-error.h-with-__GLIBC__.patch
> >>> 0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
> >>> 0013-include-fcntl.h-for-getting-O_-definitions.patch
> >>> 0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
> >>> 0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
> >>> 0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
> >>> 0017-replace-sigval_t-with-union-sigval.patch
> >>> 0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
> >>> 0022-include-sys-types.h.patch
> >>> 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
> >>> 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
> >>> 0029-trace_shed-Fix-build-with-musl.patch
> >>> 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
> >>> 0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
> >>> 0032-regen.sh-Include-asm-unistd.h-explicitly.patch
> >>> 0035-fix-test_proc_kill-hang.patch
> >>> 3)Modify one patch, since the data has been changed.
> >>> 0011-Rename-sigset-variable-to-sigset1.patch
> >>> 4)Add some new patches.
> >>> 0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
> >>> 0002-initialize-recursive-mutex-in-a-portable-way.patch
> >>> 0003-lapi-Use-sig_t-instead-of-sighandler_t.patch
> >>> 0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
> >>> 0005-Fix-test_proc_kill-hanging.patch
> >>> 0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
> >>>
> >>> Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
> >>> ---
> >>> ...-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch | 32 ++
> >>> .../ltp/0001-ltp-Don-t-link-against-libfl.patch | 30 --
> >>> ...tialize-recursive-mutex-in-a-portable-way.patch | 167 +++++++++
> >>> ...3-lapi-Use-sig_t-instead-of-sighandler_t.patch} | 30 +-
> >>> ...n-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch | 120 +++++++
> >>> ...patch => 0005-Fix-test_proc_kill-hanging.patch} | 25 +-
> >>> ...move-unused-__BEGIN_DECLS-and-__END_DECLS.patch | 48 +++
> >>> ...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
> >>> .../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 -------------
> >>> --------
> >>> .../ltp/0009-Guard-error.h-with-__GLIBC__.patch | 270 -------------
> >>> -
> >>> .../0011-Rename-sigset-variable-to-sigset1.patch | 60 ++--
> >>> ...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 -------------
> >>> -----
> >>> ...nclude-fcntl.h-for-getting-O_-definitions.patch | 67 ----
> >>> ...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
> >>> ...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64 ----
> >>> ...Change-header-from-ustat.h-to-sys-ustat.h.patch | 45 ---
> >>> .../0017-replace-sigval_t-with-union-sigval.patch | 88 -----
> >>> ...lace-canonicalize_file_name-with-realpath.patch | 32 --
> >>> .../ltp/ltp/0022-include-sys-types.h.patch | 29 --
> >>> ...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 29 --
> >>> .../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
> >>> ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 33 --
> >>> ...age-size-offset-as-per-page-size-alignmen.patch | 33 --
> >>> ...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
> >>> .../ltp/{ltp_20160126.bb => ltp_20160920.bb} | 27 +-
> >>> 25 files changed, 433 insertions(+), 1690 deletions(-)
> >>> create mode 100644 meta/recipes-extended/ltp/ltp/0001-Define-
> >>> __SIGRTMIN-and-__SIGRTMAX-on-musl.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-
> >>> against-libfl.patch
> >>> create mode 100644 meta/recipes-extended/ltp/ltp/0002-initialize-
> >>> recursive-mutex-in-a-portable-way.patch
> >>> rename meta/recipes-extended/ltp/ltp/{0028-rt_sigaction.h-Use-
> >>> sighandler_t-instead-of-__sighand.patch => 0003-lapi-Use-sig_t-instead-
> >>> of-sighandler_t.patch} (59%)
> >>> create mode 100644 meta/recipes-extended/ltp/ltp/0004-rt_sigaction-
> >>> rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
> >>> rename meta/recipes-extended/ltp/ltp/{0035-fix-test_proc_kill-
> >>> hang.patch => 0005-Fix-test_proc_kill-hanging.patch} (52%)
> >>> create mode 100644 meta/recipes-extended/ltp/ltp/0006-Remove-unused-
> >>> __BEGIN_DECLS-and-__END_DECLS.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0006-sendfile-Use-
> >>> off64_t-instead-of-__off64_t.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-
> >>> with-SIGCHLD.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0009-Guard-error.h-
> >>> with-__GLIBC__.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0012-fsstress.c-
> >>> Replace-__int64_t-with-int64_t.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-
> >>> for-getting-O_-definitions.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0014-hyperthreading-
> >>> Include-sys-types.h-for-pid_t-definit.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0015-mincore01-
> >>> Rename-PAGESIZE-to-pagesize.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0016-ustat-Change-
> >>> header-from-ustat.h-to-sys-ustat.h.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0017-replace-
> >>> sigval_t-with-union-sigval.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-
> >>> canonicalize_file_name-with-realpath.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-
> >>> types.h.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-
> >>> _SC_2_C_VERSION-conditionally.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-
> >>> build-with-musl.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0030-lib-Use-
> >>> PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-
> >>> size-offset-as-per-page-size-alignmen.patch
> >>> delete mode 100644 meta/recipes-extended/ltp/ltp/0032-regen.sh-
> >>> Include-asm-unistd.h-explicitly.patch
> >>> rename meta/recipes-extended/ltp/{ltp_20160126.bb => ltp_20160920.bb}
> >>> (80%)
> >>>
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-
> >>> __SIGRTMAX-on-musl.patch b/meta/recipes-extended/ltp/ltp/0001-Define-
> >>> __SIGRTMIN-and-__SIGRTMAX-on-musl.patch
> >>> new file mode 100644
> >>> index 0000000..b035804
> >>> --- /dev/null
> >>> +++ b/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-
> >>> __SIGRTMAX-on-musl.patch
> >>> @@ -0,0 +1,32 @@
> >>> +From f381b5d58ea02e9001a1885db99d577ef3e49da5 Mon Sep 17 00:00:00 2001
> >>> +From: Khem Raj <raj.khem@gmail.com>
> >>> +Date: Sat, 23 Jul 2016 05:25:32 +0000
> >>> +Subject: [PATCH 17/17] Define __SIGRTMIN and __SIGRTMAX on musl
> >>> +
> >>> +These defines are glibc internal symbols
> >>> +actually LTP should not have used it at all
> >>> +even the header in glibc states that
> >>> +
> >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> +---
> >>> + lib/Makefile | 4 ++++
> >>> + 1 file changed, 4 insertions(+)
> >>> +
> >>> +diff --git a/lib/Makefile b/lib/Makefile
> >>> +index 24d1faa..012a76f 100644
> >>> +--- a/lib/Makefile
> >>> ++++ b/lib/Makefile
> >>> +@@ -26,6 +26,10 @@ include $(top_srcdir)/include/mk/env_pre.mk
> >>> +
> >>> + CFLAGS += -I.
> >>> +
> >>> ++ifeq ($(LIBC),musl)
> >>> ++CFLAGS += -D__SIGRTMIN=32 -D__SIGRTMAX=64
> >>> ++endif
> >>> ++
> >>> + FILTER_OUT_LIBSRCS := mount_utils.c
> >>> +
> >>> + LIB := libltp.a
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-
> >>> libfl.patch b/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-
> >>> against-libfl.patch
> >>> deleted file mode 100644
> >>> index 585b7cb..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-
> >>> libfl.patch
> >>> +++ /dev/null
> >>> @@ -1,30 +0,0 @@
> >>> -From 14985fccf7428eaa0b45decc22bfd20fd780f621 Mon Sep 17 00:00:00 2001
> >>> -From: Chong Lu <Chong.Lu@windriver.com>
> >>> -Date: Tue, 11 Mar 2014 14:47:22 +0800
> >>> -Subject: [PATCH 01/32] ltp: Don't link against libfl
> >>> -
> >>> -We have already defined yywrap function in scan.l file. After this, we
> >>> no longer need to
> >>> -link against libfl and so no longer get errors about undefined
> >>> references to yylex.
> >>> -
> >>> -Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - pan/Makefile | 2 +-
> >>> - 1 file changed, 1 insertion(+), 1 deletion(-)
> >>> -
> >>> -diff --git a/pan/Makefile b/pan/Makefile
> >>> -index 4cc6466..a4b575b 100644
> >>> ---- a/pan/Makefile
> >>> -+++ b/pan/Makefile
> >>> -@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
> >>> -
> >>> - CPPFLAGS += -I$(abs_srcdir)
> >>> -
> >>> --LDLIBS += -lm $(LEXLIB)
> >>> -+LDLIBS += -lm
> >>> -
> >>> - LFLAGS += -l
> >>> -
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-
> >>> mutex-in-a-portable-way.patch b/meta/recipes-extended/ltp/ltp/0002-
> >>> initialize-recursive-mutex-in-a-portable-way.patch
> >>> new file mode 100644
> >>> index 0000000..3d01c90
> >>> --- /dev/null
> >>> +++ b/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-
> >>> a-portable-way.patch
> >>> @@ -0,0 +1,167 @@
> >>> +From 9ded0866313d7d59ea1833f318f2b5b42701422d Mon Sep 17 00:00:00 2001
> >>> +From: Khem Raj <raj.khem@gmail.com>
> >>> +Date: Thu, 21 Jul 2016 05:11:18 +0000
> >>> +Subject: [PATCH 11/17] initialize recursive mutex in a portable way
> >>> +
> >>> +PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not in POSIX
> >>> +
> >>> +use the portable way instead: pthread_once was designed for such
> >>> +cases.
> >>> +
> >>> +Link with libpthread wherever libltp is asked for
> >>> +
> >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> +---
> >>> + include/mk/testcases.mk | 2 +-
> >>> + lib/ltp.pc.in | 2 +-
> >>> + lib/newlib_tests/Makefile | 2 +-
> >>> + lib/tests/Makefile | 2 +-
> >>> + lib/tst_res.c | 18 +++++++++++++++++-
> >>> + testcases/kernel/containers/netns/Makefile | 2 +-
> >>> + testcases/kernel/containers/share/Makefile | 2 +-
> >>> + 7 files changed, 23 insertions(+), 7 deletions(-)
> >>> +
> >>> +diff --git a/include/mk/testcases.mk b/include/mk/testcases.mk
> >>> +index ea26d4f..eff0eee 100644
> >>> +--- a/include/mk/testcases.mk
> >>> ++++ b/include/mk/testcases.mk
> >>> +@@ -49,7 +49,7 @@ CPPFLAGS += -I$(abs_top_builddir)/$(TKI_DIR)
> >>> +
> >>> + INSTALL_DIR := testcases/bin
> >>> +
> >>> +-LDLIBS += -lltp
> >>> ++LDLIBS += -lltp -lpthread
> >>> +
> >>> + $(APICMDS_DIR) $(LIBLTP_DIR) $(abs_top_builddir)/$(TKI_DIR): %:
> >>> + mkdir -p "$@"
> >>> +diff --git a/lib/ltp.pc.in b/lib/ltp.pc.in
> >>> +index 9620129..63cd5f4 100644
> >>> +--- a/lib/ltp.pc.in
> >>> ++++ b/lib/ltp.pc.in
> >>> +@@ -6,5 +6,5 @@ libdir=@libdir@
> >>> + Name: LTP
> >>> + Description: Linux Test Project
> >>> + Version: @VERSION@
> >>> +-Libs: -L${libdir} -lltp
> >>> ++Libs: -L${libdir} -lltp -lpthread
> >>> + Cflags: -I${includedir}
> >>> +diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile
> >>> +index 0e4eeb8..9dd69fd 100644
> >>> +--- a/lib/newlib_tests/Makefile
> >>> ++++ b/lib/newlib_tests/Makefile
> >>> +@@ -3,7 +3,7 @@ top_srcdir ?= ../..
> >>> + include $(top_srcdir)/include/mk/env_pre.mk
> >>> +
> >>> + CFLAGS += -W -Wall
> >>> +-LDLIBS += -lltp
> >>> ++LDLIBS += -lltp -lpthread
> >>> +
> >>> + test08: CFLAGS+=-pthread
> >>> + test09: CFLAGS+=-pthread
> >>> +diff --git a/lib/tests/Makefile b/lib/tests/Makefile
> >>> +index 73a0f16..bc4476d 100644
> >>> +--- a/lib/tests/Makefile
> >>> ++++ b/lib/tests/Makefile
> >>> +@@ -3,7 +3,7 @@ top_srcdir ?= ../..
> >>> + include $(top_srcdir)/include/mk/env_pre.mk
> >>> +
> >>> + CFLAGS += -W
> >>> +-LDLIBS += -lltp
> >>> ++LDLIBS += -lltp -lpthread
> >>> +
> >>> + tst_cleanup_once: CFLAGS += -pthread
> >>> +
> >>> +diff --git a/lib/tst_res.c b/lib/tst_res.c
> >>> +index b388d0d..ab995f8 100644
> >>> +--- a/lib/tst_res.c
> >>> ++++ b/lib/tst_res.c
> >>> +@@ -79,7 +79,8 @@ int TEST_ERRNO;
> >>> + assert(strlen(buf) > 0); \
> >>> + } while (0)
> >>> +
> >>> +-static pthread_mutex_t tmutex =
> >>> PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
> >>> ++static pthread_once_t tmutex_once = PTHREAD_ONCE_INIT;
> >>> ++static pthread_mutex_t tmutex;
> >>> +
> >>> + static void check_env(void);
> >>> + static void tst_condense(int tnum, int ttype, const char *tmesg);
> >>> +@@ -142,9 +143,20 @@ const char *strttype(int ttype)
> >>> + #include "errnos.h"
> >>> + #include "signame.h"
> >>> +
> >>> ++static void init_tmutex(void)
> >>> ++{
> >>> ++ pthread_mutexattr_t attr;
> >>> ++
> >>> ++ pthread_mutexattr_init(&attr);
> >>> ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
> >>> ++ pthread_mutex_init(&tmutex, &attr);
> >>> ++ pthread_mutexattr_destroy(&attr);
> >>> ++}
> >>> ++
> >>> + static void tst_res__(const char *file, const int lineno, int ttype,
> >>> + const char *arg_fmt, ...)
> >>> + {
> >>> ++ pthread_once(&tmutex_once, init_tmutex);
> >>> + pthread_mutex_lock(&tmutex);
> >>> +
> >>> + char tmesg[USERMESG];
> >>> +@@ -233,6 +245,7 @@ void tst_flush(void)
> >>> + {
> >>> + NO_NEWLIB_ASSERT("Unknown", 0);
> >>> +
> >>> ++ pthread_once(&tmutex_once, init_tmutex);
> >>> + pthread_mutex_lock(&tmutex);
> >>> +
> >>> + /*
> >>> +@@ -369,6 +382,7 @@ void tst_exit(void)
> >>> + {
> >>> + NO_NEWLIB_ASSERT("Unknown", 0);
> >>> +
> >>> ++ pthread_once(&tmutex_once, init_tmutex);
> >>> + pthread_mutex_lock(&tmutex);
> >>> +
> >>> + tst_flush();
> >>> +@@ -441,6 +455,7 @@ static int tst_brk_entered = 0;
> >>> + static void tst_brk__(const char *file, const int lineno, int ttype,
> >>> + void (*func)(void), const char *arg_fmt, ...)
> >>> + {
> >>> ++ pthread_once(&tmutex_once, init_tmutex);
> >>> + pthread_mutex_lock(&tmutex);
> >>> +
> >>> + char tmesg[USERMESG];
> >>> +@@ -505,6 +520,7 @@ void tst_resm_hexd_(const char *file, const int
> >>> lineno, int ttype,
> >>> + {
> >>> + NO_NEWLIB_ASSERT(file, lineno);
> >>> +
> >>> ++ pthread_once(&tmutex_once, init_tmutex);
> >>> + pthread_mutex_lock(&tmutex);
> >>> +
> >>> + char tmesg[USERMESG];
> >>> +diff --git a/testcases/kernel/containers/netns/Makefile
> >>> b/testcases/kernel/containers/netns/Makefile
> >>> +index 3756a55..b2411cd 100644
> >>> +--- a/testcases/kernel/containers/netns/Makefile
> >>> ++++ b/testcases/kernel/containers/netns/Makefile
> >>> +@@ -22,6 +22,6 @@ top_srcdir ?= ../../../..
> >>> + include $(top_srcdir)/include/mk/testcases.mk
> >>> + include $(abs_srcdir)/../Makefile.inc
> >>> +
> >>> +-LDLIBS := -lclone -lltp
> >>> ++LDLIBS := -lclone -lltp -lpthread
> >>> +
> >>> + include $(top_srcdir)/include/mk/generic_leaf_target.mk
> >>> +diff --git a/testcases/kernel/containers/share/Makefile
> >>> b/testcases/kernel/containers/share/Makefile
> >>> +index 962d688..cd79f99 100644
> >>> +--- a/testcases/kernel/containers/share/Makefile
> >>> ++++ b/testcases/kernel/containers/share/Makefile
> >>> +@@ -17,6 +17,6 @@ top_srcdir ?= ../../../..
> >>> + include $(top_srcdir)/include/mk/testcases.mk
> >>> + include $(abs_srcdir)/../Makefile.inc
> >>> +
> >>> +-LDLIBS := -lltp
> >>> ++LDLIBS := -lltp -lpthread
> >>> +
> >>> + include $(top_srcdir)/include/mk/generic_leaf_target.mk
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-
> >>> sighandler_t-instead-of-__sighand.patch b/meta/recipes-
> >>> extended/ltp/ltp/0003-lapi-Use-sig_t-instead-of-sighandler_t.patch
> >>> similarity index 59%
> >>> rename from meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-
> >>> sighandler_t-instead-of-__sighand.patch
> >>> rename to meta/recipes-extended/ltp/ltp/0003-lapi-Use-sig_t-instead-of-
> >>> sighandler_t.patch
> >>> index fc82ff9..e06ddf1 100644
> >>> --- a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-
> >>> sighandler_t-instead-of-__sighand.patch
> >>> +++ b/meta/recipes-extended/ltp/ltp/0003-lapi-Use-sig_t-instead-of-
> >>> sighandler_t.patch
> >>> @@ -1,43 +1,39 @@
> >>> -From 94557fb7e1293c61145c959b8c5ffecf4a2b1069 Mon Sep 17 00:00:00 2001
> >>> +From 30d08c5522e9913a4f59de5bfdc4a4f2e9a12035 Mon Sep 17 00:00:00 2001
> >>> From: Khem Raj <raj.khem@gmail.com>
> >>> Date: Fri, 8 Jan 2016 07:24:44 +0000
> >>> -Subject: [PATCH 28/32] rt_sigaction.h: Use sighandler_t instead of
> >>> - __sighandler_t
> >>> +Subject: [PATCH 07/17] lapi: Use sig_t instead of sighandler_t
> >>>
> >>> -When _GNU_SOURCE is used then both typedefs are same and using
> >>> -sighandler_t makes it work on musl too
> >>> +sighandler_t is GNU specific
> >>>
> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ---
> >>> include/lapi/rt_sigaction.h | 2 +-
> >>> - testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++
> >>> - 2 files changed, 4 insertions(+), 1 deletion(-)
> >>> + testcases/kernel/syscalls/rt_sigsuspend/Makefile | 1 +
> >>> + 2 files changed, 2 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/include/lapi/rt_sigaction.h b/include/lapi/rt_sigaction.h
> >>> -index 3a5a763..870918c 100644
> >>> +index 66ccb3e..ba064e9 100644
> >>> --- a/include/lapi/rt_sigaction.h
> >>> +++ b/include/lapi/rt_sigaction.h
> >>> -@@ -34,7 +34,7 @@
> >>> - #define INVAL_SA_PTR ((void *)-1)
> >>> -
> >>> +@@ -41,7 +41,7 @@ struct kernel_sigaction {
> >>> + };
> >>> + #else
> >>> struct kernel_sigaction {
> >>> - __sighandler_t k_sa_handler;
> >>> -+ sighandler_t k_sa_handler;
> >>> ++ sig_t k_sa_handler;
> >>> unsigned long sa_flags;
> >>> void (*sa_restorer) (void);
> >>> sigset_t sa_mask;
> >>> diff --git a/testcases/kernel/syscalls/rt_sigsuspend/Makefile
> >>> b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
> >>> -index 37bc3a9..2ca7f7c 100644
> >>> +index 37bc3a9..2ef86f0 100644
> >>> --- a/testcases/kernel/syscalls/rt_sigsuspend/Makefile
> >>> +++ b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
> >>> -@@ -19,4 +19,7 @@
> >>> +@@ -19,4 +19,5 @@
> >>> top_srcdir ?= ../../../..
> >>>
> >>> include $(top_srcdir)/include/mk/testcases.mk
> >>> +
> >>> -+CFLAGS += -D_GNU_SOURCE
> >>> -+
> >>> include $(top_srcdir)/include/mk/generic_leaf_target.mk
> >>> --
> >>> -2.7.0
> >>> +2.7.4
> >>>
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-
> >>> rt_sigprocmark-Replace-SA_NOMASK-with-S.patch b/meta/recipes-
> >>> extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-
> >>> with-S.patch
> >>> new file mode 100644
> >>> index 0000000..870c598
> >>> --- /dev/null
> >>> +++ b/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-
> >>> Replace-SA_NOMASK-with-S.patch
> >>> @@ -0,0 +1,120 @@
> >>> +From 4665be95ffaae035fffb88a632b6156194e5c52d Mon Sep 17 00:00:00 2001
> >>> +From: Khem Raj <raj.khem@gmail.com>
> >>> +Date: Fri, 8 Jan 2016 07:14:58 +0000
> >>> +Subject: [PATCH 04/15] rt_sigaction/rt_sigprocmark: Replace SA_NOMASK
> >>> with
> >>> + SA_NODEFER
> >>> +
> >>> +Fixes musl build failure e.g.
> >>> +error: 'SA_NOMASK' undeclared here (not in a function)
> >>> +
> >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> +---
> >>> + testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c | 4 ++--
> >>> + testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c | 5 ++---
> >>> + testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c | 4 ++--
> >>> + testcases/kernel/syscalls/sigaction/sigaction02.c | 2 +-
> >>> + testcases/misc/crash/crash01.c | 4 ++--
> >>> + testcases/misc/crash/crash02.c | 3 +--
> >>> + 6 files changed, 10 insertions(+), 12 deletions(-)
> >>> +
> >>> +diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
> >>> b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
> >>> +index 5cf89cc..e07b974 100644
> >>> +--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
> >>> ++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
> >>> +@@ -57,10 +57,10 @@ static void setup(void)
> >>> +
> >>> + static int test_flags[] =
> >>> + { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND |
> >>> SA_SIGINFO,
> >>> +-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
> >>> ++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
> >>> + char *test_flags_list[] =
> >>> + { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND",
> >>> "SA_RESETHAND|SA_SIGINFO",
> >>> +-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
> >>> ++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
> >>> +
> >>> + static void handler(int sig)
> >>> + {
> >>> +diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
> >>> b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
> >>> +index a1da743..594b260 100644
> >>> +--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
> >>> ++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
> >>> +@@ -55,10 +54,10 @@ void setup(void)
> >>> +
> >>> + static int test_flags[] =
> >>> + { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND |
> >>> SA_SIGINFO,
> >>> +-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
> >>> ++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
> >>> + char *test_flags_list[] =
> >>> + { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND",
> >>> "SA_RESETHAND|SA_SIGINFO",
> >>> +-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
> >>> ++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
> >>> +
> >>> + static struct test_case_t {
> >>> + int exp_errno;
> >>> +diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
> >>> b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
> >>> +index 175d220..991c87f 100644
> >>> +--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
> >>> ++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
> >>> +@@ -55,10 +55,10 @@ static void setup(void)
> >>> +
> >>> + static int test_flags[] =
> >>> + { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND |
> >>> SA_SIGINFO,
> >>> +-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
> >>> ++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
> >>> + char *test_flags_list[] =
> >>> + { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND",
> >>> "SA_RESETHAND|SA_SIGINFO",
> >>> +-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
> >>> ++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
> >>> +
> >>> + static struct test_case_t {
> >>> + int exp_errno;
> >>> +diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c
> >>> b/testcases/kernel/syscalls/sigaction/sigaction02.c
> >>> +index 641a04e..8641bfc 100644
> >>> +--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
> >>> ++++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
> >>> +@@ -91,7 +91,7 @@ int set_handler(int sig, int sig_to_mask, int flag)
> >>> +
> >>> + if (flag == 0) {
> >>> + sa.sa_sigaction = (void *)handler;
> >>> +- sa.sa_flags = SA_NOMASK;
> >>> ++ sa.sa_flags = SA_NODEFER;
> >>> + sigemptyset(&sa.sa_mask);
> >>> + sigaddset(&sa.sa_mask, sig_to_mask);
> >>> + err = sigaction(sig, &sa, NULL);
> >>> +diff --git a/testcases/misc/crash/crash01.c
> >>> b/testcases/misc/crash/crash01.c
> >>> +index 0574521..614b7e8 100644
> >>> +--- a/testcases/misc/crash/crash01.c
> >>> ++++ b/testcases/misc/crash/crash01.c
> >>> +@@ -409,7 +409,7 @@ void my_signal(int sig, void (*func) ())
> >>> +
> >>> + act.sa_handler = func;
> >>> + memset(&act.sa_mask, 0x00, sizeof(sigset_t));
> >>> +- act.sa_flags = SA_NOMASK | SA_RESTART;
> >>> ++ act.sa_flags = SA_NODEFER | SA_RESTART;
> >>> + sigaction(sig, &act, 0);
> >>> + }
> >>> +
> >>> +diff --git a/testcases/misc/crash/crash02.c
> >>> b/testcases/misc/crash/crash02.c
> >>> +index 00fee34..1aba3b9 100644
> >>> +--- a/testcases/misc/crash/crash02.c
> >>> ++++ b/testcases/misc/crash/crash02.c
> >>> +@@ -49,7 +49,6 @@ TODO:
> >>> + * Does a syscall is supposed to send SIGSEGV?
> >>> + */
> >>> +
> >>> +-#define _GNU_SOURCE
> >>> + #include <sys/syscall.h>
> >>> + #include <stdio.h>
> >>> + #include <stdlib.h>
> >>> +@@ -358,7 +357,7 @@ void my_signal(int sig, void (*func) ())
> >>> +
> >>> + act.sa_handler = func;
> >>> + memset(&act.sa_mask, 0x00, sizeof(sigset_t));
> >>> +- act.sa_flags = SA_NOMASK | SA_RESTART;
> >>> ++ act.sa_flags = SA_NODEFER | SA_RESTART;
> >>> + sigaction(sig, &act, 0);
> >>> + }
> >>> +
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-
> >>> hang.patch b/meta/recipes-extended/ltp/ltp/0005-Fix-test_proc_kill-
> >>> hanging.patch
> >>> similarity index 52%
> >>> rename from meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-
> >>> hang.patch
> >>> rename to meta/recipes-extended/ltp/ltp/0005-Fix-test_proc_kill-
> >>> hanging.patch
> >>> index 32ae8aa..5d0a887 100644
> >>> --- a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
> >>> +++ b/meta/recipes-extended/ltp/ltp/0005-Fix-test_proc_kill-
> >>> hanging.patch
> >>> @@ -1,23 +1,30 @@
> >>> -Fix test_proc_kill hanging
> >>> +From c6eaf473379e0ee56d94e5168a7f4f47e9c0b482 Mon Sep 17 00:00:00 2001
> >>> +From: George Nita <george.nita@enea.com>
> >>> +Date: Wed, 20 Jul 2016 20:04:59 -0700
> >>> +Subject: [PATCH 10/17] Fix test_proc_kill hanging
> >>>
> >>> Sometimes the signal is delivered to memcg_process before the
> >>> framework took
> >>> into consideration its pid entered in the tasks. Fixed by delaying the
> >>> signal
> >>> send command.
> >>>
> >>> Signed-off-by: George Nita <george.nita@enea.com>
> >>> -Upstream-Status: Pending
> >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> +---
> >>> + testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 1 +
> >>> + 1 file changed, 1 insertion(+)
> >>>
> >>> diff --git
> >>> a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> >>> b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> >>> -index ffbe006..e81bf74 100755
> >>> +index b785fe3..2918cc5 100755
> >>> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> >>> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> >>> -@@ -220,8 +220,8 @@ test_proc_kill()
> >>> -
> >>> - $TEST_PATH/memcg_process $2 -s $3 &
> >>> +@@ -283,6 +283,7 @@ test_proc_kill()
> >>> pid=$!
> >>> -- sleep 1
> >>> + TST_CHECKPOINT_WAIT 0
> >>> echo $pid > tasks
> >>> + sleep 1
> >>>
> >>> - kill -s USR1 $pid 2> /dev/null
> >>> - sleep 1
> >>> + signal_memcg_process $pid $3
> >>> +
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0006-Remove-unused-
> >>> __BEGIN_DECLS-and-__END_DECLS.patch b/meta/recipes-
> >>> extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
> >>> new file mode 100644
> >>> index 0000000..92fbf8f
> >>> --- /dev/null
> >>> +++ b/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-
> >>> and-__END_DECLS.patch
> >>> @@ -0,0 +1,48 @@
> >>> +From fc73b57669c81ea10c00e838be8931a4e58357ba Mon Sep 17 00:00:00 2001
> >>> +From: Khem Raj <raj.khem@gmail.com>
> >>> +Date: Thu, 7 Jan 2016 19:48:14 +0000
> >>> +Subject: [PATCH 03/17] Remove unused __BEGIN_DECLS and __END_DECLS
> >>> +
> >>> +Replace __s32 definitions with int32_t
> >>> +its not a generally available typedef
> >>> +
> >>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> +---
> >>> + testcases/kernel/syscalls/epoll2/include/epoll.h | 5 -----
> >>> + utils/sctp/include/netinet/sctp.h | 10 +++-------
> >>> + 2 files changed, 3 insertions(+), 12 deletions(-)
> >>> +
> >>> +diff --git a/utils/sctp/include/netinet/sctp.h
> >>> b/utils/sctp/include/netinet/sctp.h
> >>> +index 51f5bfb..c302cdb 100644
> >>> +--- a/utils/sctp/include/netinet/sctp.h
> >>> ++++ b/utils/sctp/include/netinet/sctp.h
> >>> +@@ -42,7 +42,7 @@
> >>> + extern "C" {
> >>> + #endif
> >>> +
> >>> +-typedef __s32 sctp_assoc_t;
> >>> ++typedef int32_t sctp_assoc_t;
> >>> +
> >>> + /* Socket option layer for SCTP */
> >>> + #ifndef SOL_SCTP
> >>> +@@ -658,7 +656,7 @@ struct sctp_assoc_value {
> >>> + struct sctp_paddrinfo {
> >>> + sctp_assoc_t spinfo_assoc_id;
> >>> + struct sockaddr_storage spinfo_address;
> >>> +- __s32 spinfo_state;
> >>> ++ int32_t spinfo_state;
> >>> + __u32 spinfo_cwnd;
> >>> + __u32 spinfo_srtt;
> >>> + __u32 spinfo_rto;
> >>> +@@ -693,7 +691,7 @@ enum sctp_spinfo_state {
> >>> + */
> >>> + struct sctp_status {
> >>> + sctp_assoc_t sstat_assoc_id;
> >>> +- __s32 sstat_state;
> >>> ++ int32_t sstat_state;
> >>> + __u32 sstat_rwnd;
> >>> + __u16 sstat_unackdata;
> >>> + __u16 sstat_penddata;
> >>> +--
> >>> +2.7.4
> >>> +
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-
> >>> instead-of-__off64_t.patch b/meta/recipes-extended/ltp/ltp/0006-
> >>> sendfile-Use-off64_t-instead-of-__off64_t.patch
> >>> deleted file mode 100644
> >>> index 56a48ab..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-
> >>> of-__off64_t.patch
> >>> +++ /dev/null
> >>> @@ -1,31 +0,0 @@
> >>> -From fb8b895385a641d74f2186fe5f20a872209692ed Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 18:24:20 +0000
> >>> -Subject: [PATCH 06/32] sendfile: Use off64_t instead of __off64_t
> >>> -
> >>> -__off64_t is specific to glibc where as off64_t is widely available
> >>> -Add _GNU_SOURCE for off64_t defines from sys/types.h
> >>> -Fixes
> >>> -<command-line>:0:7: error: unknown type name 'off64_t'
> >>> -sendfile02.c:97:18: note: in expansion of macro 'OFF_T'
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/sendfile/Makefile | 2 +-
> >>> - 1 file changed, 1 insertion(+), 1 deletion(-)
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/sendfile/Makefile
> >>> b/testcases/kernel/syscalls/sendfile/Makefile
> >>> -index df7b63f..1bd1b57 100644
> >>> ---- a/testcases/kernel/syscalls/sendfile/Makefile
> >>> -+++ b/testcases/kernel/syscalls/sendfile/Makefile
> >>> -@@ -21,6 +21,6 @@ top_srcdir ?= ../../../..
> >>> - include $(top_srcdir)/include/mk/testcases.mk
> >>> - include $(abs_srcdir)/../utils/newer_64.mk
> >>> -
> >>> --%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=__off64_t
> >>> -+%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=off64_t -
> >>> D_GNU_SOURCE
> >>> -
> >>> - include $(top_srcdir)/include/mk/generic_leaf_target.mk
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-
> >>> SIGCHLD.patch b/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-
> >>> SIGCHLD.patch
> >>> deleted file mode 100644
> >>> index 4be906e..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-
> >>> SIGCHLD.patch
> >>> +++ /dev/null
> >>> @@ -1,394 +0,0 @@
> >>> -From 405c03171e4bf0edd698cb602cf7bd7fe1d0401a Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 19:33:53 +0000
> >>> -Subject: [PATCH 07/32] replace SIGCLD with SIGCHLD
> >>> -
> >>> -its defined to use SIGCHLD anyway in
> >>> -
> >>> -bits/signum.h:#define SIGCLD SIGCHLD /* Same as SIGCHLD
> >>> -(System V). */
> >>> -
> >>> -plus it helps these tests compile with musl which adheres to posix
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - lib/tst_sig.c | 8 ++++----
> >>> - testcases/kernel/connectors/pec/pec_listener.c | 1 +
> >>> - testcases/kernel/fs/doio/doio.c | 4 ++--
> >>> - testcases/kernel/fs/doio/growfiles.c | 2 +-
> >>> - testcases/kernel/syscalls/fcntl/fcntl11.c | 8 ++++----
> >>> - testcases/kernel/syscalls/fcntl/fcntl17.c | 8 ++++----
> >>> - testcases/kernel/syscalls/fcntl/fcntl19.c | 8 ++++----
> >>> - testcases/kernel/syscalls/fcntl/fcntl20.c | 8 ++++----
> >>> - testcases/kernel/syscalls/fcntl/fcntl21.c | 8 ++++----
> >>> - testcases/kernel/syscalls/kill/kill02.c | 6 +++---
> >>> - testcases/kernel/syscalls/kill/kill12.c | 8 ++++----
> >>> - testcases/kernel/syscalls/mkdir/mkdir09.c | 12 ++++++------
> >>> - testcases/kernel/syscalls/sighold/sighold02.c | 2 +-
> >>> - testcases/network/tcp_cmds/perf_lan/pingpong.c | 2 +-
> >>> - testcases/network/tcp_cmds/perf_lan/pingpong6.c | 2 +-
> >>> - 15 files changed, 44 insertions(+), 43 deletions(-)
> >>> -
> >>> -diff --git a/lib/tst_sig.c b/lib/tst_sig.c
> >>> -index 3af5ffd..36565e1 100644
> >>> ---- a/lib/tst_sig.c
> >>> -+++ b/lib/tst_sig.c
> >>> -@@ -49,7 +49,7 @@
> >>> - fork_flag - set to FORK or NOFORK depending upon whether
> >>> the
> >>> - calling program executes a fork() system call. It
> >>> - is normally the case that the calling program treats
> >>> -- SIGCLD as an expected signal if fork() is being used.
> >>> -+ SIGCHLD as an expected signal if fork() is being used.
> >>> -
> >>> - handler - a pointer to the unexpected signal handler to
> >>> - be executed after an unexpected signal has been
> >>> -@@ -82,7 +82,7 @@ static void (*tst_setup_signal(int, void (*)(int)))
> >>> (int);
> >>> -
> >>> -
> >>> /**********************************************************************
> >>> ******
> >>> - * tst_sig() : set-up to catch unexpected signals. fork_flag is set
> >>> to NOFORK
> >>> -- * if SIGCLD is to be an "unexpected signal", otherwise it is set
> >>> to
> >>> -+ * if SIGCHLD is to be an "unexpected signal", otherwise it is set
> >>> to
> >>> - * FORK. cleanup points to a cleanup routine to be executed
> >>> before
> >>> - * tst_exit is called (cleanup is set to NULL if no cleanup is
> >>> desired).
> >>> - * handler is a pointer to the signal handling routine (if handler
> >>> is
> >>> -@@ -117,7 +117,7 @@ void tst_sig(int fork_flag, void (*handler) (),
> >>> void (*cleanup) ())
> >>> - for (sig = 1; sig < NSIG; sig++) {
> >>> - /*
> >>> - * SIGKILL is never unexpected.
> >>> -- * SIGCLD is only unexpected when
> >>> -+ * SIGCHLD is only unexpected when
> >>> - * no forking is being done.
> >>> - * SIGINFO is used for file quotas and should be expected
> >>> - */
> >>> -@@ -205,7 +205,7 @@ void tst_sig(int fork_flag, void (*handler) (),
> >>> void (*cleanup) ())
> >>> - #endif
> >>> - break;
> >>> -
> >>> -- case SIGCLD:
> >>> -+ case SIGCHLD:
> >>> - if (fork_flag == FORK)
> >>> - continue;
> >>> -
> >>> -diff --git a/testcases/kernel/connectors/pec/pec_listener.c
> >>> b/testcases/kernel/connectors/pec/pec_listener.c
> >>> -index a1beb13..002750a 100644
> >>> ---- a/testcases/kernel/connectors/pec/pec_listener.c
> >>> -+++ b/testcases/kernel/connectors/pec/pec_listener.c
> >>> -@@ -20,6 +20,7 @@
> >>> - /*
> >>> */
> >>> -
> >>> /**********************************************************************
> >>> ********/
> >>> -
> >>> -+#define _GNU_SOURCE
> >>> - #include <sys/socket.h>
> >>> - #include <sys/poll.h>
> >>> - #include <sys/types.h>
> >>> -diff --git a/testcases/kernel/fs/doio/doio.c
> >>> b/testcases/kernel/fs/doio/doio.c
> >>> -index 4b0dec5..5f65ef9 100644
> >>> ---- a/testcases/kernel/fs/doio/doio.c
> >>> -+++ b/testcases/kernel/fs/doio/doio.c
> >>> -@@ -573,7 +573,7 @@ int main(int argc, char **argv)
> >>> - case SIGTSTP:
> >>> - case SIGSTOP:
> >>> - case SIGCONT:
> >>> -- case SIGCLD:
> >>> -+ case SIGCHLD:
> >>> - case SIGBUS:
> >>> - case SIGSEGV:
> >>> - case SIGQUIT:
> >>> -@@ -615,7 +615,7 @@ int main(int argc, char **argv)
> >>> - }
> >>> -
> >>> - sigemptyset(&block_mask);
> >>> -- sigaddset(&block_mask, SIGCLD);
> >>> -+ sigaddset(&block_mask, SIGCHLD);
> >>> - sigprocmask(SIG_BLOCK, &block_mask, &omask);
> >>> -
> >>> - /*
> >>> -diff --git a/testcases/kernel/fs/doio/growfiles.c
> >>> b/testcases/kernel/fs/doio/growfiles.c
> >>> -index 09e7f35..bbad230 100644
> >>> ---- a/testcases/kernel/fs/doio/growfiles.c
> >>> -+++ b/testcases/kernel/fs/doio/growfiles.c
> >>> -@@ -1640,7 +1640,7 @@ int set_sig(void)
> >>> - #ifdef SIGRESTART
> >>> - case SIGRESTART:
> >>> - #endif /* SIGRESTART */
> >>> -- case SIGCLD:
> >>> -+ case SIGCHLD:
> >>> - break;
> >>> -
> >>> - default:
> >>> -diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c
> >>> b/testcases/kernel/syscalls/fcntl/fcntl11.c
> >>> -index fa6ce53..2de2b6c 100644
> >>> ---- a/testcases/kernel/syscalls/fcntl/fcntl11.c
> >>> -+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
> >>> -@@ -105,10 +105,10 @@ void setup(void)
> >>> - memset(&act, 0, sizeof(act));
> >>> - act.sa_handler = catch_child;
> >>> - sigemptyset(&act.sa_mask);
> >>> -- sigaddset(&act.sa_mask, SIGCLD);
> >>> -- if ((sigaction(SIGCLD, &act, NULL)) < 0)
> >>> -+ sigaddset(&act.sa_mask, SIGCHLD);
> >>> -+ if ((sigaction(SIGCHLD, &act, NULL)) < 0)
> >>> - tst_brkm(TBROK | TERRNO, cleanup,
> >>> -- "sigaction(SIGCLD, ..) failed");
> >>> -+ "sigaction(SIGCHLD, ..) failed");
> >>> - }
> >>> -
> >>> - void do_child(void)
> >>> -@@ -227,7 +227,7 @@ void stop_child(void)
> >>> - {
> >>> - struct flock fl;
> >>> -
> >>> -- signal(SIGCLD, SIG_DFL);
> >>> -+ signal(SIGCHLD, SIG_DFL);
> >>> - fl.l_type = STOP;
> >>> - parent_put(&fl);
> >>> - wait(0);
> >>> -diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c
> >>> b/testcases/kernel/syscalls/fcntl/fcntl17.c
> >>> -index 5b03e39..6598b20 100644
> >>> ---- a/testcases/kernel/syscalls/fcntl/fcntl17.c
> >>> -+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
> >>> -@@ -150,9 +150,9 @@ int setup(void)
> >>> - memset(&act, 0, sizeof(act));
> >>> - act.sa_handler = catch_child;
> >>> - sigemptyset(&act.sa_mask);
> >>> -- sigaddset(&act.sa_mask, SIGCLD);
> >>> -- if (sigaction(SIGCLD, &act, NULL) < 0) {
> >>> -- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d",
> >>> errno);
> >>> -+ sigaddset(&act.sa_mask, SIGCHLD);
> >>> -+ if (sigaction(SIGCHLD, &act, NULL) < 0) {
> >>> -+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d",
> >>> errno);
> >>> - return 1;
> >>> - }
> >>> - return 0;
> >>> -@@ -381,7 +381,7 @@ void stop_children(void)
> >>> - {
> >>> - int arg;
> >>> -
> >>> -- signal(SIGCLD, SIG_DFL);
> >>> -+ signal(SIGCHLD, SIG_DFL);
> >>> - arg = STOP;
> >>> - child_free(child_pipe1[1], arg);
> >>> - child_free(child_pipe2[1], arg);
> >>> -diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c
> >>> b/testcases/kernel/syscalls/fcntl/fcntl19.c
> >>> -index a542cfc..88c91d6 100644
> >>> ---- a/testcases/kernel/syscalls/fcntl/fcntl19.c
> >>> -+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
> >>> -@@ -112,9 +112,9 @@ void setup(void)
> >>> - memset(&act, 0, sizeof(act));
> >>> - act.sa_handler = catch_child;
> >>> - sigemptyset(&act.sa_mask);
> >>> -- sigaddset(&act.sa_mask, SIGCLD);
> >>> -- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
> >>> -- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d",
> >>> errno);
> >>> -+ sigaddset(&act.sa_mask, SIGCHLD);
> >>> -+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
> >>> -+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d",
> >>> errno);
> >>> - fail = 1;
> >>> - }
> >>> - }
> >>> -@@ -265,7 +265,7 @@ void stop_child(void)
> >>> - {
> >>> - struct flock fl;
> >>> -
> >>> -- signal(SIGCLD, SIG_DFL);
> >>> -+ signal(SIGCHLD, SIG_DFL);
> >>> - fl.l_type = STOP;
> >>> - parent_put(&fl);
> >>> - wait(0);
> >>> -diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c
> >>> b/testcases/kernel/syscalls/fcntl/fcntl20.c
> >>> -index aa06bab..99fd783 100644
> >>> ---- a/testcases/kernel/syscalls/fcntl/fcntl20.c
> >>> -+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
> >>> -@@ -109,9 +109,9 @@ void setup(void)
> >>> - memset(&act, 0, sizeof(act));
> >>> - act.sa_handler = catch_child;
> >>> - sigemptyset(&act.sa_mask);
> >>> -- sigaddset(&act.sa_mask, SIGCLD);
> >>> -- if (sigaction(SIGCLD, &act, NULL) == -1)
> >>> -- tst_brkm(TFAIL | TERRNO, cleanup, "SIGCLD signal setup
> >>> failed");
> >>> -+ sigaddset(&act.sa_mask, SIGCHLD);
> >>> -+ if (sigaction(SIGCHLD, &act, NULL) == -1)
> >>> -+ tst_brkm(TFAIL | TERRNO, cleanup, "SIGCHLD signal setup
> >>> failed");
> >>> - }
> >>> -
> >>> - void cleanup(void)
> >>> -@@ -264,7 +264,7 @@ void stop_child(void)
> >>> - {
> >>> - struct flock fl;
> >>> -
> >>> -- signal(SIGCLD, SIG_DFL);
> >>> -+ signal(SIGCHLD, SIG_DFL);
> >>> - fl.l_type = STOP;
> >>> - parent_put(&fl);
> >>> - wait(0);
> >>> -diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c
> >>> b/testcases/kernel/syscalls/fcntl/fcntl21.c
> >>> -index 5307021..8f1a67c 100644
> >>> ---- a/testcases/kernel/syscalls/fcntl/fcntl21.c
> >>> -+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
> >>> -@@ -110,9 +110,9 @@ void setup(void)
> >>> - memset(&act, 0, sizeof(act));
> >>> - act.sa_handler = catch_child;
> >>> - sigemptyset(&act.sa_mask);
> >>> -- sigaddset(&act.sa_mask, SIGCLD);
> >>> -- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
> >>> -- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d",
> >>> errno);
> >>> -+ sigaddset(&act.sa_mask, SIGCHLD);
> >>> -+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
> >>> -+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d",
> >>> errno);
> >>> - fail = 1;
> >>> - }
> >>> - }
> >>> -@@ -272,7 +272,7 @@ void stop_child(void)
> >>> - {
> >>> - struct flock fl;
> >>> -
> >>> -- signal(SIGCLD, SIG_DFL);
> >>> -+ signal(SIGCHLD, SIG_DFL);
> >>> - fl.l_type = STOP;
> >>> - parent_put(&fl);
> >>> - wait(0);
> >>> -diff --git a/testcases/kernel/syscalls/kill/kill02.c
> >>> b/testcases/kernel/syscalls/kill/kill02.c
> >>> -index 9d6cc68..08360dd 100644
> >>> ---- a/testcases/kernel/syscalls/kill/kill02.c
> >>> -+++ b/testcases/kernel/syscalls/kill/kill02.c
> >>> -@@ -701,7 +701,7 @@ void setup(void)
> >>> -
> >>> - /*
> >>> - * Set to catch unexpected signals.
> >>> -- * SIGCLD is set to be ignored because we do not wait for
> >>> termination status.
> >>> -+ * SIGCHLD is set to be ignored because we do not wait for
> >>> termination status.
> >>> - * SIGUSR1 is set to be ignored because this is the signal we
> >>> are using for
> >>> - * the test and we are not concerned with the parent getting it.
> >>> - */
> >>> -@@ -713,9 +713,9 @@ void setup(void)
> >>> - "signal(SIGUSR1, SIG_IGN) failed");
> >>> - }
> >>> -
> >>> -- if (signal(SIGCLD, SIG_IGN) == SIG_ERR) {
> >>> -+ if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
> >>> - tst_brkm(TBROK | TERRNO, NULL,
> >>> -- "signal(SIGCLD, SIG_IGN) failed");
> >>> -+ "signal(SIGCHLD, SIG_IGN) failed");
> >>> - }
> >>> -
> >>> - TEST_PAUSE;
> >>> -diff --git a/testcases/kernel/syscalls/kill/kill12.c
> >>> b/testcases/kernel/syscalls/kill/kill12.c
> >>> -index 7a47a4a..d7c4147 100644
> >>> ---- a/testcases/kernel/syscalls/kill/kill12.c
> >>> -+++ b/testcases/kernel/syscalls/kill/kill12.c
> >>> -@@ -98,7 +98,7 @@ int main(int argc, char **argv)
> >>> -
> >>> - exno = 1;
> >>> -
> >>> -- if (sigset(SIGCLD, chsig) == SIG_ERR) {
> >>> -+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
> >>> - fprintf(temp, "\tsigset failed, errno = %d\n", errno);
> >>> - fail_exit();
> >>> - }
> >>> -@@ -128,7 +128,7 @@ int main(int argc, char **argv)
> >>> - sleep(1);
> >>> -
> >>> - kill(pid, sig); /* child should ignroe this sig */
> >>> -- kill(pid, SIGCLD); /* child should exit */
> >>> -+ kill(pid, SIGCHLD); /* child should exit */
> >>> -
> >>> - #ifdef BCS
> >>> - while ((npid = wait(&status)) != pid
> >>> -@@ -222,14 +222,14 @@ void do_child(void)
> >>> - int exno = 1;
> >>> -
> >>> - #ifdef UCLINUX
> >>> -- if (sigset(SIGCLD, chsig) == SIG_ERR) {
> >>> -+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
> >>> - fprintf(temp, "\tsigset failed, errno = %d\n", errno);
> >>> - fail_exit();
> >>> - }
> >>> - #endif
> >>> -
> >>> - sigset(sig, SIG_IGN); /* set to ignore signal */
> >>> -- kill(getppid(), SIGCLD); /* tell parent we are ready */
> >>> -+ kill(getppid(), SIGCHLD); /* tell parent we are ready */
> >>> - while (!chflag)
> >>> - sleep(1); /* wait for parent */
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c
> >>> b/testcases/kernel/syscalls/mkdir/mkdir09.c
> >>> -index 41c20e9..07b4fb8 100644
> >>> ---- a/testcases/kernel/syscalls/mkdir/mkdir09.c
> >>> -+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
> >>> -@@ -122,10 +122,10 @@ int main(int argc, char *argv[])
> >>> -
> >>> - }
> >>> -
> >>> -- /* Set up to catch SIGCLD signal */
> >>> -- if (signal(SIGCLD, chld) == SIG_ERR) {
> >>> -+ /* Set up to catch SIGCHLD signal */
> >>> -+ if (signal(SIGCHLD, chld) == SIG_ERR) {
> >>> - tst_brkm(TFAIL, cleanup,
> >>> -- "Error setting up SIGCLD signal, ERRNO = %d", errno);
> >>> -+ "Error setting up SIGCHLD signal, ERRNO = %d",
> >>> errno);
> >>> -
> >>> - }
> >>> -
> >>> -@@ -236,9 +236,9 @@ int runtest(void)
> >>> - tst_brkm(TFAIL, cleanup,
> >>> - "Error resetting SIGTERM signal, ERRNO = %d", errno);
> >>> - }
> >>> -- if (signal(SIGCLD, SIG_DFL) == SIG_ERR) {
> >>> -+ if (signal(SIGCHLD, SIG_DFL) == SIG_ERR) {
> >>> - tst_brkm(TFAIL, cleanup,
> >>> -- "Error resetting SIGCLD signal, ERRNO = %d", errno);
> >>> -+ "Error resetting SIGCHLD signal, ERRNO = %d", errno);
> >>> - }
> >>> -
> >>> - if (test_time) {
> >>> -@@ -372,7 +372,7 @@ void term(int sig)
> >>> -
> >>> - void chld(int sig)
> >>> - {
> >>> -- /* Routine to handle SIGCLD signal. */
> >>> -+ /* Routine to handle SIGCHLD signal. */
> >>> -
> >>> - sigchld++;
> >>> - if (jump) {
> >>> -diff --git a/testcases/kernel/syscalls/sighold/sighold02.c
> >>> b/testcases/kernel/syscalls/sighold/sighold02.c
> >>> -index e3076fb..be01874 100644
> >>> ---- a/testcases/kernel/syscalls/sighold/sighold02.c
> >>> -+++ b/testcases/kernel/syscalls/sighold/sighold02.c
> >>> -@@ -77,7 +77,7 @@ static int sigs_map[NUMSIGS];
> >>> - static int skip_sig(int sig)
> >>> - {
> >>> - switch (sig) {
> >>> -- case SIGCLD:
> >>> -+ case SIGCHLD:
> >>> - case SIGKILL:
> >>> - case SIGALRM:
> >>> - case SIGSTOP:
> >>> -diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong.c
> >>> b/testcases/network/tcp_cmds/perf_lan/pingpong.c
> >>> -index 1196312..5b06798 100644
> >>> ---- a/testcases/network/tcp_cmds/perf_lan/pingpong.c
> >>> -+++ b/testcases/network/tcp_cmds/perf_lan/pingpong.c
> >>> -@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
> >>> -
> >>> - /* Setup traps */
> >>> - signal(SIGINT, finish);
> >>> -- signal(SIGCLD, finish);
> >>> -+ signal(SIGCHLD, finish);
> >>> -
> >>> - /* Fork a child process to continue sending packets */
> >>> - tst_resm(TINFO, "Create a child process to continue to send
> >>> packets");
> >>> -diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
> >>> b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
> >>> -index 9747f58..0a0fb1d 100644
> >>> ---- a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
> >>> -+++ b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
> >>> -@@ -153,7 +153,7 @@ char *argv[];
> >>> -
> >>> - /* Setup traps */
> >>> - signal(SIGINT, finish);
> >>> -- signal(SIGCLD, finish);
> >>> -+ signal(SIGCHLD, finish);
> >>> -
> >>> - /* Fork a child process to continue sending packets */
> >>> - printf("Create a child process to continue to send packets \n");
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-
> >>> __GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-
> >>> with-__GLIBC__.patch
> >>> deleted file mode 100644
> >>> index e58e5a9..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-
> >>> __GLIBC__.patch
> >>> +++ /dev/null
> >>> @@ -1,270 +0,0 @@
> >>> -From 4ba19d64e95a874995d0b554b891b5ec35bd9495 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 19:45:35 +0000
> >>> -Subject: [PATCH 09/32] Guard error.h with __GLIBC__
> >>> -
> >>> -error API is specific to glibc so use the guard to make it conditional
> >>> -on glibc
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/faccessat/faccessat01.c | 2 ++
> >>> - testcases/kernel/syscalls/fallocate/fallocate01.c | 2 ++
> >>> - testcases/kernel/syscalls/fchmodat/fchmodat01.c | 2 ++
> >>> - testcases/kernel/syscalls/fchownat/fchownat01.c | 2 ++
> >>> - testcases/kernel/syscalls/fchownat/fchownat02.c | 2 ++
> >>> - testcases/kernel/syscalls/fstatat/fstatat01.c | 2 ++
> >>> - testcases/kernel/syscalls/futimesat/futimesat01.c | 2 ++
> >>> - testcases/kernel/syscalls/linkat/linkat01.c | 2 ++
> >>> - testcases/kernel/syscalls/linkat/linkat02.c | 2 ++
> >>> - testcases/kernel/syscalls/mkdirat/mkdirat01.c | 2 ++
> >>> - testcases/kernel/syscalls/mknodat/mknodat01.c | 2 ++
> >>> - testcases/kernel/syscalls/mknodat/mknodat02.c | 2 ++
> >>> - testcases/kernel/syscalls/openat/openat01.c | 2 ++
> >>> - testcases/kernel/syscalls/readlinkat/readlinkat01.c | 2 ++
> >>> - testcases/kernel/syscalls/renameat/renameat01.c | 2 ++
> >>> - testcases/kernel/syscalls/symlinkat/symlinkat01.c | 2 ++
> >>> - testcases/kernel/syscalls/unlinkat/unlinkat01.c | 2 ++
> >>> - 17 files changed, 34 insertions(+)
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c
> >>> b/testcases/kernel/syscalls/faccessat/faccessat01.c
> >>> -index 7f0e87a..c72dcf0 100644
> >>> ---- a/testcases/kernel/syscalls/faccessat/faccessat01.c
> >>> -+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
> >>> -@@ -37,7 +37,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c
> >>> b/testcases/kernel/syscalls/fallocate/fallocate01.c
> >>> -index e72b123..643c0e2 100644
> >>> ---- a/testcases/kernel/syscalls/fallocate/fallocate01.c
> >>> -+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
> >>> -@@ -96,7 +96,9 @@
> >>> - #include <fcntl.h>
> >>> - #include <sys/syscall.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <inttypes.h>
> >>> - #include <sys/utsname.h>
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
> >>> b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
> >>> -index 19e9ad5..ae6d807 100644
> >>> ---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
> >>> -+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
> >>> -@@ -37,7 +37,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c
> >>> b/testcases/kernel/syscalls/fchownat/fchownat01.c
> >>> -index b361253..a5218af 100644
> >>> ---- a/testcases/kernel/syscalls/fchownat/fchownat01.c
> >>> -+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
> >>> -@@ -28,7 +28,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c
> >>> b/testcases/kernel/syscalls/fchownat/fchownat02.c
> >>> -index 6b0304c..8d2863f 100644
> >>> ---- a/testcases/kernel/syscalls/fchownat/fchownat02.c
> >>> -+++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
> >>> -@@ -26,7 +26,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c
> >>> b/testcases/kernel/syscalls/fstatat/fstatat01.c
> >>> -index 61531c6..e99fbd2 100644
> >>> ---- a/testcases/kernel/syscalls/fstatat/fstatat01.c
> >>> -+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
> >>> -@@ -48,7 +48,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c
> >>> b/testcases/kernel/syscalls/futimesat/futimesat01.c
> >>> -index ae8d4fe..316dd78 100644
> >>> ---- a/testcases/kernel/syscalls/futimesat/futimesat01.c
> >>> -+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
> >>> -@@ -37,7 +37,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/linkat/linkat01.c
> >>> b/testcases/kernel/syscalls/linkat/linkat01.c
> >>> -index fc0687b..83cbfe7 100644
> >>> ---- a/testcases/kernel/syscalls/linkat/linkat01.c
> >>> -+++ b/testcases/kernel/syscalls/linkat/linkat01.c
> >>> -@@ -49,7 +49,9 @@
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/linkat/linkat02.c
> >>> b/testcases/kernel/syscalls/linkat/linkat02.c
> >>> -index e9a752a..8d7e431 100644
> >>> ---- a/testcases/kernel/syscalls/linkat/linkat02.c
> >>> -+++ b/testcases/kernel/syscalls/linkat/linkat02.c
> >>> -@@ -23,7 +23,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> - #include <unistd.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
> >>> b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
> >>> -index 7e15947..1dbc038 100644
> >>> ---- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
> >>> -+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
> >>> -@@ -30,7 +30,9 @@
> >>> - #include <sys/types.h>
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c
> >>> b/testcases/kernel/syscalls/mknodat/mknodat01.c
> >>> -index 26e5538..f034f05 100644
> >>> ---- a/testcases/kernel/syscalls/mknodat/mknodat01.c
> >>> -+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
> >>> -@@ -29,7 +29,9 @@
> >>> - #include <sys/types.h>
> >>> - #include <fcntl.h>
> >>> - #include <sys/stat.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c
> >>> b/testcases/kernel/syscalls/mknodat/mknodat02.c
> >>> -index f6368fa..7d0f7c0 100644
> >>> ---- a/testcases/kernel/syscalls/mknodat/mknodat02.c
> >>> -+++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
> >>> -@@ -29,7 +29,9 @@
> >>> - #include <sys/types.h>
> >>> - #include <fcntl.h>
> >>> - #include <sys/stat.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/openat/openat01.c
> >>> b/testcases/kernel/syscalls/openat/openat01.c
> >>> -index 85f9a91..4ee0117 100644
> >>> ---- a/testcases/kernel/syscalls/openat/openat01.c
> >>> -+++ b/testcases/kernel/syscalls/openat/openat01.c
> >>> -@@ -29,7 +29,9 @@
> >>> - #include <sys/types.h>
> >>> - #include <sys/stat.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
> >>> b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
> >>> -index 97a49e8..b162853 100644
> >>> ---- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
> >>> -+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
> >>> -@@ -29,7 +29,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/renameat/renameat01.c
> >>> b/testcases/kernel/syscalls/renameat/renameat01.c
> >>> -index f4cd51b..105a05b 100644
> >>> ---- a/testcases/kernel/syscalls/renameat/renameat01.c
> >>> -+++ b/testcases/kernel/syscalls/renameat/renameat01.c
> >>> -@@ -42,7 +42,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
> >>> b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
> >>> -index 5c238d8..cb7a7e8 100644
> >>> ---- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
> >>> -+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
> >>> -@@ -37,7 +37,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> -diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
> >>> b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
> >>> -index 31fe4e7..26f6d9a 100644
> >>> ---- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
> >>> -+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
> >>> -@@ -37,7 +37,9 @@
> >>> - #include <sys/stat.h>
> >>> - #include <sys/time.h>
> >>> - #include <fcntl.h>
> >>> -+#ifdef __GLIBC__
> >>> - #include <error.h>
> >>> -+#endif
> >>> - #include <stdlib.h>
> >>> - #include <errno.h>
> >>> - #include <string.h>
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-
> >>> to-sigset1.patch b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-
> >>> variable-to-sigset1.patch
> >>> index 945280c..6eace63 100644
> >>> --- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-
> >>> sigset1.patch
> >>> +++ b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-
> >>> sigset1.patch
> >>> @@ -20,8 +20,8 @@ index 7203e9e..fce87d6 100644
> >>> /**************/
> >>>
> >>> key_t key;
> >>> --sigset_t sigset;
> >>> -+sigset_t sigset1;
> >>> +-sigset_t set;
> >>> ++sigset_t set1;
> >>>
> >>> #define SIZE 16*1024
> >>>
> >>> @@ -29,12 +29,12 @@ index 7203e9e..fce87d6 100644
> >>>
> >>> key = (key_t) getpid();
> >>>
> >>> -- sigemptyset(&sigset);
> >>> -- sigaddset(&sigset, SIGUSR1);
> >>> -- sigprocmask(SIG_BLOCK, &sigset, NULL);
> >>> -+ sigemptyset(&sigset1);
> >>> -+ sigaddset(&sigset1, SIGUSR1);
> >>> -+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
> >>> +- sigemptyset(&set);
> >>> +- sigaddset(&set, SIGUSR1);
> >>> +- sigprocmask(SIG_BLOCK, &set, NULL);
> >>> ++ sigemptyset(&set1);
> >>> ++ sigaddset(&set1, SIGUSR1);
> >>> ++ sigprocmask(SIG_BLOCK, &set1, NULL);
> >>>
> >>> pid = fork();
> >>> switch (pid) {
> >>> @@ -42,8 +42,8 @@ index 7203e9e..fce87d6 100644
> >>> char *cp;
> >>> int sig;
> >>>
> >>> -- sigwait(&sigset, &sig);
> >>> -+ sigwait(&sigset1, &sig);
> >>> +- sigwait(&set, &sig);
> >>> ++ sigwait(&set1, &sig);
> >>> chld_pid = getpid();
> >>> /*--------------------------------------------------------*/
> >>>
> >>> @@ -55,8 +55,8 @@ index a3c9ca3..77b0fc9 100644
> >>> /**************/
> >>>
> >>> key_t key;
> >>> --sigset_t sigset;
> >>> -+sigset_t sigset1;
> >>> +-sigset_t set;
> >>> ++sigset_t set1;
> >>>
> >>> int child();
> >>> static int rm_shm(int);
> >>> @@ -64,12 +64,12 @@ index a3c9ca3..77b0fc9 100644
> >>>
> >>> key = (key_t) getpid();
> >>>
> >>> -- sigemptyset(&sigset);
> >>> -- sigaddset(&sigset, SIGUSR1);
> >>> -- sigprocmask(SIG_BLOCK, &sigset, NULL);
> >>> -+ sigemptyset(&sigset1);
> >>> -+ sigaddset(&sigset1, SIGUSR1);
> >>> -+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
> >>> +- sigemptyset(&set);
> >>> +- sigaddset(&set, SIGUSR1);
> >>> +- sigprocmask(SIG_BLOCK, &set, NULL);
> >>> ++ sigemptyset(&set1);
> >>> ++ sigaddset(&set1, SIGUSR1);
> >>> ++ sigprocmask(SIG_BLOCK, &set1, NULL);
> >>>
> >>> pid = fork();
> >>> switch (pid) {
> >>> @@ -77,8 +77,8 @@ index a3c9ca3..77b0fc9 100644
> >>> char *cp;
> >>> int sig;
> >>>
> >>> -- sigwait(&sigset, &sig);
> >>> -+ sigwait(&sigset1, &sig);
> >>> +- sigwait(&set, &sig);
> >>> ++ sigwait(&set1, &sig);
> >>> chld_pid = getpid();
> >>>
> >>> if ((shmid = shmget(key, SIZE, 0)) < 0) {
> >>> @@ -90,8 +90,8 @@ index 20fca52..6fb1d57 100644
> >>> int sig_catch = 0; /* variable to blocked/unblocked signals
> >>> */
> >>>
> >>> struct sigaction sa_new; /* struct to hold signal info */
> >>> --sigset_t sigset; /* signal set to hold signal lists */
> >>> -+sigset_t sigset1; /* signal set to hold signal lists */
> >>> +-sigset_t set; /* signal set to hold signal lists */
> >>> ++sigset_t set1; /* signal set to hold signal lists */
> >>> sigset_t sigset2;
> >>>
> >>> int main(int ac, char **av)
> >>> @@ -99,8 +99,8 @@ index 20fca52..6fb1d57 100644
> >>> * so that, signal will not be delivered to
> >>> * the test process.
> >>> */
> >>> -- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));
> >>> -+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));
> >>> +- TEST(sigprocmask(SIG_BLOCK, &set, 0));
> >>> ++ TEST(sigprocmask(SIG_BLOCK, &set1, 0));
> >>>
> >>> /* Get the process id of test process */
> >>> my_pid = getpid();
> >>> @@ -108,8 +108,8 @@ index 20fca52..6fb1d57 100644
> >>> */
> >>> errno = 0;
> >>> if (sigprocmask(SIG_UNBLOCK,
> >>> -- &sigset, 0) == -1) {
> >>> -+ &sigset1, 0) == -1) {
> >>> +- &set, 0) == -1) {
> >>> ++ &set1, 0) == -1) {
> >>> tst_brkm(TFAIL, cleanup,
> >>> "sigprocmask() failed "
> >>> "to unblock signal, "
> >>> @@ -117,8 +117,8 @@ index 20fca52..6fb1d57 100644
> >>> * Initialise the signal sets with the list that
> >>> * excludes/includes all system-defined signals.
> >>> */
> >>> -- if (sigemptyset(&sigset) == -1) {
> >>> -+ if (sigemptyset(&sigset1) == -1) {
> >>> +- if (sigemptyset(&set) == -1) {
> >>> ++ if (sigemptyset(&set1) == -1) {
> >>> tst_brkm(TFAIL, cleanup,
> >>> "sigemptyset() failed, errno=%d : %s",
> >>> errno, strerror(errno));
> >>> @@ -126,8 +126,8 @@ index 20fca52..6fb1d57 100644
> >>> * Add specified signal (SIGINT) to the signal set
> >>> * which excludes system-defined signals.
> >>> */
> >>> -- if (sigaddset(&sigset, SIGINT) == -1) {
> >>> -+ if (sigaddset(&sigset1, SIGINT) == -1) {
> >>> +- if (sigaddset(&set, SIGINT) == -1) {
> >>> ++ if (sigaddset(&set1, SIGINT) == -1) {
> >>> tst_brkm(TFAIL, cleanup,
> >>> "sigaddset() failed, errno=%d : %s",
> >>> errno, strerror(errno));
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-
> >>> __int64_t-with-int64_t.patch b/meta/recipes-extended/ltp/ltp/0012-
> >>> fsstress.c-Replace-__int64_t-with-int64_t.patch
> >>> deleted file mode 100644
> >>> index e1532c1..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-
> >>> with-int64_t.patch
> >>> +++ /dev/null
> >>> @@ -1,351 +0,0 @@
> >>> -From 54e098a366a1d773c4d7d4124f2f5aab976681c3 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 19:58:08 +0000
> >>> -Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t
> >>> -
> >>> -int64_t is defined in ISO C99
> >>> -include limits.h to get defintions of PATH_MAX
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/fs/fsstress/fsstress.c | 31 +++++++++---------
> >>> - testcases/network/nfs/nfs_fsstress/fsstress.c | 47 ++++++++++++++----
> >>> ---------
> >>> - 2 files changed, 40 insertions(+), 38 deletions(-)
> >>> -
> >>> -diff --git a/testcases/kernel/fs/fsstress/fsstress.c
> >>> b/testcases/kernel/fs/fsstress/fsstress.c
> >>> -index 2f89903..89f0b19 100644
> >>> ---- a/testcases/kernel/fs/fsstress/fsstress.c
> >>> -+++ b/testcases/kernel/fs/fsstress/fsstress.c
> >>> -@@ -36,6 +36,7 @@
> >>> - #ifdef HAVE_SYS_PRCTL_H
> >>> - # include <sys/prctl.h>
> >>> - #endif
> >>> -+#include <limits.h>
> >>> -
> >>> - #define XFS_ERRTAG_MAX 17
> >>> -
> >>> -@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)
> >>> - __u64 last;
> >>> - __s32 nent;
> >>> - xfs_bstat_t *t;
> >>> -- __int64_t total;
> >>> -+ int64_t total;
> >>> - xfs_fsop_bulkreq_t bsr;
> >>> -
> >>> - last = 0;
> >>> -@@ -1764,14 +1765,14 @@ int setdirect(int fd)
> >>> -
> >>> - void dread_f(int opno, long r)
> >>> - {
> >>> -- __int64_t align;
> >>> -+ int64_t align;
> >>> - char *buf = NULL;
> >>> - struct dioattr diob;
> >>> - int e;
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)
> >>> - return;
> >>> - }
> >>> - #endif
> >>> -- align = (__int64_t) diob.d_miniosz;
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ align = (int64_t) diob.d_miniosz;
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % stb.st_size);
> >>> - off -= (off % align);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> -@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)
> >>> -
> >>> - void dwrite_f(int opno, long r)
> >>> - {
> >>> -- __int64_t align;
> >>> -+ int64_t align;
> >>> - char *buf = NULL;
> >>> - struct dioattr diob;
> >>> - int e;
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)
> >>> - return;
> >>> - }
> >>> - #endif
> >>> -- align = (__int64_t) diob.d_miniosz;
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ align = (int64_t) diob.d_miniosz;
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off -= (off % align);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> -@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % stb.st_size);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> - len = (random() % (getpagesize() * 32)) + 1;
> >>> -@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)
> >>> - {
> >>> - int e;
> >>> - pathname_t f;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)
> >>> - free_pathname(&f);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);
> >>> - off %= maxfsize;
> >>> - e = truncate64_path(&f, off) < 0 ? errno : 0;
> >>> -@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - lseek64(fd, off, SEEK_SET);
> >>> -diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c
> >>> b/testcases/network/nfs/nfs_fsstress/fsstress.c
> >>> -index ac91262..a34c416 100644
> >>> ---- a/testcases/network/nfs/nfs_fsstress/fsstress.c
> >>> -+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
> >>> -@@ -31,6 +31,7 @@
> >>> - */
> >>> -
> >>> - #include "global.h"
> >>> -+#include <limits.h>
> >>> -
> >>> - #define XFS_ERRTAG_MAX 17
> >>> -
> >>> -@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - struct flock64 fl;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - fl.l_whence = SEEK_SET;
> >>> -@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)
> >>> - __uint64_t last;
> >>> - int nent;
> >>> - xfs_bstat_t *t;
> >>> -- __int64_t total;
> >>> -+ int64_t total;
> >>> - xfs_fsop_bulkreq_t bsr;
> >>> -
> >>> - last = 0;
> >>> -@@ -1708,14 +1709,14 @@ int setdirect(int fd)
> >>> -
> >>> - void dread_f(int opno, long r)
> >>> - {
> >>> -- __int64_t align;
> >>> -+ int64_t align;
> >>> - char *buf;
> >>> - struct dioattr diob;
> >>> - int e;
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)
> >>> - return;
> >>> - }
> >>> - #endif
> >>> -- align = (__int64_t) diob.d_miniosz;
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ align = (int64_t) diob.d_miniosz;
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % stb.st_size);
> >>> - off -= (off % align);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> -@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)
> >>> -
> >>> - void dwrite_f(int opno, long r)
> >>> - {
> >>> -- __int64_t align;
> >>> -+ int64_t align;
> >>> - char *buf;
> >>> - struct dioattr diob;
> >>> - int e;
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)
> >>> - return;
> >>> - }
> >>> - #endif
> >>> -- align = (__int64_t) diob.d_miniosz;
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ align = (int64_t) diob.d_miniosz;
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off -= (off % align);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> -@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - struct flock64 fl;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - fl.l_whence = SEEK_SET;
> >>> -@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % stb.st_size);
> >>> - lseek64(fd, off, SEEK_SET);
> >>> - len = (random() % (getpagesize() * 32)) + 1;
> >>> -@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - struct flock64 fl;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - fl.l_whence = SEEK_SET;
> >>> -@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)
> >>> - {
> >>> - int e;
> >>> - pathname_t f;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)
> >>> - free_pathname(&f);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - e = truncate64_path(&f, off) < 0 ? errno : 0;
> >>> -@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - struct flock64 fl;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - fl.l_whence = SEEK_SET;
> >>> -@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)
> >>> - pathname_t f;
> >>> - int fd;
> >>> - size_t len;
> >>> -- __int64_t lr;
> >>> -+ int64_t lr;
> >>> - off64_t off;
> >>> - struct stat64 stb;
> >>> - int v;
> >>> -@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)
> >>> - close(fd);
> >>> - return;
> >>> - }
> >>> -- lr = ((__int64_t) random() << 32) + random();
> >>> -+ lr = ((int64_t) random() << 32) + random();
> >>> - off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024),
> >>> MAXFSIZE));
> >>> - off %= maxfsize;
> >>> - lseek64(fd, off, SEEK_SET);
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-
> >>> getting-O_-definitions.patch b/meta/recipes-extended/ltp/ltp/0013-
> >>> include-fcntl.h-for-getting-O_-definitions.patch
> >>> deleted file mode 100644
> >>> index 4266e4f..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-
> >>> O_-definitions.patch
> >>> +++ /dev/null
> >>> @@ -1,67 +0,0 @@
> >>> -From 1ef8c32317064438ec3b37a114f5d82957f4e0c6 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 20:05:54 +0000
> >>> -Subject: [PATCH 13/32] include fcntl.h for getting O_* definitions
> >>> -
> >>> -musl exposes this issue, with glibc fcntl.h is included via some other
> >>> -header and this problem remained latent
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/ipc/ipc_stress/shmem_test_03.c | 1 +
> >>> - testcases/kernel/syscalls/mq_notify/mq_notify01.c | 1 +
> >>> - testcases/network/tcp_cmds/sendfile/testsf_c.c | 1 +
> >>> - testcases/network/tcp_cmds/sendfile/testsf_s.c | 1 +
> >>> - 4 files changed, 4 insertions(+)
> >>> -
> >>> -diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
> >>> b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
> >>> -index c1b11fd..8be156f 100644
> >>> ---- a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
> >>> -+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
> >>> -@@ -72,6 +72,7 @@
> >>> - #include <string.h>
> >>> - #include <unistd.h>
> >>> - #include <limits.h>
> >>> -+#include <fcntl.h>
> >>> - #include <sys/file.h>
> >>> - #include <sys/ipc.h>
> >>> - #include <sys/mman.h>
> >>> -diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
> >>> b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
> >>> -index 4728c70..5c7846c 100644
> >>> ---- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
> >>> -+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
> >>> -@@ -41,6 +41,7 @@
> >>> - #include <mqueue.h>
> >>> - #include <signal.h>
> >>> - #include <stdlib.h>
> >>> -+#include <fcntl.h>
> >>> -
> >>> - #include "../utils/include_j_h.h"
> >>> -
> >>> -diff --git a/testcases/network/tcp_cmds/sendfile/testsf_c.c
> >>> b/testcases/network/tcp_cmds/sendfile/testsf_c.c
> >>> -index 449784f..38d3274 100644
> >>> ---- a/testcases/network/tcp_cmds/sendfile/testsf_c.c
> >>> -+++ b/testcases/network/tcp_cmds/sendfile/testsf_c.c
> >>> -@@ -9,6 +9,7 @@
> >>> - #include <sys/types.h>
> >>> - #include <stdlib.h>
> >>> - #include <string.h>
> >>> -+#include <fcntl.h>
> >>> - #include <sys/file.h>
> >>> - #include <arpa/inet.h>
> >>> - #include <netinet/in.h>
> >>> -diff --git a/testcases/network/tcp_cmds/sendfile/testsf_s.c
> >>> b/testcases/network/tcp_cmds/sendfile/testsf_s.c
> >>> -index 17e98ad..bce8dd1 100644
> >>> ---- a/testcases/network/tcp_cmds/sendfile/testsf_s.c
> >>> -+++ b/testcases/network/tcp_cmds/sendfile/testsf_s.c
> >>> -@@ -6,6 +6,7 @@
> >>> - #include <stdio.h>
> >>> - #include <stdlib.h>
> >>> - #include <unistd.h>
> >>> -+#include <fcntl.h>
> >>> - #include <sys/file.h>
> >>> - #include <errno.h>
> >>> - #include <sys/signal.h>
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-
> >>> sys-types.h-for-pid_t-definit.patch b/meta/recipes-
> >>> extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-
> >>> definit.patch
> >>> deleted file mode 100644
> >>> index 84d81e9..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-
> >>> types.h-for-pid_t-definit.patch
> >>> +++ /dev/null
> >>> @@ -1,56 +0,0 @@
> >>> -From d63fefa86dac437c47b9ebbea0a82a1240aaba2c Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 20:09:56 +0000
> >>> -Subject: [PATCH 14/32] hyperthreading: Include sys/types.h for pid_t
> >>> - definition
> >>> -
> >>> -If sys/types.h is not included then it will not define pid_t_needed
> >>> -and therefore typedef wont be included and we get errors about pid_t
> >>> -being not known
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h | 1 +
> >>> - testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h | 1 +
> >>> - testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h | 1 +
> >>> - 3 files changed, 3 insertions(+)
> >>> -
> >>> -diff --git
> >>> a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
> >>> b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
> >>> -index 1ec9794..9084aa7 100644
> >>> ---- a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
> >>> -+++ b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
> >>> -@@ -3,6 +3,7 @@
> >>> - #define _HTUTILS_H_
> >>> -
> >>> - #include <stdlib.h>
> >>> -+#include <sys/types.h>
> >>> -
> >>> - int is_cmdline_para(const char *para);
> >>> -
> >>> -diff --git
> >>> a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
> >>> b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
> >>> -index 1ec9794..c03a124 100644
> >>> ---- a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
> >>> -+++ b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
> >>> -@@ -2,6 +2,7 @@
> >>> - #ifndef _HTUTILS_H_
> >>> - #define _HTUTILS_H_
> >>> -
> >>> -+#include <sys/types.h>
> >>> - #include <stdlib.h>
> >>> -
> >>> - int is_cmdline_para(const char *para);
> >>> -diff --git
> >>> a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
> >>> b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
> >>> -index 2977ad0..6b484e1 100644
> >>> ---- a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
> >>> -+++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
> >>> -@@ -3,6 +3,7 @@
> >>> - #define _HTUTILS_H_
> >>> -
> >>> - #include <stdlib.h>
> >>> -+#include <sys/types.h>
> >>> -
> >>> - int is_cmdline_para(const char *para);
> >>> -
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-
> >>> PAGESIZE-to-pagesize.patch b/meta/recipes-extended/ltp/ltp/0015-
> >>> mincore01-Rename-PAGESIZE-to-pagesize.patch
> >>> deleted file mode 100644
> >>> index 963536f..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-
> >>> pagesize.patch
> >>> +++ /dev/null
> >>> @@ -1,64 +0,0 @@
> >>> -From f091839532f3afe0a58e8ba0b45615c899a43a47 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 20:12:09 +0000
> >>> -Subject: [PATCH 15/32] mincore01: Rename PAGESIZE to pagesize
> >>> -
> >>> -PAGESIZE conflicts with system headers on musl
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/mincore/mincore01.c | 10 +++++-----
> >>> - 1 file changed, 5 insertions(+), 5 deletions(-)
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/mincore/mincore01.c
> >>> b/testcases/kernel/syscalls/mincore/mincore01.c
> >>> -index 97a3d95..fa426d1 100644
> >>> ---- a/testcases/kernel/syscalls/mincore/mincore01.c
> >>> -+++ b/testcases/kernel/syscalls/mincore/mincore01.c
> >>> -@@ -45,7 +45,7 @@
> >>> - #include "test.h"
> >>> - #include "safe_macros.h"
> >>> -
> >>> --static int PAGESIZE;
> >>> -+static int pagesize;
> >>> - static rlim_t STACK_LIMIT = 10485760;
> >>> -
> >>> - static void cleanup(void);
> >>> -@@ -146,7 +146,7 @@ static void setup4(struct test_case_t *tc)
> >>> - }
> >>> -
> >>> - tc->addr = global_pointer;
> >>> -- tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + PAGESIZE;
> >>> -+ tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + pagesize;
> >>> - tc->vector = global_vec;
> >>> -
> >>> - /*
> >>> -@@ -161,7 +161,7 @@ static void setup(void)
> >>> - char *buf;
> >>> - int fd;
> >>> -
> >>> -- PAGESIZE = getpagesize();
> >>> -+ pagesize = getpagesize();
> >>> -
> >>> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> >>> -
> >>> -@@ -170,7 +170,7 @@ static void setup(void)
> >>> - TEST_PAUSE;
> >>> -
> >>> - /* global_pointer will point to a mmapped area of global_len
> >>> bytes */
> >>> -- global_len = PAGESIZE * 2;
> >>> -+ global_len = pagesize * 2;
> >>> -
> >>> - buf = SAFE_MALLOC(cleanup, global_len);
> >>> - memset(buf, 42, global_len);
> >>> -@@ -186,7 +186,7 @@ static void setup(void)
> >>> - PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> >>> -
> >>> - global_vec = SAFE_MALLOC(cleanup,
> >>> -- (global_len + PAGESIZE - 1) / PAGESIZE);
> >>> -+ (global_len + pagesize - 1) / pagesize);
> >>> -
> >>> - SAFE_CLOSE(cleanup, fd);
> >>> - }
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-
> >>> from-ustat.h-to-sys-ustat.h.patch b/meta/recipes-extended/ltp/ltp/0016-
> >>> ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
> >>> deleted file mode 100644
> >>> index 1b5b93a..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-
> >>> ustat.h-to-sys-ustat.h.patch
> >>> +++ /dev/null
> >>> @@ -1,45 +0,0 @@
> >>> -From 2b9be924bbad8a1f84ae553fdd1aa8391aa8d2f4 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 20:15:07 +0000
> >>> -Subject: [PATCH 16/32] ustat: Change header from ustat.h to
> >>> sys/ustat.h
> >>> -
> >>> -makes it portable for musl, on glibc ustat.h is just including
> >>> -sys/ustat.h too
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/ustat/ustat01.c | 2 +-
> >>> - testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
> >>> - 2 files changed, 2 insertions(+), 2 deletions(-)
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/ustat/ustat01.c
> >>> b/testcases/kernel/syscalls/ustat/ustat01.c
> >>> -index 01b7688..494647b 100644
> >>> ---- a/testcases/kernel/syscalls/ustat/ustat01.c
> >>> -+++ b/testcases/kernel/syscalls/ustat/ustat01.c
> >>> -@@ -20,8 +20,8 @@
> >>> - */
> >>> -
> >>> - #include <unistd.h>
> >>> --#include <ustat.h>
> >>> - #include <errno.h>
> >>> -+#include <sys/ustat.h>
> >>> - #include <sys/types.h>
> >>> - #include <sys/stat.h>
> >>> - #include "test.h"
> >>> -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c
> >>> b/testcases/kernel/syscalls/ustat/ustat02.c
> >>> -index 4e66236..edada31 100644
> >>> ---- a/testcases/kernel/syscalls/ustat/ustat02.c
> >>> -+++ b/testcases/kernel/syscalls/ustat/ustat02.c
> >>> -@@ -21,8 +21,8 @@
> >>> - */
> >>> -
> >>> - #include <unistd.h>
> >>> --#include <ustat.h>
> >>> - #include <errno.h>
> >>> -+#include <sys/ustat.h>
> >>> - #include <sys/stat.h>
> >>> - #include <sys/types.h>
> >>> - #include "test.h"
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-
> >>> union-sigval.patch b/meta/recipes-extended/ltp/ltp/0017-replace-
> >>> sigval_t-with-union-sigval.patch
> >>> deleted file mode 100644
> >>> index ed25802..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-
> >>> sigval.patch
> >>> +++ /dev/null
> >>> @@ -1,88 +0,0 @@
> >>> -From c882bcd18820b44a685f0d5edd7aaff77a88c912 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Thu, 7 Jan 2016 20:17:55 +0000
> >>> -Subject: [PATCH 17/32] replace sigval_t with union sigval
> >>> -
> >>> -This makes it compatible across musl and glibc
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c | 2
> >>> +-
> >>> - testcases/kernel/syscalls/timer_gettime/timer_gettime01.c | 2
> >>> +-
> >>> - testcases/kernel/timers/timer_create/timer_create02.c | 4
> >>> ++--
> >>> - testcases/kernel/timers/timer_create/timer_create03.c | 4
> >>> ++--
> >>> - 4 files changed, 6 insertions(+), 6 deletions(-)
> >>> -
> >>> -diff --git
> >>> a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
> >>> b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
> >>> -index d186c1f..bc03544 100644
> >>> ---- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
> >>> -+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
> >>> -@@ -54,7 +54,7 @@ int main(int ac, char **av)
> >>> -
> >>> - setup();
> >>> -
> >>> -- ev.sigev_value = (sigval_t) 0;
> >>> -+ ev.sigev_value = (union sigval) 0;
> >>> - ev.sigev_signo = SIGALRM;
> >>> - ev.sigev_notify = SIGEV_SIGNAL;
> >>> - TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev,
> >>> &timer));
> >>> -diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
> >>> b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
> >>> -index b583aee..9371a6a 100644
> >>> ---- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
> >>> -+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
> >>> -@@ -55,7 +55,7 @@ int main(int ac, char **av)
> >>> -
> >>> - setup();
> >>> -
> >>> -- ev.sigev_value = (sigval_t) 0;
> >>> -+ ev.sigev_value = (union sigval) 0;
> >>> - ev.sigev_signo = SIGALRM;
> >>> - ev.sigev_notify = SIGEV_SIGNAL;
> >>> - TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev,
> >>> &timer));
> >>> -diff --git a/testcases/kernel/timers/timer_create/timer_create02.c
> >>> b/testcases/kernel/timers/timer_create/timer_create02.c
> >>> -index 7f528ed..1127400 100644
> >>> ---- a/testcases/kernel/timers/timer_create/timer_create02.c
> >>> -+++ b/testcases/kernel/timers/timer_create/timer_create02.c
> >>> -@@ -142,7 +142,7 @@ void setup_test(int option)
> >>> - {
> >>> - switch (option) {
> >>> - case 0:
> >>> -- evp.sigev_value = (sigval_t) 0;
> >>> -+ evp.sigev_value = (union sigval) 0;
> >>> - evp.sigev_signo = SIGALRM;
> >>> - evp.sigev_notify = SIGEV_SIGNAL;
> >>> - evp_ptr = &evp;
> >>> -@@ -151,7 +151,7 @@ void setup_test(int option)
> >>> - evp_ptr = NULL;
> >>> - break;
> >>> - case 2:
> >>> -- evp.sigev_value = (sigval_t) 0;
> >>> -+ evp.sigev_value = (union sigval) 0;
> >>> - evp.sigev_signo = SIGALRM; /* any will do */
> >>> - evp.sigev_notify = SIGEV_NONE;
> >>> - evp_ptr = &evp;
> >>> -diff --git a/testcases/kernel/timers/timer_create/timer_create03.c
> >>> b/testcases/kernel/timers/timer_create/timer_create03.c
> >>> -index 291fcfa..8b01bf7 100644
> >>> ---- a/testcases/kernel/timers/timer_create/timer_create03.c
> >>> -+++ b/testcases/kernel/timers/timer_create/timer_create03.c
> >>> -@@ -129,7 +129,7 @@ void setup_test(int option)
> >>> - {
> >>> - switch (option) {
> >>> - case 0:
> >>> -- evp.sigev_value = (sigval_t) 0;
> >>> -+ evp.sigev_value = (union sigval) 0;
> >>> - evp.sigev_signo = SIGALRM;
> >>> - evp.sigev_notify = SIGEV_SIGNAL;
> >>> - evp_ptr = &evp;
> >>> -@@ -138,7 +138,7 @@ void setup_test(int option)
> >>> - evp_ptr = NULL;
> >>> - break;
> >>> - case 2:
> >>> -- evp.sigev_value = (sigval_t) 0;
> >>> -+ evp.sigev_value = (union sigval) 0;
> >>> - evp.sigev_signo = SIGALRM; /* any will do */
> >>> - evp.sigev_notify = SIGEV_NONE;
> >>> - evp_ptr = &evp;
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-
> >>> canonicalize_file_name-with-realpath.patch b/meta/recipes-
> >>> extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-
> >>> realpath.patch
> >>> deleted file mode 100644
> >>> index 0a4c5f0..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-
> >>> canonicalize_file_name-with-realpath.patch
> >>> +++ /dev/null
> >>> @@ -1,32 +0,0 @@
> >>> -From 721e94985b9cff3e2724af7ea5be7d005bc12dec Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 06:55:27 +0000
> >>> -Subject: [PATCH 19/32] tomoyo: Replace canonicalize_file_name() with
> >>> - realpath()
> >>> -
> >>> -canonicalize_file_name() API is specific to glibc
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c | 4 ++--
> >>> - 1 file changed, 2 insertions(+), 2 deletions(-)
> >>> -
> >>> -diff --git a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
> >>> b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
> >>> -index da4af0f..5c1a3ca 100644
> >>> ---- a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
> >>> -+++ b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
> >>> -@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
> >>> - /* Test mount(). */
> >>> - {
> >>> - static char buf[4096];
> >>> -- char *dev_ram_path = canonicalize_file_name("/dev/ram0");
> >>> -+ char *dev_ram_path = realpath("/dev/ram0", NULL);
> >>> - if (!dev_ram_path)
> >>> -- dev_ram_path = canonicalize_file_name("/dev/ram");
> >>> -+ dev_ram_path = realpath("/dev/ram", NULL);
> >>> - if (!dev_ram_path) {
> >>> - dev_ram_path = "/dev/ram0";
> >>> - mknod(dev_ram_path, S_IFBLK, MKDEV(1, 0));
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0022-include-sys-
> >>> types.h.patch b/meta/recipes-extended/ltp/ltp/0022-include-sys-
> >>> types.h.patch
> >>> deleted file mode 100644
> >>> index 413b44a..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
> >>> +++ /dev/null
> >>> @@ -1,29 +0,0 @@
> >>> -From 7ac6fd51991ac61d1d7594f601d87842060ee284 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 07:06:11 +0000
> >>> -Subject: [PATCH 22/32] include sys/types.h
> >>> -
> >>> -Fixes
> >>> -
> >>> -error: unknown type name 'uint'
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/ipc/ipc_stress/shmem_test_04.c | 1 +
> >>> - 1 file changed, 1 insertion(+)
> >>> -
> >>> -diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
> >>> b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
> >>> -index 72c2e60..e7e5f61 100644
> >>> ---- a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
> >>> -+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
> >>> -@@ -65,6 +65,7 @@
> >>> - #include <signal.h>
> >>> - #include <stdint.h>
> >>> - #include <sys/mman.h>
> >>> -+#include <sys/types.h>
> >>> -
> >>> - #ifdef _LINUX_
> >>> - typedef unsigned long ulong_t;
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-
> >>> _SC_2_C_VERSION-conditionally.patch b/meta/recipes-
> >>> extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
> >>> deleted file mode 100644
> >>> index b47d097..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-
> >>> conditionally.patch
> >>> +++ /dev/null
> >>> @@ -1,29 +0,0 @@
> >>> -From 4a74b275acc8158850f2500928a1467c3482c986 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 07:23:11 +0000
> >>> -Subject: [PATCH 27/32] sysconf01: Use _SC_2_C_VERSION conditionally
> >>> -
> >>> -_SC_2_C_VERSION is not available on musl
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++
> >>> - 1 file changed, 2 insertions(+)
> >>> -
> >>> -diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c
> >>> b/testcases/kernel/syscalls/sysconf/sysconf01.c
> >>> -index 8542e77..e806943 100644
> >>> ---- a/testcases/kernel/syscalls/sysconf/sysconf01.c
> >>> -+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c
> >>> -@@ -102,7 +102,9 @@ int main(void)
> >>> - test_sysconf(_SC_ATEXIT_MAX);
> >>> - test_sysconf(_SC_2_C_BIND);
> >>> - test_sysconf(_SC_2_C_DEV);
> >>> -+#ifdef __GLIBC__
> >>> - test_sysconf(_SC_2_C_VERSION);
> >>> -+#endif
> >>> - /* 21 - 25 */
> >>> - test_sysconf(_SC_2_CHAR_TERM);
> >>> - test_sysconf(_SC_2_FORT_DEV);
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-
> >>> with-musl.patch b/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-
> >>> build-with-musl.patch
> >>> deleted file mode 100644
> >>> index f7ece9e..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-
> >>> musl.patch
> >>> +++ /dev/null
> >>> @@ -1,32 +0,0 @@
> >>> -From 2f8a57f66a94210d34dd0361659a8297cf3d813f Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 07:29:24 +0000
> >>> -Subject: [PATCH 29/32] trace_shed: Fix build with musl
> >>> -
> >>> -Errors on musl are
> >>> -
> >>> -trace_sched.c:425:16: error: invalid operands to binary & (have
> >>> -'thread_sched_t * {aka struct <anonymous> *}' and 'int')
> >>> - thrd_ndx, WEXITSTATUS(status));
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/sched/tool/trace_sched.c | 2 +-
> >>> - 1 file changed, 1 insertion(+), 1 deletion(-)
> >>> -
> >>> -diff --git a/testcases/kernel/sched/tool/trace_sched.c
> >>> b/testcases/kernel/sched/tool/trace_sched.c
> >>> -index 7815686..30dca5f 100644
> >>> ---- a/testcases/kernel/sched/tool/trace_sched.c
> >>> -+++ b/testcases/kernel/sched/tool/trace_sched.c
> >>> -@@ -422,7 +422,7 @@ int main(int argc, /* number of input
> >>> parameters. */
> >>> - if (status == (thread_sched_t *) - 1) {
> >>> - fprintf(stderr,
> >>> - "thread [%d] - process exited with
> >>> errors %d\n",
> >>> -- thrd_ndx, WEXITSTATUS(status));
> >>> -+ thrd_ndx, WEXITSTATUS((int)status));
> >>> - exit(-1);
> >>> - } else {
> >>> - exp_prio[thrd_ndx] = status->exp_prio;
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-
> >>> PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-
> >>> extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-
> >>> PTHREAD_.patch
> >>> deleted file mode 100644
> >>> index d2d6d76..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-
> >>> PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
> >>> +++ /dev/null
> >>> @@ -1,33 +0,0 @@
> >>> -From 77c95dacffe90382a1f131c801ac569120d95949 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 07:32:24 +0000
> >>> -Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of
> >>> - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc
> >>> -
> >>> -e.g. musl does not implement the _NP mutex types
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - lib/tst_res.c | 5 ++++-
> >>> - 1 file changed, 4 insertions(+), 1 deletion(-)
> >>> -
> >>> -diff --git a/lib/tst_res.c b/lib/tst_res.c
> >>> -index 5c1c58c..3244b5e 100644
> >>> ---- a/lib/tst_res.c
> >>> -+++ b/lib/tst_res.c
> >>> -@@ -104,8 +104,11 @@ int TEST_ERRNO;
> >>> - assert(strlen(buf) > 0); \
> >>> - } while (0)
> >>> -
> >>> -+#ifdef __GLIBC__
> >>> - static pthread_mutex_t tmutex =
> >>> PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
> >>> --
> >>> -+#else
> >>> -+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };
> >>> -+#endif
> >>> - /*
> >>> - * Define local function prototypes.
> >>> - */
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-
> >>> offset-as-per-page-size-alignmen.patch b/meta/recipes-
> >>> extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-
> >>> alignmen.patch
> >>> deleted file mode 100644
> >>> index 473ca4c..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-
> >>> per-page-size-alignmen.patch
> >>> +++ /dev/null
> >>> @@ -1,33 +0,0 @@
> >>> -From 293ff1da06748ed4c69be6ece262d42e562e7298 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 07:36:19 +0000
> >>> -Subject: [PATCH 31/32] vma03: fix page size offset as per page size
> >>> alignment
> >>> -
> >>> -the offset the param of mmap2() doesn't align the page size, but,
> >>> -this param allow must be a multiple of the page size as returned
> >>> -by sysconf(_SC_PAGE_SIZE).meanwhile offset * 4096 must be a
> >>> -multiple of the system page size, so modify the input param of offset
> >>> -pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
> >>> -
> >>> -Signed-off-by: Chuang Dong <Chuang.Dong@windriver.com>
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/mem/vma/vma03.c | 2 +-
> >>> - 1 file changed, 1 insertion(+), 1 deletion(-)
> >>> -
> >>> -diff --git a/testcases/kernel/mem/vma/vma03.c
> >>> b/testcases/kernel/mem/vma/vma03.c
> >>> -index ad8a7b4..a539233 100644
> >>> ---- a/testcases/kernel/mem/vma/vma03.c
> >>> -+++ b/testcases/kernel/mem/vma/vma03.c
> >>> -@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
> >>> - if (fd == -1)
> >>> - tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);
> >>> -
> >>> -- pgoff = ULONG_MAX - 1;
> >>> -+ pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
> >>> - map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
> >>> - fd, pgoff);
> >>> - if (map == MAP_FAILED)
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-
> >>> unistd.h-explicitly.patch b/meta/recipes-extended/ltp/ltp/0032-
> >>> regen.sh-Include-asm-unistd.h-explicitly.patch
> >>> deleted file mode 100644
> >>> index 5c6bf91..0000000
> >>> --- a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-
> >>> explicitly.patch
> >>> +++ /dev/null
> >>> @@ -1,30 +0,0 @@
> >>> -From 4f1905ff09c730091674818bd1b48ee221347101 Mon Sep 17 00:00:00 2001
> >>> -From: Khem Raj <raj.khem@gmail.com>
> >>> -Date: Fri, 8 Jan 2016 08:30:29 +0000
> >>> -Subject: [PATCH 32/32] regen.sh: Include asm/unistd.h explicitly
> >>> -
> >>> -on musl this is not included indirectly and it results in errors like
> >>> -testcases/kernel/include/linux_syscall_numbers.h:1035:25: error:
> >>> -'__NR_SYSCALL_BASE' undeclared (first use in this function)
> >>> -| # define __NR_readdir (__NR_SYSCALL_BASE+ 89)
> >>> -
> >>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ----
> >>> - testcases/kernel/include/regen.sh | 1 +
> >>> - 1 file changed, 1 insertion(+)
> >>> -
> >>> -diff --git a/testcases/kernel/include/regen.sh
> >>> b/testcases/kernel/include/regen.sh
> >>> -index f93f49b..ee790af 100755
> >>> ---- a/testcases/kernel/include/regen.sh
> >>> -+++ b/testcases/kernel/include/regen.sh
> >>> -@@ -32,6 +32,7 @@ cat << EOF > "${output_pid}"
> >>> -
> >>> - #include <errno.h>
> >>> - #include <sys/syscall.h>
> >>> -+#include <asm/unistd.h>
> >>> - #include "cleanup.c"
> >>> -
> >>> - #define ltp_syscall(NR, ...) ({ \\
> >>> ---
> >>> -2.7.0
> >>> -
> >>> diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-
> >>> extended/ltp/ltp_20160920.bb
> >>> similarity index 80%
> >>> rename from meta/recipes-extended/ltp/ltp_20160126.bb
> >>> rename to meta/recipes-extended/ltp/ltp_20160920.bb
> >>> index 7631e0e..7d4efbc 100644
> >>> --- a/meta/recipes-extended/ltp/ltp_20160126.bb
> >>> +++ b/meta/recipes-extended/ltp/ltp_20160920.bb
> >>> @@ -24,45 +24,32 @@ DEPENDS_append_libc-musl = " fts "
> >>> EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
> >>> CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
> >>> CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__"
> >>> -SRCREV = "fce797676b14f50406718e7ef640b50da66c9b36"
> >>> +SRCREV = "52f4cf73fc1304e1339136729cfc03960d2d7c85"
> >>>
> >>> SRC_URI = "git://github.com/linux-test-project/ltp.git \
> >>> - file://0001-ltp-Don-t-link-against-libfl.patch \
> >>> file://0002-Add-knob-to-control-whether-numa-support-
> >>> should-be-c.patch \
> >>> file://0003-Add-knob-to-control-tirpc-support.patch \
> >>> file://0004-build-Add-option-to-select-libc-
> >>> implementation.patch \
> >>> file://0005-kernel-controllers-Link-with-libfts-explicitly-
> >>> on-mu.patch \
> >>> - file://0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
> >>> \
> >>> - file://0007-replace-SIGCLD-with-SIGCHLD.patch \
> >>> file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-
> >>> using-it.patch \
> >>> - file://0009-Guard-error.h-with-__GLIBC__.patch \
> >>> file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \
> >>> file://0011-Rename-sigset-variable-to-sigset1.patch \
> >>> - file://0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
> >>> \
> >>> - file://0013-include-fcntl.h-for-getting-O_-
> >>> definitions.patch \
> >>> - file://0014-hyperthreading-Include-sys-types.h-for-pid_t-
> >>> definit.patch \
> >>> - file://0015-mincore01-Rename-PAGESIZE-to-pagesize.patch \
> >>> - file://0016-ustat-Change-header-from-ustat.h-to-sys-
> >>> ustat.h.patch \
> >>> - file://0017-replace-sigval_t-with-union-sigval.patch \
> >>> file://0018-guard-mallocopt-with-__GLIBC__.patch \
> >>> - file://0019-tomoyo-Replace-canonicalize_file_name-with-
> >>> realpath.patch \
> >>> file://0020-getdents-define-getdents-getdents64-only-for-
> >>> glibc.patch \
> >>> file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-
> >>> definition.patch \
> >>> - file://0022-include-sys-types.h.patch \
> >>> file://0023-ptrace-Use-int-instead-of-enum-
> >>> __ptrace_request.patch \
> >>> file://0024-rt_sigaction-rt_sigprocmark-Define-
> >>> _GNU_SOURCE.patch \
> >>> file://0025-mc_gethost-include-sys-types.h.patch \
> >>> file://0026-crash01-Define-_GNU_SOURCE.patch \
> >>> - file://0027-sysconf01-Use-_SC_2_C_VERSION-
> >>> conditionally.patch \
> >>> - file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-
> >>> __sighand.patch \
> >>> - file://0029-trace_shed-Fix-build-with-musl.patch \
> >>> - file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-
> >>> PTHREAD_.patch \
> >>> - file://0031-vma03-fix-page-size-offset-as-per-page-size-
> >>> alignmen.patch \
> >>> - file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch
> >>> \
> >>> file://0033-shmat1-Cover-GNU-specific-code-under-
> >>> __USE_GNU.patch \
> >>> file://0034-periodic_output.patch \
> >>> - file://0035-fix-test_proc_kill-hang.patch \
> >>> file://0001-testcases-network-nfsv4-acl-acl1.c-Security-
> >>> fix-on-s.patch \
> >>> + file://0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
> >>> \
> >>> + file://0002-initialize-recursive-mutex-in-a-portable-
> >>> way.patch \
> >>> + file://0003-lapi-Use-sig_t-instead-of-sighandler_t.patch \
> >>> + file://0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-
> >>> with-S.patch \
> >>> + file://0005-Fix-test_proc_kill-hanging.patch \
> >>> + file://0006-Remove-unused-__BEGIN_DECLS-and-
> >>> __END_DECLS.patch \
> >>> "
> >>>
> >>> S = "${WORKDIR}/git"
> >>> --
> >>> 2.7.4
> >>>
> >>>
> >>>
> >>> --
> >>> _______________________________________________
> >>> Openembedded-core mailing list
> >>> Openembedded-core@lists.openembedded.org
> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >>
> >>
>
>
^ permalink raw reply
* [PATCH 3/4] insane: add QAPKGTEST, a package-wide equivilant to QAPATHTEST
From: Ross Burton @ 2016-11-24 23:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480031065-19435-1-git-send-email-ross.burton@intel.com>
QAPATHTEST defines a function that is executed for every file in every package.
For tests which just need to look at the datastore this is massive overkill.
Add QAPKGTEST, which is invoked for each package in the recipe.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/insane.bbclass | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 0ba4cae..407ccee 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -822,6 +822,23 @@ def package_qa_check_staged(path,d):
return sane
+# Run all package-wide warnfuncs and errorfuncs
+def package_qa_package(warnfuncs, errorfuncs, skip, package, d):
+ warnings = {}
+ errors = {}
+
+ for func in warnfuncs:
+ func(package, d, warnings)
+ for func in errorfuncs:
+ func(package, d, errors)
+
+ for w in warnings:
+ package_qa_handle_error(w, warnings[w], d)
+ for e in errors:
+ package_qa_handle_error(e, errors[e], d)
+
+ return len(errors) == 0
+
# Walk over all files in a directory and call func
def package_qa_walk(warnfuncs, errorfuncs, skip, package, d):
import oe.qa
@@ -1162,6 +1179,9 @@ python do_package_qa () {
warn_checks, error_checks = parse_test_matrix("QAPATHTEST")
package_qa_walk(warn_checks, error_checks, skip, package, d)
+ warn_checks, error_checks = parse_test_matrix("QAPKGTEST")
+ package_qa_package(warn_checks, error_checks, skip, package, d)
+
package_qa_check_rdepends(package, pkgdest, skip, taskdeps, packages, d)
package_qa_check_deps(package, pkgdest, skip, d)
--
2.8.1
^ permalink raw reply related
* [PATCH 4/4] insane: rewrite the expanded-d test as a QAPKGTEST
From: Ross Burton @ 2016-11-24 23:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480031065-19435-1-git-send-email-ross.burton@intel.com>
Instead of being executed for every file in every package, this is now just
called for each package. It is also now correctly called for packages which
don't have any content but do have postinst scripts.
[ YOCTO #10711 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/insane.bbclass | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 407ccee..5ddb87b 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1002,30 +1002,24 @@ def package_qa_check_deps(pkg, pkgdest, skip, d):
check_valid_deps('RREPLACES')
check_valid_deps('RCONFLICTS')
-QAPATHTEST[expanded-d] = "package_qa_check_expanded_d"
-def package_qa_check_expanded_d(path,name,d,elf,messages):
+QAPKGTEST[expanded-d] = "package_qa_check_expanded_d"
+def package_qa_check_expanded_d(package, d, messages):
"""
Check for the expanded D (${D}) value in pkg_* and FILES
variables, warn the user to use it correctly.
"""
-
sane = True
- expanded_d = d.getVar('D',True)
-
- # Get packages for current recipe and iterate
- packages = d.getVar('PACKAGES', True).split(" ")
- for pak in packages:
- # Go through all variables and check if expanded D is found, warn the user accordingly
- for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':
- bbvar = d.getVar(var + "_" + pak, True)
- if bbvar:
- if expanded_d in bbvar:
- if var == 'FILES':
- package_qa_add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % pak)
- sane = False
- else:
- package_qa_add_message(messages, "expanded-d", "%s in %s recipe contains ${D}, it should be replaced by $D instead" % (var, pak))
- sane = False
+ expanded_d = d.getVar('D', True)
+
+ for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':
+ bbvar = d.getVar(var + "_" + package, True) or ""
+ if expanded_d in bbvar:
+ if var == 'FILES':
+ package_qa_add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % package)
+ sane = False
+ else:
+ package_qa_add_message(messages, "expanded-d", "%s in %s recipe contains ${D}, it should be replaced by $D instead" % (var, package))
+ sane = False
return sane
def package_qa_check_encoding(keys, encode, d):
--
2.8.1
^ permalink raw reply related
* [PATCH 2/4] insane: factor out the test matrix processing
From: Ross Burton @ 2016-11-24 23:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480031065-19435-1-git-send-email-ross.burton@intel.com>
Pull the test matrix processing out as a function so it can be reused.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/insane.bbclass | 46 ++++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 9f3065f..0ba4cae 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1116,7 +1116,6 @@ python do_package_qa () {
if not packages:
return
- testmatrix = d.getVarFlags("QAPATHTEST")
import re
# The package name matches the [a-z0-9.+-]+ regular expression
pkgname_pattern = re.compile("^[a-z0-9.+-]+$")
@@ -1126,28 +1125,33 @@ python do_package_qa () {
for dep in taskdepdata:
taskdeps.add(taskdepdata[dep][0])
- g = globals()
for package in packages:
+ def parse_test_matrix(matrix_name):
+ testmatrix = d.getVarFlags(matrix_name) or {}
+ g = globals()
+ warnchecks = []
+ for w in (d.getVar("WARN_QA", True) or "").split():
+ if w in skip:
+ continue
+ if w in testmatrix and testmatrix[w] in g:
+ warnchecks.append(g[testmatrix[w]])
+ if w == 'unsafe-references-in-binaries':
+ oe.utils.write_ld_so_conf(d)
+
+ errorchecks = []
+ for e in (d.getVar("ERROR_QA", True) or "").split():
+ if e in skip:
+ continue
+ if e in testmatrix and testmatrix[e] in g:
+ errorchecks.append(g[testmatrix[e]])
+ if e == 'unsafe-references-in-binaries':
+ oe.utils.write_ld_so_conf(d)
+ return warnchecks, errorchecks
+
skip = (d.getVar('INSANE_SKIP_' + package, True) or "").split()
if skip:
bb.note("Package %s skipping QA tests: %s" % (package, str(skip)))
- warnchecks = []
- for w in (d.getVar("WARN_QA", True) or "").split():
- if w in skip:
- continue
- if w in testmatrix and testmatrix[w] in g:
- warnchecks.append(g[testmatrix[w]])
- if w == 'unsafe-references-in-binaries':
- oe.utils.write_ld_so_conf(d)
-
- errorchecks = []
- for e in (d.getVar("ERROR_QA", True) or "").split():
- if e in skip:
- continue
- if e in testmatrix and testmatrix[e] in g:
- errorchecks.append(g[testmatrix[e]])
- if e == 'unsafe-references-in-binaries':
- oe.utils.write_ld_so_conf(d)
+
bb.note("Checking Package: %s" % package)
# Check package name
@@ -1155,8 +1159,8 @@ python do_package_qa () {
package_qa_handle_error("pkgname",
"%s doesn't match the [a-z0-9.+-]+ regex" % package, d)
- path = "%s/%s" % (pkgdest, package)
- package_qa_walk(warnchecks, errorchecks, skip, package, d)
+ warn_checks, error_checks = parse_test_matrix("QAPATHTEST")
+ package_qa_walk(warn_checks, error_checks, skip, package, d)
package_qa_check_rdepends(package, pkgdest, skip, taskdeps, packages, d)
package_qa_check_deps(package, pkgdest, skip, d)
--
2.8.1
^ permalink raw reply related
* [PATCH 1/4] insane: fix expanded-d test
From: Ross Burton @ 2016-11-24 23:44 UTC (permalink / raw)
To: openembedded-core
This test should be looking for the expanded value of ${D} in the expanded value
of pkg_postinst and so on, but one of the getVar() calls was passing
expand=False so the test would never be true.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/insane.bbclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index d51e73e..9f3065f 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1000,9 +1000,8 @@ def package_qa_check_expanded_d(path,name,d,elf,messages):
for pak in packages:
# Go through all variables and check if expanded D is found, warn the user accordingly
for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':
- bbvar = d.getVar(var + "_" + pak, False)
+ bbvar = d.getVar(var + "_" + pak, True)
if bbvar:
- # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value
if expanded_d in bbvar:
if var == 'FILES':
package_qa_add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % pak)
--
2.8.1
^ permalink raw reply related
* [PATCH][morty] weston: Add no-input-device patch to 1.11.0.
From: Daniel Díaz @ 2016-11-24 22:09 UTC (permalink / raw)
To: openembedded-core
The included patch, backported from Weston master (and OE-Core
master since Weston 1.11.1, b6864b1), allows it to run without
any input device at launch. An ini option is introduced for
this purpose, so there is no behavioral change.
Related change in weston.ini:
[core]
require-input=true
Default is true; setting it false allows Weston to run
without a keyboard or mouse, which is handy for automated
environments.
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
...on-1.11-config-option-for-no-input-device.patch | 123 +++++++++++++++++++++
meta/recipes-graphics/wayland/weston_1.11.0.bb | 1 +
2 files changed, 124 insertions(+)
create mode 100644 meta/recipes-graphics/wayland/weston/weston-1.11-config-option-for-no-input-device.patch
diff --git a/meta/recipes-graphics/wayland/weston/weston-1.11-config-option-for-no-input-device.patch b/meta/recipes-graphics/wayland/weston/weston-1.11-config-option-for-no-input-device.patch
new file mode 100644
index 0000000..6f5ad66
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/weston-1.11-config-option-for-no-input-device.patch
@@ -0,0 +1,123 @@
+From bbf2e6ebbd9c051775f43e1e3c3a2f41322342e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
+Date: Fri, 21 Oct 2016 14:03:13 -0500
+Subject: [PATCH] Add configuration option for no input device.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[Backported from master, 75b7197.]
+
+As it has been discussed in the past [1], running Weston
+without any input device at launch might be beneficial for
+some use cases.
+
+Certainly, it's best for the vast majority of users (and
+the project) to require an input device to be present, as
+to avoid frustration and hassle, but for those brave souls
+that so prefer, this patch lets them run without any input
+device at all.
+
+This introduces a simple configuration in weston.ini:
+ [core]
+ require-input=true
+
+True is the default, so no behavioral change is introduced.
+
+[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html
+
+Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
+---
+ man/weston.ini.man | 5 +++++
+ src/compositor.h | 4 ++++
+ src/libinput-seat.c | 6 ++++++
+ src/main.c | 5 +++++
+ weston.ini.in | 1 +
+ 5 files changed, 21 insertions(+)
+
+diff --git a/man/weston.ini.man b/man/weston.ini.man
+index d7c4a6f..c7d0f01 100644
+--- a/man/weston.ini.man
++++ b/man/weston.ini.man
+@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other
+ hand, if none of these sets the value, default idle timeout will be
+ set to 300 seconds.
+ .RS
++.PP
++.RE
++.TP 7
++.BI "require-input=" true
++require an input device for launch
+
+ .SH "LIBINPUT SECTION"
+ The
+diff --git a/src/compositor.h b/src/compositor.h
+index 0bbf458..476b650 100644
+--- a/src/compositor.h
++++ b/src/compositor.h
+@@ -803,6 +803,10 @@ struct weston_compositor {
+
+ void *user_data;
+ void (*exit)(struct weston_compositor *c);
++
++ /* Whether to let the compositor run without any input device. */
++ bool require_input;
++
+ };
+
+ struct weston_buffer {
+diff --git a/src/libinput-seat.c b/src/libinput-seat.c
+index 8ce0ee0..e1fdcf0 100644
+--- a/src/libinput-seat.c
++++ b/src/libinput-seat.c
+@@ -255,6 +255,12 @@ udev_input_enable(struct udev_input *input)
+ devices_found = 1;
+ }
+
++ if (devices_found == 0 && !c->require_input) {
++ weston_log("warning: no input devices found, but none required "
++ "as per configuration.\n");
++ return 0;
++ }
++
+ if (devices_found == 0) {
+ weston_log(
+ "warning: no input devices on entering Weston. "
+diff --git a/src/main.c b/src/main.c
+index 3279ac6..09905ea 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1298,6 +1298,7 @@ int main(int argc, char *argv[])
+ struct wl_client *primary_client;
+ struct wl_listener primary_client_destroyed;
+ struct weston_seat *seat;
++ int require_input;
+
+ const struct weston_option core_options[] = {
+ { WESTON_OPTION_STRING, "backend", 'B', &backend },
+@@ -1373,6 +1374,10 @@ int main(int argc, char *argv[])
+ if (weston_compositor_init_config(ec, config) < 0)
+ goto out;
+
++ weston_config_section_get_bool(section, "require-input",
++ &require_input, true);
++ ec->require_input = require_input;
++
+ if (load_backend(ec, backend, &argc, argv, config) < 0) {
+ weston_log("fatal: failed to create compositor backend\n");
+ goto out;
+diff --git a/weston.ini.in b/weston.ini.in
+index 14a4c0c..d837fb5 100644
+--- a/weston.ini.in
++++ b/weston.ini.in
+@@ -2,6 +2,7 @@
+ #modules=xwayland.so,cms-colord.so
+ #shell=desktop-shell.so
+ #gbm-format=xrgb2101010
++#require-input=true
+
+ [shell]
+ background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+--
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/weston_1.11.0.bb b/meta/recipes-graphics/wayland/weston_1.11.0.bb
index 3ad309d..9740ce9 100644
--- a/meta/recipes-graphics/wayland/weston_1.11.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.11.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://xwayland.weston-start \
file://make-weston-launch-exit-for-unrecognized-option.patch \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
+ file://weston-1.11-config-option-for-no-input-device.patch \
"
SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2"
SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125"
--
1.9.1
^ permalink raw reply related
* [PATCH v2][krogoth] weston: Add no-input-device patch to 1.9.0.
From: Daniel Díaz @ 2016-11-24 22:08 UTC (permalink / raw)
To: openembedded-core
The included patch, backported from Weston master (and OE-Core
master since Weston 1.11.1, b6864b1), allows it to run without
any input device at launch. An ini option is introduced for
this purpose, so there is no behavioral change.
Related change in weston.ini:
[core]
require-input=true
Default is true; setting it false allows Weston to run
without a keyboard or mouse, which is handy for automated
environments.
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
v2: Reposted now that the patch made it to OE-Core master.
...ton-1.9-config-option-for-no-input-device.patch | 123 +++++++++++++++++++++
meta/recipes-graphics/wayland/weston_1.9.0.bb | 1 +
2 files changed, 124 insertions(+)
create mode 100644 meta/recipes-graphics/wayland/weston/weston-1.9-config-option-for-no-input-device.patch
diff --git a/meta/recipes-graphics/wayland/weston/weston-1.9-config-option-for-no-input-device.patch b/meta/recipes-graphics/wayland/weston/weston-1.9-config-option-for-no-input-device.patch
new file mode 100644
index 0000000..61a54fd
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/weston-1.9-config-option-for-no-input-device.patch
@@ -0,0 +1,123 @@
+From 6c89292024cc08d4499916dc153c354175bd81c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
+Date: Fri, 21 Oct 2016 14:03:13 -0500
+Subject: [PATCH] Add configuration option for no input device.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[Backported from master, 75b7197.]
+
+As it has been discussed in the past [1], running Weston
+without any input device at launch might be beneficial for
+some use cases.
+
+Certainly, it's best for the vast majority of users (and
+the project) to require an input device to be present, as
+to avoid frustration and hassle, but for those brave souls
+that so prefer, this patch lets them run without any input
+device at all.
+
+This introduces a simple configuration in weston.ini:
+ [core]
+ require-input=true
+
+True is the default, so no behavioral change is introduced.
+
+[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html
+
+Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
+---
+ man/weston.ini.man | 5 +++++
+ src/compositor.h | 4 ++++
+ src/libinput-seat.c | 6 ++++++
+ src/main.c | 5 +++++
+ weston.ini.in | 1 +
+ 5 files changed, 21 insertions(+)
+
+diff --git a/man/weston.ini.man b/man/weston.ini.man
+index a9b6026..668b16f 100644
+--- a/man/weston.ini.man
++++ b/man/weston.ini.man
+@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other
+ hand, if none of these sets the value, default idle timeout will be
+ set to 300 seconds.
+ .RS
++.PP
++.RE
++.TP 7
++.BI "require-input=" true
++require an input device for launch
+
+ .SH "LIBINPUT SECTION"
+ The
+diff --git a/src/compositor.h b/src/compositor.h
+index c4c81f0..292a412 100644
+--- a/src/compositor.h
++++ b/src/compositor.h
+@@ -701,6 +701,10 @@ struct weston_compositor {
+
+ void *user_data;
+ void (*exit)(struct weston_compositor *c);
++
++ /* Whether to let the compositor run without any input device. */
++ bool require_input;
++
+ };
+
+ struct weston_buffer {
+diff --git a/src/libinput-seat.c b/src/libinput-seat.c
+index c9f9ed2..1c4c358 100644
+--- a/src/libinput-seat.c
++++ b/src/libinput-seat.c
+@@ -250,6 +250,12 @@ udev_input_enable(struct udev_input *input)
+ devices_found = 1;
+ }
+
++ if (devices_found == 0 && !c->require_input) {
++ weston_log("warning: no input devices found, but none required "
++ "as per configuration.\n");
++ return 0;
++ }
++
+ if (devices_found == 0) {
+ weston_log(
+ "warning: no input devices on entering Weston. "
+diff --git a/src/main.c b/src/main.c
+index a98570e..b8632e9 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -658,6 +658,7 @@ int main(int argc, char *argv[])
+ struct wl_client *primary_client;
+ struct wl_listener primary_client_destroyed;
+ struct weston_seat *seat;
++ int require_input;
+
+ const struct weston_option core_options[] = {
+ { WESTON_OPTION_STRING, "backend", 'B', &backend },
+@@ -737,6 +738,10 @@ int main(int argc, char *argv[])
+ if (weston_compositor_init_config(ec, config) < 0)
+ goto out_signals;
+
++ weston_config_section_get_bool(section, "require-input",
++ &require_input, true);
++ ec->require_input = require_input;
++
+ if (backend_init(ec, &argc, argv, config) < 0) {
+ weston_log("fatal: failed to create compositor backend\n");
+ goto out_signals;
+diff --git a/weston.ini.in b/weston.ini.in
+index 06b51df..e9ef992 100644
+--- a/weston.ini.in
++++ b/weston.ini.in
+@@ -2,6 +2,7 @@
+ #modules=xwayland.so,cms-colord.so
+ #shell=desktop-shell.so
+ #gbm-format=xrgb2101010
++#require-input=true
+
+ [shell]
+ background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+--
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/weston_1.9.0.bb b/meta/recipes-graphics/wayland/weston_1.9.0.bb
index 16a788d..be8c0b7 100644
--- a/meta/recipes-graphics/wayland/weston_1.9.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.9.0.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://0001-make-error-portable.patch \
file://libsystemd.patch \
file://explicit-enable-disable-systemd.patch \
+ file://weston-1.9-config-option-for-no-input-device.patch \
"
SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e"
SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf"
--
1.9.1
^ permalink raw reply related
* [PATCH v2] selftest: Test needed to verify postinst order
From: Francisco Pedraza @ 2016-11-24 21:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Francisco Pedraza
It verifies the following:
1. Compile a minimal image.
2. The compiled image will add the layer with the recipe postinst,
previously created at:
"meta-selftest/recipes-test"
3. Run QEMU.
4. Validate the task execution order.
[YOCTO #5319]
Signed-off-by: Francisco Pedraza <francisco.j.pedraza.gonzalez@intel.com>
---
.../recipes-test/postinst/postinst_1.0.bb | 124 +++++++++++++++++++++
meta/lib/oeqa/selftest/runtime-test.py | 52 +++++++++
2 files changed, 176 insertions(+)
create mode 100644 meta-selftest/recipes-test/postinst/postinst_1.0.bb
diff --git a/meta-selftest/recipes-test/postinst/postinst_1.0.bb b/meta-selftest/recipes-test/postinst/postinst_1.0.bb
new file mode 100644
index 0000000..97a1987
--- /dev/null
+++ b/meta-selftest/recipes-test/postinst/postinst_1.0.bb
@@ -0,0 +1,124 @@
+LICENSE = "MIT"
+ALLOW_EMPTY_${PN}-at-rootfs = "1"
+ALLOW_EMPTY_${PN}-delayed-a = "1"
+ALLOW_EMPTY_${PN}-delayed-b = "1"
+ALLOW_EMPTY_${PN}-delayed-d = "1"
+ALLOW_EMPTY_${PN}-delayed-p = "1"
+ALLOW_EMPTY_${PN}-delayed-t = "1"
+
+PACKAGES += "${PN}-at-rootfs ${PN}-delayed-a ${PN}-delayed-b ${PN}-delayed-d ${PN}-delayed-p ${PN}-delayed-t"
+PROVIDES += "${PN}-at-rootfs ${PN}-delayed-a ${PN}-delayed-b ${PN}-delayed-d ${PN}-delayed-p ${PN}-delayed-t"
+FILES_${PN}-delayed-a = ""
+FILES_${PN}-delayed-b = ""
+FILES_${PN}-delayed-d = ""
+FILES_${PN}-delayed-p = ""
+FILES_${PN}-delayed-t = ""
+
+# Runtime dependencies
+RDEPENDS_${PN}-delayed-a = "${PN}-at-rootfs"
+RDEPENDS_${PN}-delayed-b = "${PN}-delayed-a"
+RDEPENDS_${PN}-delayed-d = "${PN}-delayed-b"
+RDEPENDS_${PN}-delayed-p = "${PN}-delayed-d"
+RDEPENDS_${PN}-delayed-t = "${PN}-delayed-p"
+
+# Main recipe post-install
+pkg_postinst_${PN}-at-rootfs () {
+ tfile="/etc/postinsta-test"
+ if test "x$D" != "x" then
+ # Need to run on first boot
+ exit 1
+ else
+ echo "lets write postinst" > $tfile
+ fi
+}
+
+# Dependency recipes post-installs
+pkg_postinst_${PN}-delayed-a () {
+ efile="/etc/postinst-test"
+ tfile="/etc/postinsta-test"
+ rdeps="postinst"
+
+ if test "x$D" != "x"; then
+ # Need to run on first boot
+ exit 1
+ else
+ if test -e $efile ; then
+ echo 'success' > $tfile
+ else
+ echo 'fail to install $rdeps first!' >&2
+ exit 1
+ fi
+ fi
+}
+
+pkg_postinst_${PN}-delayed-b () {
+ efile="/etc/postinsta-test"
+ tfile="/etc/postinstb-test"
+ rdeps="postinsta"
+
+ if test "x$D" != "x"; then
+ # Need to run on first boot
+ exit 1
+ else
+ if test -e $efile ; then
+ echo 'success' > $tfile
+ else
+ echo 'fail to install $rdeps first!' >&2
+ exit 1
+ fi
+ fi
+}
+
+pkg_postinst_${PN}-delayed-d () {
+ efile="/etc/postinstb-test"
+ tfile="/etc/postinstd-test"
+ rdeps="postinstb"
+
+ if test "x$D" != "x"; then
+ # Need to run on first boot
+ exit 1
+ else
+ if test -e $efile ; then
+ echo 'success' > $tfile
+ else
+ echo 'fail to install $rdeps first!' >&2
+ exit 1
+ fi
+ fi
+}
+
+pkg_postinst_${PN}-delayed-p () {
+ efile="/etc/postinstd-test"
+ tfile="/etc/postinstp-test"
+ rdeps="postinstd"
+
+ if test "x$D" != "x"; then
+ # Need to run on first boot
+ exit 1
+ else
+ if test -e $efile ; then
+ echo 'success' > $tfile
+ else
+ echo 'fail to install $rdeps first!' >&2
+ exit 1
+ fi
+ fi
+}
+
+pkg_postinst_${PN}-delayed-t () {
+ efile="/etc/postinstp-test"
+ tfile="/etc/postinstt-test"
+ rdeps="postinstp"
+
+ if test "x$D" != "x"; then
+ # Need to run on first boot
+ exit 1
+ else
+ if test -e $efile ; then
+ echo 'success' > $tfile
+ else
+ echo 'fail to install $rdeps first!' >&2
+ exit 1
+ fi
+ fi
+}
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index c2d5b45..1dbfae1 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -2,6 +2,7 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
from oeqa.utils.decorators import testcase
import os
+import re
class TestExport(oeSelfTest):
@@ -103,3 +104,54 @@ class TestImage(oeSelfTest):
# Build core-image-sato and testimage
bitbake('core-image-full-cmdline socat')
bitbake('-c testimage core-image-full-cmdline')
+
+class Postinst(oeSelfTest):
+ @testcase(1540)
+ def test_verify_postinst(self):
+ """
+ Summary: The purpose of this test is to verify the execution order of postinst Bugzilla ID: [5319]
+ Expected :
+ 1. Compile a minimal image.
+ 2. The compiled image will add the created layer with the recipes postinst[ abdpt]
+ 3. Run qemux86
+ 4. Validate the task execution order
+ Author: Francisco Pedraza <francisco.j.pedraza.gonzalez@intel.com>
+ """
+ features = 'INHERIT += "testimage"\n'
+ features += 'CORE_IMAGE_EXTRA_INSTALL += "postinst-at-rootfs \
+postinst-delayed-a \
+postinst-delayed-b \
+postinst-delayed-d \
+postinst-delayed-p \
+postinst-delayed-t \
+"\n'
+ self.write_config(features)
+
+ bitbake('core-image-minimal -f ')
+
+ postinst_list = ['100-postinst-at-rootfs',
+ '101-postinst-delayed-a',
+ '102-postinst-delayed-b',
+ '103-postinst-delayed-d',
+ '104-postinst-delayed-p',
+ '105-postinst-delayed-t']
+ path_workdir = get_bb_var('WORKDIR','core-image-minimal')
+ workspacedir = 'testimage/qemu_boot_log'
+ workspacedir = os.path.join(path_workdir, workspacedir)
+ rexp = re.compile("^Running postinst .*/(?P<postinst>.*)\.\.\.$")
+ with runqemu('core-image-minimal') as qemu:
+ with open(workspacedir) as f:
+ found = False
+ idx = 0
+ for line in f.readlines():
+ line = line.strip().replace("^M","")
+ if not line: # To avoid empty lines
+ continue
+ m = rexp.search(line)
+ if m:
+ self.assertEqual(postinst_list[idx], m.group('postinst'), "Fail")
+ idx = idx+1
+ found = True
+ elif found:
+ self.assertEqual(idx, len(postinst_list), "Not found all postinsts")
+ break
--
2.5.0
^ permalink raw reply related
* [PATCH 2/2] perl: Upgrade to 5.24.0
From: Aníbal Limón @ 2016-11-24 21:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480021564-12420-1-git-send-email-anibal.limon@linux.intel.com>
Configuration changes,
Simple changes was made to bump version and api version, related to
floating point handling now the configuration needs the inf, mantisa
and nan bytes.
The new version comes with the support of API calls like memmem and
{new,free,use}locale also structure for handle siginfo supported by
glibc and musl.
Finally use64bit{int, all} was disable because the previous
configure_args don't come with them and cases some tests to fail
related to bignum's and shared memory respectively. This doesn't
means that perl couldn't use 64-bit data types, it means that don't
stores by default into a 64 bit that is good for embedded space
purposes.
Modules changes,
Some core modules are now deprecated in order to use the core ones
like version-vpp and version-regex inside module-extutils-makemaker.
For full review see perl-rdepends.inc file.
Patches rebased,
- perl/debian/errno_ver.diff
- perl/dynaloaderhack.patch
- perl/Makefile.SH.patch
- perl/config.s
- perl/dynaloaderhack.patch
- perl/perl-test-customized.patch
Patches removed, comes with the upgrade now:
- perl/perl-remove-nm-from-libswanted.patch
- perl/perl-fix-CVE-2015-8607.patch
- perl/perl-fix-CVE-2016-2381.patch
Test,
The upgrade was test using ptest the suite is fixed now.
The pod2man and pod2text installation required now for some tests.
Buildhistory was use to review the changes and only diff changes
related to modules commented above.
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
...perl-native_5.22.1.bb => perl-native_5.24.0.bb} | 5 +-
meta/recipes-devtools/perl/perl-ptest.inc | 4 +-
...depends_5.22.1.inc => perl-rdepends_5.24.0.inc} | 110 +++++++++++---------
meta/recipes-devtools/perl/perl/Makefile.SH.patch | 114 ++++++++++----------
meta/recipes-devtools/perl/perl/config.sh | 94 +++++++++++------
.../perl/perl/debian/errno_ver.diff | 28 ++---
.../perl/perl/debian/prune_libs.diff | 19 ++--
.../perl/perl/dynaloaderhack.patch | 24 +++--
.../perl/perl/perl-fix-CVE-2015-8607.patch | 74 -------------
.../perl/perl/perl-fix-CVE-2016-2381.patch | 114 --------------------
.../perl/perl/perl-remove-nm-from-libswanted.patch | 30 ------
.../perl/perl/perl-test-customized.patch | 115 +++++++++++----------
.../perl/{perl_5.22.1.bb => perl_5.24.0.bb} | 8 +-
13 files changed, 296 insertions(+), 443 deletions(-)
rename meta/recipes-devtools/perl/{perl-native_5.22.1.bb => perl-native_5.24.0.bb} (95%)
rename meta/recipes-devtools/perl/{perl-rdepends_5.22.1.inc => perl-rdepends_5.24.0.inc} (97%)
delete mode 100644 meta/recipes-devtools/perl/perl/perl-fix-CVE-2015-8607.patch
delete mode 100644 meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
delete mode 100644 meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch
rename meta/recipes-devtools/perl/{perl_5.22.1.bb => perl_5.24.0.bb} (98%)
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.1.bb b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
similarity index 95%
rename from meta/recipes-devtools/perl/perl-native_5.22.1.bb
rename to meta/recipes-devtools/perl/perl-native_5.24.0.bb
index 1c21522..af2ad7b 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.1.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
@@ -11,11 +11,10 @@ SRC_URI += "\
file://debian/errno_ver.diff \
file://dynaloaderhack.patch \
file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
- file://perl-remove-nm-from-libswanted.patch \
"
-SRC_URI[md5sum] = "6671e4829cbaf9cecafa9a84f141b0a3"
-SRC_URI[sha256sum] = "9e87317d693ce828095204be0d09af8d60b8785533fadea1a82b6f0e071e5c79"
+SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
+SRC_URI[sha256sum] = "a9a37c0860380ecd7b23aa06d61c20fc5bc6d95198029f3684c44a9d7e2952f2"
inherit native
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index 8dfc179..04406d5 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -20,7 +20,9 @@ do_install_ptest () {
-e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
-e "s,${STAGING_BINDIR_NATIVE}/,,g" \
-e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
- ${D}${PTEST_PATH}/lib/Config.pm
+ ${D}${PTEST_PATH}/lib/Config.pm \
+ ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2man \
+ ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2text
ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl
# Remove plan9 related stuff
diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.22.1.inc b/meta/recipes-devtools/perl/perl-rdepends_5.24.0.inc
similarity index 97%
rename from meta/recipes-devtools/perl/perl-rdepends_5.22.1.inc
rename to meta/recipes-devtools/perl/perl-rdepends_5.24.0.inc
index 2c497fe..10e3c04 100644
--- a/meta/recipes-devtools/perl/perl-rdepends_5.22.1.inc
+++ b/meta/recipes-devtools/perl/perl-rdepends_5.24.0.inc
@@ -22,7 +22,6 @@ RDEPENDS_${PN}-module-math-bigint += "${PN}-module-math-bigint-calc"
RDEPENDS_${PN}-module-thread-queue += "${PN}-module-attributes"
RDEPENDS_${PN}-module-overload += "${PN}-module-overloading"
-
# Depends list
# copy contents of /tmp/perl-rdepends in this file
RDEPENDS_${PN}-module-anydbm-file += "${PN}-module-strict"
@@ -134,12 +133,12 @@ RDEPENDS_${PN}-module-autodie-scope-guard += "${PN}-module-warnings"
RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-autodie-scope-guard"
RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-strict"
RDEPENDS_${PN}-module-autodie-scope-guardstack += "${PN}-module-warnings"
-RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-autodie-scope-guardstack"
-RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-strict"
-RDEPENDS_${PN}-module-autodie-scopeutil += "${PN}-module-warnings"
RDEPENDS_${PN}-module-autodie-skip += "${PN}-module-strict"
RDEPENDS_${PN}-module-autodie-skip += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-autodie-util += "${PN}-module-autodie-scope-guardstack"
+RDEPENDS_${PN}-module-autodie-util += "${PN}-module-exporter"
+RDEPENDS_${PN}-module-autodie-util += "${PN}-module-strict"
+RDEPENDS_${PN}-module-autodie-util += "${PN}-module-warnings"
RDEPENDS_${PN}-module-autoloader += "${PN}-module-carp"
RDEPENDS_${PN}-module-autoloader += "${PN}-module-strict"
RDEPENDS_${PN}-module-autosplit += "${PN}-module-carp"
@@ -181,7 +180,7 @@ RDEPENDS_${PN}-module-bigint += "${PN}-module-math-bigint"
RDEPENDS_${PN}-module-bigint += "${PN}-module-math-bigint-trace"
RDEPENDS_${PN}-module-bigint += "${PN}-module-overload"
RDEPENDS_${PN}-module-bigint += "${PN}-module-strict"
-RDEPENDS_${PN}-module-bigint += "${PN}-module-vars"
+RDEPENDS_${PN}-module-bigint += "${PN}-module-warnings"
RDEPENDS_${PN}-module-bignum += "${PN}-module-bigint"
RDEPENDS_${PN}-module-bignum += "${PN}-module-carp"
RDEPENDS_${PN}-module-bignum += "${PN}-module-exporter"
@@ -191,7 +190,7 @@ RDEPENDS_${PN}-module-bignum += "${PN}-module-math-bigint"
RDEPENDS_${PN}-module-bignum += "${PN}-module-math-bigint-trace"
RDEPENDS_${PN}-module-bignum += "${PN}-module-overload"
RDEPENDS_${PN}-module-bignum += "${PN}-module-strict"
-RDEPENDS_${PN}-module-bignum += "${PN}-module-vars"
+RDEPENDS_${PN}-module-bignum += "${PN}-module-warnings"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-bigint"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-carp"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-exporter"
@@ -201,7 +200,7 @@ RDEPENDS_${PN}-module-bigrat += "${PN}-module-math-bigint-trace"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-math-bigrat"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-overload"
RDEPENDS_${PN}-module-bigrat += "${PN}-module-strict"
-RDEPENDS_${PN}-module-bigrat += "${PN}-module-vars"
+RDEPENDS_${PN}-module-bigrat += "${PN}-module-warnings"
RDEPENDS_${PN}-module-blib += "${PN}-module-cwd"
RDEPENDS_${PN}-module-blib += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-blib += "${PN}-module-vars"
@@ -225,11 +224,16 @@ RDEPENDS_${PN}-module-carp-heavy += "${PN}-module-carp"
RDEPENDS_${PN}-module-carp += "${PN}-module-exporter"
RDEPENDS_${PN}-module-carp += "${PN}-module-strict"
RDEPENDS_${PN}-module-carp += "${PN}-module-warnings"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-bytes"
RDEPENDS_${PN}-module-charnames += "${PN}-module-bytes"
-RDEPENDS_${PN}-module-charnames += "${PN}-module-carp"
-RDEPENDS_${PN}-module-charnames += "${PN}-module-file-spec"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-carp"
+RDEPENDS_${PN}-module-charnames += "${PN}-module--charnames"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-file-spec"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-re"
RDEPENDS_${PN}-module-charnames += "${PN}-module-re"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-strict"
RDEPENDS_${PN}-module-charnames += "${PN}-module-strict"
+RDEPENDS_${PN}-module--charnames += "${PN}-module-warnings"
RDEPENDS_${PN}-module-charnames += "${PN}-module-warnings"
RDEPENDS_${PN}-module-class-struct += "${PN}-module-carp"
RDEPENDS_${PN}-module-class-struct += "${PN}-module-exporter"
@@ -277,6 +281,7 @@ RDEPENDS_${PN}-module-constant += "${PN}-module-carp"
RDEPENDS_${PN}-module-constant += "${PN}-module-strict"
RDEPENDS_${PN}-module-constant += "${PN}-module-warnings-register"
RDEPENDS_${PN}-module-corelist += "${PN}-module-list-util"
+RDEPENDS_${PN}-module-corelist += "${PN}-module-corelist"
RDEPENDS_${PN}-module-corelist += "${PN}-module-strict"
RDEPENDS_${PN}-module-corelist += "${PN}-module-vars"
RDEPENDS_${PN}-module-corelist += "${PN}-module-version"
@@ -522,11 +527,13 @@ RDEPENDS_${PN}-module-encoding += "${PN}-module-constant"
RDEPENDS_${PN}-module-encoding += "${PN}-module-encode"
RDEPENDS_${PN}-module-encoding += "${PN}-module-filter-util-call"
RDEPENDS_${PN}-module-encoding += "${PN}-module-i18n-langinfo"
+RDEPENDS_${PN}-module-encoding += "${PN}-module-posix"
RDEPENDS_${PN}-module-encoding += "${PN}-module-strict"
RDEPENDS_${PN}-module-encoding += "${PN}-module-utf8"
RDEPENDS_${PN}-module-encoding += "${PN}-module-warnings"
RDEPENDS_${PN}-module-encoding-warnings += "${PN}-module-carp"
RDEPENDS_${PN}-module-encoding-warnings += "${PN}-module-strict"
+RDEPENDS_${PN}-module-encoding-warnings += "${PN}-module-warnings"
RDEPENDS_${PN}-module-english += "${PN}-module-carp "
RDEPENDS_${PN}-module-english += "${PN}-module-exporter"
RDEPENDS_${PN}-module-env += "${PN}-module-config"
@@ -553,41 +560,58 @@ RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-file-temp"
RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-ipc-cmd"
RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-text-parsewords"
+RDEPENDS_${PN}-module-extutils-cbuilder-base += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-basename"
RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-path"
RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-file-spec"
+RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-aix += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-config"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-android += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-cygwin += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-cygwin += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-cygwin += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-cygwin += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-cygwin += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-darwin += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-darwin += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-darwin += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-darwin += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-dec-osf += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-dec-osf += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-dec-osf += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-dec-osf += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-dec-osf += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-os2 += "${PN}-module-extutils-cbuilder-platform-unix"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-os2 += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-os2 += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-os2 += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-unix += "${PN}-module-extutils-cbuilder-base"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-unix += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-unix += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-unix += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-config"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-extutils-cbuilder-base"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-file-spec-functions"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-vars"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-vms += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-bcc += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-bcc += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-gcc += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-gcc += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-msvc += "${PN}-module-strict"
+RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows-msvc += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-extutils-cbuilder-base"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-file-basename"
RDEPENDS_${PN}-module-extutils-cbuilder-platform-windows += "${PN}-module-file-spec"
@@ -704,21 +728,8 @@ RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-file-path"
RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-makemaker += "${PN}-module-version"
-RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-extutils-makemaker-version-regex"
RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-makemaker-version += "${PN}-module-vars"
-RDEPENDS_${PN}-module-extutils-makemaker-version-regex += "${PN}-module-strict"
-RDEPENDS_${PN}-module-extutils-makemaker-version-regex += "${PN}-module-vars"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-b"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-carp"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-config"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-constant"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-extutils-makemaker-version-regex"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-locale"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-overload"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-strict"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-universal"
-RDEPENDS_${PN}-module-extutils-makemaker-version-vpp += "${PN}-module-vars"
RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-carp"
RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-config"
RDEPENDS_${PN}-module-extutils-manifest += "${PN}-module-exporter"
@@ -879,9 +890,10 @@ RDEPENDS_${PN}-module-extutils-typemaps += "${PN}-module-warnings"
RDEPENDS_${PN}-module-extutils-typemaps-type += "${PN}-module-extutils-typemaps"
RDEPENDS_${PN}-module-extutils-typemaps-type += "${PN}-module-strict"
RDEPENDS_${PN}-module-extutils-typemaps-type += "${PN}-module-warnings"
+RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie"
RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-exception-system"
RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-hints"
-RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-scopeutil"
+RDEPENDS_${PN}-module-fatal += "${PN}-module-autodie-util"
RDEPENDS_${PN}-module-fatal += "${PN}-module-carp"
RDEPENDS_${PN}-module-fatal += "${PN}-module-config"
RDEPENDS_${PN}-module-fatal += "${PN}-module-constant"
@@ -966,6 +978,9 @@ RDEPENDS_${PN}-module-file-path += "${PN}-module-file-basename"
RDEPENDS_${PN}-module-file-path += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-file-path += "${PN}-module-strict"
RDEPENDS_${PN}-module-file-path += "${PN}-module-vars"
+RDEPENDS_${PN}-module-file-spec-amigaos += "${PN}-module-file-spec-unix"
+RDEPENDS_${PN}-module-file-spec-amigaos += "${PN}-module-strict"
+RDEPENDS_${PN}-module-file-spec-amigaos += "${PN}-module-vars"
RDEPENDS_${PN}-module-file-spec-cygwin += "${PN}-module-file-spec-unix"
RDEPENDS_${PN}-module-file-spec-cygwin += "${PN}-module-strict"
RDEPENDS_${PN}-module-file-spec-cygwin += "${PN}-module-vars"
@@ -1165,7 +1180,7 @@ RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-adapter-deflate"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-adapter-identity"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-base-common"
-RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-bzip2 "
+RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-bzip2"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-rawdeflate"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-zip-constants"
RDEPENDS_${PN}-module-io-compress-zip += "${PN}-module-io-compress-zlib-extra"
@@ -1426,6 +1441,7 @@ RDEPENDS_${PN}-module-load += "${PN}-module-filehandle"
RDEPENDS_${PN}-module-load += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-load += "${PN}-module-locale-maketext-simple"
RDEPENDS_${PN}-module-load += "${PN}-module-corelist"
+RDEPENDS_${PN}-module-load += "${PN}-module-load"
RDEPENDS_${PN}-module-load += "${PN}-module-params-check"
RDEPENDS_${PN}-module-load += "${PN}-module-strict"
RDEPENDS_${PN}-module-load += "${PN}-module-vars"
@@ -1563,43 +1579,45 @@ RDEPENDS_${PN}-module-locale-script += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-carp"
RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-exporter"
RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-math-bigint"
+RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-math-complex"
RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-overload"
RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigfloat += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-exporter"
RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-math-bigfloat"
RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-overload"
RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigfloat-trace += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigint-calcemu += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigint-calcemu += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigint-calcemu += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigint-calc += "${PN}-module-carp"
RDEPENDS_${PN}-module-math-bigint-calc += "${PN}-module-constant"
RDEPENDS_${PN}-module-math-bigint-calc += "${PN}-module-integer"
RDEPENDS_${PN}-module-math-bigint-calc += "${PN}-module-strict"
+RDEPENDS_${PN}-module-math-bigint-calc += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigint-fastcalc += "${PN}-module-math-bigint-calc"
RDEPENDS_${PN}-module-math-bigint-fastcalc += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigint-fastcalc += "${PN}-module-vars"
RDEPENDS_${PN}-module-math-bigint-fastcalc += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigint-fastcalc += "${PN}-module-xsloader"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-carp"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-exporter"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-math-bigfloat"
+RDEPENDS_${PN}-module-math-bigint += "${PN}-module-math-complex"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-overload"
RDEPENDS_${PN}-module-math-bigint += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigint += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigint += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-exporter"
RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-math-bigint"
RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-overload"
RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigint-trace += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-carp"
RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-math-bigfloat"
RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-math-bigint"
RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-overload"
RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-strict"
-RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-vars"
+RDEPENDS_${PN}-module-math-bigrat += "${PN}-module-warnings"
RDEPENDS_${PN}-module-math-complex += "${PN}-module-config"
RDEPENDS_${PN}-module-math-complex += "${PN}-module-exporter"
RDEPENDS_${PN}-module-math-complex += "${PN}-module-overload"
@@ -1635,6 +1653,7 @@ RDEPENDS_${PN}-module-mro += "${PN}-module-warnings"
RDEPENDS_${PN}-module-mro += "${PN}-module-xsloader"
RDEPENDS_${PN}-module-net-cmd += "${PN}-module-carp"
RDEPENDS_${PN}-module-net-cmd += "${PN}-module-constant"
+RDEPENDS_${PN}-module-net-cmd += "${PN}-module-errno"
RDEPENDS_${PN}-module-net-cmd += "${PN}-module-exporter"
RDEPENDS_${PN}-module-net-cmd += "${PN}-module-strict"
RDEPENDS_${PN}-module-net-cmd += "${PN}-module-symbol"
@@ -1816,16 +1835,17 @@ RDEPENDS_${PN}-module-pod-functions += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-inputobjects += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-inputobjects += "${PN}-module-vars"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-carp"
-RDEPENDS_${PN}-module-pod-man += "${PN}-module-encode"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-file-basename"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-pod-simple"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-subs"
RDEPENDS_${PN}-module-pod-man += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-man += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-parselink += "${PN}-module-exporter"
RDEPENDS_${PN}-module-pod-parselink += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-parselink += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-parselink += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-parser += "${PN}-module-carp"
RDEPENDS_${PN}-module-pod-parser += "${PN}-module-exporter"
RDEPENDS_${PN}-module-pod-parser += "${PN}-module-pod-inputobjects"
@@ -2001,6 +2021,7 @@ RDEPENDS_${PN}-module-pod-simple-tiedoutfh += "${PN}-module-symbol"
RDEPENDS_${PN}-module-pod-simple-tiedoutfh += "${PN}-module-vars"
RDEPENDS_${PN}-module-pod-simple-transcodedumb += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-simple-transcodedumb += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-simple-transcode += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-simple-transcode += "${PN}-module-vars"
RDEPENDS_${PN}-module-pod-simple-transcodesmart += "${PN}-module-encode"
RDEPENDS_${PN}-module-pod-simple-transcodesmart += "${PN}-module-pod-simple"
@@ -2014,20 +2035,24 @@ RDEPENDS_${PN}-module-pod-text-color += "${PN}-module-pod-text"
RDEPENDS_${PN}-module-pod-text-color += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-text-color += "${PN}-module-term-ansicolor"
RDEPENDS_${PN}-module-pod-text-color += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-text-color += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-text-overstrike += "${PN}-module-pod-text"
RDEPENDS_${PN}-module-pod-text-overstrike += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-text-overstrike += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-text-overstrike += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-carp"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-encode"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-exporter"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-pod-simple"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-text += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-text += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-pod-text"
RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-posix"
RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-strict"
RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-term-cap"
RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-vars"
+RDEPENDS_${PN}-module-pod-text-termcap += "${PN}-module-warnings"
RDEPENDS_${PN}-module-pod-usage += "${PN}-module-carp"
RDEPENDS_${PN}-module-pod-usage += "${PN}-module-config"
RDEPENDS_${PN}-module-pod-usage += "${PN}-module-exporter"
@@ -2480,9 +2505,8 @@ RDEPENDS_${PN}-module-time-piece += "${PN}-module-time-local"
RDEPENDS_${PN}-module-time-piece += "${PN}-module-time-seconds"
RDEPENDS_${PN}-module-time-seconds += "${PN}-module-constant"
RDEPENDS_${PN}-module-time-seconds += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-time-seconds += "${PN}-module-overload "
+RDEPENDS_${PN}-module-time-seconds += "${PN}-module-overload"
RDEPENDS_${PN}-module-time-seconds += "${PN}-module-strict"
-RDEPENDS_${PN}-module-time-seconds += "${PN}-module-vars"
RDEPENDS_${PN}-module-time-tm += "${PN}-module-class-struct"
RDEPENDS_${PN}-module-time-tm += "${PN}-module-strict"
RDEPENDS_${PN}-module-unicode-collate-cjk-big5 += "${PN}-module-strict"
@@ -2492,7 +2516,6 @@ RDEPENDS_${PN}-module-unicode-collate-cjk-gb2312 += "${PN}-module-warnings"
RDEPENDS_${PN}-module-unicode-collate-cjk-jisx0208 += "${PN}-module-strict"
RDEPENDS_${PN}-module-unicode-collate-cjk-jisx0208 += "${PN}-module-warnings"
RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-strict"
-RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-unicode-collate"
RDEPENDS_${PN}-module-unicode-collate-cjk-korean += "${PN}-module-warnings"
RDEPENDS_${PN}-module-unicode-collate-cjk-pinyin += "${PN}-module-strict"
RDEPENDS_${PN}-module-unicode-collate-cjk-pinyin += "${PN}-module-warnings"
@@ -2511,9 +2534,8 @@ RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-strict"
RDEPENDS_${PN}-module-unicode-collate += "${PN}-module-warnings"
RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-carp"
-RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-constant"
+RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-dynaloader"
RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-exporter"
-RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-file-spec"
RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-strict"
RDEPENDS_${PN}-module-unicode-normalize += "${PN}-module-warnings"
RDEPENDS_${PN}-module-unicode-ucd += "${PN}-module-carp"
@@ -2546,18 +2568,8 @@ RDEPENDS_${PN}-module-utf8 += "${PN}-module-utf8-heavy"
RDEPENDS_${PN}-module-version += "${PN}-module-strict"
RDEPENDS_${PN}-module-version += "${PN}-module-vars"
RDEPENDS_${PN}-module-version += "${PN}-module-version-regex"
+RDEPENDS_${PN}-module-version += "${PN}-module-warnings-register"
RDEPENDS_${PN}-module-version-regex += "${PN}-module-strict"
RDEPENDS_${PN}-module-version-regex += "${PN}-module-vars"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-b"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-carp"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-config"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-constant"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-if"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-overload"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-posix"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-strict"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-universal"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-vars"
-RDEPENDS_${PN}-module-version-vpp += "${PN}-module-version-regex"
RDEPENDS_${PN}-module-xsloader += "${PN}-module-carp"
RDEPENDS_${PN}-module-xsloader += "${PN}-module-dynaloader"
diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index edf49d6..fd8237f 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
@@ -1,15 +1,22 @@
+From 4dd9f3f81d8c81c96ff1ea0890ea55685f28b7e9 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 1 Jul 2014 15:51:53 +0800
+Subject: [PATCH 28/49] perl, perl-native, perl-ptest: upgrade from 5.14.3 to
+ 5.20.0
+
Upstream-Status:Inappropriate [embedded specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
- Makefile.SH | 145 +++++++++++++++++++++++++++--------------------------------
- 1 file changed, 67 insertions(+), 78 deletions(-)
+ Makefile.SH | 147 ++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 68 insertions(+), 79 deletions(-)
-Index: perl-5.22.1/Makefile.SH
-===================================================================
---- perl-5.22.1.orig/Makefile.SH
-+++ perl-5.22.1/Makefile.SH
-@@ -39,10 +39,10 @@ case "$useshrplib" in
+diff --git a/Makefile.SH b/Makefile.SH
+index 916b332..b143d46 100755
+--- a/Makefile.SH
++++ b/Makefile.SH
+@@ -48,10 +48,10 @@ case "$useshrplib" in
true)
# Prefix all runs of 'miniperl' and 'perl' with
# $ldlibpth so that ./perl finds *this* shared libperl.
@@ -24,7 +31,7 @@ Index: perl-5.22.1/Makefile.SH
pldlflags="$cccdlflags"
static_ldflags=''
-@@ -122,10 +122,11 @@ true)
+@@ -131,10 +131,11 @@ true)
*)
eval "ldlibpthval=\"\$$ldlibpthname\""
@@ -40,7 +47,7 @@ Index: perl-5.22.1/Makefile.SH
;;
esac
-@@ -141,18 +142,7 @@ true)
+@@ -150,18 +151,7 @@ true)
# INSTALL file, under "Building a shared perl library".
# If there is no pre-existing $libperl, we don't need
# to do anything further.
@@ -60,17 +67,13 @@ Index: perl-5.22.1/Makefile.SH
;;
os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
;;
-@@ -566,13 +556,23 @@ splintfiles = $(c1)
+@@ -596,13 +586,23 @@ splintfiles = $(c1)
@echo `$(CCCMDSRC)` -S $*.c
@`$(CCCMDSRC)` -S $*.c
-all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
- @echo " ";
- @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
--
--$(MANIFEST_SRT): MANIFEST $(PERL_EXE)
-- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
-- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
+#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT)
+# @echo " ";
+# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
@@ -80,7 +83,10 @@ Index: perl-5.22.1/Makefile.SH
+more: $(generated_pods) $(private) $(public)
+
+more2: $(dynamic_ext)
-+
+
+-$(MANIFEST_SRT): MANIFEST $(PERL_EXE)
+- @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \
+- $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
+more3: $(nonxs_ext)
+
+more4: extras.make $(MANIFEST_SRT)
@@ -91,7 +97,7 @@ Index: perl-5.22.1/Makefile.SH
@touch $(MANIFEST_SRT)
.PHONY: all utilities
-@@ -581,7 +581,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE)
+@@ -611,7 +611,7 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE)
# by make_patchnum.pl.
git_version.h: lib/Config_git.pl
@@ -100,7 +106,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) make_patchnum.pl
# make sure that we recompile perl.c if the git version changes
-@@ -594,7 +594,7 @@ perl$(OBJ_EXT): git_version.h
+@@ -624,7 +624,7 @@ perl$(OBJ_EXT): git_version.h
# loading, we need to build perl first.
case "$usedl$static_cwd" in
defineundef)
@@ -109,7 +115,7 @@ Index: perl-5.22.1/Makefile.SH
;;
definedefine)
util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
-@@ -604,7 +604,7 @@ definedefine)
+@@ -634,7 +634,7 @@ definedefine)
esac
$spitshell >>$Makefile <<!GROK!THIS!
@@ -118,16 +124,16 @@ Index: perl-5.22.1/Makefile.SH
\$(MINIPERL) -Ilib utils/Makefile.PL
utilities: utils/Makefile $util_deps
-@@ -699,7 +699,7 @@ esac
-
-
+@@ -743,7 +743,7 @@ ext.libs: $(static_ext)
+ ;;
+ *)
$spitshell >>$Makefile <<'!NO!SUBS!'
-perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib
+perlmain.c: ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
$(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext)
# The file ext.libs is a list of libraries that must be linked in
-@@ -760,7 +760,7 @@ PERLEXPORT = perl.exp
+@@ -806,7 +806,7 @@ PERLEXPORT = perl.exp
;;
esac
$spitshell >>$Makefile <<'!NO!SUBS!'
@@ -136,7 +142,7 @@ Index: perl-5.22.1/Makefile.SH
./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp
!NO!SUBS!
-@@ -769,7 +769,7 @@ os2)
+@@ -815,7 +815,7 @@ os2)
$spitshell >>$Makefile <<'!NO!SUBS!'
MINIPERLEXP = miniperl
@@ -145,19 +151,19 @@ Index: perl-5.22.1/Makefile.SH
./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def
!NO!SUBS!
-@@ -829,7 +829,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI
+@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) $(LIBPERLEXPORT)
true)
$spitshell >>$Makefile <<'!NO!SUBS!'
rm -f $@
-- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs)
-+ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
+- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs)
++ $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -Wl,-soname,libperl.so.5
!NO!SUBS!
case "$osname" in
aix)
-@@ -877,7 +877,9 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
+@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
$spitshell >>$Makefile <<'!NO!SUBS!'
- lib/buildcustomize.pl: $& $(mini_obj)
- $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs)
+ lib/buildcustomize.pl: $& $(miniperl_objs)
+ $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs)
- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ mv -f miniperl miniperl-target
+ ln -s hostperl miniperl
@@ -165,21 +171,22 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
-@@ -885,7 +887,9 @@ lib/buildcustomize.pl: $& $(mini_obj)
+ next4*)
$spitshell >>$Makefile <<'!NO!SUBS!'
- lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl
- $(CC) -o $(MINIPERL_EXE) $(mini_obj libs)
+ lib/buildcustomize.pl: $& $(miniperl_objs) write ldcustomize.pl
+- $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs)
- $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
++ $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs)
+ mv -f miniperl miniperl-target
+ ln -s hostperl miniperl
+ #$(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
-@@ -907,7 +911,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr
+@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-@rm -f miniperl.xok
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
- $(mini_obj) $(libs)
+ $(miniperl_objs) $(libs)
- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ mv -f miniperl miniperl-target
+ ln -s hostperl miniperl
@@ -187,7 +194,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
;;
-@@ -918,7 +924,9 @@ lib/buildcustomize.pl: \$& \$(mini_obj)
+@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) write_buildcustomize.pl
-@rm -f miniperl.xok
-@rm \$(MINIPERL_EXE)
\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
@@ -198,10 +205,10 @@ Index: perl-5.22.1/Makefile.SH
\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
!GROK!THIS!
else
-@@ -927,7 +935,9 @@ lib/buildcustomize.pl: $& $(mini_obj) wr
+@@ -986,7 +994,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-@rm -f miniperl.xok
$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
- $(mini_obj) $(libs)
+ $(miniperl_objs) $(libs)
- $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
+ mv -f miniperl miniperl-target
+ ln -s hostperl miniperl
@@ -209,7 +216,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
fi
-@@ -971,7 +981,7 @@ case "${osname}" in
+@@ -1036,7 +1046,7 @@ case "${osname}" in
catamount)
$spitshell >>$Makefile <<!GROK!THIS!
.PHONY: makeppport
@@ -218,7 +225,7 @@ Index: perl-5.22.1/Makefile.SH
-@for f in Makefile.PL PPPort_pm.PL PPPort_xs.PL ppport_h.PL; do \
(cd ext/Devel-PPPort && `pwd`/run.sh ../../$(MINIPERL_EXE) -I../../lib \$\$f); \
done
-@@ -981,7 +991,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM
+@@ -1046,7 +1056,7 @@ makeppport: \$(MINIPERL_EXE) \$(CONFIGPM)
*)
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: makeppport
@@ -227,7 +234,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) mkppport
!NO!SUBS!
-@@ -991,16 +1001,16 @@ esac
+@@ -1056,16 +1066,16 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
.PHONY: preplibrary
@@ -247,7 +254,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
# Commented out so always runs, mktables looks at far more files than we
# can in this makefile to decide if needs to run or not
-@@ -1009,12 +1019,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
+@@ -1074,12 +1084,12 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
# $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5
# But also this ensures that all extensions are built before we try to scan
# them, which picks up Devel::PPPort's documentation.
@@ -263,16 +270,16 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) autodoc.pl
pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
-@@ -1024,7 +1034,7 @@ pod/perl5221delta.pod: pod/perldelta.pod
- $(RMS) pod/perl5221delta.pod
- $(LNS) perldelta.pod pod/perl5221delta.pod
+@@ -1089,7 +1099,7 @@ pod/perl5240delta.pod: pod/perldelta.pod
+ $(RMS) pod/perl5240delta.pod
+ $(LNS) perldelta.pod pod/perl5240delta.pod
-extra.pods: $(MINIPERL_EXE)
+extra.pods:
-@test ! -f extra.pods || rm -f `cat extra.pods`
-@rm -f extra.pods
-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -1068,8 +1078,7 @@ EOT
+@@ -1133,8 +1143,7 @@ EOT
$spitshell >>$Makefile <<EOT
install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
@@ -282,7 +289,7 @@ Index: perl-5.22.1/Makefile.SH
EOT
fi
-@@ -1079,11 +1088,7 @@ done
+@@ -1144,11 +1153,7 @@ done
if test "X$hostperl" != X; then
$spitshell >>$Makefile <<'!NO!SUBS!'
install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -295,7 +302,7 @@ Index: perl-5.22.1/Makefile.SH
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
-@@ -1101,24 +1106,8 @@ install.html: all installhtml
+@@ -1166,24 +1171,8 @@ install.html: all installhtml
else
$spitshell >>$Makefile <<'!NO!SUBS!'
install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -321,7 +328,7 @@ Index: perl-5.22.1/Makefile.SH
!NO!SUBS!
fi
-@@ -1210,13 +1199,13 @@ manicheck: FORCE
+@@ -1275,13 +1264,13 @@ manicheck: FORCE
#
# DynaLoader may be needed for extensions that use Makefile.PL.
@@ -338,7 +345,7 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
-@@ -1405,14 +1394,14 @@ test_prep_pre: preplibrary utilities $(n
+@@ -1479,14 +1468,14 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
case "$targethost" in
'') $spitshell >>$Makefile <<'!NO!SUBS!'
@@ -355,7 +362,7 @@ Index: perl-5.22.1/Makefile.SH
\$(dynamic_ext) \$(TEST_PERL_DLL) runtests \
\$(generated_pods)
$to libperl.*
-@@ -1465,7 +1454,7 @@ test_prep test-prep: test_prep_pre \$(MI
+@@ -1539,7 +1528,7 @@ test_prep test-prep: test_prep_pre \$(MINIPERL_EXE) \$(unidatafiles) \$(PERL_EXE
esac
$spitshell >>$Makefile <<'!NO!SUBS!'
@@ -364,12 +371,15 @@ Index: perl-5.22.1/Makefile.SH
$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
!NO!SUBS!
-@@ -1526,7 +1515,7 @@ minitest_prep:
+@@ -1600,7 +1589,7 @@ minitest_prep:
MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t
-minitest: $(MINIPERL_EXE) minitest_prep
+minitest: minitest_prep
- - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) </dev/tty
+ - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty)
minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/perl/perl/config.sh b/meta/recipes-devtools/perl/perl/config.sh
index b2a7f2c..6666e6f 100644
--- a/meta/recipes-devtools/perl/perl/config.sh
+++ b/meta/recipes-devtools/perl/perl/config.sh
@@ -14,7 +14,7 @@
: Configure command line arguments.
config_arg0='Configure'
-config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.22.1 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=@USRBIN@/less -isr'
+config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.24.0 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=@USRBIN@/less -isr'
config_argc=28
config_arg1='-des'
config_arg2='-Doptimize=-O2'
@@ -26,7 +26,7 @@ config_arg7='-Dinstallprefix=@EXECPREFIX@'
config_arg8='-Dprefix=@EXECPREFIX@'
config_arg9='-Dvendorprefix=@EXECPREFIX@'
config_arg10='-Dsiteprefix=@EXECPREFIX@'
-config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.22.1'
+config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.24.0'
config_arg12='-Duseshrplib'
config_arg13='-Dusethreads'
config_arg14='-Duseithreads'
@@ -65,12 +65,12 @@ ansi2knr=''
aphostname=''
api_revision='5'
api_subversion='0'
-api_version='22'
-api_versionstring='5.22.0'
+api_version='24'
+api_versionstring='5.24.0'
ar='ar'
-archlib='@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
-archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
-archlib_exp='@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
+archlib='@LIBDIR@/perl/5.24.0/@ARCH@-thread-multi'
+archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.24.0/@ARCH@-thread-multi'
+archlib_exp='@LIBDIR@/perl/5.24.0/@ARCH@-thread-multi'
archname64=''
archname='@ARCH@-thread-multi'
archobjs=''
@@ -88,7 +88,7 @@ castflags='0'
cat='cat'
cc='gcc'
cccdlflags='-fPIC'
-ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi/CORE'
+ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.24.0/@ARCH@-thread-multi/CORE'
ccflags='-D_REENTRANT -D_GNU_SOURCE -fwrapv -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccname='gcc'
@@ -648,11 +648,15 @@ db_version_patch=''
direntrytype='struct dirent'
dlext='so'
dlsrc='dl_dlopen.xs'
+doubleinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f'
doublekind='3'
+doublemantbits='52'
+doublenanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff'
doublesize='8'
drand01='Perl_drand48()'
drand48_r_proto='REENTRANT_PROTO_I_ST'
dtrace=''
+dtraceobject=''
dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
eagain='EAGAIN'
ebcdic='undef'
@@ -834,7 +838,7 @@ inc_version_list_init='0'
incpath=''
inews=''
initialinstalllocation='@USRBIN@'
-installarchlib='@LIBDIR@/perl/5.22.1/@ARCH@-thread-multi'
+installarchlib='@LIBDIR@/perl/5.24.0/@ARCH@-thread-multi'
installbin='@USRBIN@'
installhtml1dir=''
installhtml3dir=''
@@ -842,23 +846,23 @@ installman1dir=''
installman3dir=''
installprefix='@EXECPREFIX@'
installprefixexp='@EXECPREFIX@'
-installprivlib='@LIBDIR@/perl/5.22.1'
+installprivlib='@LIBDIR@/perl/5.24.0'
installscript='@USRBIN@'
-installsitearch='@LIBDIR@/perl/site_perl/5.22.1/@ARCH@-thread-multi'
+installsitearch='@LIBDIR@/perl/site_perl/5.24.0/@ARCH@-thread-multi'
installsitebin='@USRBIN@'
installsitehtml1dir=''
installsitehtml3dir=''
-installsitelib='@LIBDIR@/perl/site_perl/5.22.1'
+installsitelib='@LIBDIR@/perl/site_perl/5.24.0'
installsiteman1dir=''
installsiteman3dir=''
installsitescript='@USRBIN@'
installstyle='lib/perl'
installusrbinperl='define'
-installvendorarch='@LIBDIR@/perl/vendor_perl/5.22.1/@ARCH@-thread-multi'
+installvendorarch='@LIBDIR@/perl/vendor_perl/5.24.0/@ARCH@-thread-multi'
installvendorbin='@USRBIN@'
installvendorhtml1dir=''
installvendorhtml3dir=''
-installvendorlib='@LIBDIR@/perl/vendor_perl/5.22.1'
+installvendorlib='@LIBDIR@/perl/vendor_perl/5.24.0'
installvendorman1dir=''
installvendorman3dir=''
installvendorscript='@USRBIN@'
@@ -895,7 +899,10 @@ lns='/bin/ln -s'
localtime_r_proto='REENTRANT_PROTO_S_TS'
locincpth='@EXECPREFIX@/local/include /opt/local/include @EXECPREFIX@/gnu/include /opt/gnu/include @EXECPREFIX@/GNU/include /opt/GNU/include'
loclibpth='@EXECPREFIX@/local@BASELIBDIR@ /opt/local@BASELIBDIR@ @EXECPREFIX@/gnu@BASELIBDIR@ /opt/gnu@BASELIBDIR@ @EXECPREFIX@/GNU@BASELIBDIR@ /opt/GNU@BASELIBDIR@'
+longdblinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00'
longdblkind='3'
+longdblmantbits='64'
+longdblnanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x32, 0xf7'
longdblsize='16'
longlongsize='8'
longsize='8'
@@ -948,6 +955,7 @@ nv_preserves_uv_bits='53'
nveformat='"e"'
nvfformat='"f"'
nvgformat='"g"'
+nvmantbits='52'
nvsize='8'
nvtype='double'
o_nonblock='O_NONBLOCK'
@@ -957,11 +965,11 @@ optimize='-O2'
orderlib='false'
osname='linux'
osvers='3.19.5-yocto-standard'
-otherlibdirs='@LIBDIR@/perl/5.22.1'
+otherlibdirs='@LIBDIR@/perl/5.24.0'
package='perl'
pager='/usr/bin/less -isr'
passcat='cat /etc/passwd'
-patchlevel='22'
+patchlevel='24'
path_sep=':'
perl5='@USRBIN@/perl'
perl='perl'
@@ -978,8 +986,8 @@ pmake=''
pr=''
prefix='@EXECPREFIX@'
prefixexp='@EXECPREFIX@'
-privlib='@LIBDIR@/perl/5.22.1'
-privlibexp='@LIBDIR@/perl/5.22.1'
+privlib='@LIBDIR@/perl/5.24.0'
+privlibexp='@LIBDIR@/perl/5.24.0'
procselfexe='"/proc/self/exe"'
prototype='define'
ptrsize='8'
@@ -1045,17 +1053,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
sig_size='69'
signal_t='void'
-sitearch='@LIBDIR@/perl/site_perl/5.22.1/@ARCH@-thread-multi'
-sitearchexp='@LIBDIR@/perl/site_perl/5.22.1/@ARCH@-thread-multi'
+sitearch='@LIBDIR@/perl/site_perl/5.24.0/@ARCH@-thread-multi'
+sitearchexp='@LIBDIR@/perl/site_perl/5.24.0/@ARCH@-thread-multi'
sitebin='@USRBIN@'
sitebinexp='@USRBIN@'
sitehtml1dir=''
sitehtml1direxp=''
sitehtml3dir=''
sitehtml3direxp=''
-sitelib='@LIBDIR@/perl/site_perl/5.22.1'
+sitelib='@LIBDIR@/perl/site_perl/5.24.0'
sitelib_stem='@LIBDIR@/perl/site_perl'
-sitelibexp='@LIBDIR@/perl/site_perl/5.22.1'
+sitelibexp='@LIBDIR@/perl/site_perl/5.24.0'
siteman1dir=''
siteman1direxp=''
siteman3dir=''
@@ -1134,8 +1142,8 @@ uname='uname'
uniq='uniq'
uquadtype='unsigned long'
use5005threads='undef'
-use64bitall='define'
-use64bitint='define'
+use64bitall='undef'
+use64bitint='undef'
usecbacktrace='undef'
usecrosscompile='define'
usedevel='undef'
@@ -1174,17 +1182,17 @@ uvtype='unsigned long'
uvuformat='"lu"'
uvxformat='"lx"'
vaproto='define'
-vendorarch='@LIBDIR@/perl/vendor_perl/5.22.1/@ARCH@-thread-multi'
-vendorarchexp='@LIBDIR@/perl/vendor_perl/5.22.1/@ARCH@-thread-multi'
+vendorarch='@LIBDIR@/perl/vendor_perl/5.24.0/@ARCH@-thread-multi'
+vendorarchexp='@LIBDIR@/perl/vendor_perl/5.24.0/@ARCH@-thread-multi'
vendorbin='@USRBIN@'
vendorbinexp='@USRBIN@'
vendorhtml1dir=' '
vendorhtml1direxp=''
vendorhtml3dir=' '
vendorhtml3direxp=''
-vendorlib='@LIBDIR@/perl/vendor_perl/5.22.1'
+vendorlib='@LIBDIR@/perl/vendor_perl/5.24.0'
vendorlib_stem='@LIBDIR@/perl/vendor_perl'
-vendorlibexp='@LIBDIR@/perl/vendor_perl/5.22.1'
+vendorlibexp='@LIBDIR@/perl/vendor_perl/5.24.0'
vendorman1dir=' '
vendorman1direxp=''
vendorman3dir=' '
@@ -1193,8 +1201,8 @@ vendorprefix='@EXECPREFIX@'
vendorprefixexp='@EXECPREFIX@'
vendorscript='@USRBIN@'
vendorscriptexp='@USRBIN@'
-version='5.22.1'
-version_patchlevel_string='version 22 subversion 1'
+version='5.24.0'
+version_patchlevel_string='version 24 subversion 0'
versiononly='undef'
vi=''
xlibpth='@LIBDIR@/386 @BASELIBDIR@386'
@@ -1203,10 +1211,10 @@ yaccflags=''
zcat=''
zip='zip'
PERL_REVISION=5
-PERL_VERSION=22
-PERL_SUBVERSION=1
+PERL_VERSION=24
+PERL_SUBVERSION=0
PERL_API_REVISION=5
-PERL_API_VERSION=22
+PERL_API_VERSION=24
PERL_API_SUBVERSION=0
PERL_PATCHLEVEL=''
PERL_CONFIG_SH=true
@@ -1219,3 +1227,23 @@ d_clock_gettime='define'
d_clock_getres='define'
d_clock='define'
d_nanosleep='define'
+
+# for Signinfo
+d_siginfo_si_errno='define'
+d_siginfo_si_pid='define'
+d_siginfo_si_uid='define'
+d_siginfo_si_addr='define'
+d_siginfo_si_status='define'
+d_siginfo_si_band='define'
+d_siginfo_si_value='define'
+
+# don't support fdclose
+d_fdclose='undef'
+
+# support memmem
+d_memmem='define'
+
+# for locale
+d_newlocale='define'
+d_freelocale='define'
+d_uselocale='define'
diff --git a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
index bcb59c6..3d09229 100644
--- a/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
+++ b/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
@@ -1,8 +1,8 @@
-From 827eee225897c35ec97194a5971bf4bfcf250748 Mon Sep 17 00:00:00 2001
+From 8e1efba7560d8d55524c7a0f1b0539ddce419b86 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 16 Dec 2005 01:32:14 +1100
-Subject: Remove Errno version check due to upgrade problems with long-running
- processes.
+Subject: [PATCH 6/8] Remove Errno version check due to upgrade problems with
+ long-running processes.
Bug-Debian: http://bugs.debian.org/343351
@@ -11,25 +11,27 @@ processes embedding perl when upgrading to a newer version,
compatible, but built on a different machine.
Patch-Name: debian/errno_ver.diff
+
---
ext/Errno/Errno_pm.PL | 5 -----
1 file changed, 5 deletions(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index c6bfa06..519e5c7 100644
+index 6251a3c..eeed445 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
-@@ -278,13 +278,8 @@ sub write_errno_pm {
-
- package Errno;
- require Exporter;
+@@ -294,11 +294,6 @@ EDQ
+ # they've already declared perl doesn't need to worry about this risk.
+ if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) {
+ print <<"CONFIG_CHECK_END";
-use Config;
- use strict;
-
-"\$Config{'archname'}-\$Config{'osvers'}" eq
-"$archname-$Config{'osvers'}" or
- die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
-
- our \$VERSION = "$VERSION";
- \$VERSION = eval \$VERSION;
- our \@ISA = 'Exporter';
+ CONFIG_CHECK_END
+ }
+
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
index b4443f6..d153e0e 100644
--- a/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
@@ -1,7 +1,8 @@
-From 21bc033755f0b609f9bb2aa9e98b10d58424406f Mon Sep 17 00:00:00 2001
+From c4538f966c49e356599358def7d1febf61bca21f Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 18 Mar 2005 22:22:25 +1100
-Subject: Prune the list of libraries wanted to what we actually need.
+Subject: [PATCH 15/49] Prune the list of libraries wanted to what we actually
+ need.
Bug-Debian: http://bugs.debian.org/128355
@@ -9,25 +10,26 @@ We want to keep the dependencies on perl-base as small as possible,
and some of the original list may be present on buildds (see Bug#128355).
Patch-Name: debian/prune_libs.diff
+
---
Configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Configure b/Configure
-index 0a405d3..6fcc3bc 100755
+index 5a353d6..a00df64 100755
--- a/Configure
+++ b/Configure
-@@ -1454,8 +1454,7 @@ libswanted_uselargefiles=''
- : set usesocks on the Configure command line to enable socks.
+@@ -1479,8 +1479,7 @@ archname=''
+ usereentrant='undef'
: List of libraries we want.
: If anyone needs extra -lxxx, put those in a hint file.
--libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
+-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
-libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
+libswanted='gdbm gdbm_compat db dl m c crypt'
: We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-@@ -23593,7 +23592,7 @@ sunos*X4*)
+@@ -24007,7 +24006,7 @@ sunos*X4*)
;;
*) case "$usedl" in
$define|true|[yY]*)
@@ -36,3 +38,6 @@ index 0a405d3..6fcc3bc 100755
shift
perllibs="$*"
;;
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/perl/perl/dynaloaderhack.patch b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
index 3df5933..719f07c 100644
--- a/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
+++ b/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
@@ -1,3 +1,8 @@
+From 2e0ce5d27e70defd66ace0661af7c24daae34f8b Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Sat, 19 Jan 2013 23:49:24 +0000
+Subject: [PATCH 7/8] perl: Add dyanloader build hack
+
Hack the dynamic module loader so that we use native modules since we can't load
the target ones.
@@ -6,14 +11,18 @@ Upstream-Status: Inappropriate
RP
2013/01/13
-Index: perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL
-===================================================================
---- perl-5.14.2.orig/ext/DynaLoader/DynaLoader_pm.PL 2011-09-19 13:18:22.000000000 +0000
-+++ perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL 2013-01-19 16:09:51.020584945 +0000
-@@ -310,6 +310,10 @@
+---
+ ext/DynaLoader/DynaLoader_pm.PL | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
+index e828f35..4021559 100644
+--- a/ext/DynaLoader/DynaLoader_pm.PL
++++ b/ext/DynaLoader/DynaLoader_pm.PL
+@@ -343,6 +343,10 @@ sub bootstrap {
foreach (@INC) {
<<$^O-eq-VMS>>chop($_ = VMS::Filespec::unixpath($_));<</$^O-eq-VMS>>
- my $dir = "$_/auto/$modpname";
+ $dir = "$_/auto/$modpname";
+
+ if (defined $ENV{PERL_LIB} and defined $ENV{PERLHOSTLIB}) {
+ $dir =~ s/$ENV{PERL_LIB}/$ENV{PERLHOSTLIB}/g;
@@ -21,3 +30,6 @@ Index: perl-5.14.2/ext/DynaLoader/DynaLoader_pm.PL
next unless -d $dir; # skip over uninteresting directories
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2015-8607.patch b/meta/recipes-devtools/perl/perl/perl-fix-CVE-2015-8607.patch
deleted file mode 100644
index 7b4a001..0000000
--- a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2015-8607.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 652c8d4852a69f1bb4d387946f9b76350a1f0d0e Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Tue, 15 Dec 2015 10:56:54 +1100
-Subject: [PATCH] perl: fix CVE-2015-8607
-
-ensure File::Spec::canonpath() preserves taint
-
-Previously the unix specific XS implementation of canonpath() would
-return an untainted path when supplied a tainted path.
-
-For the empty string case, newSVpvs() already sets taint as needed on
-its result.
-
-This issue was assigned CVE-2015-8607. [perl #126862]
-
-Backport patch from http://perl5.git.perl.org/perl.git/commitdiff/0b6f93036de171c12ba95d415e264d9cf7f4e1fd
-
-Upstream-Status: Backport
-CVE: CVE-2015-8607
-Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
----
- dist/PathTools/Cwd.xs | 1 +
- dist/PathTools/t/taint.t | 19 ++++++++++++++++++-
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs
-index 9d4dcf0..3d018dc 100644
---- a/dist/PathTools/Cwd.xs
-+++ b/dist/PathTools/Cwd.xs
-@@ -535,6 +535,7 @@ THX_unix_canonpath(pTHX_ SV *path)
- *o = 0;
- SvPOK_on(retval);
- SvCUR_set(retval, o - SvPVX(retval));
-+ SvTAINT(retval);
- return retval;
- }
-
-diff --git a/dist/PathTools/t/taint.t b/dist/PathTools/t/taint.t
-index 309b3e5..48f8c5b 100644
---- a/dist/PathTools/t/taint.t
-+++ b/dist/PathTools/t/taint.t
-@@ -12,7 +12,7 @@ use Test::More;
- BEGIN {
- plan(
- ${^TAINT}
-- ? (tests => 17)
-+ ? (tests => 21)
- : (skip_all => "A perl without taint support")
- );
- }
-@@ -34,3 +34,20 @@ foreach my $func (@Functions) {
-
- # Previous versions of Cwd tainted $^O
- is !tainted($^O), 1, "\$^O should not be tainted";
-+
-+{
-+ # [perl #126862] canonpath() loses taint
-+ my $tainted = substr($ENV{PATH}, 0, 0);
-+ # yes, getcwd()'s result should be tainted, and is tested above
-+ # but be sure
-+ ok tainted(File::Spec->canonpath($tainted . Cwd::getcwd)),
-+ "canonpath() keeps taint on non-empty string";
-+ ok tainted(File::Spec->canonpath($tainted)),
-+ "canonpath() keeps taint on empty string";
-+
-+ (Cwd::getcwd() =~ /^(.*)/);
-+ my $untainted = $1;
-+ ok !tainted($untainted), "make sure our untainted value is untainted";
-+ ok !tainted(File::Spec->canonpath($untainted)),
-+ "canonpath() doesn't add taint to untainted string";
-+}
---
-2.8.1
-
diff --git a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch b/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
deleted file mode 100644
index 99fa8d9..0000000
--- a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-CVE: CVE-2016-2381
-Upstream-Status: Backport
-
-Backport patch to fix CVE-2016-2381 from
-
-http://perl5.git.perl.org/perl.git/commitdiff/ae37b791a73a9e78dedb89fb2429d2628cf58076
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
-From: Tony Cook <tony@develop-help.com>
-Date: Wed, 27 Jan 2016 00:52:15 +0000 (+1100)
-Subject: remove duplicate environment variables from environ
-X-Git-Tag: v5.23.9~170
-X-Git-Url: http://perl5.git.perl.org/perl.git/commitdiff_plain/ae37b791a73a9e78dedb89fb2429d2628cf58076
-
-remove duplicate environment variables from environ
-
-If we see duplicate environment variables while iterating over
-environ[]:
-
-a) make sure we use the same value in %ENV that getenv() returns.
-
-Previously on a duplicate, %ENV would have the last entry for the name
-from environ[], but a typical getenv() would return the first entry.
-
-Rather than assuming all getenv() implementations return the first entry
-explicitly call getenv() to ensure they agree.
-
-b) remove duplicate entries from environ
-
-Previously if there was a duplicate definition for a name in environ[]
-setting that name in %ENV could result in an unsafe value being passed
-to a child process, so ensure environ[] has no duplicates.
-
-CVE-2016-2381
----
-
-diff --git a/perl.c b/perl.c
-index 4a324c6..5c71fd0 100644
---- a/perl.c
-+++ b/perl.c
-@@ -4329,23 +4329,70 @@ S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env)
- }
- if (env) {
- char *s, *old_var;
-+ STRLEN nlen;
- SV *sv;
-+ HV *dups = newHV();
-+
- for (; *env; env++) {
- old_var = *env;
-
- if (!(s = strchr(old_var,'=')) || s == old_var)
- continue;
-+ nlen = s - old_var;
-
- #if defined(MSDOS) && !defined(DJGPP)
- *s = '\0';
- (void)strupr(old_var);
- *s = '=';
- #endif
-- sv = newSVpv(s+1, 0);
-- (void)hv_store(hv, old_var, s - old_var, sv, 0);
-+ if (hv_exists(hv, old_var, nlen)) {
-+ const char *name = savepvn(old_var, nlen);
-+
-+ /* make sure we use the same value as getenv(), otherwise code that
-+ uses getenv() (like setlocale()) might see a different value to %ENV
-+ */
-+ sv = newSVpv(PerlEnv_getenv(name), 0);
-+
-+ /* keep a count of the dups of this name so we can de-dup environ later */
-+ if (hv_exists(dups, name, nlen))
-+ ++SvIVX(*hv_fetch(dups, name, nlen, 0));
-+ else
-+ (void)hv_store(dups, name, nlen, newSViv(1), 0);
-+
-+ Safefree(name);
-+ }
-+ else {
-+ sv = newSVpv(s+1, 0);
-+ }
-+ (void)hv_store(hv, old_var, nlen, sv, 0);
- if (env_is_not_environ)
- mg_set(sv);
- }
-+ if (HvKEYS(dups)) {
-+ /* environ has some duplicate definitions, remove them */
-+ HE *entry;
-+ hv_iterinit(dups);
-+ while ((entry = hv_iternext_flags(dups, 0))) {
-+ STRLEN nlen;
-+ const char *name = HePV(entry, nlen);
-+ IV count = SvIV(HeVAL(entry));
-+ IV i;
-+ SV **valp = hv_fetch(hv, name, nlen, 0);
-+
-+ assert(valp);
-+
-+ /* try to remove any duplicate names, depending on the
-+ * implementation used in my_setenv() the iteration might
-+ * not be necessary, but let's be safe.
-+ */
-+ for (i = 0; i < count; ++i)
-+ my_setenv(name, 0);
-+
-+ /* and set it back to the value we set $ENV{name} to */
-+ my_setenv(name, SvPV_nolen(*valp));
-+ }
-+ }
-+ SvREFCNT_dec_NN(dups);
- }
- #endif /* USE_ENVIRON_ARRAY */
- #endif /* !PERL_MICRO */
diff --git a/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch b/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch
deleted file mode 100644
index c489f05..0000000
--- a/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4732711e2548b6d734ca831d65dbcf501a89774e Mon Sep 17 00:00:00 2001
-From: Andreas Koenig <andk@cpan.org>
-Date: Sun, 3 Jan 2016 08:40:33 +0100
-Subject: [PATCH] Remove nm from libswanted
-
-Nm stood for "New Math" library in the context of 1994. 2014 a conflicting
-library libnm appeared that has a network manager context.
-
-Upstream-Status: Backport [commit 4732711e on branch blead, tag v5.25.0]
-
----
- Configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Configure b/Configure
-index 0e71b4b..cfbdaa1 100755
---- a/Configure
-+++ b/Configure
-@@ -1464,7 +1464,7 @@ libswanted_uselargefiles=''
- : set usesocks on the Configure command line to enable socks.
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
--libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
-+libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
- libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
---
-2.9.2
-
diff --git a/meta/recipes-devtools/perl/perl/perl-test-customized.patch b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
index 477be29..dc4ab00 100644
--- a/meta/recipes-devtools/perl/perl/perl-test-customized.patch
+++ b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
@@ -1,61 +1,64 @@
-The OE core recipies customize some ExtUtils-MakeMaker modules,
-which causes their MD5 sum to mismatch the provided table and the
-corresponding tests to fail. Also, we patch several test files with
-a backported patch. Update list of hashes to reflect the patched files.
+From 64df09205b6ccb5a434a4e53e8e0a32377ab634f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
+Date: Thu, 24 Nov 2016 10:49:55 -0600
+Subject: [PATCH] The OE core recipies customize some ExtUtils-MakeMaker
+ modules, which causes their MD5 sum to mismatch the provided table and the
+ corresponding tests to fail. Also, we patch several test files with a
+ backported patch. Update list of hashes to reflect the patched files.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Bill Randle <william.c.randle@intel.com>
+Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
+---
+ t/porting/customized.dat | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/t/porting/customized.dat b/t/porting/customized.dat
+index f871a32..e11d147 100644
+--- a/t/porting/customized.dat
++++ b/t/porting/customized.dat
+@@ -3,8 +3,8 @@ Encode cpan/Encode/encoding.pm 51c19efc9bfe8467d6ae12a4654f6e7f980715bf
+ ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 8d772fbc6a57637ab24d12a02794073ee71b489c
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 9be9ac3fee6fd6df702469904e02c8b4c6f2502e
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm bb2443c2314c50f09f7eab4aacc03ade8b9907dd
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 830acdc810e2974d7fd4ec408ea1bfa825c75b69
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 224832767ac102e53daf668a4243f9389a753589
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm 5c41b40e33464c6635258061dff4ece018b46bd9
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 062e5d14a803fbbec8d61803086a3d7997e8a473
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod a8a9cab7d67922ed3d6883c864e1fe29aaa6ad89
+@@ -14,7 +14,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 5d5cd55e
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm 23a4b33b974e036d59bf55aa02e025506a408048
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 288df61e9ba7be3505b58b6345091fe1f310a117
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm 8578f2ea4ec9e764a789f6ecf620ea449ddca8c1
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 9f1f6c51fb0337726c99332facc52159c0619fe2
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 0f9eaebf7f93b5de213e60708a0fe257396ee188
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm a0ec076bedfa0c2e52fc2b735fbc75b4c2706bbf
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 976b10ec76d1fe6f7ee9000b5596e8950434880b
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm bc4b33fa5296ab35bcb1be1c18759b93c4de2598
+@@ -23,7 +23,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 83601fa89eb
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 8185a7db6c4d7e0fdc5001aeaa8c2b612a884a5e
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 2fe66ca8a894d6a2ae340b8bf6f8d69c5e1f7fbe
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm e8a4dbba69a1d551bd581ea6a3f2415bacbc0ae5
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm d666ac424618c3e11b8549755c9646d942bd2d57
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 211d37e5d841e462cf2d0644c43ef01a1366fbee
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm f6581a0e75e45bfc26f343f173d3366c43fb1221
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 1997912b5018970cdeb3dae8fd7e0c24f6e5d567
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm 210a4eda8b081d9986477e3a9762fce6ebea8474
+@@ -32,7 +32,7 @@ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm f73ef46755d
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 6059d9bb7c4f0c154a61f115aa6b24ba08622b81
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 6347934cbe40da977790cea6c81987816b2fe26b
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/cd.t 0a71fbd646a7be8358b07b6f64f838243cc0aef4
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/echo.t 37aec8f794c52e037540757eb5b2556f79419ff7
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/echo.t 1a93dd8834e4bb0e5facf08204e782807567b2eb
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/NoXS.pm 371cdff1b2375017907cfbc9c8f4a31f5ad10582
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/prereq.t 53bda2c549fd13a6b6c13a070ca6bc79883081c0
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/vstrings.t 90035a2bdbf45f15b9c3196d072d7cba7e662871
+--
+2.1.4
-Index: perl-5.22.1/t/porting/customized.dat
-===================================================================
---- perl-5.22.1.orig/t/porting/customized.dat 2015-10-31 13:36:16.000000000 +0000
-+++ perl-5.22.1/t/porting/customized.dat 2016-06-02 12:50:10.381030204 -0700
-@@ -1,8 +1,8 @@
- CPAN cpan/CPAN/lib/CPAN.pm ce62c43d72f101c011184dbbc59e21c2790826f0
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 7f4dfd0fe884bd42412bcf04ca80ef97b39c1d54
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm bef099988b15fb0b2a1f5ac48c01af1f7f36d329
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8168e18f0e3ce3ece4bb7e7c72d57ec07c67c402
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 7115e97a53559cb3ec061dd6f7f344e522724c4a
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8c22e119b96d674f1f268a9c495bb4aa04e1100b
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 3d7abd674b15ed323f743594ef0bd09db76b1aee
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm f8db8d4245bf0684b8210c811f50d7cfb1a27d78
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 757bffb47857521311f8f3bde43ebe165f8d5191
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 82be06851deb84c6419ad003ce9b6d1957f395f3
-@@ -14,7 +14,7 @@
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm ab80029ab16d38d4f2e41dc88d2ceb9f3790e477
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 453e0abbc4bb38db4c0820ad5c4846f313b66291
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm c1b1babda8f43ae7a2caba1cb4f70f92af5a0e34
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 6f90d94ad3e7aa0045a3b1a10a1bb18391f89f57
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 21bde53290bf1a4da4457290b65bd1b0ca6f1d16
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm cab2b3ce08b71a4ce89aa630f236eb08b852439d
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 61fced0faf518bf87c265fcb51ed330ba354623f
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm ae0ef51a7b6dd0b05aa61c779df7167dda5f5119
-@@ -23,7 +23,7 @@
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 433135eecb85b4b1d90d3027432f329436c78447
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 1fbb5605bfb47feee4083feba8aa85e659628f70
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 5b66d1f485a6034d96fc24ba1665b1bad9e447f1
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 8cef99a9bd370ecfd07ddb0efbdcbb4101255e45
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 860d520234d7c9036d91f0b143a1dddf2a5e8cb7
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 939572fde3d59ba77c2e677fe2df2bed4bed5898
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 09c2049bfd25b735e2a5bcf56a6cff7b4827f9c8
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm d65d63f8217a55c36f62e249814988974f593c79
-@@ -31,8 +31,16 @@
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 12df38eacceeed73cab94c423236bfaed0fbbfec
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 22fe9596a0237252f45399a36abc83b7813bc328
- ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 7fbc42ca2ebc6c677b79ae5fd5647243cf069463
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t 6cdc7701b50e586bc9c4cfb1616de8eb0b1baf34
--ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t d78fdec7a4512dc8d2a7abd62b8104530af8ecf9
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/echo.t 9427f4adebbb13b57b4a76fef2972adf63c9bd96
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t ef356c196bb5c3c428ae309d7f989bdd6d79b86d
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t 3e6d4d6eb2eab42e983ac70eb5737a759af0916f
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INST.t e553fa0d53c894c8d36aafb69edd55b38a9355f8
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/min_perl_version.t e930ec9217de5a1785d0247c30b159e6f7f5673f
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/PL_FILES.t 7e49ab6c4d467826d22023fa03d77b85f935b58e
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t a04c96eecfab17e4094604e0fb998dd93cf93b93
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/recurs.t 94cce3bff875a878ed27816b3f5df2ca4225c714
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/several_authors.t f811d993c0835c66dc501ed55083acb29bf33bf7
- Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
- Win32API::File cpan/Win32API-File/buffers.h 02d230ac9ac7091365128161a0ed671898baefae
- Win32API::File cpan/Win32API-File/cFile.h fca7e383e76979c3ac3adf12d11d1bcd2618e489
diff --git a/meta/recipes-devtools/perl/perl_5.22.1.bb b/meta/recipes-devtools/perl/perl_5.24.0.bb
similarity index 98%
rename from meta/recipes-devtools/perl/perl_5.22.1.bb
rename to meta/recipes-devtools/perl/perl_5.24.0.bb
index 792a65b..ab50d29 100644
--- a/meta/recipes-devtools/perl/perl_5.22.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.0.bb
@@ -40,6 +40,7 @@ SRC_URI += " \
file://Makefile.patch \
file://Makefile.SH.patch \
file://installperl.patch \
+ file://perl-archlib-exp.patch \
file://perl-dynloader.patch \
file://perl-moreconfig.patch \
file://letgcc-find-errno.patch \
@@ -48,7 +49,6 @@ SRC_URI += " \
file://perl-enable-gdbm.patch \
file://cross-generate_uudmap.patch \
file://fix_bad_rpath.patch \
- file://perl-archlib-exp.patch \
file://dynaloaderhack.patch \
file://config.sh \
file://config.sh-32 \
@@ -65,9 +65,7 @@ SRC_URI += " \
file://perl-errno-generation-gcc5.patch \
file://perl-fix-conflict-between-skip_all-and-END.patch \
file://perl-test-customized.patch \
- file://perl-fix-CVE-2016-2381.patch \
file://perl-fix-CVE-2016-6185.patch \
- file://perl-fix-CVE-2015-8607.patch \
file://perl-fix-CVE-2016-1238.patch \
"
@@ -77,8 +75,8 @@ SRC_URI_append_class-target = " \
file://test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch \
"
-SRC_URI[md5sum] = "6671e4829cbaf9cecafa9a84f141b0a3"
-SRC_URI[sha256sum] = "9e87317d693ce828095204be0d09af8d60b8785533fadea1a82b6f0e071e5c79"
+SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
+SRC_URI[sha256sum] = "a9a37c0860380ecd7b23aa06d61c20fc5bc6d95198029f3684c44a9d7e2952f2"
inherit perlnative siteinfo
--
2.1.4
^ permalink raw reply related
* [PATCH 1/2] perl: Fix ptest update hash of ExtUtils/Liblist/Kid.pm in customized.dat
From: Aníbal Limón @ 2016-11-24 21:06 UTC (permalink / raw)
To: openembedded-core
The perl ptest is failing due to a patch changes the file
ExtUtils/Liblist/Kid.pm and the customized.dat file wasn't updated.
[YOCTO #8656]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/recipes-devtools/perl/perl/perl-test-customized.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/perl/perl/perl-test-customized.patch b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
index 84b0b88..477be29 100644
--- a/meta/recipes-devtools/perl/perl/perl-test-customized.patch
+++ b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
@@ -17,7 +17,7 @@ Index: perl-5.22.1/t/porting/customized.dat
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm bef099988b15fb0b2a1f5ac48c01af1f7f36d329
-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8168e18f0e3ce3ece4bb7e7c72d57ec07c67c402
-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 7115e97a53559cb3ec061dd6f7f344e522724c4a
-+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm a08ecf80c8f0a234243817713b2a5ab0dcae3c0a
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8c22e119b96d674f1f268a9c495bb4aa04e1100b
+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 3d7abd674b15ed323f743594ef0bd09db76b1aee
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm f8db8d4245bf0684b8210c811f50d7cfb1a27d78
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 757bffb47857521311f8f3bde43ebe165f8d5191
--
2.1.4
^ permalink raw reply related
* [PATCH v2 13/13] selftest: bblayers: remove linux kernel checks for show-recipes check
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Preferred kernel recipes depends on the distro, so remove the kernel
checks to avoid failures on non-poky distros and make the test
distro agnostic.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/bblayers.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index d23675e..677161f 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -68,20 +68,16 @@ class BitbakeLayers(oeSelfTest):
@testcase(1384)
def test_bitbakelayers_showrecipes(self):
+ distro = get_bb_var('DISTRO')
result = runCmd('bitbake-layers show-recipes')
self.assertIn('aspell:', result.output)
self.assertIn('mtd-utils:', result.output)
- self.assertIn('linux-yocto:', result.output)
self.assertIn('core-image-minimal:', result.output)
result = runCmd('bitbake-layers show-recipes mtd-utils')
self.assertIn('mtd-utils:', result.output)
self.assertNotIn('aspell:', result.output)
- result = runCmd('bitbake-layers show-recipes -i kernel')
- self.assertIn('linux-yocto:', result.output)
- self.assertNotIn('mtd-utils:', result.output)
result = runCmd('bitbake-layers show-recipes -i image')
self.assertIn('core-image-minimal', result.output)
- self.assertNotIn('linux-yocto:', result.output)
self.assertNotIn('mtd-utils:', result.output)
result = runCmd('bitbake-layers show-recipes -i cmake,pkgconfig')
self.assertIn('libproxy:', result.output)
--
2.1.4
^ permalink raw reply related
* [PATCH v2 12/13] selftest: wic: skip tests for poky-tiny distro policy
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Poky-tiny just supports cpio.gz as filesystem type so wic tests must
be skipped.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/wic.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index faac11e..b5e5840 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -190,6 +190,8 @@ class Wic(oeSelfTest):
@testcase(1346)
def test_iso_image(self):
"""Test creation of hybrid iso image with legacy and EFI boot"""
+ if self.distro == 'poky-tiny':
+ self.skipTest('wic image (mkhybridiso) not supported for poky-tiny distro')
self.assertEqual(0, runCmd("wic create mkhybridiso "
"--image-name core-image-minimal").status)
self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct")))
@@ -246,6 +248,9 @@ class Wic(oeSelfTest):
def test_mkgummidisk(self):
"""Test creation of mkgummidisk image"""
image = "mkgummidisk"
+ if self.distro == 'poky-tiny':
+ self.skipTest('wic image name (%s) not supported for poky-tiny distro' % image)
+
self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
@@ -254,6 +259,8 @@ class Wic(oeSelfTest):
def test_mkefidisk(self):
"""Test creation of mkefidisk image"""
image = "mkefidisk"
+ if self.distro == 'poky-tiny':
+ self.skipTest('wic image (%s) not supported for poky-tiny distro' % image)
self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
@@ -288,6 +295,8 @@ class Wic(oeSelfTest):
def test_systemd_bootdisk(self):
"""Test creation of systemd-bootdisk image"""
image = "systemd-bootdisk"
+ if self.distro == 'poky-tiny':
+ self.skipTest('wic image (%s) not supported for poky-tiny distro' % image)
self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
% image).status)
self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
--
2.1.4
^ permalink raw reply related
* [PATCH v2 11/13] selftest: sstatetests: skip methods in case of poky-tiny or opengl is missing
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Some tests defines images that poky-tiny cannot build so skip them. Also,
bitbake world fails if distro does not contain opengl, so skip also those.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/sstatetests.py | 57 ++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py
index 6642539..8ea3932 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -42,20 +42,36 @@ class SStateTests(SStateBase):
@testcase(975)
def test_sstate_creation_distro_specific_pass(self):
targetarch = get_bb_var('TUNE_ARCH')
- self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['binutils-cross-'+ targetarch, 'binutils-native']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_sstate_creation(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
@testcase(1374)
def test_sstate_creation_distro_specific_fail(self):
targetarch = get_bb_var('TUNE_ARCH')
- self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['binutils-cross-'+ targetarch, 'binutils-native']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_sstate_creation(targets, distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False)
@testcase(976)
def test_sstate_creation_distro_nonspecific_pass(self):
- self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['glibc-initial']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_sstate_creation(targets, distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
@testcase(1375)
def test_sstate_creation_distro_nonspecific_fail(self):
- self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['glibc-initial']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_sstate_creation(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False)
# Test the sstate files deletion part of the do_cleansstate task
@@ -78,17 +94,28 @@ class SStateTests(SStateBase):
@testcase(977)
def test_cleansstate_task_distro_specific_nonspecific(self):
targetarch = get_bb_var('TUNE_ARCH')
- self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['binutils-cross-' + targetarch, 'binutils-native', 'glibc-initial']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True)
@testcase(1376)
def test_cleansstate_task_distro_nonspecific(self):
- self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['glibc-initial']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_cleansstate_task(targets, distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
@testcase(1377)
def test_cleansstate_task_distro_specific(self):
targetarch = get_bb_var('TUNE_ARCH')
- self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
-
+ # Execute the test in all distros expect poky-tiny where glibc-initial is not provided
+ targets = ['binutils-cross-'+ targetarch, 'binutils-native', 'glibc-initial']
+ if self.distro == 'poky-tiny':
+ self.skipTest('Distro %s does not support building the following targets %s' % (self.distro, ','.join(targets)))
+ self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
# Test rebuilding of distro-specific sstate files
def run_test_rebuild_distro_specific_sstate(self, targets, temp_sstate_location=True):
@@ -228,6 +255,8 @@ class SStateTests(SStateBase):
build machines and running a builds, override the variables calling uname()
manually and check using bitbake -S.
"""
+ if self.distro == 'poky-tiny':
+ self.skipTest('core-image-sato not buildable for poky-tiny')
topdir = get_bb_var('TOPDIR')
targetvendor = get_bb_var('TARGET_VENDOR')
@@ -276,6 +305,8 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
detected. Rather than requiring two different build machines and running
builds, override the variables manually and check using bitbake -S.
"""
+ if self.distro == 'poky-tiny':
+ self.skipTest('core-image-sato not buildable for poky-tiny')
topdir = get_bb_var('TOPDIR')
self.write_config("""
@@ -310,6 +341,8 @@ NATIVELSBSTRING = \"DistroB\"
Also, rather than duplicate the test, check nativesdk stamps are the same between
the two MACHINE values.
"""
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('Distro %s does not include opengl feature, required to build intended (bitbake) targets' % self.distro)
configA = """
TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
@@ -328,6 +361,8 @@ MACHINE = \"qemuarm\"
Also, rather than duplicate the test, check nativesdk stamps are the same between
the two MACHINE values.
"""
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('Distro %s does not include opengl feature, required to build intended (bitbake) targets' % self.distro)
configA = """
TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
@@ -387,6 +422,9 @@ MULTILIBS = \"\"
qemux86copy machine to test this. Also include multilibs in the test.
"""
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('Distro %s does not include opengl feature, required to build intended (bitbake) targets' % self.distro)
+
topdir = get_bb_var('TOPDIR')
targetos = get_bb_var('TARGET_OS')
targetvendor = get_bb_var('TARGET_VENDOR')
@@ -433,6 +471,9 @@ DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
classes inherits should be the same.
"""
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('Distro %s does not include opengl feature, required to build intended (bitbake) targets' % self.distro)
+
topdir = get_bb_var('TOPDIR')
targetvendor = get_bb_var('TARGET_VENDOR')
self.write_config("""
--
2.1.4
^ permalink raw reply related
* [PATCH v2 10/13] selftest: runtime-test: skip image-install test for poky-tiny
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
poky-tiny cannot build full-cmdline image, so skip this test in this case.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/runtime-test.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index c2d5b45..e17c261 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -94,6 +94,8 @@ class TestImage(oeSelfTest):
Product: oe-core
Author: Mariano Lopez <mariano.lopez@intel.com>
"""
+ if self.distro == 'poky-tiny':
+ self.skipTest('core-image-full-cmdline not buildable for poky-tiny')
features = 'INHERIT += "testimage"\n'
features += 'TEST_SUITES = "ping ssh selftest"\n'
--
2.1.4
^ permalink raw reply related
* [PATCH v2 09/13] selftest: recipetool: use mraa instead of libmatchbox to lessen distro requirements
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
libmatchbox requires x11 distro feature to be present, so use another recipe
(mraa) with no extra requirements, allowing test execution of all supported
distros.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/recipetool.py | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index db1f8de..e5e7e43 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -383,22 +383,31 @@ class RecipetoolTests(RecipetoolBase):
@testcase(1194)
def test_recipetool_create_git(self):
# Ensure we have the right data in shlibs/pkgdata
- bitbake('libpng pango libx11 libxext jpeg libcheck')
+ bitbake('swig-native')
# Try adding a recipe
tempsrc = os.path.join(self.tempdir, 'srctree')
os.makedirs(tempsrc)
- recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
- srcuri = 'git://git.yoctoproject.org/libmatchbox'
- result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc])
+ recipefile = os.path.join(self.tempdir, 'mraa.bb')
+ srcuri = 'git://git.yoctoproject.org/mraa'
+ result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=a2277e9f8ca0b4562a42ce3476adf8be71886571", '-x', tempsrc])
+ # MRAA has MIT license (http://git.yoctoproject.org/cgit/cgit.cgi/mraa/tree/COPYING), set it instead of "MIT & Unknown & LGPLv2.1" found by the tool
+ result = runCmd(['sed', '-i', '-e', 's/^LICENSE =.*/LICENCE = "MIT"/', recipefile])
self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
checkvars = {}
- checkvars['LICENSE'] = 'LGPLv2.1'
- checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34'
+ checkvars['LICENSE'] = 'MIT'
+ checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f \
+ file://cmake/modules/LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \
+ file://cmake/modules/LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://cmake/modules/Copyright.txt;md5=3ba5a6c34481652ce573e5c4e1d707e4 \
+ file://cmake/modules/COPYING-CMAKE-SCRIPTS;md5=2d149a0f4588c9f5e60c729e786dad45 \
+ file://src/i2c/LICENSE;md5=48c7b6208b3868cd901b3248010b4d5d \
+ file://doxygen2jsdoc/COPYING;md5=e8db6501ed294e65418a933925d12058 \
+ file://doxygen2jsdoc/generators/yuidoc/tmpl/LICENSE;md5=7bd082d54c3a2328a1844a1d8b797f77'
checkvars['S'] = '${WORKDIR}/git'
- checkvars['PV'] = '1.11+git${SRCPV}'
+ checkvars['PV'] = '1.0+git${SRCPV}'
checkvars['SRC_URI'] = srcuri
- checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango'])
- inherits = ['autotools', 'pkgconfig']
+ checkvars['DEPENDS'] = set(['swig-native'])
+ inherits = ['cmake', 'pythonnative', 'python-dir']
self._test_recipe_contents(recipefile, checkvars, inherits)
@testcase(1392)
--
2.1.4
^ permalink raw reply related
* [PATCH v2 08/13] selftest: imagefeatures: skip bmap test in case of poky-tiny
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Poky-tiny distro cannot execute bmap test because ext4 filesystem
is used, so skip test in this is the case.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/imagefeatures.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index a61510b..6e00fe9 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -111,7 +111,10 @@ class ImageFeatures(oeSelfTest):
Author: Ed Bartosh <ed.bartosh@linux.intel.com>
"""
- features = 'IMAGE_FSTYPES += " ext4 ext4.bmap"'
+ ext4_features = "ext4 ext4.bmap"
+ features = 'IMAGE_FSTYPES += " %s"' % ext4_features
+ if self.distro == 'poky-tiny':
+ self.skipTest('Features (%s) not supported for poky-tiny' % ext4_features)
self.write_config(features)
image_name = 'core-image-minimal'
--
2.1.4
^ permalink raw reply related
* [PATCH v2 07/13] selftest: imagefeatures: skip tests in case distro feature is missing
From: leonardo.sandoval.gonzalez @ 2016-11-24 20:58 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480020435.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
core-image-clutter and core-image-weston, both required opengl in distro
features, skip relevant tests if this is not the case.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/lib/oeqa/selftest/imagefeatures.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index d015c49..a61510b 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -78,6 +78,8 @@ class ImageFeatures(oeSelfTest):
"""
# Build a core-image-clutter
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('opengl not present on DISTRO_FEATURES so core-image-clutter cannot be built')
bitbake('core-image-clutter')
@testcase(1117)
@@ -96,6 +98,8 @@ class ImageFeatures(oeSelfTest):
self.write_config(features)
# Build a core-image-weston
+ if 'opengl' not in get_bb_var('DISTRO_FEATURES'):
+ self.skipTest('opengl not present on DISTRO_FEATURES so core-image-weston cannot be built')
bitbake('core-image-weston')
def test_bmap(self):
--
2.1.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox