diff options
| author | Daniel Díaz <daniel.diaz@linaro.org> | 2018-06-05 17:23:13 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-07 08:52:55 +0100 |
| commit | 6c19e22c1306ae4a5a20ea7a27d5de77388e9a60 (patch) | |
| tree | e7b6ada9c18a1d9aee4fab490114ee324fbde4c1 | |
| parent | e14171cc594e8c3dfee8119847c26e10b15bacf4 (diff) | |
| download | poky-6c19e22c1306ae4a5a20ea7a27d5de77388e9a60.tar.gz | |
ltp: bump to release 20180515
The following patches have made it to upstream:
* 0001-configure-Fix-default-value-of-without-numa-switch-i.patch
* 0001-configure-add-knob-to-control-numa-support.patch
* 0003-Add-knob-to-control-tirpc-support.patch
* 0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
* 0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
These patches have been refreshed in order to apply cleanly
and without any fuzz:
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
* 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
* 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
This next patch was added to the set of patches that make LTP
build with musl:
* 0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
(From OE-Core rev: 331b08516b9b15b9d50d6cade3c9a676bdcefef2)
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13 files changed, 132 insertions, 344 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch b/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch deleted file mode 100644 index 78c6dfb2b1..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Disable-rpc01-on-glibc-and-musl.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From ff39e6b69f0b26dad8ab685ee6116ff92bc363db Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 28 Apr 2018 00:08:55 -0700 | ||
| 4 | Subject: [PATCH] Disable rpc01 on glibc and musl | ||
| 5 | |||
| 6 | It is not buildable with libtirpc | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | testcases/network/rpc/basic_tests/Makefile | 3 +++ | ||
| 13 | 1 file changed, 3 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile | ||
| 16 | index 66e9d5675..16a64e7da 100644 | ||
| 17 | --- a/testcases/network/rpc/basic_tests/Makefile | ||
| 18 | +++ b/testcases/network/rpc/basic_tests/Makefile | ||
| 19 | @@ -23,4 +23,7 @@ | ||
| 20 | top_srcdir ?= ../../../.. | ||
| 21 | |||
| 22 | include $(top_srcdir)/include/mk/env_pre.mk | ||
| 23 | + | ||
| 24 | +FILTER_OUT_DIRS += rpc01 | ||
| 25 | + | ||
| 26 | include $(top_srcdir)/include/mk/generic_trunk_target.mk | ||
| 27 | -- | ||
| 28 | 2.17.0 | ||
| 29 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch deleted file mode 100644 index da62687d57..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Petr Vorel <pvorel@suse.cz> | ||
| 3 | Date: Wed, 7 Feb 2018 11:09:49 +0100 | ||
| 4 | Subject: [PATCH] configure: Fix default value of --without-numa switch in help | ||
| 5 | |||
| 6 | The default value is no. | ||
| 7 | |||
| 8 | Fixes: 39a85a1f1 ("configure: add knob to control numa support") | ||
| 9 | |||
| 10 | Signed-off-by: Petr Vorel <pvorel@suse.cz> | ||
| 11 | Upstream-Status: Accepted | ||
| 12 | --- | ||
| 13 | configure.ac | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index b39a31d..d66ea00 100644 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -86,7 +86,7 @@ fi | ||
| 21 | # Numa | ||
| 22 | AC_ARG_WITH([numa], | ||
| 23 | AC_HELP_STRING([--without-numa], | ||
| 24 | - [without numa support (default=yes)]), | ||
| 25 | + [without numa support (default=no)]), | ||
| 26 | [with_numa=no], | ||
| 27 | [with_numa=yes] | ||
| 28 | ) | ||
| 29 | -- | ||
| 30 | 2.7.4 | ||
| 31 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch b/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch deleted file mode 100644 index 8aaa287b76..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From 39a85a1f1e6624f554215ba4b6843d3689a8415e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anders Roxell <anders.roxell@linaro.org> | ||
| 3 | Date: Mon, 5 Feb 2018 11:56:04 +0100 | ||
| 4 | Subject: [PATCH] configure: add knob to control numa support | ||
| 5 | |||
| 6 | Allow to disable numa from the top level. | ||
| 7 | |||
| 8 | Based on patch: | ||
| 9 | http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/ltp?id=4c7873552e13dfdba96afca7562c398d2966ca71 | ||
| 10 | |||
| 11 | Reported-by: Roy Li <rongqing.li@windriver.com> | ||
| 12 | Signed-off-by: Anders Roxell <anders.roxell@linaro.org> | ||
| 13 | Signed-off-by: Petr Vorel <pvorel@suse.cz> | ||
| 14 | Upstream-Status: Accepted | ||
| 15 | --- | ||
| 16 | configure.ac | 10 ++++++++++ | ||
| 17 | 1 file changed, 10 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/configure.ac b/configure.ac | ||
| 20 | index 5c8d4ea..b39a31d 100644 | ||
| 21 | --- a/configure.ac | ||
| 22 | +++ b/configure.ac | ||
| 23 | @@ -83,6 +83,14 @@ else | ||
| 24 | AC_SUBST([WITH_EXPECT],["no"]) | ||
| 25 | fi | ||
| 26 | |||
| 27 | +# Numa | ||
| 28 | +AC_ARG_WITH([numa], | ||
| 29 | + AC_HELP_STRING([--without-numa], | ||
| 30 | + [without numa support (default=yes)]), | ||
| 31 | + [with_numa=no], | ||
| 32 | + [with_numa=yes] | ||
| 33 | +) | ||
| 34 | + | ||
| 35 | # Perl | ||
| 36 | AC_ARG_WITH([perl], | ||
| 37 | [AC_HELP_STRING([--with-perl], | ||
| 38 | @@ -157,7 +165,9 @@ LTP_CHECK_SELINUX | ||
| 39 | LTP_CHECK_SIGNAL | ||
| 40 | LTP_CHECK_SYSCALL_EVENTFD | ||
| 41 | LTP_CHECK_SYSCALL_MODIFY_LDT | ||
| 42 | +if test "x$with_numa" = xyes; then | ||
| 43 | LTP_CHECK_SYSCALL_NUMA | ||
| 44 | +fi | ||
| 45 | LTP_CHECK_SYSCALL_QUOTACTL | ||
| 46 | LTP_CHECK_SYSCALL_SIGNALFD | ||
| 47 | LTP_CHECK_SYSCALL_UNSHARE | ||
| 48 | -- | ||
| 49 | 2.7.4 | ||
| 50 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch b/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch deleted file mode 100644 index 5cf1e05f79..0000000000 --- a/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | From b193011da301b3d944e8fddcf4817513c31c5b88 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Fathi Boudra <fathi.boudra@linaro.org> | ||
| 3 | Date: Thu, 7 Jan 2016 17:36:19 +0000 | ||
| 4 | Subject: [PATCH 03/32] Add knob to control tirpc support | ||
| 5 | |||
| 6 | allow to disable tirpc. Helps to disable it at top level for eg. musl it | ||
| 7 | does not yet work. | ||
| 8 | |||
| 9 | Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | Upstream-Status: Pending | ||
| 12 | --- | ||
| 13 | configure.ac | 9 +++++++++ | ||
| 14 | 1 file changed, 9 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index cc50397..9e2936b 100644 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -98,6 +98,13 @@ if test "x$with_python" = xyes; then | ||
| 21 | else | ||
| 22 | AC_SUBST([WITH_PYTHON],["no"]) | ||
| 23 | fi | ||
| 24 | + | ||
| 25 | +# TI RPC | ||
| 26 | +AC_ARG_WITH([tirpc], | ||
| 27 | + AC_HELP_STRING([--without-tirpc], | ||
| 28 | + [without libtirpc support]), | ||
| 29 | + [],[with_tirpc=yes], | ||
| 30 | +) | ||
| 31 | # END tools knobs | ||
| 32 | |||
| 33 | # Testsuites knobs | ||
| 34 | @@ -169,7 +176,9 @@ LTP_CHECK_RENAMEAT2 | ||
| 35 | LTP_CHECK_FALLOCATE | ||
| 36 | LTP_CHECK_SYSCALL_FCNTL | ||
| 37 | LTP_CHECK_SYSCALL_PERF_EVENT_OPEN | ||
| 38 | +if test "x$with_tirpc" = xyes; then | ||
| 39 | LTP_CHECK_TIRPC | ||
| 40 | +fi | ||
| 41 | LTP_CHECK_TEE | ||
| 42 | LTP_CHECK_SPLICE | ||
| 43 | LTP_CHECK_VMSPLICE | ||
| 44 | -- | ||
| 45 | 2.7.0 | ||
| 46 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch index 0781ba1743..2df385591b 100644 --- a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch | |||
| @@ -22,10 +22,10 @@ Upstream-Status: Pending | |||
| 22 | testcases/realtime/stress/pi-tests/Makefile | 5 +++++ | 22 | testcases/realtime/stress/pi-tests/Makefile | 5 +++++ |
| 23 | 8 files changed, 35 insertions(+), 2 deletions(-) | 23 | 8 files changed, 35 insertions(+), 2 deletions(-) |
| 24 | 24 | ||
| 25 | Index: git/Makefile | 25 | diff --git a/Makefile b/Makefile |
| 26 | =================================================================== | 26 | index 297f8e7..906b280 100644 |
| 27 | --- git.orig/Makefile | 27 | --- a/Makefile |
| 28 | +++ git/Makefile | 28 | +++ b/Makefile |
| 29 | @@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 | 29 | @@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 |
| 30 | UCLINUX ?= 0 | 30 | UCLINUX ?= 0 |
| 31 | export UCLINUX | 31 | export UCLINUX |
| @@ -38,10 +38,10 @@ Index: git/Makefile | |||
| 38 | # CLEAN_TARGETS: Targets which exist solely in clean. | 38 | # CLEAN_TARGETS: Targets which exist solely in clean. |
| 39 | # COMMON_TARGETS: Targets which exist in all, clean, and install. | 39 | # COMMON_TARGETS: Targets which exist in all, clean, and install. |
| 40 | # INSTALL_TARGETS: Targets which exist in clean and install (contains | 40 | # INSTALL_TARGETS: Targets which exist in clean and install (contains |
| 41 | Index: git/testcases/kernel/Makefile | 41 | diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile |
| 42 | =================================================================== | 42 | index 50a12fa..4f1987f 100644 |
| 43 | --- git.orig/testcases/kernel/Makefile | 43 | --- a/testcases/kernel/Makefile |
| 44 | +++ git/testcases/kernel/Makefile | 44 | +++ b/testcases/kernel/Makefile |
| 45 | @@ -48,13 +48,16 @@ SUBDIRS += connectors \ | 45 | @@ -48,13 +48,16 @@ SUBDIRS += connectors \ |
| 46 | logging \ | 46 | logging \ |
| 47 | mem \ | 47 | mem \ |
| @@ -60,10 +60,10 @@ Index: git/testcases/kernel/Makefile | |||
| 60 | ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) | 60 | ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) |
| 61 | SUBDIRS += power_management | 61 | SUBDIRS += power_management |
| 62 | endif | 62 | endif |
| 63 | Index: git/testcases/kernel/sched/Makefile | 63 | diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile |
| 64 | =================================================================== | 64 | index 6245ed0..aa4eb7f 100644 |
| 65 | --- git.orig/testcases/kernel/sched/Makefile | 65 | --- a/testcases/kernel/sched/Makefile |
| 66 | +++ git/testcases/kernel/sched/Makefile | 66 | +++ b/testcases/kernel/sched/Makefile |
| 67 | @@ -23,5 +23,7 @@ | 67 | @@ -23,5 +23,7 @@ |
| 68 | top_srcdir ?= ../../.. | 68 | top_srcdir ?= ../../.. |
| 69 | 69 | ||
| @@ -73,10 +73,10 @@ Index: git/testcases/kernel/sched/Makefile | |||
| 73 | + FILTER_OUT_DIRS += process_stress | 73 | + FILTER_OUT_DIRS += process_stress |
| 74 | +endif | 74 | +endif |
| 75 | include $(top_srcdir)/include/mk/generic_trunk_target.mk | 75 | include $(top_srcdir)/include/mk/generic_trunk_target.mk |
| 76 | Index: git/testcases/kernel/syscalls/Makefile | 76 | diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile |
| 77 | =================================================================== | 77 | index 8acb395..b749126 100644 |
| 78 | --- git.orig/testcases/kernel/syscalls/Makefile | 78 | --- a/testcases/kernel/syscalls/Makefile |
| 79 | +++ git/testcases/kernel/syscalls/Makefile | 79 | +++ b/testcases/kernel/syscalls/Makefile |
| 80 | @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) | 80 | @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) |
| 81 | FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ | 81 | FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ |
| 82 | mincore mprotect nftw profil remap_file_pages sbrk | 82 | mincore mprotect nftw profil remap_file_pages sbrk |
| @@ -89,11 +89,11 @@ Index: git/testcases/kernel/syscalls/Makefile | |||
| 89 | 89 | ||
| 90 | ifeq ($(UCLIBC),1) | 90 | ifeq ($(UCLIBC),1) |
| 91 | FILTER_OUT_DIRS += profil | 91 | FILTER_OUT_DIRS += profil |
| 92 | Index: git/testcases/network/nfsv4/acl/Makefile | 92 | diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile |
| 93 | =================================================================== | 93 | index 8bc78c2..c36cf50 100644 |
| 94 | --- git.orig/testcases/network/nfsv4/acl/Makefile | 94 | --- a/testcases/network/nfsv4/acl/Makefile |
| 95 | +++ git/testcases/network/nfsv4/acl/Makefile | 95 | +++ b/testcases/network/nfsv4/acl/Makefile |
| 96 | @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre | 96 | @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk |
| 97 | 97 | ||
| 98 | LDLIBS += $(ACL_LIBS) | 98 | LDLIBS += $(ACL_LIBS) |
| 99 | 99 | ||
| @@ -102,11 +102,25 @@ Index: git/testcases/network/nfsv4/acl/Makefile | |||
| 102 | +endif | 102 | +endif |
| 103 | + | 103 | + |
| 104 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | 104 | include $(top_srcdir)/include/mk/generic_leaf_target.mk |
| 105 | Index: git/testcases/realtime/func/pi-tests/Makefile | 105 | diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile |
| 106 | =================================================================== | 106 | index 3160813..9bdf5d0 100644 |
| 107 | --- git.orig/testcases/realtime/func/pi-tests/Makefile | 107 | --- a/testcases/network/rpc/basic_tests/Makefile |
| 108 | +++ git/testcases/realtime/func/pi-tests/Makefile | 108 | +++ b/testcases/network/rpc/basic_tests/Makefile |
| 109 | @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre | 109 | @@ -23,4 +23,9 @@ |
| 110 | top_srcdir ?= ../../../.. | ||
| 111 | |||
| 112 | include $(top_srcdir)/include/mk/env_pre.mk | ||
| 113 | + | ||
| 114 | +ifeq ($(LIBC),musl) | ||
| 115 | +FILTER_OUT_DIRS += rpc01 | ||
| 116 | +endif | ||
| 117 | + | ||
| 118 | include $(top_srcdir)/include/mk/generic_trunk_target.mk | ||
| 119 | diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile | ||
| 120 | index 7a7a57a..5808866 100644 | ||
| 121 | --- a/testcases/realtime/func/pi-tests/Makefile | ||
| 122 | +++ b/testcases/realtime/func/pi-tests/Makefile | ||
| 123 | @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk | ||
| 110 | include $(abs_srcdir)/../../config.mk | 124 | include $(abs_srcdir)/../../config.mk |
| 111 | 125 | ||
| 112 | MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex | 126 | MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex |
| @@ -116,10 +130,10 @@ Index: git/testcases/realtime/func/pi-tests/Makefile | |||
| 116 | + | 130 | + |
| 117 | 131 | ||
| 118 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | 132 | include $(top_srcdir)/include/mk/generic_leaf_target.mk |
| 119 | Index: git/testcases/realtime/stress/pi-tests/Makefile | 133 | diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile |
| 120 | =================================================================== | 134 | index 5edc3b4..aa5987a 100644 |
| 121 | --- git.orig/testcases/realtime/stress/pi-tests/Makefile | 135 | --- a/testcases/realtime/stress/pi-tests/Makefile |
| 122 | +++ git/testcases/realtime/stress/pi-tests/Makefile | 136 | +++ b/testcases/realtime/stress/pi-tests/Makefile |
| 123 | @@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. | 137 | @@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. |
| 124 | 138 | ||
| 125 | include $(top_srcdir)/include/mk/env_pre.mk | 139 | include $(top_srcdir)/include/mk/env_pre.mk |
| @@ -130,3 +144,6 @@ Index: git/testcases/realtime/stress/pi-tests/Makefile | |||
| 130 | +endif | 144 | +endif |
| 131 | + | 145 | + |
| 132 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | 146 | include $(top_srcdir)/include/mk/generic_leaf_target.mk |
| 147 | -- | ||
| 148 | 2.7.0 | ||
| 149 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index e325ce4e49..428ac30049 100644 --- a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +++ b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | |||
| @@ -11,9 +11,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
| 12 | --- | 12 | --- |
| 13 | testcases/kernel/syscalls/accept4/accept4_01.c | 9 ++++- | 13 | testcases/kernel/syscalls/accept4/accept4_01.c | 9 ++++- |
| 14 | testcases/kernel/syscalls/getcpu/getcpu01.c | 40 +++++++++++++++++++++- | 14 | testcases/kernel/syscalls/getcpu/getcpu01.c | 39 +++++++++++++++++++++- |
| 15 | .../sched_getaffinity/sched_getaffinity01.c | 26 ++++++++++++++ | 15 | .../sched_getaffinity/sched_getaffinity01.c | 26 +++++++++++++++ |
| 16 | 3 files changed, 73 insertions(+), 2 deletions(-) | 16 | 3 files changed, 72 insertions(+), 2 deletions(-) |
| 17 | 17 | ||
| 18 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c | 18 | diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c |
| 19 | index 6072bfa..2b090cb 100644 | 19 | index 6072bfa..2b090cb 100644 |
| @@ -102,7 +102,7 @@ index c927512..921b107 100644 | |||
| 102 | *cpu_id = sched_getcpu(); | 102 | *cpu_id = sched_getcpu(); |
| 103 | #endif | 103 | #endif |
| 104 | return 0; | 104 | return 0; |
| 105 | @@ -191,15 +204,20 @@ unsigned int set_cpu_affinity(void) | 105 | @@ -191,15 +203,20 @@ unsigned int set_cpu_affinity(void) |
| 106 | cpu_set_t *set; | 106 | cpu_set_t *set; |
| 107 | size_t size; | 107 | size_t size; |
| 108 | int nrcpus = 1024; | 108 | int nrcpus = 1024; |
| @@ -123,7 +123,7 @@ index c927512..921b107 100644 | |||
| 123 | #if __GLIBC_PREREQ(2, 7) | 123 | #if __GLIBC_PREREQ(2, 7) |
| 124 | size = CPU_ALLOC_SIZE(nrcpus); | 124 | size = CPU_ALLOC_SIZE(nrcpus); |
| 125 | CPU_ZERO_S(size, set); | 125 | CPU_ZERO_S(size, set); |
| 126 | @@ -207,8 +225,13 @@ realloc: | 126 | @@ -207,8 +224,13 @@ realloc: |
| 127 | size = sizeof(cpu_set_t); | 127 | size = sizeof(cpu_set_t); |
| 128 | CPU_ZERO(set); | 128 | CPU_ZERO(set); |
| 129 | #endif | 129 | #endif |
| @@ -137,7 +137,7 @@ index c927512..921b107 100644 | |||
| 137 | #if __GLIBC_PREREQ(2, 7) | 137 | #if __GLIBC_PREREQ(2, 7) |
| 138 | if (errno == EINVAL && nrcpus < (1024 << 8)) { | 138 | if (errno == EINVAL && nrcpus < (1024 << 8)) { |
| 139 | nrcpus = nrcpus << 2; | 139 | nrcpus = nrcpus << 2; |
| 140 | @@ -220,10 +243,17 @@ realloc: | 140 | @@ -220,10 +242,17 @@ realloc: |
| 141 | "NR_CPUS of the kernel is more than 1024, so we'd better use a newer glibc(>= 2.7)"); | 141 | "NR_CPUS of the kernel is more than 1024, so we'd better use a newer glibc(>= 2.7)"); |
| 142 | else | 142 | else |
| 143 | #endif | 143 | #endif |
| @@ -155,7 +155,7 @@ index c927512..921b107 100644 | |||
| 155 | #if __GLIBC_PREREQ(2, 7) | 155 | #if __GLIBC_PREREQ(2, 7) |
| 156 | CPU_ZERO_S(size, set); | 156 | CPU_ZERO_S(size, set); |
| 157 | CPU_SET_S(cpu_max, size, set); | 157 | CPU_SET_S(cpu_max, size, set); |
| 158 | @@ -231,6 +261,10 @@ realloc: | 158 | @@ -231,6 +260,10 @@ realloc: |
| 159 | CPU_ZERO(set); | 159 | CPU_ZERO(set); |
| 160 | CPU_SET(cpu_max, set); | 160 | CPU_SET(cpu_max, set); |
| 161 | #endif | 161 | #endif |
| @@ -166,7 +166,7 @@ index c927512..921b107 100644 | |||
| 166 | if (sched_setaffinity(0, size, set) < 0) { | 166 | if (sched_setaffinity(0, size, set) < 0) { |
| 167 | CPU_FREE(set); | 167 | CPU_FREE(set); |
| 168 | tst_brkm(TFAIL, NULL, "sched_setaffinity:errno:%d", errno); | 168 | tst_brkm(TFAIL, NULL, "sched_setaffinity:errno:%d", errno); |
| 169 | @@ -247,11 +281,15 @@ unsigned int max_cpuid(size_t size, cpu_set_t * set) | 169 | @@ -247,11 +280,15 @@ unsigned int max_cpuid(size_t size, cpu_set_t * set) |
| 170 | { | 170 | { |
| 171 | unsigned int index, max = 0; | 171 | unsigned int index, max = 0; |
| 172 | for (index = 0; index < size * BITS_PER_BYTE; index++) | 172 | for (index = 0; index < size * BITS_PER_BYTE; index++) |
| @@ -186,7 +186,7 @@ diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b | |||
| 186 | index 9d6a81a..4ed13b2 100644 | 186 | index 9d6a81a..4ed13b2 100644 |
| 187 | --- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c | 187 | --- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c |
| 188 | +++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c | 188 | +++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c |
| 189 | @@ -66,9 +66,11 @@ do { \ | 189 | @@ -67,9 +67,11 @@ do { \ |
| 190 | tst_resm((TEST_RETURN == -1 ? TPASS : TFAIL) | TTERRNO, #t); \ | 190 | tst_resm((TEST_RETURN == -1 ? TPASS : TFAIL) | TTERRNO, #t); \ |
| 191 | } while (0) | 191 | } while (0) |
| 192 | 192 | ||
| @@ -198,7 +198,7 @@ index 9d6a81a..4ed13b2 100644 | |||
| 198 | 198 | ||
| 199 | int main(int ac, char **av) | 199 | int main(int ac, char **av) |
| 200 | { | 200 | { |
| 201 | @@ -95,14 +97,19 @@ static void do_test(void) | 201 | @@ -96,14 +98,19 @@ static void do_test(void) |
| 202 | pid_t unused_pid; | 202 | pid_t unused_pid; |
| 203 | unsigned len; | 203 | unsigned len; |
| 204 | 204 | ||
| @@ -218,7 +218,7 @@ index 9d6a81a..4ed13b2 100644 | |||
| 218 | #if __GLIBC_PREREQ(2, 7) | 218 | #if __GLIBC_PREREQ(2, 7) |
| 219 | len = CPU_ALLOC_SIZE(nrcpus); | 219 | len = CPU_ALLOC_SIZE(nrcpus); |
| 220 | CPU_ZERO_S(len, mask); | 220 | CPU_ZERO_S(len, mask); |
| 221 | @@ -110,10 +117,15 @@ realloc: | 221 | @@ -111,10 +118,15 @@ realloc: |
| 222 | len = sizeof(cpu_set_t); | 222 | len = sizeof(cpu_set_t); |
| 223 | CPU_ZERO(mask); | 223 | CPU_ZERO(mask); |
| 224 | #endif | 224 | #endif |
| @@ -234,7 +234,7 @@ index 9d6a81a..4ed13b2 100644 | |||
| 234 | #if __GLIBC_PREREQ(2, 7) | 234 | #if __GLIBC_PREREQ(2, 7) |
| 235 | if (errno == EINVAL && nrcpus < (1024 << 8)) { | 235 | if (errno == EINVAL && nrcpus < (1024 << 8)) { |
| 236 | nrcpus = nrcpus << 2; | 236 | nrcpus = nrcpus << 2; |
| 237 | @@ -125,17 +137,27 @@ realloc: | 237 | @@ -126,17 +138,27 @@ realloc: |
| 238 | "newer glibc(>= 2.7)"); | 238 | "newer glibc(>= 2.7)"); |
| 239 | else | 239 | else |
| 240 | #endif | 240 | #endif |
| @@ -262,7 +262,7 @@ index 9d6a81a..4ed13b2 100644 | |||
| 262 | if (TEST_RETURN != -1) | 262 | if (TEST_RETURN != -1) |
| 263 | tst_resm(TPASS, "sched_getaffinity() succeed, " | 263 | tst_resm(TPASS, "sched_getaffinity() succeed, " |
| 264 | "this process %d is running " | 264 | "this process %d is running " |
| 265 | @@ -143,11 +165,15 @@ realloc: | 265 | @@ -144,11 +166,15 @@ realloc: |
| 266 | } | 266 | } |
| 267 | } | 267 | } |
| 268 | 268 | ||
diff --git a/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch b/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch deleted file mode 100644 index b9fce880fa..0000000000 --- a/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | From 0130f4146ced320aadb01b22e36b13d269a8ebba Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 7 Jan 2016 19:48:14 +0000 | ||
| 4 | Subject: [PATCH 10/32] replace __BEGIN_DECLS and __END_DECLS | ||
| 5 | |||
| 6 | They are not portable across libc implementations | ||
| 7 | therefore replace them with expanded macros | ||
| 8 | |||
| 9 | Include <asm-generic/types.h> to get __s32 definitions | ||
| 10 | its not a generally available typedef | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | --- | ||
| 16 | testcases/kernel/syscalls/epoll2/include/epoll.h | 8 ++++++-- | ||
| 17 | utils/sctp/include/netinet/sctp.h | 9 +++++++-- | ||
| 18 | 2 files changed, 13 insertions(+), 4 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/testcases/kernel/syscalls/epoll2/include/epoll.h b/testcases/kernel/syscalls/epoll2/include/epoll.h | ||
| 21 | index be599c7..8cc5e7e 100644 | ||
| 22 | --- a/testcases/kernel/syscalls/epoll2/include/epoll.h | ||
| 23 | +++ b/testcases/kernel/syscalls/epoll2/include/epoll.h | ||
| 24 | @@ -85,7 +85,9 @@ struct epoll_event | ||
| 25 | } EPOLL_PACKED; | ||
| 26 | |||
| 27 | |||
| 28 | -__BEGIN_DECLS | ||
| 29 | +#ifdef __cplusplus | ||
| 30 | +extern "C" { | ||
| 31 | +#endif | ||
| 32 | |||
| 33 | /* Creates an epoll instance. Returns an fd for the new instance. | ||
| 34 | The "size" parameter is a hint specifying the number of file | ||
| 35 | @@ -114,6 +116,8 @@ extern int epoll_ctl (int __epfd, int __op, int __fd, | ||
| 36 | extern int epoll_wait (int __epfd, struct epoll_event *__events, | ||
| 37 | int __maxevents, int __timeout) __THROW; | ||
| 38 | |||
| 39 | -__END_DECLS | ||
| 40 | +#ifdef __cplusplus | ||
| 41 | +} | ||
| 42 | +#endif | ||
| 43 | |||
| 44 | #endif /* sys/epoll.h */ | ||
| 45 | diff --git a/utils/sctp/include/netinet/sctp.h b/utils/sctp/include/netinet/sctp.h | ||
| 46 | index 51f5bfb..c61aef3 100644 | ||
| 47 | --- a/utils/sctp/include/netinet/sctp.h | ||
| 48 | +++ b/utils/sctp/include/netinet/sctp.h | ||
| 49 | @@ -35,9 +35,12 @@ | ||
| 50 | |||
| 51 | #include <stdint.h> | ||
| 52 | #include <linux/types.h> | ||
| 53 | +#include <asm-generic/types.h> | ||
| 54 | #include <sys/socket.h> | ||
| 55 | |||
| 56 | -__BEGIN_DECLS | ||
| 57 | +#ifdef __cplusplus | ||
| 58 | +extern "C" { | ||
| 59 | +#endif | ||
| 60 | |||
| 61 | typedef __s32 sctp_assoc_t; | ||
| 62 | |||
| 63 | @@ -862,6 +865,8 @@ int sctp_recvmsg(int s, void *msg, size_t len, struct sockaddr *from, | ||
| 64 | /* Return the address length for an address family. */ | ||
| 65 | int sctp_getaddrlen(sa_family_t family); | ||
| 66 | |||
| 67 | -__END_DECLS | ||
| 68 | +#ifdef __cplusplus | ||
| 69 | +} | ||
| 70 | +#endif | ||
| 71 | |||
| 72 | #endif /* __linux_sctp_h__ */ | ||
| 73 | -- | ||
| 74 | 2.7.0 | ||
| 75 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch index 462976da42..6c5f360351 100644 --- a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch +++ b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch | |||
| @@ -18,10 +18,10 @@ Upstream-Status: Pending | |||
| 18 | testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ | 18 | testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ |
| 19 | 3 files changed, 7 insertions(+), 1 deletion(-) | 19 | 3 files changed, 7 insertions(+), 1 deletion(-) |
| 20 | 20 | ||
| 21 | Index: git/testcases/kernel/syscalls/mremap/mremap01.c | 21 | diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c |
| 22 | =================================================================== | 22 | index d63d1e4..24ca174 100644 |
| 23 | --- git.orig/testcases/kernel/syscalls/mremap/mremap01.c | 23 | --- a/testcases/kernel/syscalls/mremap/mremap01.c |
| 24 | +++ git/testcases/kernel/syscalls/mremap/mremap01.c | 24 | +++ b/testcases/kernel/syscalls/mremap/mremap01.c |
| 25 | @@ -76,10 +76,12 @@ | 25 | @@ -76,10 +76,12 @@ |
| 26 | */ | 26 | */ |
| 27 | #include <unistd.h> | 27 | #include <unistd.h> |
| @@ -36,10 +36,10 @@ Index: git/testcases/kernel/syscalls/mremap/mremap01.c | |||
| 36 | 36 | ||
| 37 | #include "test.h" | 37 | #include "test.h" |
| 38 | #include "safe_macros.h" | 38 | #include "safe_macros.h" |
| 39 | Index: git/testcases/kernel/syscalls/mremap/mremap02.c | 39 | diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c |
| 40 | =================================================================== | 40 | index 5a51b9a..a530a6b 100644 |
| 41 | --- git.orig/testcases/kernel/syscalls/mremap/mremap02.c | 41 | --- a/testcases/kernel/syscalls/mremap/mremap02.c |
| 42 | +++ git/testcases/kernel/syscalls/mremap/mremap02.c | 42 | +++ b/testcases/kernel/syscalls/mremap/mremap02.c |
| 43 | @@ -75,9 +75,11 @@ | 43 | @@ -75,9 +75,11 @@ |
| 44 | #include <errno.h> | 44 | #include <errno.h> |
| 45 | #include <unistd.h> | 45 | #include <unistd.h> |
| @@ -52,10 +52,10 @@ Index: git/testcases/kernel/syscalls/mremap/mremap02.c | |||
| 52 | 52 | ||
| 53 | #include "test.h" | 53 | #include "test.h" |
| 54 | 54 | ||
| 55 | Index: git/testcases/kernel/syscalls/mremap/mremap03.c | 55 | diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c |
| 56 | =================================================================== | 56 | index 12e3829..9b39f8b 100644 |
| 57 | --- git.orig/testcases/kernel/syscalls/mremap/mremap03.c | 57 | --- a/testcases/kernel/syscalls/mremap/mremap03.c |
| 58 | +++ git/testcases/kernel/syscalls/mremap/mremap03.c | 58 | +++ b/testcases/kernel/syscalls/mremap/mremap03.c |
| 59 | @@ -76,9 +76,11 @@ | 59 | @@ -76,9 +76,11 @@ |
| 60 | #include <errno.h> | 60 | #include <errno.h> |
| 61 | #include <unistd.h> | 61 | #include <unistd.h> |
| @@ -68,3 +68,6 @@ Index: git/testcases/kernel/syscalls/mremap/mremap03.c | |||
| 68 | 68 | ||
| 69 | #include "test.h" | 69 | #include "test.h" |
| 70 | 70 | ||
| 71 | -- | ||
| 72 | 2.7.0 | ||
| 73 | |||
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 index c730d46e69..40ee894143 100644 --- 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 | |||
| @@ -11,14 +11,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 11 | 11 | ||
| 12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
| 13 | --- | 13 | --- |
| 14 | include/lapi/rt_sigaction.h | 2 +- | 14 | include/lapi/rt_sigaction.h | 4 ++-- |
| 15 | testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++ | 15 | testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++ |
| 16 | 2 files changed, 4 insertions(+), 1 deletion(-) | 16 | 2 files changed, 5 insertions(+), 2 deletions(-) |
| 17 | 17 | ||
| 18 | Index: git/include/lapi/rt_sigaction.h | 18 | diff --git a/include/lapi/rt_sigaction.h b/include/lapi/rt_sigaction.h |
| 19 | =================================================================== | 19 | index 18236db..15facda 100644 |
| 20 | --- git.orig/include/lapi/rt_sigaction.h | 20 | --- a/include/lapi/rt_sigaction.h |
| 21 | +++ git/include/lapi/rt_sigaction.h | 21 | +++ b/include/lapi/rt_sigaction.h |
| 22 | @@ -36,12 +36,12 @@ | 22 | @@ -36,12 +36,12 @@ |
| 23 | #if defined(__mips__) | 23 | #if defined(__mips__) |
| 24 | struct kernel_sigaction { | 24 | struct kernel_sigaction { |
| @@ -34,10 +34,10 @@ Index: git/include/lapi/rt_sigaction.h | |||
| 34 | unsigned long sa_flags; | 34 | unsigned long sa_flags; |
| 35 | void (*sa_restorer) (void); | 35 | void (*sa_restorer) (void); |
| 36 | sigset_t sa_mask; | 36 | sigset_t sa_mask; |
| 37 | Index: git/testcases/kernel/syscalls/rt_sigsuspend/Makefile | 37 | diff --git a/testcases/kernel/syscalls/rt_sigsuspend/Makefile b/testcases/kernel/syscalls/rt_sigsuspend/Makefile |
| 38 | =================================================================== | 38 | index 37bc3a9..2ca7f7c 100644 |
| 39 | --- git.orig/testcases/kernel/syscalls/rt_sigsuspend/Makefile | 39 | --- a/testcases/kernel/syscalls/rt_sigsuspend/Makefile |
| 40 | +++ git/testcases/kernel/syscalls/rt_sigsuspend/Makefile | 40 | +++ b/testcases/kernel/syscalls/rt_sigsuspend/Makefile |
| 41 | @@ -19,4 +19,7 @@ | 41 | @@ -19,4 +19,7 @@ |
| 42 | top_srcdir ?= ../../../.. | 42 | top_srcdir ?= ../../../.. |
| 43 | 43 | ||
diff --git a/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch index 04532be79e..e826d48e3b 100644 --- a/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch +++ b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch | |||
| @@ -27,7 +27,7 @@ diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/ac | |||
| 27 | index b8b67b4..7c7c506 100644 | 27 | index b8b67b4..7c7c506 100644 |
| 28 | --- a/testcases/network/nfsv4/acl/acl1.c | 28 | --- a/testcases/network/nfsv4/acl/acl1.c |
| 29 | +++ b/testcases/network/nfsv4/acl/acl1.c | 29 | +++ b/testcases/network/nfsv4/acl/acl1.c |
| 30 | @@ -314,7 +314,7 @@ void test_acl_default(char *dir, acl_t acl) | 30 | @@ -303,7 +303,7 @@ void test_acl_default(char *dir, acl_t acl) |
| 31 | char *cmd = malloc(256); | 31 | char *cmd = malloc(256); |
| 32 | 32 | ||
| 33 | strcpy(cmd, "chmod 7777 "); | 33 | strcpy(cmd, "chmod 7777 "); |
diff --git a/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch b/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch new file mode 100644 index 0000000000..0245a89f3d --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From 23518508de307790231d16af307291f1b45e903a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> | ||
| 3 | Date: Tue, 5 Jun 2018 15:36:30 -0500 | ||
| 4 | Subject: [PATCH] read_all: Define FNM_EXTMATCH if not already (like under | ||
| 5 | musl). | ||
| 6 | MIME-Version: 1.0 | ||
| 7 | Content-Type: text/plain; charset=UTF-8 | ||
| 8 | Content-Transfer-Encoding: 8bit | ||
| 9 | |||
| 10 | With musl, FNM_EXTMATCH is not defined: | ||
| 11 | | read_all.c: In function 'read_test': | ||
| 12 | | read_all.c:201:41: error: 'FNM_EXTMATCH' undeclared (first use in this function); did you mean 'FNM_NOMATCH'? | ||
| 13 | | if (exclude && !fnmatch(exclude, path, FNM_EXTMATCH)) { | ||
| 14 | | ^~~~~~~~~~~~ | ||
| 15 | | FNM_NOMATCH | ||
| 16 | | read_all.c:201:41: note: each undeclared identifier is reported only once for each function it appears in | ||
| 17 | | <builtin>: recipe for target 'read_all' failed | ||
| 18 | | make[4]: *** [read_all] Error 1 | ||
| 19 | |||
| 20 | Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> | ||
| 21 | |||
| 22 | Upstream-Status: Pending | ||
| 23 | --- | ||
| 24 | testcases/kernel/fs/read_all/read_all.c | 4 ++++ | ||
| 25 | 1 file changed, 4 insertions(+) | ||
| 26 | |||
| 27 | diff --git a/testcases/kernel/fs/read_all/read_all.c b/testcases/kernel/fs/read_all/read_all.c | ||
| 28 | index a8e1611..e9ff47a 100644 | ||
| 29 | --- a/testcases/kernel/fs/read_all/read_all.c | ||
| 30 | +++ b/testcases/kernel/fs/read_all/read_all.c | ||
| 31 | @@ -59,6 +59,10 @@ | ||
| 32 | #define MAX_PATH 4096 | ||
| 33 | #define MAX_DISPLAY 40 | ||
| 34 | |||
| 35 | +#if !defined(FNM_EXTMATCH) | ||
| 36 | +#define FNM_EXTMATCH 0 | ||
| 37 | +#endif | ||
| 38 | + | ||
| 39 | struct queue { | ||
| 40 | sem_t sem; | ||
| 41 | int front; | ||
| 42 | -- | ||
| 43 | 2.7.4 | ||
| 44 | |||
diff --git a/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch b/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch deleted file mode 100644 index 5096a85c1e..0000000000 --- a/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Li Wang <liwang@redhat.com> | ||
| 3 | Date: Tue, 23 Jan 2018 17:46:35 +0800 | ||
| 4 | Subject: [PATCH] safe_macros: make is_fuse() return zero if fs_type is NULL | ||
| 5 | |||
| 6 | This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) | ||
| 7 | involves FUSE fs check in safe_mount(), but we'd better guarantee the "fs_type" | ||
| 8 | is legal to check in is_fuse() function otherwise system will kill the program. | ||
| 9 | |||
| 10 | cmdline="fanotify06" | ||
| 11 | contacts="" | ||
| 12 | analysis=exit | ||
| 13 | <<<test_output>>> | ||
| 14 | tst_test.c:980: INFO: Timeout per run is 0h 10m 00s | ||
| 15 | tst_test.c:1025: BROK: Test killed by SIGSEGV! | ||
| 16 | |||
| 17 | Signed-off-by: Li Wang <liwang@redhat.com> | ||
| 18 | Acked-by: Jan Stancek <jstancek@redhat.com> | ||
| 19 | Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d] | ||
| 20 | --- | ||
| 21 | lib/safe_macros.c | 3 +++ | ||
| 22 | 1 file changed, 3 insertions(+) | ||
| 23 | |||
| 24 | diff --git a/lib/safe_macros.c b/lib/safe_macros.c | ||
| 25 | index c48e436dc..abdeca013 100644 | ||
| 26 | --- a/lib/safe_macros.c | ||
| 27 | +++ b/lib/safe_macros.c | ||
| 28 | @@ -708,6 +708,9 @@ static int is_fuse(const char *fs_type) | ||
| 29 | { | ||
| 30 | unsigned int i; | ||
| 31 | |||
| 32 | + if (!fs_type) | ||
| 33 | + return 0; | ||
| 34 | + | ||
| 35 | for (i = 0; i < ARRAY_SIZE(fuse_fs_types); i++) { | ||
| 36 | if (!strcmp(fuse_fs_types[i], fs_type)) | ||
| 37 | return 1; | ||
| 38 | -- | ||
| 39 | 2.11.0 | ||
| 40 | |||
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180515.bb index b3e2f533cb..b07c1b9268 100644 --- a/meta/recipes-extended/ltp/ltp_20180118.bb +++ b/meta/recipes-extended/ltp/ltp_20180515.bb | |||
| @@ -21,18 +21,14 @@ DEPENDS_append_libc-musl = " fts " | |||
| 21 | EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " | 21 | EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " |
| 22 | CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" | 22 | CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
| 23 | CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" | 23 | CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" |
| 24 | SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1" | 24 | SRCREV = "96cbf48313afa65ef4d693d3441cbfd60a8d9b27" |
| 25 | 25 | ||
| 26 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ | 26 | SRC_URI = "git://github.com/linux-test-project/ltp.git \ |
| 27 | file://0001-configure-add-knob-to-control-numa-support.patch \ | ||
| 28 | file://0001-configure-Fix-default-value-of-without-numa-switch-i.patch \ | ||
| 29 | file://0003-Add-knob-to-control-tirpc-support.patch \ | ||
| 30 | file://0004-build-Add-option-to-select-libc-implementation.patch \ | 27 | file://0004-build-Add-option-to-select-libc-implementation.patch \ |
| 31 | file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ | 28 | file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ |
| 32 | file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch \ | 29 | file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch \ |
| 33 | file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ | 30 | file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ |
| 34 | file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ | 31 | file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ |
| 35 | file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \ | ||
| 36 | file://0018-guard-mallocopt-with-__GLIBC__.patch \ | 32 | file://0018-guard-mallocopt-with-__GLIBC__.patch \ |
| 37 | file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \ | 33 | file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \ |
| 38 | file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \ | 34 | file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \ |
| @@ -44,8 +40,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ | |||
| 44 | file://0035-fix-test_proc_kill-hang.patch \ | 40 | file://0035-fix-test_proc_kill-hang.patch \ |
| 45 | file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ | 41 | file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ |
| 46 | file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ | 42 | file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ |
| 47 | file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \ | 43 | file://0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch \ |
| 48 | file://0001-Disable-rpc01-on-glibc-and-musl.patch \ | ||
| 49 | " | 44 | " |
| 50 | 45 | ||
| 51 | S = "${WORKDIR}/git" | 46 | S = "${WORKDIR}/git" |
