diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 |
1 files changed, 394 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch new file mode 100644 index 000000000..4be906ec7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch @@ -0,0 +1,394 @@ +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 + |