ltp: update to new upstream release 20170929

Message ID 20171005174751.30098-1-fathi.boudra@linaro.org
State New
Headers show
Series
  • ltp: update to new upstream release 20170929
Related show

Commit Message

Fathi Boudra Oct. 5, 2017, 5:47 p.m.
* Update SRCREV to match 20170929 release
* Drop patches available in 20170929 release:
  - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
  - 0038-commands-gdb01-replace-stdin-with-dev-null.patch

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

---
 ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 ---------------------
 ...ommands-gdb01-replace-stdin-with-dev-null.patch |  34 -------
 .../ltp/{ltp_20170516.bb => ltp_20170929.bb}       |   4 +-
 3 files changed, 1 insertion(+), 150 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
 rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb} (96%)

-- 
2.14.2

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj Oct. 5, 2017, 6:35 p.m. | #1
On Thu, Oct 5, 2017 at 10:47 AM, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> * Update SRCREV to match 20170929 release

> * Drop patches available in 20170929 release:

>   - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>   - 0038-commands-gdb01-replace-stdin-with-dev-null.patch

>


A build time test for musl target would be appreciated.

> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

> ---

>  ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 ---------------------

>  ...ommands-gdb01-replace-stdin-with-dev-null.patch |  34 -------

>  .../ltp/{ltp_20170516.bb => ltp_20170929.bb}       |   4 +-

>  3 files changed, 1 insertion(+), 150 deletions(-)

>  delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>  delete mode 100644 meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

>  rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb} (96%)

>

> diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

> deleted file mode 100644

> index c8738ae0d4..0000000000

> --- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

> +++ /dev/null

> @@ -1,113 +0,0 @@

> -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001

> -From: Dengke Du <dengke.du@windriver.com>

> -Date: Thu, 10 Aug 2017 15:27:03 +0800

> -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when

> - build with musl

> -

> -error 1:

> -

> -|stack_clash.c:50:22: error: expected identifier or '(' before numeric constant

> -| static unsigned long PAGE_SIZE;

> -

> -This is because the musl libc already contain PAGE_SIZE definition in limits.c,

> -we can check it here:

> -

> -    https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43

> -

> -error 2:

> -

> -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function); did you mean 'S_IREAD'?

> -|   fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);

> -|                       ^~~~~~~

> -|                       S_IREAD

> -

> -This is because the musl libc put those in fcntl.h, so we should include that

> -file.

> -

> -Upstream-Status: Submitted [ https://github.com/linux-test-project/ltp/pull/194 ]

> -

> -Signed-off-by: Dengke Du <dengke.du@windriver.com>

> ----

> - testcases/cve/stack_clash.c               | 12 ++++++------

> - testcases/kernel/syscalls/flock/flock01.c |  1 +

> - testcases/kernel/syscalls/flock/flock02.c |  1 +

> - 3 files changed, 8 insertions(+), 6 deletions(-)

> -

> -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c

> -index 2ef1a82..7c45991 100644

> ---- a/testcases/cve/stack_clash.c

> -+++ b/testcases/cve/stack_clash.c

> -@@ -47,7 +47,7 @@

> - #include "tst_test.h"

> - #include "tst_safe_stdio.h"

> -

> --static unsigned long PAGE_SIZE;

> -+static unsigned long PAGE_SIZE_tst;

> - static unsigned long PAGE_MASK;

> - static unsigned long GAP_PAGES = 256;

> - static unsigned long THRESHOLD;

> -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void)

> -       exhaust_stack_into_sigsegv();

> - }

> -

> --#define MAPPED_LEN PAGE_SIZE

> -+#define MAPPED_LEN PAGE_SIZE_tst

> - static unsigned long mapped_addr;

> -

> - void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED)

> -@@ -150,7 +150,7 @@ void do_child(void)

> -       stack_t signal_stack;

> -       struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO};

> -       void *map;

> --      unsigned long gap = GAP_PAGES * PAGE_SIZE;

> -+      unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;

> -       struct rlimit rlimit;

> -

> -       rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;

> -@@ -200,8 +200,8 @@ void setup(void)

> - {

> -       char buf[4096], *p;

> -

> --      PAGE_SIZE = sysconf(_SC_PAGESIZE);

> --      PAGE_MASK = ~(PAGE_SIZE - 1);

> -+      PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);

> -+      PAGE_MASK = ~(PAGE_SIZE_tst - 1);

> -

> -       buf[4095] = '\0';

> -       SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf);

> -@@ -214,7 +214,7 @@ void setup(void)

> -               tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES);

> -       }

> -

> --      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;

> -+      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;

> -

