<div><br></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Dec 15, 2019 at 3:02 AM Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>As the last three issues are clang or musl related, may I request that you look into them?</div><div></div></div></blockquote><div dir="auto"><br></div><div dir="auto">I will try but there is one issue where a patch is removed which should not be so it’s better if that patch can be forward ported as needed for newer issues I will see if I can find some solutions </div><div dir="auto"><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><br></div><div>Alex<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, 15 Dec 2019 at 06:33, Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">musl build fails on aarch64<br>
<br>
<a href="https://errors.yoctoproject.org/Errors/Details/297288/" rel="noreferrer" target="_blank">https://errors.yoctoproject.org/Errors/Details/297288/</a><br>
<br>
On Thu, Dec 12, 2019 at 10:18 AM Alexander Kanavin<br>
<<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>> wrote:<br>
><br>
> Drop a big pile of backports.<br>
><br>
> Add a patch to address absent string formatting error.<br>
><br>
> Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> ---<br>
> ...me-check-for-getdents-getdents64-API.patch | 72 --------<br>
> ...option-to-select-libc-implementation.patch | 27 ++-<br>
> ...-17052-Avoid-unsafe-exits-in-threads.patch | 64 -------<br>
> ...meltdown.c-Fix-kernel-symbol-finding.patch | 81 ---------<br>
> ...y-update-for-mm-fix-false-positive-O.patch | 57 -------<br>
> ...medwait01-Fix-wrong-sigset-length-fo.patch | 46 -----<br>
> ...3-wait-for-defunct-tid-to-get-detach.patch | 75 --------<br>
> ...es-fix-an-absent-format-string-issue.patch | 24 +++<br>
> ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------<br>
> ...x-EFAULT-in-32bit-compatibility-mode.patch | 36 ----<br>
> ...k-for-RES_USE_INET6-during-configure.patch | 68 --------<br>
> ...BC_PREREQ-is-defined-before-using-it.patch | 27 ++-<br>
> ...se-hardcoded-index-0-for-SHM_STAT-te.patch | 82 ---------<br>
> ...11-direct_io-diotest4-drop-MAP_FIXED.patch | 56 ------<br>
> ...st-a-bit-of-code-to-compatiable-with.patch | 64 -------<br>
> .../ltp/{<a href="http://ltp_20190517.bb" rel="noreferrer" target="_blank">ltp_20190517.bb</a> => <a href="http://ltp_20190930.bb" rel="noreferrer" target="_blank">ltp_20190930.bb</a>} | 15 +-<br>
> 16 files changed, 51 insertions(+), 904 deletions(-)<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch<br>
> create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch<br>
> delete mode 100644 meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch<br>
> rename meta/recipes-extended/ltp/{<a href="http://ltp_20190517.bb" rel="noreferrer" target="_blank">ltp_20190517.bb</a> => <a href="http://ltp_20190930.bb" rel="noreferrer" target="_blank">ltp_20190930.bb</a>} (84%)<br>
><br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch b/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch<br>
> deleted file mode 100644<br>
> index bfceadb190d..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch<br>
> +++ /dev/null<br>
> @@ -1,72 +0,0 @@<br>
> -From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001<br>
> -From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> -Date: Fri, 26 Jul 2019 10:32:29 -0700<br>
> -Subject: [PATCH 1/2] Add configure time check for getdents/getdents64 APIs<br>
> -<br>
> -glibc 2.30 has added wrapper for getdents64 this will help in detecting<br>
> -right condition to use fallback<br>
> -<br>
> -Check for getdents API as well while here<br>
> -<br>
> -Upstream-Status: Submitted [<a href="http://lists.linux.it/pipermail/ltp/2019-July/012954.html" rel="noreferrer" target="_blank">http://lists.linux.it/pipermail/ltp/2019-July/012954.html</a>]<br>
> -Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> ----<br>
> - <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 2 ++<br>
> - testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++--<br>
> - 2 files changed, 8 insertions(+), 2 deletions(-)<br>
> -<br>
> ---- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \<br>
> - fallocate \<br>
> - fchownat \<br>
> - fstatat \<br>
> -+ getdents \<br>
> -+ getdents64 \<br>
> - kcmp \<br>
> - mkdirat \<br>
> - mknodat \<br>
> ---- a/testcases/kernel/syscalls/getdents/getdents.h<br>
> -+++ b/testcases/kernel/syscalls/getdents/getdents.h<br>
> -@@ -23,7 +23,7 @@<br>
> - #include <stdint.h><br>
> - #include "test.h"<br>
> - #include "lapi/syscalls.h"<br>
> --<br>
> -+#include "config.h"<br>
> - /*<br>
> - * See fs/compat.c struct compat_linux_dirent<br>
> - */<br>
> -@@ -34,12 +34,17 @@ struct linux_dirent {<br>
> - char d_name[];<br>
> - };<br>
> -<br>
> -+#if HAVE_GETDENTS<br>
> -+#include <unistd.h><br>
> -+#else<br>
> - static inline int<br>
> - getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size)<br>
> - {<br>
> - return ltp_syscall(__NR_getdents, fd, dirp, size);<br>
> - }<br>
> -<br>
> -+#endif /* HAVE_GETDENTS */<br>
> -+<br>
> - struct linux_dirent64 {<br>
> - uint64_t d_ino;<br>
> - int64_t d_off;<br>
> -@@ -48,10 +53,13 @@ struct linux_dirent64 {<br>
> - char d_name[];<br>
> - };<br>
> -<br>
> -+#if HAVE_GETDENTS64<br>
> -+#include <unistd.h><br>
> -+#else<br>
> - static inline int<br>
> - getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size)<br>
> - {<br>
> - return ltp_syscall(__NR_getdents64, fd, dirp64, size);<br>
> - }<br>
> --<br>
> -+#endif /* HAVE_GETDENTS64 */<br>
> - #endif /* GETDENTS_H */<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch<br>
> index b5c25c56a57..1705abcf196 100644<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch<br>
> +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch<br>
> @@ -1,4 +1,4 @@<br>
> -From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001<br>
> +From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001<br>
> From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> Date: Thu, 7 Jan 2016 18:19:03 +0000<br>
> Subject: [PATCH] build: Add option to select libc implementation<br>
> @@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ on musl based systems<br>
> Upstream-Status: Pending<br>
><br>
> Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> +<br>
> ---<br>
> Makefile | 5 +++++<br>
> testcases/kernel/Makefile | 5 ++++-<br>
> @@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> 8 files changed, 35 insertions(+), 2 deletions(-)<br>
><br>
> diff --git a/Makefile b/Makefile<br>
> -index 768ca46..e9d679a 100644<br>
> +index 768ca4606..e9d679a71 100644<br>
> --- a/Makefile<br>
> +++ b/Makefile<br>
> @@ -41,6 +41,11 @@ vpath %.mk $(top_srcdir)/mk:$(top_srcdir)/mk/include<br>
> @@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644<br>
> # COMMON_TARGETS: Targets which exist in all, clean, and install.<br>
> # INSTALL_TARGETS: Targets which exist in clean and install (contains<br>
> diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile<br>
> -index 39d79c7..24a57d9 100644<br>
> +index 3319b3163..94ea362c8 100644<br>
> --- a/testcases/kernel/Makefile<br>
> +++ b/testcases/kernel/Makefile<br>
> -@@ -49,12 +49,15 @@ SUBDIRS += connectors \<br>
> +@@ -49,13 +49,16 @@ SUBDIRS += connectors \<br>
> logging \<br>
> mem \<br>
> numa \<br>
> - pty \<br>
> sched \<br>
> security \<br>
> - timers \<br>
> + sound \<br>
> tracing \<br>
> + uevents \<br>
><br>
> +ifneq ($(LIBC),musl)<br>
> +SUBDIRS += pty<br>
> @@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644<br>
> SUBDIRS += power_management<br>
> endif<br>
> diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile<br>
> -index 6a57d79..74bb933 100644<br>
> +index 6a57d79ee..74bb93370 100644<br>
> --- a/testcases/kernel/sched/Makefile<br>
> +++ b/testcases/kernel/sched/Makefile<br>
> @@ -23,5 +23,7 @@<br>
> @@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644<br>
> +endif<br>
> include $(top_srcdir)/include/mk/<a href="http://generic_trunk_target.mk" rel="noreferrer" target="_blank">generic_trunk_target.mk</a><br>
> diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile<br>
> -index 45a00cf..d1becd0 100644<br>
> +index 45a00cf7d..d1becd054 100644<br>
> --- a/testcases/kernel/syscalls/Makefile<br>
> +++ b/testcases/kernel/syscalls/Makefile<br>
> @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)<br>
> @@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644<br>
> ifeq ($(UCLIBC),1)<br>
> FILTER_OUT_DIRS += profil<br>
> diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile<br>
> -index 8c55a6b..f7cda62 100644<br>
> +index 8c55a6bbd..f7cda621d 100644<br>
> --- a/testcases/network/nfsv4/acl/Makefile<br>
> +++ b/testcases/network/nfsv4/acl/Makefile<br>
> @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/<a href="http://env_pre.mk" rel="noreferrer" target="_blank">env_pre.mk</a><br>
> @@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644<br>
> +<br>
> include $(top_srcdir)/include/mk/<a href="http://generic_leaf_target.mk" rel="noreferrer" target="_blank">generic_leaf_target.mk</a><br>
> diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile<br>
> -index 66e9d56..ea8eb8a 100644<br>
> +index 66e9d5675..ea8eb8a98 100644<br>
> --- a/testcases/network/rpc/basic_tests/Makefile<br>
> +++ b/testcases/network/rpc/basic_tests/Makefile<br>
> @@ -23,4 +23,9 @@<br>
> @@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644<br>
> +<br>
> include $(top_srcdir)/include/mk/<a href="http://generic_trunk_target.mk" rel="noreferrer" target="_blank">generic_trunk_target.mk</a><br>
> diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile<br>
> -index 68616a7..748754b 100644<br>
> +index 68616a711..748754bb4 100644<br>
> --- a/testcases/realtime/func/pi-tests/Makefile<br>
> +++ b/testcases/realtime/func/pi-tests/Makefile<br>
> @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/<a href="http://env_pre.mk" rel="noreferrer" target="_blank">env_pre.mk</a><br>
> @@ -131,7 +133,7 @@ index 68616a7..748754b 100644<br>
><br>
> include $(top_srcdir)/include/mk/<a href="http://generic_leaf_target.mk" rel="noreferrer" target="_blank">generic_leaf_target.mk</a><br>
> diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile<br>
> -index 1881f75..266e0b8 100644<br>
> +index 1881f7565..266e0b815 100644<br>
> --- a/testcases/realtime/stress/pi-tests/Makefile<br>
> +++ b/testcases/realtime/stress/pi-tests/Makefile<br>
> @@ -24,4 +24,9 @@ top_srcdir ?= ../../../..<br>
> @@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644<br>
> +endif<br>
> +<br>
> include $(top_srcdir)/include/mk/<a href="http://generic_leaf_target.mk" rel="noreferrer" target="_blank">generic_leaf_target.mk</a><br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch b/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch<br>
> deleted file mode 100644<br>
> index cc40081300c..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch<br>
> +++ /dev/null<br>
> @@ -1,64 +0,0 @@<br>
> -From e3a8502d0a4f8a44ddd02ca4b2efc097133fb9f7 Mon Sep 17 00:00:00 2001<br>
> -From: Mathias Fiedler <<a href="mailto:mathias.fiedler@aox-tech.de" target="_blank">mathias.fiedler@aox-tech.de</a>><br>
> -Date: Fri, 23 Aug 2019 12:46:48 +0200<br>
> -Subject: [PATCH] cve-2017-17052: Avoid unsafe exits in threads<br>
> -<br>
> -According to manpage exit(3) calling exit is not thread-safe.<br>
> -And with glibc 2.28 (and probably also with glibc >=2.27) sometimes<br>
> -child processes created in fork_thread can get stuck on process exit in<br>
> -glibc's __run_exit_handlers trying to acquire some lock which was in<br>
> -locked state while the fork was created. This can happen when exit is<br>
> -called in mmap_thread concurrently to the fork.<br>
> -While the main process will still return with PASSED some of its<br>
> -children are left behind.<br>
> -<br>
> -Comparing the source code with the original program as described in the<br>
> -commit 2b7e8665b4ff51c034c55df3cff76518d1a9ee3a of linux kernel >=4.13<br>
> -the exits in mmap_thread and fork_thread should not be necessary to<br>
> -trigger the original bug.<br>
> -<br>
> -Therefore those exit calls are removed. The mmap_thread and fork_thread<br>
> -should still exit when their corresponding main thread in do_test_fork<br>
> -calls exit_group. The remaining exit in do_test_fork will be called in<br>
> -the main thread without any concurrent thread in the same process.<br>
> -<br>
> -Signed-off-by: Mathias Fiedler <<a href="mailto:mathias.fiedler@aox-tech.de" target="_blank">mathias.fiedler@aox-tech.de</a>><br>
> -Acked-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz" target="_blank">chrubis@suse.cz</a>><br>
> -Acked-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4</a>]<br>
> -<br>
> -CVE: CVE-2017-17052<br>
> -<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> ----<br>
> - testcases/cve/cve-2017-17052.c | 5 -----<br>
> - 1 file changed, 5 deletions(-)<br>
> -<br>
> -diff --git a/testcases/cve/cve-2017-17052.c b/testcases/cve/cve-2017-17052.c<br>
> -index d7da7e919..18cd2a6d7 100644<br>
> ---- a/testcases/cve/cve-2017-17052.c<br>
> -+++ b/testcases/cve/cve-2017-17052.c<br>
> -@@ -58,8 +58,6 @@ static void *mmap_thread(void *arg)<br>
> - for (;;) {<br>
> - SAFE_MMAP(NULL, 0x1000000, PROT_READ,<br>
> - MAP_POPULATE|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);<br>
> -- if (*do_exit)<br>
> -- exit(0);<br>
> - }<br>
> -<br>
> - return arg;<br>
> -@@ -67,9 +65,6 @@ static void *mmap_thread(void *arg)<br>
> -<br>
> - static void *fork_thread(void *arg)<br>
> - {<br>
> -- if (*do_exit)<br>
> -- exit(0);<br>
> --<br>
> - usleep(rand() % 10000);<br>
> - SAFE_FORK();<br>
> -<br>
> ---<br>
> -2.17.1<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch b/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch<br>
> deleted file mode 100644<br>
> index 94f6f5a15a6..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch<br>
> +++ /dev/null<br>
> @@ -1,81 +0,0 @@<br>
> -From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001<br>
> -From: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> -Date: Wed, 21 Aug 2019 16:27:24 +0800<br>
> -Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding<br>
> -<br>
> -meltdown case fails as below.<br>
> -safe_file_ops.c:219: BROK: Expected 3 conversions got 2 at meltdown.c:272<br>
> -<br>
> -find_kernel_symbol is defined to try twice with each of /proc/kallsyms and<br>
> -/boot/System.map-%s. Currently if the symbol is not found in /proc/kallsyms,<br>
> -when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop the case<br>
> -immediately due to SAFE_FILE_LINES_SCANF.<br>
> -<br>
> -This patch turns to use FILE_LINES_SCANF to give find_kernel_symbol second<br>
> -chance.<br>
> -<br>
> -[jstancek] Fix also condition introduced in 7709d2ae92ea, even if<br>
> - /proc/kallsyms is disabled, we still want to try System.map.<br>
> -<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8</a>]<br>
> -<br>
> -Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort the test if kallsyms was not enabled")<br>
> -that has been covered by this patch.<br>
> -<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> ----<br>
> - testcases/cve/meltdown.c | 13 ++++++++++---<br>
> - 1 file changed, 10 insertions(+), 3 deletions(-)<br>
> -<br>
> -diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c<br>
> -index a53ea9b..22651a6 100644<br>
> ---- a/testcases/cve/meltdown.c<br>
> -+++ b/testcases/cve/meltdown.c<br>
> -@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, const char *symname)<br>
> - int ret, read;<br>
> - char fmt[strlen(symname) + 64];<br>
> -<br>
> -+ tst_res(TINFO, "Looking for %s in %s", symname, filename);<br>
> -+ if (access(filename, F_OK) == -1) {<br>
> -+ tst_res(TINFO, "%s not available", filename);<br>
> -+ return 0;<br>
> -+ }<br>
> -+<br>
> - sprintf(fmt, "%%lx %%c %s%%c", symname);<br>
> -<br>
> -- ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);<br>
> -+ ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);<br>
> - if (ret)<br>
> - return 0;<br>
> -<br>
> -@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name)<br>
> - if (addr)<br>
> - return addr;<br>
> -<br>
> -- tst_res(TINFO, "not found '%s' in /proc/kallsyms", name);<br>
> - if (uname(&utsname) < 0)<br>
> - tst_brk(TBROK | TERRNO, "uname");<br>
> -<br>
> - sprintf(systemmap, "/boot/System.map-%s", utsname.release);<br>
> -<br>
> -- tst_res(TINFO, "looking in '%s'\n", systemmap);<br>
> - addr = find_symbol_in_file(systemmap, name);<br>
> - return addr;<br>
> - }<br>
> -@@ -308,6 +312,9 @@ static void setup(void)<br>
> - saved_cmdline_addr = find_kernel_symbol("saved_command_line");<br>
> - tst_res(TINFO, "&saved_command_line == 0x%lx", saved_cmdline_addr);<br>
> -<br>
> -+ if (!saved_cmdline_addr)<br>
> -+ tst_brk(TCONF, "saved_command_line not found");<br>
> -+<br>
> - spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY);<br>
> -<br>
> - memset(target_array, 1, sizeof(target_array));<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch b/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch<br>
> deleted file mode 100644<br>
> index bed84712a15..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch<br>
> +++ /dev/null<br>
> @@ -1,57 +0,0 @@<br>
> -From d656a447893dccc310c975a239f482278550c3e0 Mon Sep 17 00:00:00 2001<br>
> -From: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Date: Tue, 21 May 2019 10:10:44 +0200<br>
> -Subject: [PATCH] overcommit_memory: update for "mm: fix false-positive<br>
> - OVERCOMMIT_GUESS failures"<br>
> -<br>
> -commit 8c7829b04c52 ("mm: fix false-positive OVERCOMMIT_GUESS failures")<br>
> -changes logic of __vm_enough_memory(), simplifying it to:<br>
> - When in GUESS mode, catch wild allocations by comparing their request<br>
> - size to total amount of ram and swap in the system.<br>
> -<br>
> -Testcase currently allocates mem_total + swap_total, which doesn't trigger<br>
> -new condition. Make it more extreme, but assuming free_total / 2 will PASS,<br>
> -and 2*sum_total will FAIL.<br>
> -<br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Acked-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz" target="_blank">chrubis@suse.cz</a>><br>
> -<br>
> -Upstream-Status: Backport [<a href="https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0</a>]<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/mem/tunable/overcommit_memory.c | 11 ++++-------<br>
> - 1 file changed, 4 insertions(+), 7 deletions(-)<br>
> -<br>
> -diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c<br>
> -index 555298f..345764d 100644<br>
> ---- a/testcases/kernel/mem/tunable/overcommit_memory.c<br>
> -+++ b/testcases/kernel/mem/tunable/overcommit_memory.c<br>
> -@@ -36,11 +36,10 @@<br>
> - *<br>
> - * The program is designed to test the two tunables:<br>
> - *<br>
> -- * When overcommit_memory = 0, allocatable memory can't overextends<br>
> -- * the amount of free memory. I choose the three cases:<br>
> -+ * When overcommit_memory = 0, allocatable memory can't overextend<br>
> -+ * the amount of total memory:<br>
> - * a. less than free_total: free_total / 2, alloc should pass.<br>
> -- * b. greater than free_total: free_total * 2, alloc should fail.<br>
> -- * c. equal to sum_total: sum_tatal, alloc should fail<br>
> -+ * b. greater than sum_total: sum_total * 2, alloc should fail.<br>
> - *<br>
> - * When overcommit_memory = 1, it can alloc enough much memory, I<br>
> - * choose the three cases:<br>
> -@@ -164,9 +163,7 @@ static void overcommit_memory_test(void)<br>
> -<br>
> - update_mem();<br>
> - alloc_and_check(free_total / 2, EXPECT_PASS);<br>
> -- update_mem();<br>
> -- alloc_and_check(free_total * 2, EXPECT_FAIL);<br>
> -- alloc_and_check(sum_total, EXPECT_FAIL);<br>
> -+ alloc_and_check(sum_total * 2, EXPECT_FAIL);<br>
> -<br>
> - /* start to test overcommit_memory=1 */<br>
> - set_sys_tune("overcommit_memory", 1, 1);<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch b/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch<br>
> deleted file mode 100644<br>
> index 0e56c08255e..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch<br>
> +++ /dev/null<br>
> @@ -1,46 +0,0 @@<br>
> -From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001<br>
> -From: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> -Date: Thu, 29 Aug 2019 21:09:46 +0800<br>
> -Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset length for MIPS<br>
> -<br>
> -rt_sigtimedwait01 fails as follow on MIPS arches<br>
> -rt_sigtimedwait01 1 TFAIL : .../sigwaitinfo01.c:58: test_empty_set<br>
> -(.../sigwaitinfo01.c: 148): Unexpected failure:<br>
> -TEST_ERRNO=EINVAL(22): Invalid argument<br>
> -<br>
> -As this case purposely bypasses glibc, it should align with the size of kernel<br>
> -definition of sigset_t which is different from other arches.<br>
> -<a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/include/uapi/asm/signal.h#n15" rel="noreferrer" target="_blank">https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/include/uapi/asm/signal.h#n15</a><br>
> -<br>
> -This patch turns to use _NSIG which is always right for all arches.<br>
> -<br>
> -Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c]<br>
> -<br>
> -Suggested-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Acked-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Acked-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz" target="_blank">chrubis@suse.cz</a>><br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> -Signed-off-by: Petr Vorel <<a href="mailto:pvorel@suse.cz" target="_blank">pvorel@suse.cz</a>><br>
> ----<br>
> - testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++---<br>
> - 1 file changed, 2 insertions(+), 3 deletions(-)<br>
> -<br>
> -diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c<br>
> -index 5a32ce1..6a30c27 100644<br>
> ---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c<br>
> -+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c<br>
> -@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set, siginfo_t * info,<br>
> - static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info,<br>
> - struct timespec *timeout)<br>
> - {<br>
> --<br>
> -- /* The last argument is (number_of_signals)/(bits_per_byte), which are 64 and 8, resp. */<br>
> -- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8);<br>
> -+ /* _NSIG is always the right number of bits of signal map for all arches */<br>
> -+ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8);<br>
> - }<br>
> - #endif<br>
> -<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch<br>
> deleted file mode 100644<br>
> index 6ea26150fbf..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch<br>
> +++ /dev/null<br>
> @@ -1,75 +0,0 @@<br>
> -From e747d0456adc080a1d31fb653bda9dc491795c80 Mon Sep 17 00:00:00 2001<br>
> -From: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Date: Sun, 16 Jun 2019 11:14:16 +0200<br>
> -Subject: [PATCH] syscalls/tgkill03: wait for defunct tid to get detached<br>
> -<br>
> -Case where defunct tid is used has been observed to sporadically fail:<br>
> - tgkill03.c:96: FAIL: Defunct tid should have failed with ESRCH: SUCCESS<br>
> -<br>
> -glibc __pthread_timedjoin_ex() waits for CLONE_CHILD_CLEARTID to clear tid,<br>
> -and then resumes. Kernel clears it (glibc pd->tid) at:<br>
> - do_exit<br>
> - exit_mm<br>
> - mm_release<br>
> - put_user(0, tsk->clear_child_tid);<br>
> -<br>
> -but kernel tid is still valid, presumably until:<br>
> - release_task<br>
> - __exit_signal<br>
> - __unhash_process<br>
> - detach_pid<br>
> -<br>
> -To avoid race wait until /proc/<pid>/task/<tid> disappears.<br>
> -<br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Reviewed-by: Li Wang <<a href="mailto:liwang@redhat.com" target="_blank">liwang@redhat.com</a>><br>
> -Acked-by: Sumit Garg <<a href="mailto:sumit.garg@linaro.org" target="_blank">sumit.garg@linaro.org</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80</a>]<br>
> -<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/syscalls/tgkill/tgkill03.c | 6 +++++-<br>
> - 1 file changed, 5 insertions(+), 1 deletion(-)<br>
> -<br>
> -diff --git a/testcases/kernel/syscalls/tgkill/tgkill03.c b/testcases/kernel/syscalls/tgkill/tgkill03.c<br>
> -index f5bbdc5..593a217 100644<br>
> ---- a/testcases/kernel/syscalls/tgkill/tgkill03.c<br>
> -+++ b/testcases/kernel/syscalls/tgkill/tgkill03.c<br>
> -@@ -7,6 +7,7 @@<br>
> -<br>
> - #include <pthread.h><br>
> - #include <pwd.h><br>
> -+#include <stdio.h><br>
> - #include <sys/types.h><br>
> -<br>
> - #include "tst_safe_pthread.h"<br>
> -@@ -42,6 +43,7 @@ static void setup(void)<br>
> - {<br>
> - sigset_t sigusr1;<br>
> - pthread_t defunct_thread;<br>
> -+ char defunct_tid_path[PATH_MAX];<br>
> -<br>
> - sigemptyset(&sigusr1);<br>
> - sigaddset(&sigusr1, SIGUSR1);<br>
> -@@ -55,8 +57,9 @@ static void setup(void)<br>
> - TST_CHECKPOINT_WAIT(0);<br>
> -<br>
> - SAFE_PTHREAD_CREATE(&defunct_thread, NULL, defunct_thread_func, NULL);<br>
> --<br>
> - SAFE_PTHREAD_JOIN(defunct_thread, NULL);<br>
> -+ sprintf(defunct_tid_path, "/proc/%d/task/%d", getpid(), defunct_tid);<br>
> -+ TST_RETRY_FN_EXP_BACKOFF(access(defunct_tid_path, R_OK), -1, 15);<br>
> - }<br>
> -<br>
> - static void cleanup(void)<br>
> -@@ -108,4 +111,5 @@ static struct tst_test test = {<br>
> - .setup = setup,<br>
> - .cleanup = cleanup,<br>
> - .test = run,<br>
> -+ .timeout = 20,<br>
> - };<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch<br>
> new file mode 100644<br>
> index 00000000000..93308445098<br>
> --- /dev/null<br>
> +++ b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch<br>
> @@ -0,0 +1,24 @@<br>
> +From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001<br>
> +From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +Date: Thu, 12 Dec 2019 17:56:02 +0100<br>
> +Subject: [PATCH] testcases: fix an absent format string issue<br>
> +<br>
> +Upstream-Status: Pending<br>
> +Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +---<br>
> + .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c<br>
> +index 27dbc6626..19d943d06 100644<br>
> +--- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c<br>
> ++++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c<br>
> +@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void)<br>
> +<br>
> + /* Manipulate PID for next process */<br>
> + sprintf(pid_str, "%d", pid - 1);<br>
> +- SAFE_FILE_PRINTF(last_pid_file, pid_str);<br>
> ++ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str);<br>
> +<br>
> + new_pid = SAFE_FORK();<br>
> + if (new_pid == 0) {<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch<br>
> deleted file mode 100644<br>
> index f4f87f38ab7..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch<br>
> +++ /dev/null<br>
> @@ -1,161 +0,0 @@<br>
> -From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Wed, 28 Aug 2019 18:30:23 +0200<br>
> -Subject: [PATCH] testcases: use python3 everywhere to run python scripts<br>
> -<br>
> -The scripts themselves have #!/usr/bin/python3 in them,<br>
> -so I trust they are already py3-compatible.<br>
> -<br>
> -Upstream-Status: Pending<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> ----<br>
> - testcases/kernel/power_management/runpwtests05.sh | 2 +-<br>
> - .../power_management/runpwtests_exclusive01.sh | 2 +-<br>
> - .../power_management/runpwtests_exclusive02.sh | 2 +-<br>
> - .../power_management/runpwtests_exclusive03.sh | 2 +-<br>
> - .../power_management/runpwtests_exclusive04.sh | 2 +-<br>
> - .../power_management/runpwtests_exclusive05.sh | 2 +-<br>
> - testcases/network/nfsv4/acl/runtest | 14 +++++++-------<br>
> - testcases/realtime/func/pi-tests/run_auto.sh | 6 +++---<br>
> - 8 files changed, 16 insertions(+), 16 deletions(-)<br>
> -<br>
> -diff --git a/testcases/kernel/power_management/runpwtests05.sh b/testcases/kernel/power_management/runpwtests05.sh<br>
> -index 8a7d0f6e0..43e234d01 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests05.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests05.sh<br>
> -@@ -35,7 +35,7 @@ else<br>
> - max_sched_smt=1<br>
> - fi<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - if ! grep sched_debug -qw /proc/cmdline ; then<br>
> - tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \<br>
> -diff --git a/testcases/kernel/power_management/runpwtests_exclusive01.sh b/testcases/kernel/power_management/runpwtests_exclusive01.sh<br>
> -index ec78319e2..9fefcbf6e 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests_exclusive01.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh<br>
> -@@ -35,7 +35,7 @@ else<br>
> - max_sched_smt=1<br>
> - fi<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - hyper_threaded=$(is_hyper_threaded)<br>
> - multi_socket=$(is_multi_socket)<br>
> -diff --git a/testcases/kernel/power_management/runpwtests_exclusive02.sh b/testcases/kernel/power_management/runpwtests_exclusive02.sh<br>
> -index e107fce35..2cd0ecb05 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests_exclusive02.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh<br>
> -@@ -33,7 +33,7 @@ else<br>
> - max_sched_smt=1<br>
> - fi<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - hyper_threaded=$(is_hyper_threaded)<br>
> - multi_socket=$(is_multi_socket)<br>
> -diff --git a/testcases/kernel/power_management/runpwtests_exclusive03.sh b/testcases/kernel/power_management/runpwtests_exclusive03.sh<br>
> -index 490344bb3..ab3a5d11d 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests_exclusive03.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh<br>
> -@@ -35,7 +35,7 @@ else<br>
> - max_sched_smt=1<br>
> - fi<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - hyper_threaded=$(is_hyper_threaded)<br>
> - multi_socket=$(is_multi_socket)<br>
> -diff --git a/testcases/kernel/power_management/runpwtests_exclusive04.sh b/testcases/kernel/power_management/runpwtests_exclusive04.sh<br>
> -index 978ca02ae..438ef603f 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests_exclusive04.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh<br>
> -@@ -27,7 +27,7 @@ export TST_TOTAL=2<br>
> - # Checking test environment<br>
> - check_kervel_arch<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - hyper_threaded=$(is_hyper_threaded)<br>
> - multi_socket=$(is_multi_socket)<br>
> -diff --git a/testcases/kernel/power_management/runpwtests_exclusive05.sh b/testcases/kernel/power_management/runpwtests_exclusive05.sh<br>
> -index a0dad5834..3a9afdbf2 100755<br>
> ---- a/testcases/kernel/power_management/runpwtests_exclusive05.sh<br>
> -+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh<br>
> -@@ -35,7 +35,7 @@ else<br>
> - max_sched_smt=1<br>
> - fi<br>
> -<br>
> --tst_test_cmds python<br>
> -+tst_test_cmds python3<br>
> -<br>
> - hyper_threaded=$(is_hyper_threaded)<br>
> - multi_socket=$(is_multi_socket)<br>
> -diff --git a/testcases/network/nfsv4/acl/runtest b/testcases/network/nfsv4/acl/runtest<br>
> -index d2e1b4c49..a859e85bc 100755<br>
> ---- a/testcases/network/nfsv4/acl/runtest<br>
> -+++ b/testcases/network/nfsv4/acl/runtest<br>
> -@@ -22,7 +22,7 @@ do<br>
> - done<br>
> -<br>
> - # creation of users on the remote machine (removed only at the end of the tests)<br>
> --rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50<br>
> -+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50<br>
> -<br>
> - echo "Starting ACL testing"<br>
> -<br>
> -@@ -51,19 +51,19 @@ echo "Basic tests finished"<br>
> -<br>
> - echo "LONG ACL TEST"<br>
> - echo "creating necessary users and groups"<br>
> --python create_users.py -u 50 -g 50<br>
> -+python3 create_users.py -u 50 -g 50<br>
> - echo "creating necessary users and groups on the remote host"<br>
> - mkdir $NFSMNTDIR/lacl-testdir<br>
> --python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir<br>
> -+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir<br>
> - rm -rf $NFSMNTDIR/lacl-testdir<br>
> - echo "Long ACL test OK with $MAXLENGTH entries"<br>
> - echo "ACL STRESSING TEST"<br>
> --python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR<br>
> -+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR<br>
> -<br>
> - # remove local an remote users<br>
> --python cleanusers.py<br>
> --python cleangroups.py<br>
> --rsh -n $REMOTEHOST python $PWD/cleanusers.py<br>
> -+python3 cleanusers.py<br>
> -+python3 cleangroups.py<br>
> -+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py<br>
> -<br>
> - echo "Test OK"<br>
> -<br>
> -diff --git a/testcases/realtime/func/pi-tests/run_auto.sh b/testcases/realtime/func/pi-tests/run_auto.sh<br>
> -index d13026049..277988568 100755<br>
> ---- a/testcases/realtime/func/pi-tests/run_auto.sh<br>
> -+++ b/testcases/realtime/func/pi-tests/run_auto.sh<br>
> -@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0<br>
> -<br>
> - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log"<br>
> - $SCRIPTS_DIR/run_c_files.sh $profile testpi-1<br>
> --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -<br>
> - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log"<br>
> - $SCRIPTS_DIR/run_c_files.sh $profile testpi-2<br>
> --PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -+PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -<br>
> - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log"<br>
> - $SCRIPTS_DIR/run_c_files.sh $profile testpi-4<br>
> --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE<br>
> -<br>
> -<br>
> - export LOG_FILE=""<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch b/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch<br>
> deleted file mode 100644<br>
> index c936b788fe1..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch<br>
> +++ /dev/null<br>
> @@ -1,36 +0,0 @@<br>
> -From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001<br>
> -From: Steven Price <<a href="mailto:steven.price@arm.com" target="_blank">steven.price@arm.com</a>><br>
> -Date: Fri, 19 Jul 2019 13:48:17 +0100<br>
> -Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility mode<br>
> -<br>
> -The size of dev_t is larger than 32 bits which causes the dev argument<br>
> -to be passed incorrectly. On Arm this means that the EFAULT test case<br>
> -actually returns EINVAL because the device number isn't recognised.<br>
> -<br>
> -Signed-off-by: Steven Price <<a href="mailto:steven.price@arm.com" target="_blank">steven.price@arm.com</a>><br>
> -Acked-by: Li Wang <<a href="mailto:liwang@redhat.com" target="_blank">liwang@redhat.com</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060</a>]<br>
> -<br>
> -Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/syscalls/ustat/ustat02.c | 2 +-<br>
> - 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> -<br>
> -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c<br>
> -index 9bbe4f3..1a0e9e0 100644<br>
> ---- a/testcases/kernel/syscalls/ustat/ustat02.c<br>
> -+++ b/testcases/kernel/syscalls/ustat/ustat02.c<br>
> -@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc);<br>
> -<br>
> - void run(unsigned int test)<br>
> - {<br>
> -- TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf));<br>
> -+ TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev, tc[test].buf));<br>
> -<br>
> - if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno))<br>
> - tst_res(TPASS | TTERRNO, "ustat(2) expected failure");<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch b/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch<br>
> deleted file mode 100644<br>
> index 12e47eb2b61..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch<br>
> +++ /dev/null<br>
> @@ -1,68 +0,0 @@<br>
> -From 7bc134545b7beb09717a60541530c20a1a5740d3 Mon Sep 17 00:00:00 2001<br>
> -From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> -Date: Fri, 26 Jul 2019 10:55:28 -0700<br>
> -Subject: [PATCH 2/2] check for RES_USE_INET6 during configure<br>
> -<br>
> -glibc 2.30 has remove RES_USE_INET6 define which has been on its way out<br>
> -since 2.26 release, this check ensures that we detect it before using it<br>
> -<br>
> -Upstream-Status: Submitted [<a href="http://lists.linux.it/pipermail/ltp/2019-July/012955.html" rel="noreferrer" target="_blank">http://lists.linux.it/pipermail/ltp/2019-July/012955.html</a>]<br>
> -Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> ----<br>
> - <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 13 +++++++++++++<br>
> - testcases/network/multicast/mc_gethost/mc_gethost.c | 6 ++++++<br>
> - 2 files changed, 19 insertions(+)<br>
> -<br>
> -diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -index 2255b5c181..ed7acccb01 100644<br>
> ---- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -@@ -91,6 +91,19 @@ AC_CHECK_FUNCS([ \<br>
> - vmsplice \<br>
> - ])<br>
> -<br>
> -+#check defines<br>
> -+AC_MSG_CHECKING([for RES_USE_INET6])<br>
> -+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <resolv.h>]],<br>
> -+ [[char dummy[RES_USE_INET6];]])],<br>
> -+ [<br>
> -+ AC_MSG_RESULT([yes])<br>
> -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 1, [Define to 1 if you have the RES_USE_INET6 macro.])<br>
> -+ ],<br>
> -+ [<br>
> -+ AC_MSG_RESULT([no])<br>
> -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 0, [Define to 1 if you have the RES_USE_INET6 macro.])<br>
> -+ ]<br>
> -+)<br>
> - # Tools knobs<br>
> -<br>
> - # Expect<br>
> -diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c b/testcases/network/multicast/mc_gethost/mc_gethost.c<br>
> -index 9cc15d086b..d1cae5441a 100644<br>
> ---- a/testcases/network/multicast/mc_gethost/mc_gethost.c<br>
> -+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c<br>
> -@@ -17,6 +17,8 @@<br>
> - #include <string.h><br>
> - #include <stdlib.h><br>
> -<br>
> -+#include "config.h"<br>
> -+<br>
> - #ifndef LOG_PERROR<br>
> - #define LOG_PERROR 0<br>
> - #endif<br>
> -@@ -50,8 +52,12 @@ usage:<br>
> - argv++, argc--;<br>
> - }<br>
> - if (argc >= 1 && !strcmp(*argv, "-6")) {<br>
> -+#if HAVE_RES_USE_INET6<br>
> - af = AF_INET6, size = IN6ADDRSZ;<br>
> - _res.options |= RES_USE_INET6;<br>
> -+#else<br>
> -+ af = AF_INET, size = INADDRSZ;<br>
> -+#endif<br>
> - argv++, argc--;<br>
> - }<br>
> - if (argc >= 1 && !strcmp(*argv, "-f")) {<br>
> ---<br>
> -2.22.0<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch<br>
> index c0f69ecf5fc..df3e8831f54 100644<br>
> --- a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch<br>
> +++ b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch<br>
> @@ -1,4 +1,4 @@<br>
> -From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001<br>
> +From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001<br>
> From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> Date: Thu, 7 Jan 2016 19:40:08 +0000<br>
> Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it<br>
> @@ -10,16 +10,17 @@ Upstream-Status: Pending<br>
><br>
> Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
> Signed-off-by: Yi Zhao <<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>><br>
> +<br>
> ---<br>
> testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++<br>
> 1 file changed, 7 insertions(+)<br>
><br>
> diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c<br>
> -index dd289cf..76aa969 100644<br>
> +index 29e18f27d..07444a46f 100644<br>
> --- a/testcases/kernel/syscalls/accept4/accept4_01.c<br>
> +++ b/testcases/kernel/syscalls/accept4/accept4_01.c<br>
> @@ -38,6 +38,7 @@<br>
> - static struct sockaddr_in conn_addr;<br>
> + static struct sockaddr_in *conn_addr, *accept_addr;<br>
> static int listening_fd;<br>
><br>
> +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)<br>
> @@ -34,25 +35,21 @@ index dd289cf..76aa969 100644<br>
><br>
> static int create_listening_socket(void)<br>
> {<br>
> -@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr)<br>
> - SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr));<br>
> - addrlen = sizeof(claddr);<br>
> +@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr)<br>
> + SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr));<br>
> + addrlen = sizeof(*accept_addr);<br>
><br>
> +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)<br>
> #if !(__GLIBC_PREREQ(2, 10))<br>
> - TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen,<br>
> + TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen,<br>
> tcase->cloexec | tcase->nonblock));<br>
> -@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr)<br>
> - TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,<br>
> + #else<br>
> + TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen,<br>
> tcase->cloexec | tcase->nonblock));<br>
> - #endif<br>
> ++#endif<br>
> +#else<br>
> + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,<br>
> + tcase->cloexec | tcase->nonblock));<br>
> -+#endif<br>
> + #endif<br>
> if (TST_RET == -1) {<br>
> if (TST_ERR == ENOSYS)<br>
> - tst_brk(TCONF, "syscall __NR_accept4 not supported");<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch b/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch<br>
> deleted file mode 100644<br>
> index 8704e5ffe8a..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch<br>
> +++ /dev/null<br>
> @@ -1,82 +0,0 @@<br>
> -From 794933b38354a2612cf2c471f11798b306f35315 Mon Sep 17 00:00:00 2001<br>
> -From: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Date: Mon, 20 May 2019 20:47:20 +0200<br>
> -Subject: [PATCH] shmctl01: don't use hardcoded index == 0 for SHM_STAT test<br>
> -<br>
> -Test fails on SHM_STAT testcase:<br>
> - shmctl01 5 TFAIL : shmctl01.c:173: shmctl01 call failed<br>
> - errno = 22 : Invalid argument<br>
> - shmctl(0, SHM_STAT, 0x601060) = -EINVAL<br>
> -<br>
> -since following commit:<br>
> - commit 99db46ea292780cd978d56932d9445b1e8bdafe8<br>
> - Author: Manfred Spraul <<a href="mailto:manfred@colorfullife.com" target="_blank">manfred@colorfullife.com</a>><br>
> - Date: Tue May 14 15:46:36 2019 -0700<br>
> - ipc: do cyclic id allocation for the ipc object.<br>
> -<br>
> -Don't rely on index 0 being always available, but instead<br>
> -use (maximum) index returned by SHM_INFO.<br>
> -<br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Reviewed-by: Petr Vorel <<a href="mailto:pvorel@suse.cz" target="_blank">pvorel@suse.cz</a>><br>
> -Acked-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz" target="_blank">chrubis@suse.cz</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062</a>]<br>
> -<br>
> -Signed-off-by: Hongzhi Song <<a href="mailto:hongzhi.song@windriver.com" target="_blank">hongzhi.song@windriver.com</a>><br>
> -Signed-off-by: Yi Zhao <<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 21 ++++++++++++++++++---<br>
> - 1 file changed, 18 insertions(+), 3 deletions(-)<br>
> -<br>
> -diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c<br>
> -index 1b46977..52bf23a 100644<br>
> ---- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c<br>
> -+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c<br>
> -@@ -79,6 +79,7 @@ static void func_info(int ret);<br>
> -<br>
> - /* Check routine for SHM_STAT */<br>
> - static void func_sstat(int ret);<br>
> -+static void func_sstat_setup(void);<br>
> -<br>
> - /* Check routine for SHM_LOCK */<br>
> - static void func_lock(int ret);<br>
> -@@ -110,7 +111,7 @@ static struct test_case_t {<br>
> - #endif<br>
> - {&shm_id_1, IPC_SET, &buf, func_set, set_setup},<br>
> - {&shm_id_1, IPC_INFO, (struct shmid_ds *) &info, func_info, NULL},<br>
> -- {&shm_index, SHM_STAT, &buf, func_sstat, NULL},<br>
> -+ {&shm_index, SHM_STAT, &buf, func_sstat, func_sstat_setup},<br>
> - {&shm_id_1, SHM_LOCK, NULL, func_lock, NULL},<br>
> - {&shm_id_1, SHM_UNLOCK, NULL, func_unlock, NULL},<br>
> - {&shm_id_1, IPC_RMID, NULL, func_rmid, NULL},<br>
> -@@ -407,9 +408,23 @@ static void func_info(int ret)<br>
> - static void func_sstat(int ret)<br>
> - {<br>
> - if (ret >= 0)<br>
> -- tst_resm(TPASS, "get correct shared memory id");<br>
> -+ tst_resm(TPASS, "get correct shared memory id for index: %d",<br>
> -+ shm_index);<br>
> - else<br>
> -- tst_resm(TFAIL, "shared memory id is incorrect");<br>
> -+ tst_resm(TFAIL, "shared memory id is incorrect, index: %d",<br>
> -+ shm_index);<br>
> -+}<br>
> -+<br>
> -+static void func_sstat_setup(void)<br>
> -+{<br>
> -+ struct shm_info tmp;<br>
> -+ int ret;<br>
> -+<br>
> -+ ret = shmctl(shm_id_1, SHM_INFO, (void *)&tmp);<br>
> -+ if (ret < 0)<br>
> -+ tst_resm(TFAIL|TERRNO, "shmctl(SHM_INFO)");<br>
> -+ else<br>
> -+ shm_index = ret;<br>
> - }<br>
> -<br>
> - static void func_lock(int ret)<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch b/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch<br>
> deleted file mode 100644<br>
> index 9cd188f6567..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch<br>
> +++ /dev/null<br>
> @@ -1,56 +0,0 @@<br>
> -From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001<br>
> -From: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Date: Thu, 4 Jul 2019 16:45:23 +0200<br>
> -Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED<br>
> -<br>
> -Hongzhi reports that this test is failing on mips64 with 5.1+:<br>
> - diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument<br>
> - diotest4 11 TBROK : diotest4.c:368: Remaining cases broken<br>
> -I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7.<br>
> -<br>
> -Test is trying to map into area immediately following heap as MAP_SHARED,<br>
> -but it used wrong alignment (fixed by 'lapi/mmap.h: include config.h').<br>
> -<br>
> -Usage of MAP_FIXED seems unnecessary, so drop that too and let the kernel<br>
> -pick an address.<br>
> -<br>
> -Reported-by: Hongzhi.Song <<a href="mailto:hongzhi.song@windriver.com" target="_blank">hongzhi.song@windriver.com</a>><br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Acked-by: Cyril Hrubis <<a href="mailto:chrubis@suse.cz" target="_blank">chrubis@suse.cz</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3</a>]<br>
> -<br>
> -Signed-off-by: Yi Zhao <<a href="mailto:yi.zhao@windriver.com" target="_blank">yi.zhao@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/io/direct_io/diotest4.c | 8 ++------<br>
> - 1 file changed, 2 insertions(+), 6 deletions(-)<br>
> -<br>
> -diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c<br>
> -index e4616e4..bf200cd 100644<br>
> ---- a/testcases/kernel/io/direct_io/diotest4.c<br>
> -+++ b/testcases/kernel/io/direct_io/diotest4.c<br>
> -@@ -352,18 +352,14 @@ int main(int argc, char *argv[])<br>
> - total++;<br>
> -<br>
> - /* Test-10: read, write to a mmaped file */<br>
> -- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz - 1));<br>
> -- if (shm_base == NULL) {<br>
> -- tst_brkm(TBROK, cleanup, "sbrk failed: %s", strerror(errno));<br>
> -- }<br>
> - offset = 4096;<br>
> - count = bufsize;<br>
> - if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) {<br>
> - tst_brkm(TBROK, cleanup, "can't open %s: %s",<br>
> - filename, strerror(errno));<br>
> - }<br>
> -- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE,<br>
> -- MAP_SHARED | MAP_FIXED, fd, 0);<br>
> -+ shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE,<br>
> -+ MAP_SHARED, fd, 0);<br>
> - if (shm_base == (caddr_t) - 1) {<br>
> - tst_brkm(TBROK, cleanup, "can't mmap file: %s",<br>
> - strerror(errno));<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch b/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch<br>
> deleted file mode 100644<br>
> index aecbc80e9b5..00000000000<br>
> --- a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch<br>
> +++ /dev/null<br>
> @@ -1,64 +0,0 @@<br>
> -From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001<br>
> -From: "Hongzhi.Song" <<a href="mailto:hongzhi.song@windriver.com" target="_blank">hongzhi.song@windriver.com</a>><br>
> -Date: Mon, 15 Jul 2019 03:39:06 -0400<br>
> -Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable with mips32<br>
> -<br>
> -Error info:<br>
> -getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur =<br>
> -ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff<br>
> -<br>
> -According to kernel code: [arch/mips/include/uapi/asm/resource.h]<br>
> -RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32.<br>
> -<br>
> - /*<br>
> - * SuS says limits have to be unsigned.<br>
> - * Which makes a ton more sense anyway,<br>
> - * but we keep the old value on MIPS32,<br>
> - * for compatibility:<br>
> - */<br>
> - #ifndef __mips64<br>
> - # define RLIM_INFINITY 0x7fffffffUL<br>
> - #endif<br>
> -<br>
> -Adding conditional statement about mips to fix this.<br>
> -<br>
> -Signed-off-by: Jan Stancek <<a href="mailto:jstancek@redhat.com" target="_blank">jstancek@redhat.com</a>><br>
> -Signed-off-by: Hongzhi.Song <<a href="mailto:hongzhi.song@windriver.com" target="_blank">hongzhi.song@windriver.com</a>><br>
> -<br>
> -Upstream-Status: Backport<br>
> -[<a href="https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde" rel="noreferrer" target="_blank">https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde</a>]<br>
> -<br>
> -Signed-off-by: Hongzhi.Song <<a href="mailto:hongzhi.song@windriver.com" target="_blank">hongzhi.song@windriver.com</a>><br>
> ----<br>
> - testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++-<br>
> - 1 file changed, 7 insertions(+), 1 deletion(-)<br>
> -<br>
> -diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c b/testcases/kernel/syscalls/getrlimit/getrlimit03.c<br>
> -index e4d56c4..319bc49 100644<br>
> ---- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c<br>
> -+++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c<br>
> -@@ -26,6 +26,7 @@<br>
> -<br>
> - #include "tst_test.h"<br>
> - #include "lapi/syscalls.h"<br>
> -+#include "lapi/abisize.h"<br>
> -<br>
> - /**<br>
> - * Linux provides an "old" getrlimit syscall handler that uses signed long,<br>
> -@@ -61,7 +62,12 @@ struct rlimit_ulong {<br>
> - unsigned long rlim_cur;<br>
> - unsigned long rlim_max;<br>
> - };<br>
> --const unsigned long RLIM_INFINITY_UL = ULONG_MAX;<br>
> -+<br>
> -+#if defined(__mips__) && defined(TST_ABI32)<br>
> -+ const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL;<br>
> -+#else<br>
> -+ const unsigned long RLIM_INFINITY_UL = ULONG_MAX;<br>
> -+#endif<br>
> -<br>
> - static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim)<br>
> - {<br>
> ---<br>
> -2.7.4<br>
> -<br>
> diff --git a/meta/recipes-extended/ltp/<a href="http://ltp_20190517.bb" rel="noreferrer" target="_blank">ltp_20190517.bb</a> b/meta/recipes-extended/ltp/<a href="http://ltp_20190930.bb" rel="noreferrer" target="_blank">ltp_20190930.bb</a><br>
> similarity index 84%<br>
> rename from meta/recipes-extended/ltp/<a href="http://ltp_20190517.bb" rel="noreferrer" target="_blank">ltp_20190517.bb</a><br>
> rename to meta/recipes-extended/ltp/<a href="http://ltp_20190930.bb" rel="noreferrer" target="_blank">ltp_20190930.bb</a><br>
> index 60f749b4c01..9a436a52303 100644<br>
> --- a/meta/recipes-extended/ltp/<a href="http://ltp_20190517.bb" rel="noreferrer" target="_blank">ltp_20190517.bb</a><br>
> +++ b/meta/recipes-extended/ltp/<a href="http://ltp_20190930.bb" rel="noreferrer" target="_blank">ltp_20190930.bb</a><br>
> @@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"<br>
><br>
> CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"<br>
> CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"<br>
> -SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2"<br>
> +SRCREV = "c9707b465a08397569920b676345474f44327200"<br>
><br>
> SRC_URI = "git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-project/ltp.git</a> \<br>
> file://0001-build-Add-option-to-select-libc-implementation.patch \<br>
> @@ -38,19 +38,8 @@ SRC_URI = "git://<a href="http://github.com/linux-test-project/ltp.git" rel="noreferrer" target="_blank">github.com/linux-test-project/ltp.git</a> \<br>
> file://0007-Fix-test_proc_kill-hanging.patch \<br>
> file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \<br>
> file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \<br>
> - file://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \<br>
> - file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \<br>
> - file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \<br>
> - file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \<br>
> - file://0002-check-for-RES_USE_INET6-during-configure.patch \<br>
> - file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \<br>
> - file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \<br>
> - file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \<br>
> - file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \<br>
> - file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \<br>
> - file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \<br>
> - file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \<br>
> file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \<br>
> + file://0001-testcases-fix-an-absent-format-string-issue.patch \<br>
> "<br>
><br>
> S = "${WORKDIR}/git"<br>
> --<br>
> 2.17.1<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>
</blockquote></div></div>