> -       {

> -               volatile int *a = alloca(128);

> -diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c

> -index 3e17be4..06d89e3 100644

> ---- a/testcases/kernel/syscalls/flock/flock01.c

> -+++ b/testcases/kernel/syscalls/flock/flock01.c

> -@@ -69,6 +69,7 @@

> - #include <stdio.h>

> - #include <sys/wait.h>

> - #include <sys/file.h>

> -+#include <fcntl.h>

> - #include "test.h"

> -

> - void setup(void);

> -diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c

> -index 414df68..9ddf729 100644

> ---- a/testcases/kernel/syscalls/flock/flock02.c

> -+++ b/testcases/kernel/syscalls/flock/flock02.c

> -@@ -75,6 +75,7 @@

> - #include <sys/types.h>

> - #include <sys/file.h>

> - #include <sys/wait.h>

> -+#include <fcntl.h>

> - #include <errno.h>

> - #include <stdio.h>

> - #include "test.h"

> ---

> -2.7.4

> -

> diff --git a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch b/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

> deleted file mode 100644

> index f7c0a4bf17..0000000000

> --- a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

> +++ /dev/null

> @@ -1,34 +0,0 @@

> -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001

> -From: Jan Stancek <jstancek@redhat.com>

> -Date: Mon, 11 Sep 2017 12:57:58 +0200

> -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null

> -

> -If this testcase runs as background process, gdb can receive

> -SIGTTOU and then testcase gets stuck.

> -

> -Signed-off-by: Jan Stancek <jstancek@redhat.com>

> -

> -Upstream-Status: Backport

> -[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0]

> -

> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

> ----

> - testcases/commands/gdb/gdb01.sh | 2 +-

> - 1 file changed, 1 insertion(+), 1 deletion(-)

> -

> -diff --git a/testcases/commands/gdb/gdb01.sh b/testcases/commands/gdb/gdb01.sh

> -index 07ae36f..e3a5b51 100755

> ---- a/testcases/commands/gdb/gdb01.sh

> -+++ b/testcases/commands/gdb/gdb01.sh

> -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat"

> -

> - simple_test()

> - {

> --      gdb /bin/cat -ex "run /etc/passwd" -ex quit

> -+      gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null

> -       RC=$?

> -       if [ $RC -eq 0 ] ; then

> -               tst_res TPASS "gdb attached to process and completed run"

> ---

> -2.7.4

> -

> diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170929.bb

> similarity index 96%

> rename from meta/recipes-extended/ltp/ltp_20170516.bb

> rename to meta/recipes-extended/ltp/ltp_20170929.bb

> index 653cbfd4ed..925dd91256 100644

> --- a/meta/recipes-extended/ltp/ltp_20170516.bb

> +++ b/meta/recipes-extended/ltp/ltp_20170929.bb

> @@ -21,7 +21,7 @@ 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 = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"

> +SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377"

>

>  SRC_URI = "git://github.com/linux-test-project/ltp.git \

>             file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \

> @@ -48,8 +48,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \

>             file://0034-periodic_output.patch \

>             file://0035-fix-test_proc_kill-hang.patch \

>             file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \

> -           file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \

> -           file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \

>             "

>

>  S = "${WORKDIR}/git"

> --

> 2.14.2

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross Oct. 11, 2017, 8:30 p.m. | #2
Sorry:

| fanotify08.c:56:3: error: format not a string literal and no format
arguments [-Werror=format-security]
|    tst_res(TPASS, msg);
|    ^~~~~~~
| fanotify08.c:58:3: error: format not a string literal and no format
arguments [-Werror=format-security]
|    tst_res(TFAIL, msg);
|    ^~~~~~~

Ross

On 5 October 2017 at 18:47, Fathi Boudra <fathi.boudra@linaro.org> wrote:

> * Update SRCREV to match 20170929 release

> * Drop patches available in 20170929 release:

>   - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>   - 0038-commands-gdb01-replace-stdin-with-dev-null.patch

>

> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

> ---

>  ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113

> ---------------------

>  ...ommands-gdb01-replace-stdin-with-dev-null.patch |  34 -------

>  .../ltp/{ltp_20170516.bb => ltp_20170929.bb}       |   4 +-

>  3 files changed, 1 insertion(+), 150 deletions(-)

>  delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-

> redefinition-and-O_CREAT-undeclear.patch

>  delete mode 100644 meta/recipes-extended/ltp/ltp/

> 0038-commands-gdb01-replace-stdin-with-dev-null.patch

>  rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb}

> (96%)

>

> diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-

> redefinition-and-O_CREAT-undeclear.patch b/meta/recipes-extended/ltp/

> ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

> deleted file mode 100644

> index c8738ae0d4..0000000000

> --- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-

> redefinition-and-O_CREAT-undeclear.patch

> +++ /dev/null

> @@ -1,113 +0,0 @@

> -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001

> -From: Dengke Du <dengke.du@windriver.com>

> -Date: Thu, 10 Aug 2017 15:27:03 +0800

> -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear

> when

> - build with musl

> -

> -error 1:

> -

> -|stack_clash.c:50:22: error: expected identifier or '(' before numeric

> constant

> -| static unsigned long PAGE_SIZE;

> -

> -This is because the musl libc already contain PAGE_SIZE definition in

> limits.c,

> -we can check it here:

> -

> -    https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43

> -

> -error 2:

> -

> -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function);

> did you mean 'S_IREAD'?

> -|   fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);

> -|                       ^~~~~~~

> -|                       S_IREAD

> -

> -This is because the musl libc put those in fcntl.h, so we should include

> that

> -file.

> -

> -Upstream-Status: Submitted [ https://github.com/linux-test-

> project/ltp/pull/194 ]

> -

> -Signed-off-by: Dengke Du <dengke.du@windriver.com>

> ----

> - testcases/cve/stack_clash.c               | 12 ++++++------

> - testcases/kernel/syscalls/flock/flock01.c |  1 +

> - testcases/kernel/syscalls/flock/flock02.c |  1 +

> - 3 files changed, 8 insertions(+), 6 deletions(-)

> -

> -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c

> -index 2ef1a82..7c45991 100644

> ---- a/testcases/cve/stack_clash.c

> -+++ b/testcases/cve/stack_clash.c

> -@@ -47,7 +47,7 @@

> - #include "tst_test.h"

> - #include "tst_safe_stdio.h"

> -

> --static unsigned long PAGE_SIZE;

> -+static unsigned long PAGE_SIZE_tst;

> - static unsigned long PAGE_MASK;

> - static unsigned long GAP_PAGES = 256;

> - static unsigned long THRESHOLD;

> -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void)

> -       exhaust_stack_into_sigsegv();

> - }

> -

> --#define MAPPED_LEN PAGE_SIZE

> -+#define MAPPED_LEN PAGE_SIZE_tst

> - static unsigned long mapped_addr;

> -

> - void segv_handler(int sig, siginfo_t *info, void *data

> LTP_ATTRIBUTE_UNUSED)

> -@@ -150,7 +150,7 @@ void do_child(void)

> -       stack_t signal_stack;

> -       struct sigaction segv_sig = {.sa_sigaction = segv_handler,

> .sa_flags = SA_ONSTACK|SA_SIGINFO};

> -       void *map;

> --      unsigned long gap = GAP_PAGES * PAGE_SIZE;

> -+      unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;

> -       struct rlimit rlimit;

> -

> -       rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;

> -@@ -200,8 +200,8 @@ void setup(void)

> - {

> -       char buf[4096], *p;

> -

> --      PAGE_SIZE = sysconf(_SC_PAGESIZE);

> --      PAGE_MASK = ~(PAGE_SIZE - 1);

> -+      PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);

> -+      PAGE_MASK = ~(PAGE_SIZE_tst - 1);

> -

> -       buf[4095] = '\0';

> -       SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf);

> -@@ -214,7 +214,7 @@ void setup(void)

> -               tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES);

> -       }

> -

> --      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;

> -+      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;

> -

> -       {

> -               volatile int *a = alloca(128);

> -diff --git a/testcases/kernel/syscalls/flock/flock01.c

> b/testcases/kernel/syscalls/flock/flock01.c

> -index 3e17be4..06d89e3 100644

> ---- a/testcases/kernel/syscalls/flock/flock01.c

> -+++ b/testcases/kernel/syscalls/flock/flock01.c

> -@@ -69,6 +69,7 @@

> - #include <stdio.h>

> - #include <sys/wait.h>

> - #include <sys/file.h>

> -+#include <fcntl.h>

> - #include "test.h"

> -

> - void setup(void);

> -diff --git a/testcases/kernel/syscalls/flock/flock02.c

> b/testcases/kernel/syscalls/flock/flock02.c

> -index 414df68..9ddf729 100644

> ---- a/testcases/kernel/syscalls/flock/flock02.c

> -+++ b/testcases/kernel/syscalls/flock/flock02.c

> -@@ -75,6 +75,7 @@

> - #include <sys/types.h>

> - #include <sys/file.h>

> - #include <sys/wait.h>

> -+#include <fcntl.h>

> - #include <errno.h>

> - #include <stdio.h>

> - #include "test.h"

> ---

> -2.7.4

> -

> diff --git a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-

> replace-stdin-with-dev-null.patch b/meta/recipes-extended/ltp/

> ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

> deleted file mode 100644

> index f7c0a4bf17..0000000000

> --- a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-

> replace-stdin-with-dev-null.patch

> +++ /dev/null

> @@ -1,34 +0,0 @@

> -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001

> -From: Jan Stancek <jstancek@redhat.com>

> -Date: Mon, 11 Sep 2017 12:57:58 +0200

> -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null

> -

> -If this testcase runs as background process, gdb can receive

> -SIGTTOU and then testcase gets stuck.

> -

> -Signed-off-by: Jan Stancek <jstancek@redhat.com>

> -

> -Upstream-Status: Backport

> -[https://github.com/linux-test-project/ltp/commit/

> 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0]

> -

> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

> ----

> - testcases/commands/gdb/gdb01.sh | 2 +-

> - 1 file changed, 1 insertion(+), 1 deletion(-)

> -

> -diff --git a/testcases/commands/gdb/gdb01.sh b/testcases/commands/gdb/

> gdb01.sh

> -index 07ae36f..e3a5b51 100755

> ---- a/testcases/commands/gdb/gdb01.sh

> -+++ b/testcases/commands/gdb/gdb01.sh

> -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat"

> -

> - simple_test()

> - {

> --      gdb /bin/cat -ex "run /etc/passwd" -ex quit

> -+      gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null

> -       RC=$?

> -       if [ $RC -eq 0 ] ; then

> -               tst_res TPASS "gdb attached to process and completed run"

> ---

> -2.7.4

> -

> diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb

> b/meta/recipes-extended/ltp/ltp_20170929.bb

> similarity index 96%

> rename from meta/recipes-extended/ltp/ltp_20170516.bb

> rename to meta/recipes-extended/ltp/ltp_20170929.bb

> index 653cbfd4ed..925dd91256 100644

> --- a/meta/recipes-extended/ltp/ltp_20170516.bb

> +++ b/meta/recipes-extended/ltp/ltp_20170929.bb

> @@ -21,7 +21,7 @@ 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 = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"

> +SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377"

>

>  SRC_URI = "git://github.com/linux-test-project/ltp.git \

>             file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \

> @@ -48,8 +48,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \

>             file://0034-periodic_output.patch \

>             file://0035-fix-test_proc_kill-hang.patch \

>             file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch

> \

> -           file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

> \

> -           file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \

>             "

>

>  S = "${WORKDIR}/git"

> --

> 2.14.2

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div dir="ltr">Sorry:<div><br></div><div><div>| fanotify08.c:56:3: error: format not a string literal and no format arguments [-Werror=format-security]</div><div>|    tst_res(TPASS, msg);</div><div>|    ^~~~~~~</div><div>| fanotify08.c:58:3: error: format not a string literal and no format arguments [-Werror=format-security]</div><div>|    tst_res(TFAIL, msg);</div><div>|    ^~~~~~~</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 5 October 2017 at 18:47, Fathi Boudra <span dir="ltr">&lt;<a href="mailto:fathi.boudra@linaro.org" target="_blank">fathi.boudra@linaro.org</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* Update SRCREV to match 20170929 release<br>
* Drop patches available in 20170929 release:<br>
  - 0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch<br>
  - 0038-commands-gdb01-replace-<wbr>stdin-with-dev-null.patch<br>
<br>
Signed-off-by: Fathi Boudra &lt;<a href="mailto:fathi.boudra@linaro.org">fathi.boudra@linaro.org</a>&gt;<br>

---<br>
 ...E_SIZE-redefinition-and-O_<wbr>CREAT-undeclear.patch | 113 ---------------------<br>
 ...ommands-gdb01-replace-<wbr>stdin-with-dev-null.patch |  34 -------<br>
 .../ltp/{<a href="http://ltp_20170516.bb" rel="noreferrer" target="_blank">ltp_20170516.bb</a> =&gt; <a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp_20170929.bb</a>}       |   4 +-<br>
 3 files changed, 1 insertion(+), 150 deletions(-)<br>
 delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch<br>
 delete mode 100644 meta/recipes-extended/ltp/ltp/<wbr>0038-commands-gdb01-replace-<wbr>stdin-with-dev-null.patch<br>
 rename meta/recipes-extended/ltp/{<a href="http://ltp_20170516.bb" rel="noreferrer" target="_blank">ltp<wbr>_20170516.bb</a> =&gt; <a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp_20170929.bb</a>} (96%)<br>
<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch b/meta/recipes-extended/ltp/<wbr>ltp/0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch<br>
deleted file mode 100644<br>
index c8738ae0d4..0000000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch<br>
+++ /dev/null<br>
@@ -1,113 +0,0 @@<br>
-From a9d5595d2fa2ab252f1cabf63f4b65<wbr>c3efbafeb9 Mon Sep 17 00:00:00 2001<br>
-From: Dengke Du &lt;<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>&gt;<br>
-Date: Thu, 10 Aug 2017 15:27:03 +0800<br>
-Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when<br>
- build with musl<br>
-<br>
-error 1:<br>
-<br>
-|stack_clash.c:50:22: error: expected identifier or &#39;(&#39; before numeric constant<br>
-| static unsigned long PAGE_SIZE;<br>
-<br>
-This is because the musl libc already contain PAGE_SIZE definition in limits.c,<br>
-we can check it here:<br>
-<br>
-    <a href="https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43" rel="noreferrer" target="_blank">https://git.musl-libc.org/<wbr>cgit/musl/tree/include/limits.<wbr>h#n43</a><br>
-<br>
-error 2:<br>
-<br>
-|ck01.c:157:22: error: &#39;O_CREAT&#39; undeclared (first use in this function); did you mean &#39;S_IREAD&#39;?<br>
-|   fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);<br>
-|                       ^~~~~~~<br>
-|                       S_IREAD<br>
-<br>
-This is because the musl libc put those in fcntl.h, so we should include that<br>
-file.<br>
-<br>
-Upstream-Status: Submitted [ <a href="https://github.com/linux-test-project/ltp/pull/194" rel="noreferrer" target="_blank">https://github.com/linux-test-<wbr>project/ltp/pull/194</a> ]<br>
-<br>
-Signed-off-by: Dengke Du &lt;<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>&gt;<br>
----<br>
- testcases/cve/stack_clash.c               | 12 ++++++------<br>
- testcases/kernel/syscalls/<wbr>flock/flock01.c |  1 +<br>
- testcases/kernel/syscalls/<wbr>flock/flock02.c |  1 +<br>
- 3 files changed, 8 insertions(+), 6 deletions(-)<br>
-<br>
-diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c<br>
-index 2ef1a82..7c45991 100644<br>
---- a/testcases/cve/stack_clash.c<br>
-+++ b/testcases/cve/stack_clash.c<br>
-@@ -47,7 +47,7 @@<br>
- #include &quot;tst_test.h&quot;<br>
- #include &quot;tst_safe_stdio.h&quot;<br>
-<br>
--static unsigned long PAGE_SIZE;<br>
-+static unsigned long PAGE_SIZE_tst;<br>
- static unsigned long PAGE_MASK;<br>
- static unsigned long GAP_PAGES = 256;<br>
- static unsigned long THRESHOLD;<br>
-@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(<wbr>void)<br>
-       exhaust_stack_into_sigsegv();<br>
- }<br>
-<br>
--#define MAPPED_LEN PAGE_SIZE<br>
-+#define MAPPED_LEN PAGE_SIZE_tst<br>
- static unsigned long mapped_addr;<br>
-<br>
- void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED)<br>
-@@ -150,7 +150,7 @@ void do_child(void)<br>
-       stack_t signal_stack;<br>
-       struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO};<br>
-       void *map;<br>
--      unsigned long gap = GAP_PAGES * PAGE_SIZE;<br>
-+      unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;<br>
-       struct rlimit rlimit;<br>
-<br>
-       rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;<br>
-@@ -200,8 +200,8 @@ void setup(void)<br>
- {<br>
-       char buf[4096], *p;<br>
-<br>
--      PAGE_SIZE = sysconf(_SC_PAGESIZE);<br>
--      PAGE_MASK = ~(PAGE_SIZE - 1);<br>
-+      PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);<br>
-+      PAGE_MASK = ~(PAGE_SIZE_tst - 1);<br>
-<br>
-       buf[4095] = &#39;\0&#39;;<br>
-       SAFE_FILE_SCANF(&quot;/proc/<wbr>cmdline&quot;, &quot;%4095[^\n]&quot;, buf);<br>
-@@ -214,7 +214,7 @@ void setup(void)<br>
-               tst_res(TINFO, &quot;stack_guard_gap = %ld&quot;, GAP_PAGES);<br>
-       }<br>
-<br>
--      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;<br>
-+      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;<br>
-<br>
-       {<br>
-               volatile int *a = alloca(128);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>flock/flock01.c b/testcases/kernel/syscalls/<wbr>flock/flock01.c<br>
-index 3e17be4..06d89e3 100644<br>
---- a/testcases/kernel/syscalls/<wbr>flock/flock01.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>flock/flock01.c<br>
-@@ -69,6 +69,7 @@<br>
- #include &lt;stdio.h&gt;<br>
- #include &lt;sys/wait.h&gt;<br>
- #include &lt;sys/file.h&gt;<br>
-+#include &lt;fcntl.h&gt;<br>
- #include &quot;test.h&quot;<br>
-<br>
- void setup(void);<br>
-diff --git a/testcases/kernel/syscalls/<wbr>flock/flock02.c b/testcases/kernel/syscalls/<wbr>flock/flock02.c<br>
-index 414df68..9ddf729 100644<br>
---- a/testcases/kernel/syscalls/<wbr>flock/flock02.c<br>
-+++ b/testcases/kernel/syscalls/<wbr>flock/flock02.c<br>
-@@ -75,6 +75,7 @@<br>
- #include &lt;sys/types.h&gt;<br>
- #include &lt;sys/file.h&gt;<br>
- #include &lt;sys/wait.h&gt;<br>
-+#include &lt;fcntl.h&gt;<br>
- #include &lt;errno.h&gt;<br>
- #include &lt;stdio.h&gt;<br>
- #include &quot;test.h&quot;<br>
---<br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<wbr>ltp/0038-commands-gdb01-<wbr>replace-stdin-with-dev-null.<wbr>patch b/meta/recipes-extended/ltp/<wbr>ltp/0038-commands-gdb01-<wbr>replace-stdin-with-dev-null.<wbr>patch<br>
deleted file mode 100644<br>
index f7c0a4bf17..0000000000<br>
--- a/meta/recipes-extended/ltp/<wbr>ltp/0038-commands-gdb01-<wbr>replace-stdin-with-dev-null.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,34 +0,0 @@<br>
-From 2f6ab8f694b26b7f2566624f6d1f23<wbr>788d6ab8a0 Mon Sep 17 00:00:00 2001<br>
-From: Jan Stancek &lt;<a href="mailto:jstancek@redhat.com">jstancek@redhat.com</a>&gt;<br>
-Date: Mon, 11 Sep 2017 12:57:58 +0200<br>
-Subject: [PATCH] commands/gdb01: replace stdin with /dev/null<br>
-<br>
-If this testcase runs as background process, gdb can receive<br>
-SIGTTOU and then testcase gets stuck.<br>
-<br>
-Signed-off-by: Jan Stancek &lt;<a href="mailto:jstancek@redhat.com">jstancek@redhat.com</a>&gt;<br>
-<br>
-Upstream-Status: Backport<br>
-[<a href="https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0" rel="noreferrer" target="_blank">https://github.com/linux-<wbr>test-project/ltp/commit/<wbr>2f6ab8f694b26b7f2566624f6d1f23<wbr>788d6ab8a0</a>]<br>
-<br>
-Signed-off-by: Yi Zhao &lt;<a href="mailto:yi.zhao@windriver.com">yi.zhao@windriver.com</a>&gt;<br>
----<br>
- testcases/commands/gdb/gdb01.<wbr>sh | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/testcases/commands/gdb/<wbr>gdb01.sh b/testcases/commands/gdb/<wbr>gdb01.sh<br>
-index 07ae36f..e3a5b51 100755<br>
---- a/testcases/commands/gdb/<wbr>gdb01.sh<br>
-+++ b/testcases/commands/gdb/<wbr>gdb01.sh<br>
-@@ -29,7 +29,7 @@ TST_NEEDS_CMDS=&quot;gdb /bin/cat&quot;<br>
-<br>
- simple_test()<br>
- {<br>
--      gdb /bin/cat -ex &quot;run /etc/passwd&quot; -ex quit<br>
-+      gdb /bin/cat -ex &quot;run /etc/passwd&quot; -ex quit &lt; /dev/null<br>
-       RC=$?<br>
-       if [ $RC -eq 0 ] ; then<br>
-               tst_res TPASS &quot;gdb attached to process and completed run&quot;<br>
---<br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-extended/ltp/<a href="http://ltp_20170516.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170516.bb</a> b/meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170929.bb</a><br>
similarity index 96%<br>
rename from meta/recipes-extended/ltp/<a href="http://ltp_20170516.bb" rel="noreferrer" target="_blank">ltp_<wbr>20170516.bb</a><br>
rename to meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">ltp_<wbr>20170929.bb</a><br>
index 653cbfd4ed..925dd91256 100644<br>
--- a/meta/recipes-extended/ltp/<a href="http://ltp_20170516.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170516.bb</a><br>
+++ b/meta/recipes-extended/ltp/<a href="http://ltp_20170929.bb" rel="noreferrer" target="_blank">lt<wbr>p_20170929.bb</a><br>
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = &quot; fts &quot;<br>
 EXTRA_OEMAKE_append_libc-musl = &quot; LIBC=musl &quot;<br>
 CFLAGS_append_powerpc64 = &quot; -D__SANE_USERSPACE_TYPES__&quot;<br>
 CFLAGS_append_mipsarchn64 = &quot; -D__SANE_USERSPACE_TYPES__&quot;<br>
-SRCREV = &quot;<wbr>18916a2e6d8c997b7b29dcfa9550d5<wbr>a15b22ed22&quot;<br>
+SRCREV = &quot;<wbr>e671f2a13c695bbd87f7dfec2954ca<wbr>7e3c43f377&quot;<br>
<br>
 SRC_URI = &quot;git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-<wbr>project/ltp.git</a> \<br>
            file://0001-add-_GNU_SOURCE-<wbr>to-pec_listener.c.patch \<br>
@@ -48,8 +48,6 @@ SRC_URI = &quot;git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-<wbr>project/ltp.git</a> \<br>
            file://0034-periodic_output.<wbr>patch \<br>
            file://0035-fix-test_proc_<wbr>kill-hang.patch \<br>
            file://0036-testcases-network-<wbr>nfsv4-acl-acl1.c-Security-fix-<wbr>on-s.patch \<br>
-           file://0037-ltp-fix-PAGE_SIZE-<wbr>redefinition-and-O_CREAT-<wbr>undeclear.patch \<br>
-           file://0038-commands-gdb01-<wbr>replace-stdin-with-dev-null.<wbr>patch \<br>
            &quot;<br>
<br>
 S = &quot;${WORKDIR}/git&quot;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.2<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Oct. 12, 2017, 12:38 a.m. | #3
On Wed, Oct 11, 2017 at 1:30 PM, Burton, Ross <ross.burton@intel.com> wrote:
> Sorry:

>

> | fanotify08.c:56:3: error: format not a string literal and no format

> arguments [-Werror=format-security]

> |    tst_res(TPASS, msg);

> |    ^~~~~~~

> | fanotify08.c:58:3: error: format not a string literal and no format

> arguments [-Werror=format-security]

> |    tst_res(TFAIL, msg);

> |    ^~~~~~~

>



tst_res(TFAIL, "%s", msg) might fix it.

> Ross

>

> On 5 October 2017 at 18:47, Fathi Boudra <fathi.boudra@linaro.org> wrote:

>>

>> * Update SRCREV to match 20170929 release

>> * Drop patches available in 20170929 release:

>>   - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>>   - 0038-commands-gdb01-replace-stdin-with-dev-null.patch

>>

>> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

>> ---

>>  ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113

>> ---------------------

>>  ...ommands-gdb01-replace-stdin-with-dev-null.patch |  34 -------

>>  .../ltp/{ltp_20170516.bb => ltp_20170929.bb}       |   4 +-

>>  3 files changed, 1 insertion(+), 150 deletions(-)

>>  delete mode 100644

>> meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>>  delete mode 100644

>> meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

>>  rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb}

>> (96%)

>>

>> diff --git

>> a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>> b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>> deleted file mode 100644

>> index c8738ae0d4..0000000000

>> ---

>> a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch

>> +++ /dev/null

>> @@ -1,113 +0,0 @@

>> -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001

>> -From: Dengke Du <dengke.du@windriver.com>

>> -Date: Thu, 10 Aug 2017 15:27:03 +0800

>> -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear

>> when

>> - build with musl

>> -

>> -error 1:

>> -

>> -|stack_clash.c:50:22: error: expected identifier or '(' before numeric

>> constant

>> -| static unsigned long PAGE_SIZE;

>> -

>> -This is because the musl libc already contain PAGE_SIZE definition in

>> limits.c,

>> -we can check it here:

>> -

>> -    https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43

>> -

>> -error 2:

>> -

>> -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function);

>> did you mean 'S_IREAD'?

>> -|   fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);

>> -|                       ^~~~~~~

>> -|                       S_IREAD

>> -

>> -This is because the musl libc put those in fcntl.h, so we should include

>> that

>> -file.

>> -

>> -Upstream-Status: Submitted [

>> https://github.com/linux-test-project/ltp/pull/194 ]

>> -

>> -Signed-off-by: Dengke Du <dengke.du@windriver.com>

>> ----

>> - testcases/cve/stack_clash.c               | 12 ++++++------

>> - testcases/kernel/syscalls/flock/flock01.c |  1 +

>> - testcases/kernel/syscalls/flock/flock02.c |  1 +

>> - 3 files changed, 8 insertions(+), 6 deletions(-)

>> -

>> -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c

>> -index 2ef1a82..7c45991 100644

>> ---- a/testcases/cve/stack_clash.c

>> -+++ b/testcases/cve/stack_clash.c

>> -@@ -47,7 +47,7 @@

>> - #include "tst_test.h"

>> - #include "tst_safe_stdio.h"

>> -

>> --static unsigned long PAGE_SIZE;

>> -+static unsigned long PAGE_SIZE_tst;

>> - static unsigned long PAGE_MASK;

>> - static unsigned long GAP_PAGES = 256;

>> - static unsigned long THRESHOLD;

>> -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void)

>> -       exhaust_stack_into_sigsegv();

>> - }

>> -

>> --#define MAPPED_LEN PAGE_SIZE

>> -+#define MAPPED_LEN PAGE_SIZE_tst

>> - static unsigned long mapped_addr;

>> -

>> - void segv_handler(int sig, siginfo_t *info, void *data

>> LTP_ATTRIBUTE_UNUSED)

>> -@@ -150,7 +150,7 @@ void do_child(void)

>> -       stack_t signal_stack;

>> -       struct sigaction segv_sig = {.sa_sigaction = segv_handler,

>> .sa_flags = SA_ONSTACK|SA_SIGINFO};

>> -       void *map;

>> --      unsigned long gap = GAP_PAGES * PAGE_SIZE;

>> -+      unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;

>> -       struct rlimit rlimit;

>> -

>> -       rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;

>> -@@ -200,8 +200,8 @@ void setup(void)

>> - {

>> -       char buf[4096], *p;

>> -

>> --      PAGE_SIZE = sysconf(_SC_PAGESIZE);

>> --      PAGE_MASK = ~(PAGE_SIZE - 1);

>> -+      PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);

>> -+      PAGE_MASK = ~(PAGE_SIZE_tst - 1);

>> -

>> -       buf[4095] = '\0';

>> -       SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf);

>> -@@ -214,7 +214,7 @@ void setup(void)

>> -               tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES);

>> -       }

>> -

>> --      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;

>> -+      THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;

>> -

>> -       {

>> -               volatile int *a = alloca(128);

>> -diff --git a/testcases/kernel/syscalls/flock/flock01.c

>> b/testcases/kernel/syscalls/flock/flock01.c

>> -index 3e17be4..06d89e3 100644

>> ---- a/testcases/kernel/syscalls/flock/flock01.c

>> -+++ b/testcases/kernel/syscalls/flock/flock01.c

>> -@@ -69,6 +69,7 @@

>> - #include <stdio.h>

>> - #include <sys/wait.h>

>> - #include <sys/file.h>

>> -+#include <fcntl.h>

>> - #include "test.h"

>> -

>> - void setup(void);

>> -diff --git a/testcases/kernel/syscalls/flock/flock02.c

>> b/testcases/kernel/syscalls/flock/flock02.c

>> -index 414df68..9ddf729 100644

>> ---- a/testcases/kernel/syscalls/flock/flock02.c

>> -+++ b/testcases/kernel/syscalls/flock/flock02.c

>> -@@ -75,6 +75,7 @@

>> - #include <sys/types.h>

>> - #include <sys/file.h>

>> - #include <sys/wait.h>

>> -+#include <fcntl.h>

>> - #include <errno.h>

>> - #include <stdio.h>

>> - #include "test.h"

>> ---

>> -2.7.4

>> -

>> diff --git

>> a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

>> b/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

>> deleted file mode 100644

>> index f7c0a4bf17..0000000000

>> ---

>> a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch

>> +++ /dev/null

>> @@ -1,34 +0,0 @@

>> -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001

>> -From: Jan Stancek <jstancek@redhat.com>

>> -Date: Mon, 11 Sep 2017 12:57:58 +0200

>> -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null

>> -

>> -If this testcase runs as background process, gdb can receive

>> -SIGTTOU and then testcase gets stuck.

>> -

>> -Signed-off-by: Jan Stancek <jstancek@redhat.com>

>> -

>> -Upstream-Status: Backport

>>

>> -[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0]

>> -

>> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com>

>> ----

>> - testcases/commands/gdb/gdb01.sh | 2 +-

>> - 1 file changed, 1 insertion(+), 1 deletion(-)

>> -

>> -diff --git a/testcases/commands/gdb/gdb01.sh

>> b/testcases/commands/gdb/gdb01.sh

>> -index 07ae36f..e3a5b51 100755

>> ---- a/testcases/commands/gdb/gdb01.sh

>> -+++ b/testcases/commands/gdb/gdb01.sh

>> -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat"

>> -

>> - simple_test()

>> - {

>> --      gdb /bin/cat -ex "run /etc/passwd" -ex quit

>> -+      gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null

>> -       RC=$?

>> -       if [ $RC -eq 0 ] ; then

>> -               tst_res TPASS "gdb attached to process and completed run"

>> ---

>> -2.7.4

>> -

>> diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb

>> b/meta/recipes-extended/ltp/ltp_20170929.bb

>> similarity index 96%

>> rename from meta/recipes-extended/ltp/ltp_20170516.bb

>> rename to meta/recipes-extended/ltp/ltp_20170929.bb

>> index 653cbfd4ed..925dd91256 100644

>> --- a/meta/recipes-extended/ltp/ltp_20170516.bb

>> +++ b/meta/recipes-extended/ltp/ltp_20170929.bb

>> @@ -21,7 +21,7 @@ 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 = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"

>> +SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377"

>>

>>  SRC_URI = "git://github.com/linux-test-project/ltp.git \

>>             file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \

>> @@ -48,8 +48,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \

>>             file://0034-periodic_output.patch \

>>             file://0035-fix-test_proc_kill-hang.patch \

>>

>> file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \

>> -

>> file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \

>> -           file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \

>>             "

>>

>>  S = "${WORKDIR}/git"

>> --

>> 2.14.2

>>

>> --

>> _______________________________________________

>> Openembedded-core mailing list

>> Openembedded-core@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>

>

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
deleted file mode 100644
index c8738ae0d4..0000000000
--- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
+++ /dev/null
@@ -1,113 +0,0 @@ 
-From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Thu, 10 Aug 2017 15:27:03 +0800
-Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when
- build with musl
-
-error 1:
-
-|stack_clash.c:50:22: error: expected identifier or '(' before numeric constant
-| static unsigned long PAGE_SIZE;
-
-This is because the musl libc already contain PAGE_SIZE definition in limits.c,
-we can check it here:
-
-    https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43
-
-error 2:
-
-|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function); did you mean 'S_IREAD'?
-|   fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);
-|                       ^~~~~~~
-|                       S_IREAD
-
-This is because the musl libc put those in fcntl.h, so we should include that
-file.
-
-Upstream-Status: Submitted [ https://github.com/linux-test-project/ltp/pull/194 ]
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- testcases/cve/stack_clash.c               | 12 ++++++------
- testcases/kernel/syscalls/flock/flock01.c |  1 +
- testcases/kernel/syscalls/flock/flock02.c |  1 +
- 3 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c
-index 2ef1a82..7c45991 100644
---- a/testcases/cve/stack_clash.c
-+++ b/testcases/cve/stack_clash.c
-@@ -47,7 +47,7 @@
- #include "tst_test.h"
- #include "tst_safe_stdio.h"
- 
--static unsigned long PAGE_SIZE;
-+static unsigned long PAGE_SIZE_tst;
- static unsigned long PAGE_MASK;
- static unsigned long GAP_PAGES = 256;
- static unsigned long THRESHOLD;
-@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void)
- 	exhaust_stack_into_sigsegv();
- }
- 
--#define MAPPED_LEN PAGE_SIZE
-+#define MAPPED_LEN PAGE_SIZE_tst
- static unsigned long mapped_addr;
- 
- void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED)
-@@ -150,7 +150,7 @@ void do_child(void)
- 	stack_t signal_stack;
- 	struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO};
- 	void *map;
--	unsigned long gap = GAP_PAGES * PAGE_SIZE;
-+	unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;
- 	struct rlimit rlimit;
- 
- 	rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;
-@@ -200,8 +200,8 @@ void setup(void)
- {
- 	char buf[4096], *p;
- 
--	PAGE_SIZE = sysconf(_SC_PAGESIZE);
--	PAGE_MASK = ~(PAGE_SIZE - 1);
-+	PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);
-+	PAGE_MASK = ~(PAGE_SIZE_tst - 1);
- 
- 	buf[4095] = '\0';
- 	SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf);
-@@ -214,7 +214,7 @@ void setup(void)
- 		tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES);
- 	}
- 
--	THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;
-+	THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;
- 
- 	{
- 		volatile int *a = alloca(128);
-diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c
-index 3e17be4..06d89e3 100644
---- a/testcases/kernel/syscalls/flock/flock01.c
-+++ b/testcases/kernel/syscalls/flock/flock01.c
-@@ -69,6 +69,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-+#include <fcntl.h>
- #include "test.h"
- 
- void setup(void);
-diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c
-index 414df68..9ddf729 100644
---- a/testcases/kernel/syscalls/flock/flock02.c
-+++ b/testcases/kernel/syscalls/flock/flock02.c
-@@ -75,6 +75,7 @@
- #include <sys/types.h>
- #include <sys/file.h>
- #include <sys/wait.h>
-+#include <fcntl.h>
- #include <errno.h>
- #include <stdio.h>
- #include "test.h"
--- 
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch b/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
deleted file mode 100644
index f7c0a4bf17..0000000000
--- a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001
-From: Jan Stancek <jstancek@redhat.com>
-Date: Mon, 11 Sep 2017 12:57:58 +0200
-Subject: [PATCH] commands/gdb01: replace stdin with /dev/null
-
-If this testcase runs as background process, gdb can receive
-SIGTTOU and then testcase gets stuck.
-
-Signed-off-by: Jan Stancek <jstancek@redhat.com>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- testcases/commands/gdb/gdb01.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/commands/gdb/gdb01.sh b/testcases/commands/gdb/gdb01.sh
-index 07ae36f..e3a5b51 100755
---- a/testcases/commands/gdb/gdb01.sh
-+++ b/testcases/commands/gdb/gdb01.sh
-@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat"
- 
- simple_test()
- {
--	gdb /bin/cat -ex "run /etc/passwd" -ex quit
-+	gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null
- 	RC=$?
- 	if [ $RC -eq 0 ] ; then
- 		tst_res TPASS "gdb attached to process and completed run"
--- 
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170929.bb
similarity index 96%
rename from meta/recipes-extended/ltp/ltp_20170516.bb
rename to meta/recipes-extended/ltp/ltp_20170929.bb
index 653cbfd4ed..925dd91256 100644
--- a/meta/recipes-extended/ltp/ltp_20170516.bb
+++ b/meta/recipes-extended/ltp/ltp_20170929.bb
@@ -21,7 +21,7 @@  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 = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"
+SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \
@@ -48,8 +48,6 @@  SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0034-periodic_output.patch \
            file://0035-fix-test_proc_kill-hang.patch \
            file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-           file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \
-           file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \
            "
 
 S = "${WORKDIR}/git"