rpm: upgrade to 4.15.1
Re: [PATCH 26/30] ltp: update to 20190930
In reply to Khem RajAs the last three issues are clang or musl related, may I request that you look into them?
Alex
Quoted 1,413 lines · Khem Raj
musl build fails on aarch64
https://errors.yoctoproject.org/Errors/Details/297288/
Quoted 17 lines · Alexander Kanavin
Drop a big pile of backports.
Add a patch to address absent string formatting error.
Signed-off-by Alexander Kanavin <[email protected]>--- ...me-check-for-getdents-getdents64-API.patch | 72 -------- ...option-to-select-libc-implementation.patch | 27 ++- ...-17052-Avoid-unsafe-exits-in-threads.patch | 64 ------- ...meltdown.c-Fix-kernel-symbol-finding.patch | 81 --------- ...y-update-for-mm-fix-false-positive-O.patch | 57 ------- ...medwait01-Fix-wrong-sigset-length-fo.patch | 46 ----- ...3-wait-for-defunct-tid-to-get-detach.patch | 75 -------- ...es-fix-an-absent-format-string-issue.patch | 24 +++ ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------ ...x-EFAULT-in-32bit-compatibility-mode.patch | 36 ----Quoted 8 lines
...k-for-RES_USE_INET6-during-configure.patch | 68 -------- ...BC_PREREQ-is-defined-before-using-it.patch | 27 ++- ...se-hardcoded-index-0-for-SHM_STAT-te.patch | 82 --------- ...11-direct_io-diotest4-drop-MAP_FIXED.patch | 56 ------ ...st-a-bit-of-code-to-compatiable-with.patch | 64 ------- .../ltp/{ltp_20190517.bb => ltp_20190930.bb} | 15 +- 16 files changed, 51 insertions(+), 904 deletions(-) delete mode 100644
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 1 line
create mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 1 line
rename meta/recipes-extended/ltp/{ltp_20190517.bb => ltp_20190930.bb}(84%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchb/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 3 lines
deleted file mode 100644
index bfceadb190d..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-4@@ -1,72 +0,0 @@ -From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:32:29 -0700 -Subject: [PATCH 1/2] Add configure time check for getdents/getdents64APIs
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-7- -glibc 2.30 has added wrapper for getdents64 this will help in detecting -right condition to use fallback - -Check for getdents API as well while here - -Upstream-Status: Submitted [Quoted 45 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-45-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 2 ++ - testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \ - fallocate \ - fchownat \ - fstatat \ -+ getdents \ -+ getdents64 \ - kcmp \ - mkdirat \ - mknodat \ ---- a/testcases/kernel/syscalls/getdents/getdents.h -+++ b/testcases/kernel/syscalls/getdents/getdents.h -@@ -23,7 +23,7 @@ - #include <stdint.h> - #include "test.h" - #include "lapi/syscalls.h" -- -+#include "config.h" - /* - * See fs/compat.c struct compat_linux_dirent - */ -@@ -34,12 +34,17 @@ struct linux_dirent { - char d_name[]; - }; - -+#if HAVE_GETDENTS -+#include <unistd.h> -+#else - static inline int - getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size) - { - return ltp_syscall(__NR_getdents, fd, dirp, size); - } - -+#endif /* HAVE_GETDENTS */ -+ - struct linux_dirent64 { - uint64_t d_ino;meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-10- int64_t d_off; -@@ -48,10 +53,13 @@ struct linux_dirent64 { - char d_name[]; - }; - -+#if HAVE_GETDENTS64 -+#include <unistd.h> -+#else - static inline int - getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsignedint size)
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-6- { - return ltp_syscall(__NR_getdents64, fd, dirp64, size); - } -- -+#endif /* HAVE_GETDENTS64 */ - #endif /* GETDENTS_H */diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchb/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 2 lines
index
b5c25c56a57..1705abcf196100644
---
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchmeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Disable tests specifically not building _yet_ on musl
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -1,4 +1,4 @@ -From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001 +From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 18:19:03 +0000 Subject: [PATCH] build: Add option to select libc implementation@@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ on muslbased systems
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-0Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + --- Makefile | 5 +++++ testcases/kernel/Makefile | 5 ++++-meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Signed-off-by: Khem Raj <[email protected]> · line 31
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]> 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 768ca46..e9d679a 100644 +index 768ca4606..e9d679a71 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,11 @@ vpath %.mk$(top_srcdir)/mk:$(top_srcdir)/mk/include
Review index 768ca46..e9d679a 100644 · line 42
Quoted 3 lines
(quoted diff) +0
-0@@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644 # COMMON_TARGETS: Targets which exist in all, clean, and install. # INSTALL_TARGETS: Targets which exist in clean and install(contains
Quoted 21 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +4
-3diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile -index 39d79c7..24a57d9 100644 +index 3319b3163..94ea362c8 100644 --- a/testcases/kernel/Makefile +++ b/testcases/kernel/Makefile -@@ -49,12 +49,15 @@ SUBDIRS += connectors \ +@@ -49,13 +49,16 @@ SUBDIRS += connectors \ logging \ mem \ numa \ - pty \ sched \ security \ - timers \ + sound \ tracing \ + uevents \ +ifneq ($(LIBC),musl) +SUBDIRS += ptymeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 39d79c7..24a57d9 100644 · line 65
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-0@@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644 SUBDIRS += power_management endif diff --git a/testcases/kernel/sched/Makefileb/testcases/kernel/sched/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 6a57d79..74bb933 100644 · line 78
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 6a57d79..74bb933 100644 +index 6a57d79ee..74bb93370 100644 --- a/testcases/kernel/sched/Makefile +++ b/testcases/kernel/sched/Makefile @@ -23,5 +23,7 @@@@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefileb/testcases/kernel/syscalls/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 45a00cf..d1becd0 100644 · line 94
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 45a00cf..d1becd0 100644 +index 45a00cf7d..d1becd054 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)@@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644 ifeq ($(UCLIBC),1) FILTER_OUT_DIRS += profil diff --git a/testcases/network/nfsv4/acl/Makefileb/testcases/network/nfsv4/acl/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 8c55a6b..f7cda62 100644 · line 107
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 8c55a6b..f7cda62 100644 +index 8c55a6bbd..f7cda621d 100644 --- a/testcases/network/nfsv4/acl/Makefile +++ b/testcases/network/nfsv4/acl/Makefile @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644 + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/network/rpc/basic_tests/Makefileb/testcases/network/rpc/basic_tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 66e9d56..ea8eb8a 100644 · line 121
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 66e9d56..ea8eb8a 100644 +index 66e9d5675..ea8eb8a98 100644 --- a/testcases/network/rpc/basic_tests/Makefile +++ b/testcases/network/rpc/basic_tests/Makefile @@ -23,4 +23,9 @@@@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644 + include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/realtime/func/pi-tests/Makefileb/testcases/realtime/func/pi-tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 68616a7..748754b 100644 · line 135
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 68616a7..748754b 100644 +index 68616a711..748754bb4 100644 --- a/testcases/realtime/func/pi-tests/Makefile +++ b/testcases/realtime/func/pi-tests/Makefile @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -131,7 +133,7 @@ index 68616a7..748754b 100644 include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/realtime/stress/pi-tests/Makefileb/testcases/realtime/stress/pi-tests/Makefile
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-4-index 1881f75..266e0b8 100644 +index 1881f7565..266e0b815 100644 --- a/testcases/realtime/stress/pi-tests/Makefile +++ b/testcases/realtime/stress/pi-tests/Makefile @@ -24,4 +24,9 @@ top_srcdir ?= ../../../..@@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchb/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 3 lines
deleted file mode 100644
index cc40081300c..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 22 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-20@@ -1,64 +0,0 @@ -From e3a8502d0a4f8a44ddd02ca4b2efc097133fb9f7 Mon Sep 17 00:00:00 2001 -From: Mathias Fiedler <[email protected]> -Date: Fri, 23 Aug 2019 12:46:48 +0200 -Subject: [PATCH] cve-2017-17052: Avoid unsafe exits in threads - -According to manpage exit(3) calling exit is not thread-safe. -And with glibc 2.28 (and probably also with glibc >=2.27) sometimes -child processes created in fork_thread can get stuck on process exit in -glibc's __run_exit_handlers trying to acquire some lock which was in -locked state while the fork was created. This can happen when exit is -called in mmap_thread concurrently to the fork. -While the main process will still return with PASSED some of its -children are left behind. - -Comparing the source code with the original program as described in the -commit 2b7e8665b4ff51c034c55df3cff76518d1a9ee3a of linux kernel >=4.13 -the exits in mmap_thread and fork_thread should not be necessary to -trigger the original bug. - -Therefore those exit calls are removed. The mmap_thread and fork_threadmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch line 30
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-10-should still exit when their corresponding main thread in do_test_fork -calls exit_group. The remaining exit in do_test_fork will be called in -the main thread without any concurrent thread in the same process. - -Signed-off-by: Mathias Fiedler <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Acked-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4
]meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-9- -CVE: CVE-2017-17052 - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/cve-2017-17052.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/testcases/cve/cve-2017-17052.c
b/testcases/cve/cve-2017-17052.cmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-7-index d7da7e919..18cd2a6d7 100644 ---- a/testcases/cve/cve-2017-17052.c -+++ b/testcases/cve/cve-2017-17052.c -@@ -58,8 +58,6 @@ static void *mmap_thread(void *arg) - for (;;) { - SAFE_MMAP(NULL, 0x1000000, PROT_READ, - MAP_POPULATE|MAP_ANONYMOUS|MAP_PRIVATE,-1, 0);
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-18-- if (*do_exit) -- exit(0); - } - - return arg; -@@ -67,9 +65,6 @@ static void *mmap_thread(void *arg) - - static void *fork_thread(void *arg) - { -- if (*do_exit) -- exit(0); -- - usleep(rand() % 10000); - SAFE_FORK(); - --- -2.17.1 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchb/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 3 lines
deleted file mode 100644
index 94f6f5a15a6..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-7@@ -1,81 +0,0 @@ -From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Wed, 21 Aug 2019 16:27:24 +0800 -Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding - -meltdown case fails as below. -safe_file_ops.c:219: BROK: Expected 3 conversions got 2 atmeltdown.c:272
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -find_kernel_symbol is defined to try twice with each of /proc/kallsymsand
Review line 10
Quoted 1 line
(quoted diff) +0
-1-/boot/System.map-%s. Currently if the symbol is not found in
/proc/kallsyms,Review line 11
Quoted 1 line
(quoted diff) +0
-1-when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop thecase
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-3-immediately due to SAFE_FILE_LINES_SCANF. - -This patch turns to use FILE_LINES_SCANF to give find_kernel_symbolsecond
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10-chance. - -[jstancek] Fix also condition introduced in 7709d2ae92ea, even if - /proc/kallsyms is disabled, we still want to try System.map. - -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8
]Review line 26
Quoted 2 lines
(quoted diff) +0
-2- -Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort thetest if kallsyms was not enabled")
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-12-that has been covered by this patch. - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/meltdown.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c -index a53ea9b..22651a6 100644 ---- a/testcases/cve/meltdown.c -+++ b/testcases/cve/meltdown.c -@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, constchar *symname)
Quoted 23 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-23- int ret, read; - char fmt[strlen(symname) + 64]; - -+ tst_res(TINFO, "Looking for %s in %s", symname, filename); -+ if (access(filename, F_OK) == -1) { -+ tst_res(TINFO, "%s not available", filename); -+ return 0; -+ } -+ - sprintf(fmt, "%%lx %%c %s%%c", symname); - -- ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); -+ ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); - if (ret) - return 0; - -@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name) - if (addr) - return addr; - -- tst_res(TINFO, "not found '%s' in /proc/kallsyms", name); - if (uname(&utsname) < 0) - tst_brk(TBROK | TERRNO, "uname");meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- - sprintf(systemmap, "/boot/System.map-%s", utsname.release); - -- tst_res(TINFO, "looking in '%s'\n", systemmap); - addr = find_symbol_in_file(systemmap, name); - return addr; - } -@@ -308,6 +312,9 @@ static void setup(void) - saved_cmdline_addr = find_kernel_symbol("saved_command_line"); - tst_res(TINFO, "&saved_command_line == 0x%lx",
saved_cmdline_addr);Quoted 11 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- -+ if (!saved_cmdline_addr) -+ tst_brk(TCONF, "saved_command_line not found"); -+ - spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY); - - memset(target_array, 1, sizeof(target_array)); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchb/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 3 lines
deleted file mode 100644
index bed84712a15..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch line 9
Quoted 11 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-9@@ -1,57 +0,0 @@ -From d656a447893dccc310c975a239f482278550c3e0 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Tue, 21 May 2019 10:10:44 +0200 -Subject: [PATCH] overcommit_memory: update for "mm: fix false-positive - OVERCOMMIT_GUESS failures" - -commit 8c7829b04c52 ("mm: fix false-positive OVERCOMMIT_GUESS failures") -changes logic of __vm_enough_memory(), simplifying it to: - When in GUESS mode, catch wild allocations by comparing theirrequest
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-3- size to total amount of ram and swap in the system. - -Testcase currently allocates mem_total + swap_total, which doesn'ttrigger
Review line 13
Quoted 1 line
(quoted diff) +0
-1-new condition. Make it more extreme, but assuming free_total / 2 willPASS,
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-and 2*sum_total will FAIL. - -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0
]meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/mem/tunable/overcommit_memory.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c
b/testcases/kernel/mem/tunable/overcommit_memory.cQuoted 32 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-32-index 555298f..345764d 100644 ---- a/testcases/kernel/mem/tunable/overcommit_memory.c -+++ b/testcases/kernel/mem/tunable/overcommit_memory.c -@@ -36,11 +36,10 @@ - * - * The program is designed to test the two tunables: - * -- * When overcommit_memory = 0, allocatable memory can't overextends -- * the amount of free memory. I choose the three cases: -+ * When overcommit_memory = 0, allocatable memory can't overextend -+ * the amount of total memory: - * a. less than free_total: free_total / 2, alloc should pass. -- * b. greater than free_total: free_total * 2, alloc should fail. -- * c. equal to sum_total: sum_tatal, alloc should fail -+ * b. greater than sum_total: sum_total * 2, alloc should fail. - * - * When overcommit_memory = 1, it can alloc enough much memory, I - * choose the three cases: -@@ -164,9 +163,7 @@ static void overcommit_memory_test(void) - - update_mem(); - alloc_and_check(free_total / 2, EXPECT_PASS); -- update_mem(); -- alloc_and_check(free_total * 2, EXPECT_FAIL); -- alloc_and_check(sum_total, EXPECT_FAIL); -+ alloc_and_check(sum_total * 2, EXPECT_FAIL); - - /* start to test overcommit_memory=1 */ - set_sys_tune("overcommit_memory", 1, 1); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchb/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 3 lines
deleted file mode 100644
index 0e56c08255e..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4@@ -1,46 +0,0 @@ -From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Thu, 29 Aug 2019 21:09:46 +0800 -Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset length forMIPS
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-7- -rt_sigtimedwait01 fails as follow on MIPS arches -rt_sigtimedwait01 1 TFAIL : .../sigwaitinfo01.c:58: test_empty_set -(.../sigwaitinfo01.c: 148): Unexpected failure: -TEST_ERRNO=EINVAL(22): Invalid argument - -As this case purposely bypasses glibc, it should align with the size ofkernel
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 14
Quoted 2 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-2-definition of sigset_t which is different from other arches. -Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- -This patch turns to use _NSIG which is always right for all arches. - -Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c] -meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-10-Suggested-by: Jan Stancek <[email protected]> -Acked-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Petr Vorel <[email protected]> ---- - testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.cmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4-index 5a32ce1..6a30c27 100644 ---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set,
siginfo_t* info,meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info, - struct timespec *timeout) - { -- -- /* The last argument is (number_of_signals)/(bits_per_byte),which are 64 and 8, resp. */
Review line 39
Quoted 2 lines
(quoted diff) +0
-2-- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8); -+ /* _NSIG is always the right number of bits of signal map forall arches */
Review line 40
Quoted 1 line
(quoted diff) +0
-1-+ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout,_NSIG/8);
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-6- } - #endif - --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchb/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 3 lines
deleted file mode 100644
index 6ea26150fbf..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-7@@ -1,75 +0,0 @@ -From e747d0456adc080a1d31fb653bda9dc491795c80 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Sun, 16 Jun 2019 11:14:16 +0200 -Subject: [PATCH] syscalls/tgkill03: wait for defunct tid to get detached - -Case where defunct tid is used has been observed to sporadically fail: - tgkill03.c:96: FAIL: Defunct tid should have failed with ESRCH:SUCCESS
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -glibc __pthread_timedjoin_ex() waits for CLONE_CHILD_CLEARTID to cleartid,
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10-and then resumes. Kernel clears it (glibc pd->tid) at: - do_exit - exit_mm - mm_release - put_user(0, tsk->clear_child_tid); - -but kernel tid is still valid, presumably until: - release_task - __exit_signal - __unhash_processmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- detach_pid - -To avoid race wait until /proc/<pid>/task/<tid> disappears. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Li Wang <[email protected]> -Acked-by: Sumit Garg <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80
]meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/tgkill/tgkill03.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/tgkill/tgkill03.c
b/testcases/kernel/syscalls/tgkill/tgkill03.cQuoted 13 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-13-index f5bbdc5..593a217 100644 ---- a/testcases/kernel/syscalls/tgkill/tgkill03.c -+++ b/testcases/kernel/syscalls/tgkill/tgkill03.c -@@ -7,6 +7,7 @@ - - #include <pthread.h> - #include <pwd.h> -+#include <stdio.h> - #include <sys/types.h> - - #include "tst_safe_pthread.h" -@@ -42,6 +43,7 @@ static void setup(void) - {meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- sigset_t sigusr1; - pthread_t defunct_thread; -+ char defunct_tid_path[PATH_MAX]; - - sigemptyset(&sigusr1); - sigaddset(&sigusr1, SIGUSR1); -@@ -55,8 +57,9 @@ static void setup(void) - TST_CHECKPOINT_WAIT(0); - - SAFE_PTHREAD_CREATE(&defunct_thread, NULL, defunct_thread_func,NULL);
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-3-- - SAFE_PTHREAD_JOIN(defunct_thread, NULL); -+ sprintf(defunct_tid_path, "/proc/%d/task/%d", getpid(),
defunct_tid);Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-13-+ TST_RETRY_FN_EXP_BACKOFF(access(defunct_tid_path, R_OK), -1, 15); - } - - static void cleanup(void) -@@ -108,4 +111,5 @@ static struct tst_test test = { - .setup = setup, - .cleanup = cleanup, - .test = run, -+ .timeout = 20, - }; --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 4 lines
new file mode 100644
index 00000000000..93308445098
---/dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchmeta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch line 12
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +12
-0@@ -0,0 +1,24 @@ +From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 12 Dec 2019 17:56:02 +0100 +Subject: [PATCH] testcases: fix an absent format string issue + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git
a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cb/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cQuoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +12
-0+index 27dbc6626..19d943d06 100644 +--- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c ++++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c +@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) + + /* Manipulate PID for next process */ + sprintf(pid_str, "%d", pid - 1); +- SAFE_FILE_PRINTF(last_pid_file, pid_str); ++ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); + + new_pid = SAFE_FORK(); + if (new_pid == 0) {Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 3 lines
deleted file mode 100644
index f4f87f38ab7..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 14 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12@@ -1,161 +0,0 @@ -From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 28 Aug 2019 18:30:23 +0200 -Subject: [PATCH] testcases: use python3 everywhere to run python scripts - -The scripts themselves have #!/usr/bin/python3 in them, -so I trust they are already py3-compatible. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - testcases/kernel/power_management/runpwtests05.sh | 2 +-meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch line 22
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10- .../power_management/runpwtests_exclusive01.sh | 2 +- - .../power_management/runpwtests_exclusive02.sh | 2 +- - .../power_management/runpwtests_exclusive03.sh | 2 +- - .../power_management/runpwtests_exclusive04.sh | 2 +- - .../power_management/runpwtests_exclusive05.sh | 2 +- - testcases/network/nfsv4/acl/runtest | 14 +++++++------- - testcases/realtime/func/pi-tests/run_auto.sh | 6 +++--- - 8 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/testcases/kernel/power_management/runpwtests05.sh
b/testcases/kernel/power_management/runpwtests05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 8a7d0f6e0..43e234d01 100755 ---- a/testcases/kernel/power_management/runpwtests05.sh -+++ b/testcases/kernel/power_management/runpwtests05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - if ! grep sched_debug -qw /proc/cmdline ; then - tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \ -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive01.shb/testcases/kernel/power_management/runpwtests_exclusive01.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index ec78319e2..9fefcbf6e 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive01.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive02.shb/testcases/kernel/power_management/runpwtests_exclusive02.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index e107fce35..2cd0ecb05 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive02.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh -@@ -33,7 +33,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive03.shb/testcases/kernel/power_management/runpwtests_exclusive03.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 490344bb3..ab3a5d11d 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive03.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive04.shb/testcases/kernel/power_management/runpwtests_exclusive04.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 978ca02ae..438ef603f 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive04.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh -@@ -27,7 +27,7 @@ export TST_TOTAL=2 - # Checking test environment - check_kervel_arch - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive05.shb/testcases/kernel/power_management/runpwtests_exclusive05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index a0dad5834..3a9afdbf2 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive05.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git a/testcases/network/nfsv4/acl/runtestb/testcases/network/nfsv4/acl/runtest
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-7-index d2e1b4c49..a859e85bc 100755 ---- a/testcases/network/nfsv4/acl/runtest -+++ b/testcases/network/nfsv4/acl/runtest -@@ -22,7 +22,7 @@ do - done - - # creation of users on the remote machine (removed only at the end ofthe tests)
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-9--rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50 -+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50 - - echo "Starting ACL testing" - -@@ -51,19 +51,19 @@ echo "Basic tests finished" - - echo "LONG ACL TEST" - echo "creating necessary users and groups"meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10--python create_users.py -u 50 -g 50 -+python3 create_users.py -u 50 -g 50 - echo "creating necessary users and groups on the remote host" - mkdir $NFSMNTDIR/lacl-testdir --python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir -+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir - rm -rf $NFSMNTDIR/lacl-testdir - echo "Long ACL test OK with $MAXLENGTH entries" - echo "ACL STRESSING TEST" --python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p$NFSMNTDIR
Review line 127
Quoted 1 line
(quoted diff) +0
-1-+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p$NFSMNTDIR
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12- - # remove local an remote users --python cleanusers.py --python cleangroups.py --rsh -n $REMOTEHOST python $PWD/cleanusers.py -+python3 cleanusers.py -+python3 cleangroups.py -+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py - - echo "Test OK" - -diff --git a/testcases/realtime/func/pi-tests/run_auto.sh
b/testcases/realtime/func/pi-tests/run_auto.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-8-index d13026049..277988568 100755 ---- a/testcases/realtime/func/pi-tests/run_auto.sh -+++ b/testcases/realtime/func/pi-tests/run_auto.sh -@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0 - - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-1 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 148
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-2 --PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 153
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-4 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 158
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-3- - - export LOG_FILE=""diff --git
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchb/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 3 lines
deleted file mode 100644
index c936b788fe1..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-4@@ -1,36 +0,0 @@ -From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001 -From: Steven Price <[email protected]> -Date: Fri, 19 Jul 2019 13:48:17 +0100 -Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility modemeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch line 14
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-10- -The size of dev_t is larger than 32 bits which causes the dev argument -to be passed incorrectly. On Arm this means that the EFAULT test case -actually returns EINVAL because the device number isn't recognised. - -Signed-off-by: Steven Price <[email protected]> -Acked-by: Li Wang <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060
]meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/ustat/ustat02.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c
b/testcases/kernel/syscalls/ustat/ustat02.cmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-9-index 9bbe4f3..1a0e9e0 100644 ---- a/testcases/kernel/syscalls/ustat/ustat02.c -+++ b/testcases/kernel/syscalls/ustat/ustat02.c -@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc); - - void run(unsigned int test) - { -- TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf)); -+ TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev,tc[test].buf));
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-6- - if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno)) - tst_res(TPASS | TTERRNO, "ustat(2) expected failure"); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchb/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 3 lines
deleted file mode 100644
index 12e47eb2b61..00000000000
---
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch line 9
Quoted 11 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-9@@ -1,68 +0,0 @@ -From 7bc134545b7beb09717a60541530c20a1a5740d3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:55:28 -0700 -Subject: [PATCH 2/2] check for RES_USE_INET6 during configure - -glibc 2.30 has remove RES_USE_INET6 define which has been on its way out -since 2.26 release, this check ensures that we detect it before using it - -Upstream-Status: Submitted [Quoted 11 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-11-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 13 +++++++++++++ - testcases/network/multicast/mc_gethost/mc_gethost.c | 6 ++++++ - 2 files changed, 19 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2255b5c181..ed7acccb01 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,6 +91,19 @@ AC_CHECK_FUNCS([ \meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-10- vmsplice \ - ]) - -+#check defines -+AC_MSG_CHECKING([for RES_USE_INET6]) -+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <resolv.h>]], -+ [[char dummy[RES_USE_INET6];]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 1, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-4-+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 0, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-6-+ ] -+) - # Tools knobs - - # Expect -diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c
b/testcases/network/multicast/mc_gethost/mc_gethost.cQuoted 28 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-28-index 9cc15d086b..d1cae5441a 100644 ---- a/testcases/network/multicast/mc_gethost/mc_gethost.c -+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c -@@ -17,6 +17,8 @@ - #include <string.h> - #include <stdlib.h> - -+#include "config.h" -+ - #ifndef LOG_PERROR - #define LOG_PERROR 0 - #endif -@@ -50,8 +52,12 @@ usage: - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-6")) { -+#if HAVE_RES_USE_INET6 - af = AF_INET6, size = IN6ADDRSZ; - _res.options |= RES_USE_INET6; -+#else -+ af = AF_INET, size = INADDRSZ; -+#endif - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-f")) { --- -2.22.0 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchb/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 2 lines
index
c0f69ecf5fc..df3e8831f54100644
---
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 7 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1@@ -1,4 +1,4 @@ -From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 +From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 19:40:08 +0000 Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using itmeta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch Upstream-Status: Pending · line 18
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-0@@ -10,16 +10,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Yi Zhao <[email protected]> + --- testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c
b/testcases/kernel/syscalls/accept4/accept4_01.cQuoted 11 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-2-index dd289cf..76aa969 100644 +index 29e18f27d..07444a46f 100644 --- a/testcases/kernel/syscalls/accept4/accept4_01.c +++ b/testcases/kernel/syscalls/accept4/accept4_01.c @@ -38,6 +38,7 @@ - static struct sockaddr_in conn_addr; + static struct sockaddr_in *conn_addr, *accept_addr; static int listening_fd; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644 · line 38
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +0
-2@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644 static int create_listening_socket(void) { -@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) - SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr,
sizeof(conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-1- addrlen = sizeof(claddr); +@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr) + SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr,
sizeof(*conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1+ addrlen = sizeof(*accept_addr); +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if !(__GLIBC_PREREQ(2, 10)) - TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr,&addrlen,
Review index dd289cf..76aa969 100644 · line 44
Quoted 1 line
(quoted diff) +1
-0+ TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-2tcase->cloexec | tcase->nonblock)); -@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) - TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, + #else + TEST(accept4(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-3tcase->cloexec | tcase->nonblock)); - #endif ++#endif +#else + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, + tcase->cloexec | tcase->nonblock)); -+#endif + #endif if (TST_RET == -1) { if (TST_ERR == ENOSYS) - tst_brk(TCONF, "syscall __NR_accept4 notsupported");
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-3--- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchb/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 3 lines
deleted file mode 100644
index 8704e5ffe8a..00000000000
---
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4@@ -1,82 +0,0 @@ -From 794933b38354a2612cf2c471f11798b306f35315 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Mon, 20 May 2019 20:47:20 +0200 -Subject: [PATCH] shmctl01: don't use hardcoded index == 0 for SHM_STATtest
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11- -Test fails on SHM_STAT testcase: - shmctl01 5 TFAIL : shmctl01.c:173: shmctl01 call failed - errno = 22 : Invalid argument - shmctl(0, SHM_STAT, 0x601060) = -EINVAL - -since following commit: - commit 99db46ea292780cd978d56932d9445b1e8bdafe8 - Author: Manfred Spraul <[email protected]> - Date: Tue May 14 15:46:36 2019 -0700 - ipc: do cyclic id allocation for the ipc object.meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- -Don't rely on index 0 being always available, but instead -use (maximum) index returned by SHM_INFO. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Petr Vorel <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062
]meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5- -Signed-off-by: Hongzhi Song <[email protected]> -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 21++++++++++++++++++---
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-3- 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.cQuoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5-index 1b46977..52bf23a 100644 ---- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -@@ -79,6 +79,7 @@ static void func_info(int ret); -meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- /* Check routine for SHM_STAT */ - static void func_sstat(int ret); -+static void func_sstat_setup(void); - - /* Check routine for SHM_LOCK */ - static void func_lock(int ret); -@@ -110,7 +111,7 @@ static struct test_case_t { - #endif - {&shm_id_1, IPC_SET, &buf, func_set, set_setup}, - {&shm_id_1, IPC_INFO, (struct shmid_ds *) &info, func_info,NULL},
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11-- {&shm_index, SHM_STAT, &buf, func_sstat, NULL}, -+ {&shm_index, SHM_STAT, &buf, func_sstat, func_sstat_setup}, - {&shm_id_1, SHM_LOCK, NULL, func_lock, NULL}, - {&shm_id_1, SHM_UNLOCK, NULL, func_unlock, NULL}, - {&shm_id_1, IPC_RMID, NULL, func_rmid, NULL}, -@@ -407,9 +408,23 @@ static void func_info(int ret) - static void func_sstat(int ret) - { - if (ret >= 0) -- tst_resm(TPASS, "get correct shared memory id"); -+ tst_resm(TPASS, "get correct shared memory id for index:%d",
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4-+ shm_index); - else -- tst_resm(TFAIL, "shared memory id is incorrect"); -+ tst_resm(TFAIL, "shared memory id is incorrect, index:%d",
Quoted 19 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-19-+ shm_index); -+} -+ -+static void func_sstat_setup(void) -+{ -+ struct shm_info tmp; -+ int ret; -+ -+ ret = shmctl(shm_id_1, SHM_INFO, (void *)&tmp); -+ if (ret < 0) -+ tst_resm(TFAIL|TERRNO, "shmctl(SHM_INFO)"); -+ else -+ shm_index = ret; - } - - static void func_lock(int ret) --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchb/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 3 lines
deleted file mode 100644
index 9cd188f6567..00000000000
---
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch line 11
Quoted 13 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-11@@ -1,56 +0,0 @@ -From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Thu, 4 Jul 2019 16:45:23 +0200 -Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED - -Hongzhi reports that this test is failing on mips64 with 5.1+: - diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument - diotest4 11 TBROK : diotest4.c:368: Remaining cases broken -I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7. - -Test is trying to map into area immediately following heap as
MAP_SHARED,meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-3-but it used wrong alignment (fixed by 'lapi/mmap.h: include config.h'). - -Usage of MAP_FIXED seems unnecessary, so drop that too and let thekernel
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-pick an address. - -Reported-by: Hongzhi.Song <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3
]meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-7- -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/io/direct_io/diotest4.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/testcases/kernel/io/direct_io/diotest4.c
b/testcases/kernel/io/direct_io/diotest4.cmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-index e4616e4..bf200cd 100644 ---- a/testcases/kernel/io/direct_io/diotest4.c -+++ b/testcases/kernel/io/direct_io/diotest4.c -@@ -352,18 +352,14 @@ int main(int argc, char *argv[]) - total++; - - /* Test-10: read, write to a mmaped file */ -- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz -1));
Review line 39
Quoted 2 lines
(quoted diff) +0
-2-- if (shm_base == NULL) { -- tst_brkm(TBROK, cleanup, "sbrk failed: %s",strerror(errno));
Quoted 17 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-17-- } - offset = 4096; - count = bufsize; - if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) { - tst_brkm(TBROK, cleanup, "can't open %s: %s", - filename, strerror(errno)); - } -- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_FIXED, fd, 0); -+ shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE, -+ MAP_SHARED, fd, 0); - if (shm_base == (caddr_t) - 1) { - tst_brkm(TBROK, cleanup, "can't mmap file: %s", - strerror(errno)); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchb/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 3 lines
deleted file mode 100644
index aecbc80e9b5..00000000000
---
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-4@@ -1,64 +0,0 @@ -From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <[email protected]> -Date: Mon, 15 Jul 2019 03:39:06 -0400 -Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable withmips32
Quoted 15 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-15- -Error info: -getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur = -ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff - -According to kernel code: [arch/mips/include/uapi/asm/resource.h] -RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32. - - /* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway, - * but we keep the old value on MIPS32, - * for compatibility: - */ - #ifndef __mips64meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-10- # define RLIM_INFINITY 0x7fffffffUL - #endif - -Adding conditional statement about mips to fix this. - -Signed-off-by: Jan Stancek <[email protected]> -Signed-off-by: Hongzhi.Song <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde
]meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-7- -Signed-off-by: Hongzhi.Song <[email protected]> ---- - testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c
b/testcases/kernel/syscalls/getrlimit/getrlimit03.cmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-11-index e4d56c4..319bc49 100644 ---- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c -+++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c -@@ -26,6 +26,7 @@ - - #include "tst_test.h" - #include "lapi/syscalls.h" -+#include "lapi/abisize.h" - - /** - * Linux provides an "old" getrlimit syscall handler that uses signedlong,
Review
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-17-@@ -61,7 +62,12 @@ struct rlimit_ulong { - unsigned long rlim_cur; - unsigned long rlim_max; - }; --const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+ -+#if defined(__mips__) && defined(TST_ABI32) -+ const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL; -+#else -+ const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+#endif - - static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim) - { --- -2.7.4 -(quoted diff) +0
-0b/meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 7 lines
similarity index 84%
rename from meta/recipes-extended/ltp/ltp_20190517.bb rename to meta/recipes-extended/ltp/ltp_20190930.bb index60f749b4c01..9a436a52303100644meta/recipes-extended/ltp/ltp_20190930.bb CFLAGS_append_x86-64 = " -fomit-frame-pointer" · line 33
Quoted 8 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +1
-1@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2" +SRCREV = "c9707b465a08397569920b676345474f44327200" SRC_URI = "git://github.com/linux-test-project/ltp.git \file://0001-build-Add-option-to-select-libc-implementation.patch \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://
Quoted 1 line
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0@@ -38,19 +38,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://github.com/linux-test-project/ltp.git \ · line 44
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0file://0007-Fix-test_proc_kill-hanging.patch \file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
Quoted 1 line
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
Quoted 1 line
-
file://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \ -file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \
Quoted 1 line
-
file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0002-check-for-RES_USE_INET6-during-configure.patch \ -file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
Quoted 1 line
-
file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \ -file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
Quoted 1 line
-
file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
Quoted 1 line
-
file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
Quoted 1 line
-
file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
Quoted 1 line
file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
Quoted 1 line
+
file://0001-testcases-fix-an-absent-format-string-issue.patch \
Quoted 11 lines
"S = "${WORKDIR}/git"
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 26/30] ltp: update to 20190930
Quoted 3 lines · Alexander Kanavin
As the last three issues are clang or musl related, may I request that you look into them?
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
Quoted 1,428 lines
Alex
Quoted 1,423 lines · Khem Raj
musl build fails on aarch64
https://errors.yoctoproject.org/Errors/Details/297288/
Quoted 17 lines · Alexander Kanavin
Drop a big pile of backports.
Add a patch to address absent string formatting error.
Signed-off-by Alexander Kanavin <[email protected]>--- ...me-check-for-getdents-getdents64-API.patch | 72 -------- ...option-to-select-libc-implementation.patch | 27 ++- ...-17052-Avoid-unsafe-exits-in-threads.patch | 64 ------- ...meltdown.c-Fix-kernel-symbol-finding.patch | 81 --------- ...y-update-for-mm-fix-false-positive-O.patch | 57 ------- ...medwait01-Fix-wrong-sigset-length-fo.patch | 46 ----- ...3-wait-for-defunct-tid-to-get-detach.patch | 75 -------- ...es-fix-an-absent-format-string-issue.patch | 24 +++ ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------ ...x-EFAULT-in-32bit-compatibility-mode.patch | 36 ----Quoted 8 lines
...k-for-RES_USE_INET6-during-configure.patch | 68 -------- ...BC_PREREQ-is-defined-before-using-it.patch | 27 ++- ...se-hardcoded-index-0-for-SHM_STAT-te.patch | 82 --------- ...11-direct_io-diotest4-drop-MAP_FIXED.patch | 56 ------ ...st-a-bit-of-code-to-compatiable-with.patch | 64 ------- .../ltp/{ltp_20190517.bb => ltp_20190930.bb} | 15 +- 16 files changed, 51 insertions(+), 904 deletions(-) delete mode 100644
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 1 line
create mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 1 line
rename meta/recipes-extended/ltp/{ltp_20190517.bb => ltp_20190930.bb}(84%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchb/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 3 lines
deleted file mode 100644
index bfceadb190d..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-4@@ -1,72 +0,0 @@ -From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:32:29 -0700 -Subject: [PATCH 1/2] Add configure time check for getdents/getdents64APIs
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-7- -glibc 2.30 has added wrapper for getdents64 this will help in detecting -right condition to use fallback - -Check for getdents API as well while here - -Upstream-Status: Submitted [Quoted 27 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-27-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 2 ++ - testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \ - fallocate \ - fchownat \ - fstatat \ -+ getdents \ -+ getdents64 \ - kcmp \ - mkdirat \ - mknodat \ ---- a/testcases/kernel/syscalls/getdents/getdents.h -+++ b/testcases/kernel/syscalls/getdents/getdents.h -@@ -23,7 +23,7 @@ - #include <stdint.h> - #include "test.h" - #include "lapi/syscalls.h" -- -+#include "config.h" - /* - * See fs/compat.c struct compat_linux_direntmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-10- */ -@@ -34,12 +34,17 @@ struct linux_dirent { - char d_name[]; - }; - -+#if HAVE_GETDENTS -+#include <unistd.h> -+#else - static inline int - getdents(unsigned int fd, struct linux_dirent *dirp, unsigned intsize)
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-8- { - return ltp_syscall(__NR_getdents, fd, dirp, size); - } - -+#endif /* HAVE_GETDENTS */ -+ - struct linux_dirent64 { - uint64_t d_ino;meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-10- int64_t d_off; -@@ -48,10 +53,13 @@ struct linux_dirent64 { - char d_name[]; - }; - -+#if HAVE_GETDENTS64 -+#include <unistd.h> -+#else - static inline int - getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsignedint size)
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-6- { - return ltp_syscall(__NR_getdents64, fd, dirp64, size); - } -- -+#endif /* HAVE_GETDENTS64 */ - #endif /* GETDENTS_H */diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchb/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 2 lines
index
b5c25c56a57..1705abcf196100644
---
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchmeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Disable tests specifically not building _yet_ on musl
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -1,4 +1,4 @@ -From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001 +From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 18:19:03 +0000 Subject: [PATCH] build: Add option to select libc implementation@@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ on muslbased systems
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-0Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + --- Makefile | 5 +++++ testcases/kernel/Makefile | 5 ++++-meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Signed-off-by: Khem Raj <[email protected]> · line 31
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]> 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 768ca46..e9d679a 100644 +index 768ca4606..e9d679a71 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,11 @@ vpath %.mk$(top_srcdir)/mk:$(top_srcdir)/mk/include
Review index 768ca46..e9d679a 100644 · line 42
Quoted 3 lines
(quoted diff) +0
-0@@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644 # COMMON_TARGETS: Targets which exist in all, clean, and install. # INSTALL_TARGETS: Targets which exist in clean and install(contains
Quoted 21 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +4
-3diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile -index 39d79c7..24a57d9 100644 +index 3319b3163..94ea362c8 100644 --- a/testcases/kernel/Makefile +++ b/testcases/kernel/Makefile -@@ -49,12 +49,15 @@ SUBDIRS += connectors \ +@@ -49,13 +49,16 @@ SUBDIRS += connectors \ logging \ mem \ numa \ - pty \ sched \ security \ - timers \ + sound \ tracing \ + uevents \ +ifneq ($(LIBC),musl) +SUBDIRS += ptymeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 39d79c7..24a57d9 100644 · line 65
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-0@@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644 SUBDIRS += power_management endif diff --git a/testcases/kernel/sched/Makefileb/testcases/kernel/sched/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 6a57d79..74bb933 100644 · line 78
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 6a57d79..74bb933 100644 +index 6a57d79ee..74bb93370 100644 --- a/testcases/kernel/sched/Makefile +++ b/testcases/kernel/sched/Makefile @@ -23,5 +23,7 @@@@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefileb/testcases/kernel/syscalls/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 45a00cf..d1becd0 100644 · line 94
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 45a00cf..d1becd0 100644 +index 45a00cf7d..d1becd054 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)@@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644 ifeq ($(UCLIBC),1) FILTER_OUT_DIRS += profil diff --git a/testcases/network/nfsv4/acl/Makefileb/testcases/network/nfsv4/acl/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 8c55a6b..f7cda62 100644 · line 107
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 8c55a6b..f7cda62 100644 +index 8c55a6bbd..f7cda621d 100644 --- a/testcases/network/nfsv4/acl/Makefile +++ b/testcases/network/nfsv4/acl/Makefile @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644 + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/network/rpc/basic_tests/Makefileb/testcases/network/rpc/basic_tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 66e9d56..ea8eb8a 100644 · line 121
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 66e9d56..ea8eb8a 100644 +index 66e9d5675..ea8eb8a98 100644 --- a/testcases/network/rpc/basic_tests/Makefile +++ b/testcases/network/rpc/basic_tests/Makefile @@ -23,4 +23,9 @@@@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644 + include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/realtime/func/pi-tests/Makefileb/testcases/realtime/func/pi-tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 68616a7..748754b 100644 · line 135
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 68616a7..748754b 100644 +index 68616a711..748754bb4 100644 --- a/testcases/realtime/func/pi-tests/Makefile +++ b/testcases/realtime/func/pi-tests/Makefile @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -131,7 +133,7 @@ index 68616a7..748754b 100644 include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/realtime/stress/pi-tests/Makefileb/testcases/realtime/stress/pi-tests/Makefile
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-4-index 1881f75..266e0b8 100644 +index 1881f7565..266e0b815 100644 --- a/testcases/realtime/stress/pi-tests/Makefile +++ b/testcases/realtime/stress/pi-tests/Makefile @@ -24,4 +24,9 @@ top_srcdir ?= ../../../..@@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchb/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 3 lines
deleted file mode 100644
index cc40081300c..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 22 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-20@@ -1,64 +0,0 @@ -From e3a8502d0a4f8a44ddd02ca4b2efc097133fb9f7 Mon Sep 17 00:00:00 2001 -From: Mathias Fiedler <[email protected]> -Date: Fri, 23 Aug 2019 12:46:48 +0200 -Subject: [PATCH] cve-2017-17052: Avoid unsafe exits in threads - -According to manpage exit(3) calling exit is not thread-safe. -And with glibc 2.28 (and probably also with glibc >=2.27) sometimes -child processes created in fork_thread can get stuck on process exit in -glibc's __run_exit_handlers trying to acquire some lock which was in -locked state while the fork was created. This can happen when exit is -called in mmap_thread concurrently to the fork. -While the main process will still return with PASSED some of its -children are left behind. - -Comparing the source code with the original program as described in the -commit 2b7e8665b4ff51c034c55df3cff76518d1a9ee3a of linux kernel >=4.13 -the exits in mmap_thread and fork_thread should not be necessary to -trigger the original bug. - -Therefore those exit calls are removed. The mmap_thread and fork_threadmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch line 30
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-10-should still exit when their corresponding main thread in do_test_fork -calls exit_group. The remaining exit in do_test_fork will be called in -the main thread without any concurrent thread in the same process. - -Signed-off-by: Mathias Fiedler <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Acked-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4
]meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-9- -CVE: CVE-2017-17052 - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/cve-2017-17052.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/testcases/cve/cve-2017-17052.c
b/testcases/cve/cve-2017-17052.cmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-7-index d7da7e919..18cd2a6d7 100644 ---- a/testcases/cve/cve-2017-17052.c -+++ b/testcases/cve/cve-2017-17052.c -@@ -58,8 +58,6 @@ static void *mmap_thread(void *arg) - for (;;) { - SAFE_MMAP(NULL, 0x1000000, PROT_READ, - MAP_POPULATE|MAP_ANONYMOUS|MAP_PRIVATE,-1, 0);
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-18-- if (*do_exit) -- exit(0); - } - - return arg; -@@ -67,9 +65,6 @@ static void *mmap_thread(void *arg) - - static void *fork_thread(void *arg) - { -- if (*do_exit) -- exit(0); -- - usleep(rand() % 10000); - SAFE_FORK(); - --- -2.17.1 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchb/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 3 lines
deleted file mode 100644
index 94f6f5a15a6..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-7@@ -1,81 +0,0 @@ -From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Wed, 21 Aug 2019 16:27:24 +0800 -Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding - -meltdown case fails as below. -safe_file_ops.c:219: BROK: Expected 3 conversions got 2 atmeltdown.c:272
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -find_kernel_symbol is defined to try twice with each of /proc/kallsymsand
Review line 10
Quoted 1 line
(quoted diff) +0
-1-/boot/System.map-%s. Currently if the symbol is not found in
/proc/kallsyms,Review line 11
Quoted 1 line
(quoted diff) +0
-1-when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop thecase
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-3-immediately due to SAFE_FILE_LINES_SCANF. - -This patch turns to use FILE_LINES_SCANF to give find_kernel_symbolsecond
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10-chance. - -[jstancek] Fix also condition introduced in 7709d2ae92ea, even if - /proc/kallsyms is disabled, we still want to try System.map. - -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8
]Review line 26
Quoted 2 lines
(quoted diff) +0
-2- -Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort thetest if kallsyms was not enabled")
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-12-that has been covered by this patch. - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/meltdown.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c -index a53ea9b..22651a6 100644 ---- a/testcases/cve/meltdown.c -+++ b/testcases/cve/meltdown.c -@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, constchar *symname)
Quoted 23 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-23- int ret, read; - char fmt[strlen(symname) + 64]; - -+ tst_res(TINFO, "Looking for %s in %s", symname, filename); -+ if (access(filename, F_OK) == -1) { -+ tst_res(TINFO, "%s not available", filename); -+ return 0; -+ } -+ - sprintf(fmt, "%%lx %%c %s%%c", symname); - -- ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); -+ ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); - if (ret) - return 0; - -@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name) - if (addr) - return addr; - -- tst_res(TINFO, "not found '%s' in /proc/kallsyms", name); - if (uname(&utsname) < 0) - tst_brk(TBROK | TERRNO, "uname");meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- - sprintf(systemmap, "/boot/System.map-%s", utsname.release); - -- tst_res(TINFO, "looking in '%s'\n", systemmap); - addr = find_symbol_in_file(systemmap, name); - return addr; - } -@@ -308,6 +312,9 @@ static void setup(void) - saved_cmdline_addr = find_kernel_symbol("saved_command_line"); - tst_res(TINFO, "&saved_command_line == 0x%lx",
saved_cmdline_addr);Quoted 11 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- -+ if (!saved_cmdline_addr) -+ tst_brk(TCONF, "saved_command_line not found"); -+ - spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY); - - memset(target_array, 1, sizeof(target_array)); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchb/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 3 lines
deleted file mode 100644
index bed84712a15..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-7@@ -1,57 +0,0 @@ -From d656a447893dccc310c975a239f482278550c3e0 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Tue, 21 May 2019 10:10:44 +0200 -Subject: [PATCH] overcommit_memory: update for "mm: fix false-positive - OVERCOMMIT_GUESS failures" - -commit 8c7829b04c52 ("mm: fix false-positive OVERCOMMIT_GUESSfailures")
Review line 9
Quoted 2 lines
(quoted diff) +0
-2-changes logic of __vm_enough_memory(), simplifying it to: - When in GUESS mode, catch wild allocations by comparing theirrequest
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-3- size to total amount of ram and swap in the system. - -Testcase currently allocates mem_total + swap_total, which doesn'ttrigger
Review line 13
Quoted 1 line
(quoted diff) +0
-1-new condition. Make it more extreme, but assuming free_total / 2 willPASS,
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-and 2*sum_total will FAIL. - -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0
]meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/mem/tunable/overcommit_memory.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c
b/testcases/kernel/mem/tunable/overcommit_memory.cQuoted 32 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-32-index 555298f..345764d 100644 ---- a/testcases/kernel/mem/tunable/overcommit_memory.c -+++ b/testcases/kernel/mem/tunable/overcommit_memory.c -@@ -36,11 +36,10 @@ - * - * The program is designed to test the two tunables: - * -- * When overcommit_memory = 0, allocatable memory can't overextends -- * the amount of free memory. I choose the three cases: -+ * When overcommit_memory = 0, allocatable memory can't overextend -+ * the amount of total memory: - * a. less than free_total: free_total / 2, alloc should pass. -- * b. greater than free_total: free_total * 2, alloc should fail. -- * c. equal to sum_total: sum_tatal, alloc should fail -+ * b. greater than sum_total: sum_total * 2, alloc should fail. - * - * When overcommit_memory = 1, it can alloc enough much memory, I - * choose the three cases: -@@ -164,9 +163,7 @@ static void overcommit_memory_test(void) - - update_mem(); - alloc_and_check(free_total / 2, EXPECT_PASS); -- update_mem(); -- alloc_and_check(free_total * 2, EXPECT_FAIL); -- alloc_and_check(sum_total, EXPECT_FAIL); -+ alloc_and_check(sum_total * 2, EXPECT_FAIL); - - /* start to test overcommit_memory=1 */ - set_sys_tune("overcommit_memory", 1, 1); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchb/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 3 lines
deleted file mode 100644
index 0e56c08255e..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4@@ -1,46 +0,0 @@ -From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Thu, 29 Aug 2019 21:09:46 +0800 -Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset lengthfor MIPS
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-3- -rt_sigtimedwait01 fails as follow on MIPS arches -rt_sigtimedwait01 1 TFAIL : .../sigwaitinfo01.c:58:
test_empty_setmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4-(.../sigwaitinfo01.c: 148): Unexpected failure: -TEST_ERRNO=EINVAL(22): Invalid argument - -As this case purposely bypasses glibc, it should align with the sizeof kernel
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 14
Quoted 2 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-2-definition of sigset_t which is different from other arches. -Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- -This patch turns to use _NSIG which is always right for all arches. - -Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c] -meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-10-Suggested-by: Jan Stancek <[email protected]> -Acked-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Petr Vorel <[email protected]> ---- - testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.cmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4-index 5a32ce1..6a30c27 100644 ---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set,
siginfo_t* info,meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info, - struct timespec *timeout) - { -- -- /* The last argument is (number_of_signals)/(bits_per_byte),which are 64 and 8, resp. */
Review line 39
Quoted 2 lines
(quoted diff) +0
-2-- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8); -+ /* _NSIG is always the right number of bits of signal map forall arches */
Review line 40
Quoted 1 line
(quoted diff) +0
-1-+ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout,_NSIG/8);
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-6- } - #endif - --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchb/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 3 lines
deleted file mode 100644
index 6ea26150fbf..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-4@@ -1,75 +0,0 @@ -From e747d0456adc080a1d31fb653bda9dc491795c80 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Sun, 16 Jun 2019 11:14:16 +0200 -Subject: [PATCH] syscalls/tgkill03: wait for defunct tid to getdetached
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-3- -Case where defunct tid is used has been observed to sporadically fail: - tgkill03.c:96: FAIL: Defunct tid should have failed with ESRCH:SUCCESS
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -glibc __pthread_timedjoin_ex() waits for CLONE_CHILD_CLEARTID to cleartid,
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10-and then resumes. Kernel clears it (glibc pd->tid) at: - do_exit - exit_mm - mm_release - put_user(0, tsk->clear_child_tid); - -but kernel tid is still valid, presumably until: - release_task - __exit_signal - __unhash_processmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- detach_pid - -To avoid race wait until /proc/<pid>/task/<tid> disappears. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Li Wang <[email protected]> -Acked-by: Sumit Garg <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80
]meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/tgkill/tgkill03.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/tgkill/tgkill03.c
b/testcases/kernel/syscalls/tgkill/tgkill03.cQuoted 13 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-13-index f5bbdc5..593a217 100644 ---- a/testcases/kernel/syscalls/tgkill/tgkill03.c -+++ b/testcases/kernel/syscalls/tgkill/tgkill03.c -@@ -7,6 +7,7 @@ - - #include <pthread.h> - #include <pwd.h> -+#include <stdio.h> - #include <sys/types.h> - - #include "tst_safe_pthread.h" -@@ -42,6 +43,7 @@ static void setup(void) - {meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- sigset_t sigusr1; - pthread_t defunct_thread; -+ char defunct_tid_path[PATH_MAX]; - - sigemptyset(&sigusr1); - sigaddset(&sigusr1, SIGUSR1); -@@ -55,8 +57,9 @@ static void setup(void) - TST_CHECKPOINT_WAIT(0); - - SAFE_PTHREAD_CREATE(&defunct_thread, NULL, defunct_thread_func,NULL);
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-3-- - SAFE_PTHREAD_JOIN(defunct_thread, NULL); -+ sprintf(defunct_tid_path, "/proc/%d/task/%d", getpid(),
defunct_tid);Review line 63
Quoted 1 line
(quoted diff) +0
-1-+ TST_RETRY_FN_EXP_BACKOFF(access(defunct_tid_path, R_OK), -1,15);
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-12- } - - static void cleanup(void) -@@ -108,4 +111,5 @@ static struct tst_test test = { - .setup = setup, - .cleanup = cleanup, - .test = run, -+ .timeout = 20, - }; --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 4 lines
new file mode 100644
index 00000000000..93308445098
---/dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchmeta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch line 12
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +12
-0@@ -0,0 +1,24 @@ +From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 12 Dec 2019 17:56:02 +0100 +Subject: [PATCH] testcases: fix an absent format string issue + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git
a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cb/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cQuoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +12
-0+index 27dbc6626..19d943d06 100644 +--- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c ++++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c +@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) + + /* Manipulate PID for next process */ + sprintf(pid_str, "%d", pid - 1); +- SAFE_FILE_PRINTF(last_pid_file, pid_str); ++ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); + + new_pid = SAFE_FORK(); + if (new_pid == 0) {Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 3 lines
deleted file mode 100644
index f4f87f38ab7..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4@@ -1,161 +0,0 @@ -From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 28 Aug 2019 18:30:23 +0200 -Subject: [PATCH] testcases: use python3 everywhere to run pythonscripts
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-8- -The scripts themselves have #!/usr/bin/python3 in them, -so I trust they are already py3-compatible. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - testcases/kernel/power_management/runpwtests05.sh | 2 +-meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10- .../power_management/runpwtests_exclusive01.sh | 2 +- - .../power_management/runpwtests_exclusive02.sh | 2 +- - .../power_management/runpwtests_exclusive03.sh | 2 +- - .../power_management/runpwtests_exclusive04.sh | 2 +- - .../power_management/runpwtests_exclusive05.sh | 2 +- - testcases/network/nfsv4/acl/runtest | 14 +++++++------- - testcases/realtime/func/pi-tests/run_auto.sh | 6 +++--- - 8 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/testcases/kernel/power_management/runpwtests05.sh
b/testcases/kernel/power_management/runpwtests05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12-index 8a7d0f6e0..43e234d01 100755 ---- a/testcases/kernel/power_management/runpwtests05.sh -+++ b/testcases/kernel/power_management/runpwtests05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - if ! grep sched_debug -qw /proc/cmdline ; then - tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed,"\
Review line 35
Quoted 1 line
(quoted diff) +0
-1-diff --git
a/testcases/kernel/power_management/runpwtests_exclusive01.shb/testcases/kernel/power_management/runpwtests_exclusive01.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index ec78319e2..9fefcbf6e 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive01.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive02.shb/testcases/kernel/power_management/runpwtests_exclusive02.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index e107fce35..2cd0ecb05 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive02.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh -@@ -33,7 +33,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive03.shb/testcases/kernel/power_management/runpwtests_exclusive03.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 490344bb3..ab3a5d11d 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive03.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive04.shb/testcases/kernel/power_management/runpwtests_exclusive04.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 978ca02ae..438ef603f 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive04.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh -@@ -27,7 +27,7 @@ export TST_TOTAL=2 - # Checking test environment - check_kervel_arch - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive05.shb/testcases/kernel/power_management/runpwtests_exclusive05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index a0dad5834..3a9afdbf2 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive05.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git a/testcases/network/nfsv4/acl/runtestb/testcases/network/nfsv4/acl/runtest
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-7-index d2e1b4c49..a859e85bc 100755 ---- a/testcases/network/nfsv4/acl/runtest -+++ b/testcases/network/nfsv4/acl/runtest -@@ -22,7 +22,7 @@ do - done - - # creation of users on the remote machine (removed only at the endof the tests)
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-9--rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50 -+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50 - - echo "Starting ACL testing" - -@@ -51,19 +51,19 @@ echo "Basic tests finished" - - echo "LONG ACL TEST" - echo "creating necessary users and groups"meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10--python create_users.py -u 50 -g 50 -+python3 create_users.py -u 50 -g 50 - echo "creating necessary users and groups on the remote host" - mkdir $NFSMNTDIR/lacl-testdir --python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir -+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir - rm -rf $NFSMNTDIR/lacl-testdir - echo "Long ACL test OK with $MAXLENGTH entries" - echo "ACL STRESSING TEST" --python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p$NFSMNTDIR
Review line 127
Quoted 1 line
(quoted diff) +0
-1-+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p$NFSMNTDIR
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12- - # remove local an remote users --python cleanusers.py --python cleangroups.py --rsh -n $REMOTEHOST python $PWD/cleanusers.py -+python3 cleanusers.py -+python3 cleangroups.py -+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py - - echo "Test OK" - -diff --git a/testcases/realtime/func/pi-tests/run_auto.sh
b/testcases/realtime/func/pi-tests/run_auto.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-8-index d13026049..277988568 100755 ---- a/testcases/realtime/func/pi-tests/run_auto.sh -+++ b/testcases/realtime/func/pi-tests/run_auto.sh -@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0 - - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-1 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 148
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-2 --PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 153
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-4 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 158
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-3- - - export LOG_FILE=""diff --git
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchb/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 3 lines
deleted file mode 100644
index c936b788fe1..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-4@@ -1,36 +0,0 @@ -From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001 -From: Steven Price <[email protected]> -Date: Fri, 19 Jul 2019 13:48:17 +0100 -Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility modemeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch line 14
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-10- -The size of dev_t is larger than 32 bits which causes the dev argument -to be passed incorrectly. On Arm this means that the EFAULT test case -actually returns EINVAL because the device number isn't recognised. - -Signed-off-by: Steven Price <[email protected]> -Acked-by: Li Wang <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060
]meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/ustat/ustat02.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c
b/testcases/kernel/syscalls/ustat/ustat02.cmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-9-index 9bbe4f3..1a0e9e0 100644 ---- a/testcases/kernel/syscalls/ustat/ustat02.c -+++ b/testcases/kernel/syscalls/ustat/ustat02.c -@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc); - - void run(unsigned int test) - { -- TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf)); -+ TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev,tc[test].buf));
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-6- - if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno)) - tst_res(TPASS | TTERRNO, "ustat(2) expected failure"); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchb/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 3 lines
deleted file mode 100644
index 12e47eb2b61..00000000000
---
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch line 6
Quoted 8 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-6@@ -1,68 +0,0 @@ -From 7bc134545b7beb09717a60541530c20a1a5740d3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:55:28 -0700 -Subject: [PATCH 2/2] check for RES_USE_INET6 during configure - -glibc 2.30 has remove RES_USE_INET6 define which has been on its wayout
Review line 7
Quoted 1 line
(quoted diff) +0
-1-since 2.26 release, this check ensures that we detect it before usingit
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -Upstream-Status: Submitted [meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-3-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 13+++++++++++++
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-8- testcases/network/multicast/mc_gethost/mc_gethost.c | 6 ++++++ - 2 files changed, 19 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2255b5c181..ed7acccb01 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,6 +91,19 @@ AC_CHECK_FUNCS([ \meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-10- vmsplice \ - ]) - -+#check defines -+AC_MSG_CHECKING([for RES_USE_INET6]) -+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <resolv.h>]], -+ [[char dummy[RES_USE_INET6];]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 1, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-4-+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 0, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-6-+ ] -+) - # Tools knobs - - # Expect -diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c
b/testcases/network/multicast/mc_gethost/mc_gethost.cQuoted 28 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-28-index 9cc15d086b..d1cae5441a 100644 ---- a/testcases/network/multicast/mc_gethost/mc_gethost.c -+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c -@@ -17,6 +17,8 @@ - #include <string.h> - #include <stdlib.h> - -+#include "config.h" -+ - #ifndef LOG_PERROR - #define LOG_PERROR 0 - #endif -@@ -50,8 +52,12 @@ usage: - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-6")) { -+#if HAVE_RES_USE_INET6 - af = AF_INET6, size = IN6ADDRSZ; - _res.options |= RES_USE_INET6; -+#else -+ af = AF_INET, size = INADDRSZ; -+#endif - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-f")) { --- -2.22.0 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchb/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 2 lines
index
c0f69ecf5fc..df3e8831f54100644
---
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 7 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1@@ -1,4 +1,4 @@ -From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 +From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 19:40:08 +0000 Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using itmeta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch Upstream-Status: Pending · line 18
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-0@@ -10,16 +10,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Yi Zhao <[email protected]> + --- testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c
b/testcases/kernel/syscalls/accept4/accept4_01.cQuoted 11 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-2-index dd289cf..76aa969 100644 +index 29e18f27d..07444a46f 100644 --- a/testcases/kernel/syscalls/accept4/accept4_01.c +++ b/testcases/kernel/syscalls/accept4/accept4_01.c @@ -38,6 +38,7 @@ - static struct sockaddr_in conn_addr; + static struct sockaddr_in *conn_addr, *accept_addr; static int listening_fd; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644 · line 38
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +0
-2@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644 static int create_listening_socket(void) { -@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) - SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr,
sizeof(conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-1- addrlen = sizeof(claddr); +@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr) + SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr,
sizeof(*conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1+ addrlen = sizeof(*accept_addr); +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if !(__GLIBC_PREREQ(2, 10)) - TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr,&addrlen,
Review index dd289cf..76aa969 100644 · line 44
Quoted 1 line
(quoted diff) +1
-0+ TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-2tcase->cloexec | tcase->nonblock)); -@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) - TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, + #else + TEST(accept4(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-3tcase->cloexec | tcase->nonblock)); - #endif ++#endif +#else + TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen, + tcase->cloexec | tcase->nonblock)); -+#endif + #endif if (TST_RET == -1) { if (TST_ERR == ENOSYS) - tst_brk(TCONF, "syscall __NR_accept4 notsupported");
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-3--- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchb/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 3 lines
deleted file mode 100644
index 8704e5ffe8a..00000000000
---
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4@@ -1,82 +0,0 @@ -From 794933b38354a2612cf2c471f11798b306f35315 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Mon, 20 May 2019 20:47:20 +0200 -Subject: [PATCH] shmctl01: don't use hardcoded index == 0 for SHM_STATtest
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11- -Test fails on SHM_STAT testcase: - shmctl01 5 TFAIL : shmctl01.c:173: shmctl01 call failed - errno = 22 : Invalid argument - shmctl(0, SHM_STAT, 0x601060) = -EINVAL - -since following commit: - commit 99db46ea292780cd978d56932d9445b1e8bdafe8 - Author: Manfred Spraul <[email protected]> - Date: Tue May 14 15:46:36 2019 -0700 - ipc: do cyclic id allocation for the ipc object.meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- -Don't rely on index 0 being always available, but instead -use (maximum) index returned by SHM_INFO. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Petr Vorel <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062
]meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5- -Signed-off-by: Hongzhi Song <[email protected]> -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 21++++++++++++++++++---
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-3- 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.cQuoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5-index 1b46977..52bf23a 100644 ---- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -@@ -79,6 +79,7 @@ static void func_info(int ret); -meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- /* Check routine for SHM_STAT */ - static void func_sstat(int ret); -+static void func_sstat_setup(void); - - /* Check routine for SHM_LOCK */ - static void func_lock(int ret); -@@ -110,7 +111,7 @@ static struct test_case_t { - #endif - {&shm_id_1, IPC_SET, &buf, func_set, set_setup}, - {&shm_id_1, IPC_INFO, (struct shmid_ds *) &info, func_info,NULL},
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11-- {&shm_index, SHM_STAT, &buf, func_sstat, NULL}, -+ {&shm_index, SHM_STAT, &buf, func_sstat, func_sstat_setup}, - {&shm_id_1, SHM_LOCK, NULL, func_lock, NULL}, - {&shm_id_1, SHM_UNLOCK, NULL, func_unlock, NULL}, - {&shm_id_1, IPC_RMID, NULL, func_rmid, NULL}, -@@ -407,9 +408,23 @@ static void func_info(int ret) - static void func_sstat(int ret) - { - if (ret >= 0) -- tst_resm(TPASS, "get correct shared memory id"); -+ tst_resm(TPASS, "get correct shared memory id forindex: %d",
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4-+ shm_index); - else -- tst_resm(TFAIL, "shared memory id is incorrect"); -+ tst_resm(TFAIL, "shared memory id is incorrect, index:%d",
Quoted 19 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-19-+ shm_index); -+} -+ -+static void func_sstat_setup(void) -+{ -+ struct shm_info tmp; -+ int ret; -+ -+ ret = shmctl(shm_id_1, SHM_INFO, (void *)&tmp); -+ if (ret < 0) -+ tst_resm(TFAIL|TERRNO, "shmctl(SHM_INFO)"); -+ else -+ shm_index = ret; - } - - static void func_lock(int ret) --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchb/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 3 lines
deleted file mode 100644
index 9cd188f6567..00000000000
---
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch line 11
Quoted 13 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-11@@ -1,56 +0,0 @@ -From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Thu, 4 Jul 2019 16:45:23 +0200 -Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED - -Hongzhi reports that this test is failing on mips64 with 5.1+: - diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument - diotest4 11 TBROK : diotest4.c:368: Remaining cases broken -I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7. - -Test is trying to map into area immediately following heap as
MAP_SHARED,meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-3-but it used wrong alignment (fixed by 'lapi/mmap.h: include config.h'). - -Usage of MAP_FIXED seems unnecessary, so drop that too and let thekernel
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-pick an address. - -Reported-by: Hongzhi.Song <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3
]meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-7- -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/io/direct_io/diotest4.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/testcases/kernel/io/direct_io/diotest4.c
b/testcases/kernel/io/direct_io/diotest4.cmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-index e4616e4..bf200cd 100644 ---- a/testcases/kernel/io/direct_io/diotest4.c -+++ b/testcases/kernel/io/direct_io/diotest4.c -@@ -352,18 +352,14 @@ int main(int argc, char *argv[]) - total++; - - /* Test-10: read, write to a mmaped file */ -- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz -1));
Review line 39
Quoted 2 lines
(quoted diff) +0
-2-- if (shm_base == NULL) { -- tst_brkm(TBROK, cleanup, "sbrk failed: %s",strerror(errno));
Quoted 17 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-17-- } - offset = 4096; - count = bufsize; - if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) { - tst_brkm(TBROK, cleanup, "can't open %s: %s", - filename, strerror(errno)); - } -- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_FIXED, fd, 0); -+ shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE, -+ MAP_SHARED, fd, 0); - if (shm_base == (caddr_t) - 1) { - tst_brkm(TBROK, cleanup, "can't mmap file: %s", - strerror(errno)); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchb/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 3 lines
deleted file mode 100644
index aecbc80e9b5..00000000000
---
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-4@@ -1,64 +0,0 @@ -From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <[email protected]> -Date: Mon, 15 Jul 2019 03:39:06 -0400 -Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable withmips32
Quoted 15 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-15- -Error info: -getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur = -ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff - -According to kernel code: [arch/mips/include/uapi/asm/resource.h] -RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32. - - /* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway, - * but we keep the old value on MIPS32, - * for compatibility: - */ - #ifndef __mips64meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-10- # define RLIM_INFINITY 0x7fffffffUL - #endif - -Adding conditional statement about mips to fix this. - -Signed-off-by: Jan Stancek <[email protected]> -Signed-off-by: Hongzhi.Song <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde
]meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-7- -Signed-off-by: Hongzhi.Song <[email protected]> ---- - testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c
b/testcases/kernel/syscalls/getrlimit/getrlimit03.cmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-11-index e4d56c4..319bc49 100644 ---- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c -+++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c -@@ -26,6 +26,7 @@ - - #include "tst_test.h" - #include "lapi/syscalls.h" -+#include "lapi/abisize.h" - - /** - * Linux provides an "old" getrlimit syscall handler that uses signedlong,
Review
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-17-@@ -61,7 +62,12 @@ struct rlimit_ulong { - unsigned long rlim_cur; - unsigned long rlim_max; - }; --const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+ -+#if defined(__mips__) && defined(TST_ABI32) -+ const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL; -+#else -+ const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+#endif - - static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim) - { --- -2.7.4 -(quoted diff) +0
-0b/meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 7 lines
similarity index 84%
rename from meta/recipes-extended/ltp/ltp_20190517.bb rename to meta/recipes-extended/ltp/ltp_20190930.bb index60f749b4c01..9a436a52303100644meta/recipes-extended/ltp/ltp_20190930.bb CFLAGS_append_x86-64 = " -fomit-frame-pointer" · line 33
Quoted 8 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +1
-1@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2" +SRCREV = "c9707b465a08397569920b676345474f44327200" SRC_URI = "git://github.com/linux-test-project/ltp.git \file://0001-build-Add-option-to-select-libc-implementation.patch \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://
Quoted 1 line
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0@@ -38,19 +38,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://github.com/linux-test-project/ltp.git \ · line 44
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0file://0007-Fix-test_proc_kill-hanging.patch \file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
Quoted 1 line
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
Quoted 1 line
-
file://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \ -file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \
Quoted 1 line
-
file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0002-check-for-RES_USE_INET6-during-configure.patch \ -file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
Quoted 1 line
-
file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \ -file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
Quoted 1 line
-
file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
Quoted 1 line
-
file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
Quoted 1 line
-
file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
Quoted 1 line
file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
Quoted 1 line
+
file://0001-testcases-fix-an-absent-format-string-issue.patch \
Quoted 11 lines
"S = "${WORKDIR}/git"
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 26/30] ltp: update to 20190930
Quoted 11 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
As the last three issues are clang or musl related, may I request that you look into them?
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
The patch was removed as upstream has actually fixed/changed the things it was patching, so it's probably a new issue. Also I am not able to easily test with clang.
Can you take a look please?
Alex
Quoted 1,445 lines
Quoted 1,445 lines
Alex
Quoted 1,440 lines · Khem Raj
musl build fails on aarch64
https://errors.yoctoproject.org/Errors/Details/297288/
Quoted 17 lines · Alexander Kanavin
Drop a big pile of backports.
Add a patch to address absent string formatting error.
Signed-off-by Alexander Kanavin <[email protected]>--- ...me-check-for-getdents-getdents64-API.patch | 72 -------- ...option-to-select-libc-implementation.patch | 27 ++- ...-17052-Avoid-unsafe-exits-in-threads.patch | 64 ------- ...meltdown.c-Fix-kernel-symbol-finding.patch | 81 --------- ...y-update-for-mm-fix-false-positive-O.patch | 57 ------- ...medwait01-Fix-wrong-sigset-length-fo.patch | 46 ----- ...3-wait-for-defunct-tid-to-get-detach.patch | 75 -------- ...es-fix-an-absent-format-string-issue.patch | 24 +++ ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------ ...x-EFAULT-in-32bit-compatibility-mode.patch | 36 ----Quoted 8 lines
...k-for-RES_USE_INET6-during-configure.patch | 68 -------- ...BC_PREREQ-is-defined-before-using-it.patch | 27 ++- ...se-hardcoded-index-0-for-SHM_STAT-te.patch | 82 --------- ...11-direct_io-diotest4-drop-MAP_FIXED.patch | 56 ------ ...st-a-bit-of-code-to-compatiable-with.patch | 64 ------- .../ltp/{ltp_20190517.bb => ltp_20190930.bb} | 15 +- 16 files changed, 51 insertions(+), 904 deletions(-) delete mode 100644
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 1 line
create mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 1 line
delete mode 100644
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 1 line
rename meta/recipes-extended/ltp/{ltp_20190517.bb => ltp_20190930.bb}(84%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchb/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchQuoted 3 lines
deleted file mode 100644
index bfceadb190d..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patchmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-4@@ -1,72 +0,0 @@ -From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:32:29 -0700 -Subject: [PATCH 1/2] Add configure time check for getdents/getdents64APIs
Review line 6
Quoted 2 lines
(quoted diff) +0
-2- -glibc 2.30 has added wrapper for getdents64 this will help indetecting
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-5-right condition to use fallback - -Check for getdents API as well while here - -Upstream-Status: Submitted [Quoted 27 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-27-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 2 ++ - testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \ - fallocate \ - fchownat \ - fstatat \ -+ getdents \ -+ getdents64 \ - kcmp \ - mkdirat \ - mknodat \ ---- a/testcases/kernel/syscalls/getdents/getdents.h -+++ b/testcases/kernel/syscalls/getdents/getdents.h -@@ -23,7 +23,7 @@ - #include <stdint.h> - #include "test.h" - #include "lapi/syscalls.h" -- -+#include "config.h" - /* - * See fs/compat.c struct compat_linux_direntmeta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-10- */ -@@ -34,12 +34,17 @@ struct linux_dirent { - char d_name[]; - }; - -+#if HAVE_GETDENTS -+#include <unistd.h> -+#else - static inline int - getdents(unsigned int fd, struct linux_dirent *dirp, unsigned intsize)
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-8- { - return ltp_syscall(__NR_getdents, fd, dirp, size); - } - -+#endif /* HAVE_GETDENTS */ -+ - struct linux_dirent64 { - uint64_t d_ino;meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-10- int64_t d_off; -@@ -48,10 +53,13 @@ struct linux_dirent64 { - char d_name[]; - }; - -+#if HAVE_GETDENTS64 -+#include <unistd.h> -+#else - static inline int - getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsignedint size)
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-6- { - return ltp_syscall(__NR_getdents64, fd, dirp64, size); - } -- -+#endif /* HAVE_GETDENTS64 */ - #endif /* GETDENTS_H */diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchb/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 2 lines
index
b5c25c56a57..1705abcf196100644
---
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patchmeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Disable tests specifically not building _yet_ on
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -1,4 +1,4 @@ -From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001 +From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 18:19:03 +0000 Subject: [PATCH] build: Add option to select libc implementation@@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ onmusl based systems
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-0Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + --- Makefile | 5 +++++ testcases/kernel/Makefile | 5 ++++-meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch Signed-off-by: Khem Raj <[email protected]> · line 31
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1@@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]> 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 768ca46..e9d679a 100644 +index 768ca4606..e9d679a71 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,11 @@ vpath %.mk$(top_srcdir)/mk:$(top_srcdir)/mk/include
Review index 768ca46..e9d679a 100644 · line 42
Quoted 3 lines
(quoted diff) +0
-0@@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644 # COMMON_TARGETS: Targets which exist in all, clean, and install. # INSTALL_TARGETS: Targets which exist in clean and install(contains
Quoted 21 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +4
-3diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile -index 39d79c7..24a57d9 100644 +index 3319b3163..94ea362c8 100644 --- a/testcases/kernel/Makefile +++ b/testcases/kernel/Makefile -@@ -49,12 +49,15 @@ SUBDIRS += connectors \ +@@ -49,13 +49,16 @@ SUBDIRS += connectors \ logging \ mem \ numa \ - pty \ sched \ security \ - timers \ + sound \ tracing \ + uevents \ +ifneq ($(LIBC),musl) +SUBDIRS += ptymeta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 39d79c7..24a57d9 100644 · line 65
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-0@@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644 SUBDIRS += power_management endif diff --git a/testcases/kernel/sched/Makefileb/testcases/kernel/sched/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 6a57d79..74bb933 100644 · line 78
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 6a57d79..74bb933 100644 +index 6a57d79ee..74bb93370 100644 --- a/testcases/kernel/sched/Makefile +++ b/testcases/kernel/sched/Makefile @@ -23,5 +23,7 @@@@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644 +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/syscalls/Makefileb/testcases/kernel/syscalls/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 45a00cf..d1becd0 100644 · line 94
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 45a00cf..d1becd0 100644 +index 45a00cf7d..d1becd054 100644 --- a/testcases/kernel/syscalls/Makefile +++ b/testcases/kernel/syscalls/Makefile @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)@@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644 ifeq ($(UCLIBC),1) FILTER_OUT_DIRS += profil diff --git a/testcases/network/nfsv4/acl/Makefileb/testcases/network/nfsv4/acl/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 8c55a6b..f7cda62 100644 · line 107
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 8c55a6b..f7cda62 100644 +index 8c55a6bbd..f7cda621d 100644 --- a/testcases/network/nfsv4/acl/Makefile +++ b/testcases/network/nfsv4/acl/Makefile @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644 + include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/network/rpc/basic_tests/Makefileb/testcases/network/rpc/basic_tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 66e9d56..ea8eb8a 100644 · line 121
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 66e9d56..ea8eb8a 100644 +index 66e9d5675..ea8eb8a98 100644 --- a/testcases/network/rpc/basic_tests/Makefile +++ b/testcases/network/rpc/basic_tests/Makefile @@ -23,4 +23,9 @@@@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644 + include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/realtime/func/pi-tests/Makefileb/testcases/realtime/func/pi-tests/Makefile
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 68616a7..748754b 100644 · line 135
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-1-index 68616a7..748754b 100644 +index 68616a711..748754bb4 100644 --- a/testcases/realtime/func/pi-tests/Makefile +++ b/testcases/realtime/func/pi-tests/Makefile @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk@@ -131,7 +133,7 @@ index 68616a7..748754b 100644 include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/realtime/stress/pi-tests/Makefileb/testcases/realtime/stress/pi-tests/Makefile
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +1
-4-index 1881f75..266e0b8 100644 +index 1881f7565..266e0b815 100644 --- a/testcases/realtime/stress/pi-tests/Makefile +++ b/testcases/realtime/stress/pi-tests/Makefile @@ -24,4 +24,9 @@ top_srcdir ?= ../../../..@@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchb/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchQuoted 3 lines
deleted file mode 100644
index cc40081300c..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patchmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch line 8
Quoted 10 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-8@@ -1,64 +0,0 @@ -From e3a8502d0a4f8a44ddd02ca4b2efc097133fb9f7 Mon Sep 17 00:00:00 2001 -From: Mathias Fiedler <[email protected]> -Date: Fri, 23 Aug 2019 12:46:48 +0200 -Subject: [PATCH] cve-2017-17052: Avoid unsafe exits in threads - -According to manpage exit(3) calling exit is not thread-safe. -And with glibc 2.28 (and probably also with glibc >=2.27) sometimes -child processes created in fork_thread can get stuck on process exitin
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-7-glibc's __run_exit_handlers trying to acquire some lock which was in -locked state while the fork was created. This can happen when exit is -called in mmap_thread concurrently to the fork. -While the main process will still return with PASSED some of its -children are left behind. - -Comparing the source code with the original program as described inthe
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-5-commit 2b7e8665b4ff51c034c55df3cff76518d1a9ee3a of linux kernel >=4.13 -the exits in mmap_thread and fork_thread should not be necessary to -trigger the original bug. - -Therefore those exit calls are removed. The mmap_thread and
fork_threadmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-10-should still exit when their corresponding main thread in do_test_fork -calls exit_group. The remaining exit in do_test_fork will be called in -the main thread without any concurrent thread in the same process. - -Signed-off-by: Mathias Fiedler <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Acked-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4
]meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-9- -CVE: CVE-2017-17052 - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/cve-2017-17052.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/testcases/cve/cve-2017-17052.c
b/testcases/cve/cve-2017-17052.cmeta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch line 50
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-7-index d7da7e919..18cd2a6d7 100644 ---- a/testcases/cve/cve-2017-17052.c -+++ b/testcases/cve/cve-2017-17052.c -@@ -58,8 +58,6 @@ static void *mmap_thread(void *arg) - for (;;) { - SAFE_MMAP(NULL, 0x1000000, PROT_READ, -MAP_POPULATE|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0
-18-- if (*do_exit) -- exit(0); - } - - return arg; -@@ -67,9 +65,6 @@ static void *mmap_thread(void *arg) - - static void *fork_thread(void *arg) - { -- if (*do_exit) -- exit(0); -- - usleep(rand() % 10000); - SAFE_FORK(); - --- -2.17.1 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchb/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchQuoted 3 lines
deleted file mode 100644
index 94f6f5a15a6..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patchmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-7@@ -1,81 +0,0 @@ -From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Wed, 21 Aug 2019 16:27:24 +0800 -Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding - -meltdown case fails as below. -safe_file_ops.c:219: BROK: Expected 3 conversions got 2 atmeltdown.c:272
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -find_kernel_symbol is defined to try twice with each of
/proc/kallsymsandReview line 10
Quoted 1 line
(quoted diff) +0
-1-/boot/System.map-%s. Currently if the symbol is not found in
/proc/kallsyms,Review line 11
Quoted 1 line
(quoted diff) +0
-1-when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop thecase
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-3-immediately due to SAFE_FILE_LINES_SCANF. - -This patch turns to use FILE_LINES_SCANF to give find_kernel_symbolsecond
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-4-chance. - -[jstancek] Fix also condition introduced in 7709d2ae92ea, even if - /proc/kallsyms is disabled, we still want to trySystem.map.
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-6- -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8
]Review line 26
Quoted 2 lines
(quoted diff) +0
-2- -Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort thetest if kallsyms was not enabled")
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-12-that has been covered by this patch. - -Signed-off-by: He Zhe <[email protected]> ---- - testcases/cve/meltdown.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c -index a53ea9b..22651a6 100644 ---- a/testcases/cve/meltdown.c -+++ b/testcases/cve/meltdown.c -@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, constchar *symname)
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-12- int ret, read; - char fmt[strlen(symname) + 64]; - -+ tst_res(TINFO, "Looking for %s in %s", symname, filename); -+ if (access(filename, F_OK) == -1) { -+ tst_res(TINFO, "%s not available", filename); -+ return 0; -+ } -+ - sprintf(fmt, "%%lx %%c %s%%c", symname); - -- ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type,&read);
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-11-+ ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read); - if (ret) - return 0; - -@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name) - if (addr) - return addr; - -- tst_res(TINFO, "not found '%s' in /proc/kallsyms", name); - if (uname(&utsname) < 0) - tst_brk(TBROK | TERRNO, "uname");meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- - sprintf(systemmap, "/boot/System.map-%s", utsname.release); - -- tst_res(TINFO, "looking in '%s'\n", systemmap); - addr = find_symbol_in_file(systemmap, name); - return addr; - } -@@ -308,6 +312,9 @@ static void setup(void) - saved_cmdline_addr = find_kernel_symbol("saved_command_line"); - tst_res(TINFO, "&saved_command_line == 0x%lx",
saved_cmdline_addr);Quoted 11 lines
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0
-10- -+ if (!saved_cmdline_addr) -+ tst_brk(TCONF, "saved_command_line not found"); -+ - spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY); - - memset(target_array, 1, sizeof(target_array)); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchb/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchQuoted 3 lines
deleted file mode 100644
index bed84712a15..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patchmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-7@@ -1,57 +0,0 @@ -From d656a447893dccc310c975a239f482278550c3e0 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Tue, 21 May 2019 10:10:44 +0200 -Subject: [PATCH] overcommit_memory: update for "mm: fix false-positive - OVERCOMMIT_GUESS failures" - -commit 8c7829b04c52 ("mm: fix false-positive OVERCOMMIT_GUESSfailures")
Review line 9
Quoted 2 lines
(quoted diff) +0
-2-changes logic of __vm_enough_memory(), simplifying it to: - When in GUESS mode, catch wild allocations by comparing theirrequest
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-3- size to total amount of ram and swap in the system. - -Testcase currently allocates mem_total + swap_total, which doesn'ttrigger
Review line 13
Quoted 1 line
(quoted diff) +0
-1-new condition. Make it more extreme, but assuming free_total / 2 willPASS,
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-and 2*sum_total will FAIL. - -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0
]meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-6-Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/mem/tunable/overcommit_memory.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c
b/testcases/kernel/mem/tunable/overcommit_memory.cQuoted 32 lines
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0
-32-index 555298f..345764d 100644 ---- a/testcases/kernel/mem/tunable/overcommit_memory.c -+++ b/testcases/kernel/mem/tunable/overcommit_memory.c -@@ -36,11 +36,10 @@ - * - * The program is designed to test the two tunables: - * -- * When overcommit_memory = 0, allocatable memory can't overextends -- * the amount of free memory. I choose the three cases: -+ * When overcommit_memory = 0, allocatable memory can't overextend -+ * the amount of total memory: - * a. less than free_total: free_total / 2, alloc should pass. -- * b. greater than free_total: free_total * 2, alloc should fail. -- * c. equal to sum_total: sum_tatal, alloc should fail -+ * b. greater than sum_total: sum_total * 2, alloc should fail. - * - * When overcommit_memory = 1, it can alloc enough much memory, I - * choose the three cases: -@@ -164,9 +163,7 @@ static void overcommit_memory_test(void) - - update_mem(); - alloc_and_check(free_total / 2, EXPECT_PASS); -- update_mem(); -- alloc_and_check(free_total * 2, EXPECT_FAIL); -- alloc_and_check(sum_total, EXPECT_FAIL); -+ alloc_and_check(sum_total * 2, EXPECT_FAIL); - - /* start to test overcommit_memory=1 */ - set_sys_tune("overcommit_memory", 1, 1); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchb/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchQuoted 3 lines
deleted file mode 100644
index 0e56c08255e..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patchmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4@@ -1,46 +0,0 @@ -From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001 -From: He Zhe <[email protected]> -Date: Thu, 29 Aug 2019 21:09:46 +0800 -Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset lengthfor MIPS
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-3- -rt_sigtimedwait01 fails as follow on MIPS arches -rt_sigtimedwait01 1 TFAIL : .../sigwaitinfo01.c:58:
test_empty_setmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4-(.../sigwaitinfo01.c: 148): Unexpected failure: -TEST_ERRNO=EINVAL(22): Invalid argument - -As this case purposely bypasses glibc, it should align with the sizeof kernel
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch line 14
Quoted 2 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-2-definition of sigset_t which is different from other arches. -Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- -This patch turns to use _NSIG which is always right for all arches. - -Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c] -meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-10-Suggested-by: Jan Stancek <[email protected]> -Acked-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> -Signed-off-by: He Zhe <[email protected]> -Signed-off-by: Petr Vorel <[email protected]> ---- - testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.cmeta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-4-index 5a32ce1..6a30c27 100644 ---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set,
siginfo_t* info,meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-5- static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info, - struct timespec *timeout) - { -- -- /* The last argument is (number_of_signals)/(bits_per_byte),which are 64 and 8, resp. */
Review line 38
Quoted 1 line
(quoted diff) +0
-1-- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout,8);
Review line 39
Quoted 1 line
(quoted diff) +0
-1-+ /* _NSIG is always the right number of bits of signal map forall arches */
Review line 40
Quoted 1 line
(quoted diff) +0
-1-+ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout,_NSIG/8);
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0
-6- } - #endif - --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchb/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchQuoted 3 lines
deleted file mode 100644
index 6ea26150fbf..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patchmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-4@@ -1,75 +0,0 @@ -From e747d0456adc080a1d31fb653bda9dc491795c80 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Sun, 16 Jun 2019 11:14:16 +0200 -Subject: [PATCH] syscalls/tgkill03: wait for defunct tid to getdetached
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-3- -Case where defunct tid is used has been observed to sporadically fail: - tgkill03.c:96: FAIL: Defunct tid should have failed with ESRCH:SUCCESS
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -glibc __pthread_timedjoin_ex() waits for CLONE_CHILD_CLEARTID toclear tid,
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10-and then resumes. Kernel clears it (glibc pd->tid) at: - do_exit - exit_mm - mm_release - put_user(0, tsk->clear_child_tid); - -but kernel tid is still valid, presumably until: - release_task - __exit_signal - __unhash_processmeta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- detach_pid - -To avoid race wait until /proc/<pid>/task/<tid> disappears. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Li Wang <[email protected]> -Acked-by: Sumit Garg <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80
]meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/tgkill/tgkill03.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/tgkill/tgkill03.c
b/testcases/kernel/syscalls/tgkill/tgkill03.cQuoted 13 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-13-index f5bbdc5..593a217 100644 ---- a/testcases/kernel/syscalls/tgkill/tgkill03.c -+++ b/testcases/kernel/syscalls/tgkill/tgkill03.c -@@ -7,6 +7,7 @@ - - #include <pthread.h> - #include <pwd.h> -+#include <stdio.h> - #include <sys/types.h> - - #include "tst_safe_pthread.h" -@@ -42,6 +43,7 @@ static void setup(void) - {meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-10- sigset_t sigusr1; - pthread_t defunct_thread; -+ char defunct_tid_path[PATH_MAX]; - - sigemptyset(&sigusr1); - sigaddset(&sigusr1, SIGUSR1); -@@ -55,8 +57,9 @@ static void setup(void) - TST_CHECKPOINT_WAIT(0); - - SAFE_PTHREAD_CREATE(&defunct_thread, NULL,
defunct_thread_func, NULL);meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-3-- - SAFE_PTHREAD_JOIN(defunct_thread, NULL); -+ sprintf(defunct_tid_path, "/proc/%d/task/%d", getpid(),
defunct_tid);Review line 63
Quoted 1 line
(quoted diff) +0
-1-+ TST_RETRY_FN_EXP_BACKOFF(access(defunct_tid_path, R_OK), -1,15);
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0
-12- } - - static void cleanup(void) -@@ -108,4 +111,5 @@ static struct tst_test test = { - .setup = setup, - .cleanup = cleanup, - .test = run, -+ .timeout = 20, - }; --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchQuoted 4 lines
new file mode 100644
index 00000000000..93308445098
---/dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patchmeta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch line 9
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +9
-0@@ -0,0 +1,24 @@ +From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 12 Dec 2019 17:56:02 +0100 +Subject: [PATCH] testcases: fix an absent format string issue + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <[email protected]> +--- + .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c | 2+-
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +3
-0+ 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git
a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cb/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cReview line 14
Quoted 2 lines
(quoted diff) +2
-0+index 27dbc6626..19d943d06 100644 +---
a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cReview line 15
Quoted 1 line
(quoted diff) +1
-0++++
b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.cQuoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +9
-0+@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void) + + /* Manipulate PID for next process */ + sprintf(pid_str, "%d", pid - 1); +- SAFE_FILE_PRINTF(last_pid_file, pid_str); ++ SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str); + + new_pid = SAFE_FORK(); + if (new_pid == 0) {diff --git
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchb/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchQuoted 3 lines
deleted file mode 100644
index f4f87f38ab7..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patchmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4@@ -1,161 +0,0 @@ -From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 28 Aug 2019 18:30:23 +0200 -Subject: [PATCH] testcases: use python3 everywhere to run pythonscripts
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- -The scripts themselves have #!/usr/bin/python3 in them, -so I trust they are already py3-compatible. -meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10-Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - testcases/kernel/power_management/runpwtests05.sh | 2 +- - .../power_management/runpwtests_exclusive01.sh | 2 +- - .../power_management/runpwtests_exclusive02.sh | 2 +- - .../power_management/runpwtests_exclusive03.sh | 2 +- - .../power_management/runpwtests_exclusive04.sh | 2 +- - .../power_management/runpwtests_exclusive05.sh | 2 +- - testcases/network/nfsv4/acl/runtest | 14+++++++-------
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- testcases/realtime/func/pi-tests/run_auto.sh | 6 +++--- - 8 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/testcases/kernel/power_management/runpwtests05.sh
b/testcases/kernel/power_management/runpwtests05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12-index 8a7d0f6e0..43e234d01 100755 ---- a/testcases/kernel/power_management/runpwtests05.sh -+++ b/testcases/kernel/power_management/runpwtests05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - if ! grep sched_debug -qw /proc/cmdline ; then - tst_brkm TCONF "Kernel cmdline parameter 'sched_debug'needed," \
Review line 35
Quoted 1 line
(quoted diff) +0
-1-diff --git
a/testcases/kernel/power_management/runpwtests_exclusive01.shb/testcases/kernel/power_management/runpwtests_exclusive01.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index ec78319e2..9fefcbf6e 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive01.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive02.shb/testcases/kernel/power_management/runpwtests_exclusive02.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index e107fce35..2cd0ecb05 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive02.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh -@@ -33,7 +33,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive03.shb/testcases/kernel/power_management/runpwtests_exclusive03.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 490344bb3..ab3a5d11d 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive03.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive04.shb/testcases/kernel/power_management/runpwtests_exclusive04.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index 978ca02ae..438ef603f 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive04.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh -@@ -27,7 +27,7 @@ export TST_TOTAL=2 - # Checking test environment - check_kervel_arch - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git
a/testcases/kernel/power_management/runpwtests_exclusive05.shb/testcases/kernel/power_management/runpwtests_exclusive05.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 13 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-13-index a0dad5834..3a9afdbf2 100755 ---- a/testcases/kernel/power_management/runpwtests_exclusive05.sh -+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh -@@ -35,7 +35,7 @@ else - max_sched_smt=1 - fi - --tst_test_cmds python -+tst_test_cmds python3 - - hyper_threaded=$(is_hyper_threaded) - multi_socket=$(is_multi_socket) -diff --git a/testcases/network/nfsv4/acl/runtestb/testcases/network/nfsv4/acl/runtest
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-7-index d2e1b4c49..a859e85bc 100755 ---- a/testcases/network/nfsv4/acl/runtest -+++ b/testcases/network/nfsv4/acl/runtest -@@ -22,7 +22,7 @@ do - done - - # creation of users on the remote machine (removed only at the endof the tests)
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-9--rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50 -+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50 - - echo "Starting ACL testing" - -@@ -51,19 +51,19 @@ echo "Basic tests finished" - - echo "LONG ACL TEST" - echo "creating necessary users and groups"meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-10--python create_users.py -u 50 -g 50 -+python3 create_users.py -u 50 -g 50 - echo "creating necessary users and groups on the remote host" - mkdir $NFSMNTDIR/lacl-testdir --python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir -+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir - rm -rf $NFSMNTDIR/lacl-testdir - echo "Long ACL test OK with $MAXLENGTH entries" - echo "ACL STRESSING TEST" --python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p$NFSMNTDIR
Review line 127
Quoted 1 line
(quoted diff) +0
-1-+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB-p $NFSMNTDIR
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 12 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-12- - # remove local an remote users --python cleanusers.py --python cleangroups.py --rsh -n $REMOTEHOST python $PWD/cleanusers.py -+python3 cleanusers.py -+python3 cleangroups.py -+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py - - echo "Test OK" - -diff --git a/testcases/realtime/func/pi-tests/run_auto.sh
b/testcases/realtime/func/pi-tests/run_auto.shmeta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-8-index d13026049..277988568 100755 ---- a/testcases/realtime/func/pi-tests/run_auto.sh -+++ b/testcases/realtime/func/pi-tests/run_auto.sh -@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0 - - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-1 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 148
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-2 --PYTHONPATH=../../ python parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 153
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-4- - export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log" - $SCRIPTS_DIR/run_c_files.sh $profile testpi-4 --PYTHONPATH=../../ python parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Review line 158
Quoted 1 line
(quoted diff) +0
-1-+PYTHONPATH=../../ python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a$LOG_FILE
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0
-3- - - export LOG_FILE=""diff --git
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchb/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 3 lines
deleted file mode 100644
index c936b788fe1..00000000000
---
a/meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patchQuoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-4@@ -1,36 +0,0 @@ -From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001 -From: Steven Price <[email protected]> -Date: Fri, 19 Jul 2019 13:48:17 +0100 -Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility modemeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch line 14
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-10- -The size of dev_t is larger than 32 bits which causes the dev argument -to be passed incorrectly. On Arm this means that the EFAULT test case -actually returns EINVAL because the device number isn't recognised. - -Signed-off-by: Steven Price <[email protected]> -Acked-by: Li Wang <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060
]meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-7- -Signed-off-by: He Zhe <[email protected]> ---- - testcases/kernel/syscalls/ustat/ustat02.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c
b/testcases/kernel/syscalls/ustat/ustat02.cmeta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-9-index 9bbe4f3..1a0e9e0 100644 ---- a/testcases/kernel/syscalls/ustat/ustat02.c -+++ b/testcases/kernel/syscalls/ustat/ustat02.c -@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc); - - void run(unsigned int test) - { -- TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf)); -+ TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev,tc[test].buf));
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0
-6- - if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno)) - tst_res(TPASS | TTERRNO, "ustat(2) expected failure"); --- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchb/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchQuoted 3 lines
deleted file mode 100644
index 12e47eb2b61..00000000000
---
a/meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patchmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch line 6
Quoted 8 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-6@@ -1,68 +0,0 @@ -From 7bc134545b7beb09717a60541530c20a1a5740d3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 26 Jul 2019 10:55:28 -0700 -Subject: [PATCH 2/2] check for RES_USE_INET6 during configure - -glibc 2.30 has remove RES_USE_INET6 define which has been on its wayout
Review line 7
Quoted 1 line
(quoted diff) +0
-1-since 2.26 release, this check ensures that we detect it before usingit
Review line 9
Quoted 2 lines
(quoted diff) +0
-2- -Upstream-Status: Submitted [meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0
-3-Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 13+++++++++++++
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-8- testcases/network/multicast/mc_gethost/mc_gethost.c | 6 ++++++ - 2 files changed, 19 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2255b5c181..ed7acccb01 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,6 +91,19 @@ AC_CHECK_FUNCS([ \meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-10- vmsplice \ - ]) - -+#check defines -+AC_MSG_CHECKING([for RES_USE_INET6]) -+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <resolv.h>]], -+ [[char dummy[RES_USE_INET6];]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 1, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-4-+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 0, [Define to 1 if youhave the
RES_USE_INET6macro.])meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-6-+ ] -+) - # Tools knobs - - # Expect -diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c
b/testcases/network/multicast/mc_gethost/mc_gethost.cQuoted 28 lines
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0
-28-index 9cc15d086b..d1cae5441a 100644 ---- a/testcases/network/multicast/mc_gethost/mc_gethost.c -+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c -@@ -17,6 +17,8 @@ - #include <string.h> - #include <stdlib.h> - -+#include "config.h" -+ - #ifndef LOG_PERROR - #define LOG_PERROR 0 - #endif -@@ -50,8 +52,12 @@ usage: - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-6")) { -+#if HAVE_RES_USE_INET6 - af = AF_INET6, size = IN6ADDRSZ; - _res.options |= RES_USE_INET6; -+#else -+ af = AF_INET, size = INADDRSZ; -+#endif - argv++, argc--; - } - if (argc >= 1 && !strcmp(*argv, "-f")) { --- -2.22.0 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchb/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 2 lines
index
c0f69ecf5fc..df3e8831f54100644
---
a/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 1 line
+++
b/meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patchQuoted 7 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1@@ -1,4 +1,4 @@ -From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001 +From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 7 Jan 2016 19:40:08 +0000 Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using itmeta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch Upstream-Status: Pending · line 18
Quoted 9 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-0@@ -10,16 +10,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Yi Zhao <[email protected]> + --- testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c
b/testcases/kernel/syscalls/accept4/accept4_01.cQuoted 11 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-2-index dd289cf..76aa969 100644 +index 29e18f27d..07444a46f 100644 --- a/testcases/kernel/syscalls/accept4/accept4_01.c +++ b/testcases/kernel/syscalls/accept4/accept4_01.c @@ -38,6 +38,7 @@ - static struct sockaddr_in conn_addr; + static struct sockaddr_in *conn_addr, *accept_addr; static int listening_fd; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644 · line 38
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +0
-2@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644 static int create_listening_socket(void) { -@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr) - SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr,
sizeof(conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +2
-1- addrlen = sizeof(claddr); +@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr) + SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr,
sizeof(*conn_addr));meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1+ addrlen = sizeof(*accept_addr); +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if !(__GLIBC_PREREQ(2, 10)) - TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr,&addrlen,
Review index dd289cf..76aa969 100644 · line 44
Quoted 1 line
(quoted diff) +1
-0+ TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +0
-2tcase->cloexec | tcase->nonblock)); -@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr) - TEST(accept4(listening_fd, (struct sockaddr *)&claddr,&addrlen,
Review index dd289cf..76aa969 100644 · line 47
Quoted 2 lines
(quoted diff) +2
-0+ #else + TEST(accept4(listening_fd, (struct sockaddr *)accept_addr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-1tcase->cloexec | tcase->nonblock)); - #endif ++#endif +#else + TEST(accept4(listening_fd, (struct sockaddr *)&claddr,&addrlen,
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index dd289cf..76aa969 100644
Quoted 6 lines
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +1
-2+ tcase->cloexec | tcase->nonblock)); -+#endif + #endif if (TST_RET == -1) { if (TST_ERR == ENOSYS) - tst_brk(TCONF, "syscall __NR_accept4 notsupported");
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +0
-3--- -2.7.4 -diff --git
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchb/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchQuoted 3 lines
deleted file mode 100644
index 8704e5ffe8a..00000000000
---
a/meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patchmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4@@ -1,82 +0,0 @@ -From 794933b38354a2612cf2c471f11798b306f35315 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Mon, 20 May 2019 20:47:20 +0200 -Subject: [PATCH] shmctl01: don't use hardcoded index == 0 for
SHM_STATtestQuoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11- -Test fails on SHM_STAT testcase: - shmctl01 5 TFAIL : shmctl01.c:173: shmctl01 call failed - errno = 22 : Invalid argument - shmctl(0, SHM_STAT, 0x601060) = -EINVAL - -since following commit: - commit 99db46ea292780cd978d56932d9445b1e8bdafe8 - Author: Manfred Spraul <[email protected]> - Date: Tue May 14 15:46:36 2019 -0700 - ipc: do cyclic id allocation for the ipc object.meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- -Don't rely on index 0 being always available, but instead -use (maximum) index returned by SHM_INFO. - -Signed-off-by: Jan Stancek <[email protected]> -Reviewed-by: Petr Vorel <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062
]meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5- -Signed-off-by: Hongzhi Song <[email protected]> -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 21++++++++++++++++++---
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 3 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-3- 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.cQuoted 5 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-5-index 1b46977..52bf23a 100644 ---- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c -@@ -79,6 +79,7 @@ static void func_info(int ret); -meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-10- /* Check routine for SHM_STAT */ - static void func_sstat(int ret); -+static void func_sstat_setup(void); - - /* Check routine for SHM_LOCK */ - static void func_lock(int ret); -@@ -110,7 +111,7 @@ static struct test_case_t { - #endif - {&shm_id_1, IPC_SET, &buf, func_set, set_setup}, - {&shm_id_1, IPC_INFO, (struct shmid_ds *) &info, func_info,NULL},
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-11-- {&shm_index, SHM_STAT, &buf, func_sstat, NULL}, -+ {&shm_index, SHM_STAT, &buf, func_sstat, func_sstat_setup}, - {&shm_id_1, SHM_LOCK, NULL, func_lock, NULL}, - {&shm_id_1, SHM_UNLOCK, NULL, func_unlock, NULL}, - {&shm_id_1, IPC_RMID, NULL, func_rmid, NULL}, -@@ -407,9 +408,23 @@ static void func_info(int ret) - static void func_sstat(int ret) - { - if (ret >= 0) -- tst_resm(TPASS, "get correct shared memory id"); -+ tst_resm(TPASS, "get correct shared memory id forindex: %d",
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-4-+ shm_index); - else -- tst_resm(TFAIL, "shared memory id is incorrect"); -+ tst_resm(TFAIL, "shared memory id is incorrect, index:%d",
Quoted 19 lines
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0
-19-+ shm_index); -+} -+ -+static void func_sstat_setup(void) -+{ -+ struct shm_info tmp; -+ int ret; -+ -+ ret = shmctl(shm_id_1, SHM_INFO, (void *)&tmp); -+ if (ret < 0) -+ tst_resm(TFAIL|TERRNO, "shmctl(SHM_INFO)"); -+ else -+ shm_index = ret; - } - - static void func_lock(int ret) --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchb/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchQuoted 3 lines
deleted file mode 100644
index 9cd188f6567..00000000000
---
a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patchmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch line 7
Quoted 9 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-7@@ -1,56 +0,0 @@ -From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <[email protected]> -Date: Thu, 4 Jul 2019 16:45:23 +0200 -Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED - -Hongzhi reports that this test is failing on mips64 with 5.1+: - diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalidargument
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-4- diotest4 11 TBROK : diotest4.c:368: Remaining cases broken -I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7. - -Test is trying to map into area immediately following heap as
MAP_SHARED,Review line 12
Quoted 1 line
(quoted diff) +0
-1-but it used wrong alignment (fixed by 'lapi/mmap.h: include
config.h').Review line 14
Quoted 2 lines
(quoted diff) +0
-2- -Usage of MAP_FIXED seems unnecessary, so drop that too and let thekernel
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-pick an address. - -Reported-by: Hongzhi.Song <[email protected]> -Signed-off-by: Jan Stancek <[email protected]> -Acked-by: Cyril Hrubis <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3
]meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-7- -Signed-off-by: Yi Zhao <[email protected]> ---- - testcases/kernel/io/direct_io/diotest4.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/testcases/kernel/io/direct_io/diotest4.c
b/testcases/kernel/io/direct_io/diotest4.cmeta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
Quoted 8 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-8-index e4616e4..bf200cd 100644 ---- a/testcases/kernel/io/direct_io/diotest4.c -+++ b/testcases/kernel/io/direct_io/diotest4.c -@@ -352,18 +352,14 @@ int main(int argc, char *argv[]) - total++; - - /* Test-10: read, write to a mmaped file */ -- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz -1));
Review line 39
Quoted 2 lines
(quoted diff) +0
-2-- if (shm_base == NULL) { -- tst_brkm(TBROK, cleanup, "sbrk failed: %s",strerror(errno));
Quoted 17 lines
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0
-17-- } - offset = 4096; - count = bufsize; - if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) { - tst_brkm(TBROK, cleanup, "can't open %s: %s", - filename, strerror(errno)); - } -- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_FIXED, fd, 0); -+ shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE, -+ MAP_SHARED, fd, 0); - if (shm_base == (caddr_t) - 1) { - tst_brkm(TBROK, cleanup, "can't mmap file: %s", - strerror(errno)); --- -2.7.4 -Quoted 1 line
diff --git
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchb/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchQuoted 3 lines
deleted file mode 100644
index aecbc80e9b5..00000000000
---
a/meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patchmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch line 4
Quoted 6 lines
+++
/dev/nullmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-4@@ -1,64 +0,0 @@ -From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <[email protected]> -Date: Mon, 15 Jul 2019 03:39:06 -0400 -Subject: [PATCH] getrlimit03: adjust a bit of code to compatiablewith mips32
Quoted 15 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-15- -Error info: -getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur = -ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff - -According to kernel code: [arch/mips/include/uapi/asm/resource.h] -RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32. - - /* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway, - * but we keep the old value on MIPS32, - * for compatibility: - */ - #ifndef __mips64meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 10 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-10- # define RLIM_INFINITY 0x7fffffffUL - #endif - -Adding conditional statement about mips to fix this. - -Signed-off-by: Jan Stancek <[email protected]> -Signed-off-by: Hongzhi.Song <[email protected]> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde
]meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 7 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-7- -Signed-off-by: Hongzhi.Song <[email protected]> ---- - testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c
b/testcases/kernel/syscalls/getrlimit/getrlimit03.cmeta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
Quoted 11 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-11-index e4d56c4..319bc49 100644 ---- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c -+++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c -@@ -26,6 +26,7 @@ - - #include "tst_test.h" - #include "lapi/syscalls.h" -+#include "lapi/abisize.h" - - /** - * Linux provides an "old" getrlimit syscall handler that usessigned long,
Review
Quoted 18 lines
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0
-17-@@ -61,7 +62,12 @@ struct rlimit_ulong { - unsigned long rlim_cur; - unsigned long rlim_max; - }; --const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+ -+#if defined(__mips__) && defined(TST_ABI32) -+ const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL; -+#else -+ const unsigned long RLIM_INFINITY_UL = ULONG_MAX; -+#endif - - static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim) - { --- -2.7.4 -(quoted diff) +0
-0b/meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 7 lines
similarity index 84%
rename from meta/recipes-extended/ltp/ltp_20190517.bb rename to meta/recipes-extended/ltp/ltp_20190930.bb index60f749b4c01..9a436a52303100644meta/recipes-extended/ltp/ltp_20190930.bb CFLAGS_append_x86-64 = " -fomit-frame-pointer" · line 33
Quoted 8 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +1
-1@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2" +SRCREV = "c9707b465a08397569920b676345474f44327200" SRC_URI = "git://github.com/linux-test-project/ltp.git \file://0001-build-Add-option-to-select-libc-implementation.patch \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://
Quoted 1 line
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0@@ -38,19 +38,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
meta/recipes-extended/ltp/ltp_20190930.bb SRC_URI = "git://github.com/linux-test-project/ltp.git \ · line 44
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-0file://0007-Fix-test_proc_kill-hanging.patch \file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
Quoted 1 line
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
Quoted 1 line
-
file://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
meta/recipes-extended/ltp/ltp_20190930.bb
Quoted 2 lines
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +0
-2- file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \ -file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \
Quoted 1 line
-
file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \
Quoted 1 line
- file://0002-check-for-RES_USE_INET6-during-configure.patch
\
Quoted 1 line
-
file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
Quoted 1 line
-
file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
Quoted 1 line
- file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
\
Quoted 1 line
-
file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
Quoted 1 line
-
file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
Quoted 1 line
-
file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
Quoted 1 line
-
file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
Quoted 1 line
file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
Quoted 1 line
+
file://0001-testcases-fix-an-absent-format-string-issue.patch \
Quoted 11 lines
"S = "${WORKDIR}/git"
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 27/30 cpio: update to 2.13
In reply to Alexander KanavinDrop a couple of backports.
---
...2016-2037-1-byte-out-of-bounds-write.patch | 346 ------------------
.../0001-Fix-segfault-with-append.patch | 51 ---
.../0001-Fix-CVE-2015-1197.patch | 0
...charset_alias-when-building-for-musl.patch | 0
.../cpio/{cpio_2.12.bb => cpio_2.13.bb} | 6 +-
5 files changed, 2 insertions(+), 401 deletions(-)
delete mode 100644 meta/recipes-extended/cpio/cpio-2.12/0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch
delete mode 100644 meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch
rename meta/recipes-extended/cpio/{cpio-2.12 => cpio-2.13}/0001-Fix-CVE-2015-1197.patch (100%)
rename meta/recipes-extended/cpio/{cpio-2.12 => cpio-2.13}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%)
rename meta/recipes-extended/cpio/{cpio_2.12.bb => cpio_2.13.bb} (83%)meta/recipes-extended/cpio/cpio-2.12/0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch deleted +0 -346
@@ -1,346 +0,0 @@ -From ebf9a2d776474181936a720ce811d72bbd1da3b6 Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup <[email protected]> -Date: Tue, 26 Jan 2016 23:17:54 +0100 -Subject: [PATCH] CVE-2016-2037 - 1 byte out-of-bounds write - -Ensure that cpio_safer_name_suffix always works with dynamically -allocated buffer, and that it has size of at least 32 bytes. -Then, any call to cpio_safer_name_suffix is safe (it requires at -least 2 bytes in the buffer). - -Also ensure that c_namesize is always correctly initialized (by -cpio_set_c_name) to avoid undefined behavior when reading -file_hdr.c_namesize (previously happened for tar archives). - -References: -http://www.mail-archive.com/[email protected]/msg00545.html - -* src/copyin.c (query_rename): Drop the hack, as we now work with -dynamically allocated buffer. Use cpio_set_c_name. -(create_defered_links_to_skipped): Use cpio_set_c_name rather than -manual assignment. -(read_name_from_file): New function to avoid C&P. -(read_in_old_ascii, read_in_new_ascii, read_in_binary): Use -read_name_from_file. -(process_copy_in): Initialize file_hdr.c_namesize. -* src/copyout.c (process_copy_out): Use cpio_set_c_name. -* src/cpiohdr.h (cpio_set_c_name): New prototype. -* src/tar.c (read_in_tar_header): Use cpio_set_c_name. -* src/util.c (cpio_set_c_name): New function to set -file_hdr->c_name and c_namesize from arbitrary string. -(cpio_safer_name_suffix): Some docs fixes. -* tests/inout.at: Also test copy-in, and try various formats. - -CVE: CVE-2016-2037 - -Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=d36ec5f4e93130efb24fb9678aafd88e8070095b] - -Signed-off-by: Andre McCurdy <[email protected]> ---- - src/copyin.c | 68 +++++++++++++++++++--------------------------------------- - src/copyout.c | 13 +++++------ - src/cpiohdr.h | 1 + - src/tar.c | 10 +++++---- - src/util.c | 32 ++++++++++++++++++++++++++- - tests/inout.at | 19 ++++++++++++++-- - 6 files changed, 82 insertions(+), 61 deletions(-) - -diff --git a/src/copyin.c b/src/copyin.c -index cde911e..972f8a6 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -76,28 +76,7 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out, - return -1; - } - else -- /* Debian hack: file_hrd.c_name is sometimes set to -- point to static memory by code in tar.c. This -- causes a segfault. This has been fixed and an -- additional check to ensure that the file name -- is not too long has been added. (Reported by -- Horst Knobloch.) This bug has been reported to -- "[email protected]". (99/1/6) -BEM */ -- { -- if (archive_format != arf_tar && archive_format != arf_ustar) -- { -- free (file_hdr->c_name); -- file_hdr->c_name = xstrdup (new_name.ds_string); -- } -- else -- { -- if (is_tar_filename_too_long (new_name.ds_string)) -- error (0, 0, _("%s: file name too long"), -- new_name.ds_string); -- else -- strcpy (file_hdr->c_name, new_name.ds_string); -- } -- } -+ cpio_set_c_name (file_hdr, new_name.ds_string); - return 0; - } - -@@ -344,8 +323,7 @@ create_defered_links_to_skipped (struct cpio_file_stat *file_hdr, - d_prev->next = d->next; - else - deferments = d->next; -- free (file_hdr->c_name); -- file_hdr->c_name = xstrdup(d->header.c_name); -+ cpio_set_c_name (file_hdr, d->header.c_name); - free_deferment (d); - copyin_regular_file(file_hdr, in_file_des); - return 0; -@@ -1064,6 +1042,22 @@ read_in_header (struct cpio_file_stat *file_hdr, int in_des) - } - } - -+static void -+read_name_from_file (struct cpio_file_stat *file_hdr, int fd, uintmax_t len) -+{ -+ static char *tmp_filename; -+ static size_t buflen; -+ -+ if (buflen < len) -+ { -+ buflen = len; -+ tmp_filename = xrealloc (tmp_filename, buflen); -+ } -+ -+ tape_buffered_read (tmp_filename, fd, len); -+ cpio_set_c_name (file_hdr, tmp_filename); -+} -+ - /* Fill in FILE_HDR by reading an old-format ASCII format cpio header from - file descriptor IN_DES, except for the magic number, which is - already filled in. */ -@@ -1090,14 +1084,8 @@ read_in_old_ascii (struct cpio_file_stat *file_hdr, int in_des) - file_hdr->c_rdev_min = minor (dev); - - file_hdr->c_mtime = FROM_OCTAL (ascii_header.c_mtime); -- file_hdr->c_namesize = FROM_OCTAL (ascii_header.c_namesize); - file_hdr->c_filesize = FROM_OCTAL (ascii_header.c_filesize); -- -- /* Read file name from input. */ -- if (file_hdr->c_name != NULL) -- free (file_hdr->c_name); -- file_hdr->c_name = (char *) xmalloc (file_hdr->c_namesize + 1); -- tape_buffered_read (file_hdr->c_name, in_des, (long) file_hdr->c_namesize); -+ read_name_from_file (file_hdr, in_des, FROM_OCTAL (ascii_header.c_namesize)); - - /* HP/UX cpio creates archives that look just like ordinary archives, - but for devices it sets major = 0, minor = 1, and puts the -@@ -1152,14 +1140,8 @@ read_in_new_ascii (struct cpio_file_stat *file_hdr, int in_des) - file_hdr->c_dev_min = FROM_HEX (ascii_header.c_dev_min); - file_hdr->c_rdev_maj = FROM_HEX (ascii_header.c_rdev_maj); - file_hdr->c_rdev_min = FROM_HEX (ascii_header.c_rdev_min); -- file_hdr->c_namesize = FROM_HEX (ascii_header.c_namesize); - file_hdr->c_chksum = FROM_HEX (ascii_header.c_chksum); -- -- /* Read file name from input. */ -- if (file_hdr->c_name != NULL) -- free (file_hdr->c_name); -- file_hdr->c_name = (char *) xmalloc (file_hdr->c_namesize); -- tape_buffered_read (file_hdr->c_name, in_des, (long) file_hdr->c_namesize); -+ read_name_from_file (file_hdr, in_des, FROM_HEX (ascii_header.c_namesize)); - - /* In SVR4 ASCII format, the amount of space allocated for the header - is rounded up to the next long-word, so we might need to drop -@@ -1207,16 +1189,9 @@ read_in_binary (struct cpio_file_stat *file_hdr, - file_hdr->c_rdev_min = minor (short_hdr->c_rdev); - file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16 - | short_hdr->c_mtimes[1]; -- -- file_hdr->c_namesize = short_hdr->c_namesize; - file_hdr->c_filesize = (unsigned long) short_hdr->c_filesizes[0] << 16 - | short_hdr->c_filesizes[1]; -- -- /* Read file name from input. */ -- if (file_hdr->c_name != NULL) -- free (file_hdr->c_name); -- file_hdr->c_name = (char *) xmalloc (file_hdr->c_namesize); -- tape_buffered_read (file_hdr->c_name, in_des, (long) file_hdr->c_namesize); -+ read_name_from_file (file_hdr, in_des, short_hdr->c_namesize); - - /* In binary mode, the amount of space allocated in the header for - the filename is `c_namesize' rounded up to the next short-word, -@@ -1297,6 +1272,7 @@ process_copy_in () - read_pattern_file (); - } - file_hdr.c_name = NULL; -+ file_hdr.c_namesize = 0; - - if (rename_batch_file) - { -diff --git a/src/copyout.c b/src/copyout.c -index 1f0987a..bb39559 100644 ---- a/src/copyout.c -+++ b/src/copyout.c -@@ -660,8 +660,7 @@ process_copy_out () - cpio_safer_name_suffix (input_name.ds_string, false, - !no_abs_paths_flag, true); - #ifndef HPUX_CDF -- file_hdr.c_name = input_name.ds_string; -- file_hdr.c_namesize = strlen (input_name.ds_string) + 1; -+ cpio_set_c_name (&file_hdr, input_name.ds_string); - #else - if ( (archive_format != arf_tar) && (archive_format != arf_ustar) ) - { -@@ -670,16 +669,15 @@ process_copy_out () - properly recreate the directory as hidden (in case the - files of a directory go into the archive before the - directory itself (e.g from "find ... -depth ... | cpio")). */ -- file_hdr.c_name = add_cdf_double_slashes (input_name.ds_string); -- file_hdr.c_namesize = strlen (file_hdr.c_name) + 1; -+ cpio_set_c_name (&file_hdr, -+ add_cdf_double_slashes (input_name.ds_string)); - } - else - { - /* We don't mark CDF's in tar files. We assume the "hidden" - directory will always go into the archive before any of - its files. */ -- file_hdr.c_name = input_name.ds_string; -- file_hdr.c_namesize = strlen (input_name.ds_string) + 1; -+ cpio_set_c_name (&file_hdr, input_name.ds_string); - } - #endif - -@@ -866,8 +864,7 @@ process_copy_out () - file_hdr.c_chksum = 0; - - file_hdr.c_filesize = 0; -- file_hdr.c_namesize = 11; -- file_hdr.c_name = CPIO_TRAILER_NAME; -+ cpio_set_c_name (&file_hdr, CPIO_TRAILER_NAME); - if (archive_format != arf_tar && archive_format != arf_ustar) - write_out_header (&file_hdr, out_file_des); - else -diff --git a/src/cpiohdr.h b/src/cpiohdr.h -index b29e6fb..f4c63be 100644 ---- a/src/cpiohdr.h -+++ b/src/cpiohdr.h -@@ -129,5 +129,6 @@ struct cpio_file_stat /* Internal representation of a CPIO header */ - char *c_tar_linkname; - }; - -+void cpio_set_c_name(struct cpio_file_stat *file_hdr, char *name); - - #endif /* cpiohdr.h */ -diff --git a/src/tar.c b/src/tar.c -index a2ce171..e41f89d 100644 ---- a/src/tar.c -+++ b/src/tar.c -@@ -282,7 +282,7 @@ read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des) - if (null_block ((long *) &tar_rec, TARRECORDSIZE)) - #endif - { -- file_hdr->c_name = CPIO_TRAILER_NAME; -+ cpio_set_c_name (file_hdr, CPIO_TRAILER_NAME); - return; - } - #if 0 -@@ -316,9 +316,11 @@ read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des) - } - - if (archive_format != arf_ustar) -- file_hdr->c_name = stash_tar_filename (NULL, tar_hdr->name); -+ cpio_set_c_name (file_hdr, stash_tar_filename (NULL, tar_hdr->name)); - else -- file_hdr->c_name = stash_tar_filename (tar_hdr->prefix, tar_hdr->name); -+ cpio_set_c_name (file_hdr, stash_tar_filename (tar_hdr->prefix, -+ tar_hdr->name)); -+ - file_hdr->c_nlink = 1; - file_hdr->c_mode = FROM_OCTAL (tar_hdr->mode); - file_hdr->c_mode = file_hdr->c_mode & 07777; -@@ -398,7 +400,7 @@ read_in_tar_header (struct cpio_file_stat *file_hdr, int in_des) - case AREGTYPE: - /* Old tar format; if the last char in filename is '/' then it is - a directory, otherwise it's a regular file. */ -- if (file_hdr->c_name[strlen (file_hdr->c_name) - 1] == '/') -+ if (file_hdr->c_name[file_hdr->c_namesize - 1] == '/') - file_hdr->c_mode |= CP_IFDIR; - else - file_hdr->c_mode |= CP_IFREG; -diff --git a/src/util.c b/src/util.c -index 6ff6032..4f3c073 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -1410,8 +1410,34 @@ set_file_times (int fd, - utime_error (name); - } - -+ -+void -+cpio_set_c_name (struct cpio_file_stat *file_hdr, char *name) -+{ -+ static size_t buflen = 0; -+ size_t len = strlen (name) + 1; -+ -+ if (buflen == 0) -+ { -+ buflen = len; -+ if (buflen < 32) -+ buflen = 32; -+ file_hdr->c_name = xmalloc (buflen); -+ } -+ else if (buflen < len) -+ { -+ buflen = len; -+ file_hdr->c_name = xrealloc (file_hdr->c_name, buflen); -+ } -+ -+ file_hdr->c_namesize = len; -+ memmove (file_hdr->c_name, name, len); -+} -+ - /* Do we have to ignore absolute paths, and if so, does the filename -- have an absolute path? */ -+ have an absolute path? Before calling this function make sure that the -+ allocated NAME buffer has capacity at least 2 bytes. */ -+ - void - cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, - bool strip_leading_dots) -@@ -1426,6 +1452,10 @@ cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, - ++p; - } - if (p != name) -+ /* The 'p' string is shortened version of 'name' with one exception; when -+ the 'name' points to an empty string (buffer where name[0] == '\0') the -+ 'p' then points to static string ".". So caller needs to ensure there -+ are at least two bytes available in 'name' buffer so memmove succeeds. */ - memmove (name, p, (size_t)(strlen (p) + 1)); - } - -diff --git a/tests/inout.at b/tests/inout.at -index 60c3716..730cbd2 100644 ---- a/tests/inout.at -+++ b/tests/inout.at -@@ -35,7 +35,22 @@ while read NAME LENGTH - do - genfile --length $LENGTH > $NAME - echo $NAME --done < filelist | -- cpio --quiet -o > archive]) -+done < filelist > filelist_raw -+ -+for format in bin odc newc crc tar ustar hpbin hpodc -+do -+ cpio --format=$format --quiet -o < filelist_raw > archive.$format -+ rm -rf output -+ mkdir output && cd output -+ cpio -i --quiet < ../archive.$format -+ -+ while read file -+ do -+ test -f $file || echo "$file not found" -+ done < ../filelist_raw -+ -+ cd .. -+done -+]) - - AT_CLEANUP --- -1.9.1 -
meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch deleted +0 -51
51 lines not on this page · raw message
meta/recipes-extended/cpio/cpio-2.13/0001-Fix-CVE-2015-1197.patch renamed from meta/recipes-extended/cpio/cpio-2.12/0001-Fix-CVE-2015-1197.patch +0 -0
meta/recipes-extended/cpio/cpio-2.13/0001-Unset-need_charset_alias-when-building-for-musl.patch renamed from meta/recipes-extended/cpio/cpio-2.12/0001-Unset-need_charset_alias-when-building-for-musl.patch +0 -0
meta/recipes-extended/cpio/cpio_2.13.bb renamed from meta/recipes-extended/cpio/cpio_2.12.bb +2 -4
@@ -9,12 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Fix-CVE-2015-1197.patch \ - file://0001-CVE-2016-2037-1-byte-out-of-bounds-write.patch \ - file://0001-Fix-segfault-with-append.patch \ " -SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" -SRC_URI[sha256sum] = "08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73" +SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810" +SRC_URI[sha256sum] = "e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88" inherit autotools gettext texinfo
Signature · 1 line
2.17.1
PATCH 28/30 sudo: update to 1.8.29
In reply to Alexander KanavinLicense-Update: added SPDX info.
---
meta/recipes-extended/sudo/sudo.inc | 22 +--
.../sudo/sudo/CVE-2019-14287-1.patch | 178 ------------------
.../sudo/sudo/CVE-2019-14287-2.patch | 112 -----------
.../sudo/{sudo_1.8.27.bb => sudo_1.8.29.bb} | 6 +-
4 files changed, 13 insertions(+), 305 deletions(-)
delete mode 100644 meta/recipes-extended/sudo/sudo/CVE-2019-14287-1.patch
delete mode 100644 meta/recipes-extended/sudo/sudo/CVE-2019-14287-2.patch
rename meta/recipes-extended/sudo/{sudo_1.8.27.bb => sudo_1.8.29.bb} (87%)meta/recipes-extended/sudo/sudo.inc +11 -11
@@ -5,17 +5,17 @@ BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 \ - file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=4a162fc04b86b03f5632180fe6076cda \ - file://lib/util/reallocarray.c;beginline=3;endline=15;md5=b47f1f85a12f05a0744cd8b1b6f41a0d \ - file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ - file://lib/util/getcwd.c;beginline=2;endline=27;md5=09068a19b4f6b6f0a0958655bfe98b63 \ - file://lib/util/glob.c;beginline=2;endline=31;md5=1f2f771c35fb0658d567a7824007e56d \ - file://lib/util/snprintf.c;beginline=3;endline=33;md5=63e48e1b992bce749a19dd9b2256e9a0 \ - file://include/sudo_queue.h;beginline=2;endline=27;md5=082b138b72ba3e568a13a25c3bf254dc \ - file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a \ - file://lib/util/arc4random.c;beginline=3;endline=20;md5=15bdc89c1b003fa4d7353e6296ebfd68 \ - file://lib/util/arc4random_uniform.c;beginline=3;endline=17;md5=31e630ac814d692fd0ab7a942659b46f \ - file://lib/util/getentropy.c;beginline=1;endline=19;md5=9f1a275ecd44cc264a2a4d5e06a75292 \ + file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ + file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ + file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ + file://lib/util/getcwd.c;beginline=2;endline=27;md5=50f8d9667750e18dea4e84a935c12009 \ + file://lib/util/glob.c;beginline=2;endline=31;md5=2852f68687544e3eb8a0a61665506f0e \ + file://lib/util/snprintf.c;beginline=3;endline=33;md5=b70df6179969e38fcf68da91b53b8029 \ + file://include/sudo_queue.h;beginline=2;endline=27;md5=ad578e9664d17a010b63e4bc0576ee8d \ + file://lib/util/inet_pton.c;beginline=3;endline=17;md5=27785c9f5835093eda42aa0816a2d0b4 \ + file://lib/util/arc4random.c;beginline=3;endline=20;md5=ced8636ecefa2ba907cfe390bc3bd964 \ + file://lib/util/arc4random_uniform.c;beginline=3;endline=17;md5=e30c2b777cdc00cfcaf7c445a10b262f \ + file://lib/util/getentropy.c;beginline=1;endline=19;md5=a0f58be3d60b6dcd898ec5fe0866d36f \ " inherit autotools
meta/recipes-extended/sudo/sudo/CVE-2019-14287-1.patch deleted +0 -178
178 lines not on this page · raw message
meta/recipes-extended/sudo/sudo/CVE-2019-14287-2.patch deleted +0 -112
112 lines not on this page · raw message
meta/recipes-extended/sudo/sudo_1.8.29.bb renamed from meta/recipes-extended/sudo/sudo_1.8.27.bb +2 -4
@@ -3,14 +3,12 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://0001-Include-sys-types.h-for-id_t-definition.patch \ - file://CVE-2019-14287-1.patch \ - file://CVE-2019-14287-2.patch \ " PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "b5c184b13b6b5de32af630af2fd013fd" -SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0" +SRC_URI[md5sum] = "b28dabff9c460f115fe74de4d6a6f79d" +SRC_URI[sha256sum] = "ce53ffac9604e23321334d8ba8ac59ded2bcf624fdb9dbde097ab2049bf29c7c" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
Signature · 1 line
2.17.1
PATCH 29/30 nfs-utils: update to 2.4.2
In reply to Alexander KanavinDrop backports, and a musl patch that is no longer needed.
---
...de-order-between-config.h-and-stat.h.patch | 156 ---------------
.../nfs-utils/clang-format-string.patch | 183 ------------------
.../nfs-utils-musl-res_querydomain.patch | 46 -----
...{nfs-utils_2.4.1.bb => nfs-utils_2.4.2.bb} | 9 +-
4 files changed, 3 insertions(+), 391 deletions(-)
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-include-order-between-config.h-and-stat.h.patch
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/clang-format-string.patch
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.4.1.bb => nfs-utils_2.4.2.bb} (94%)meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-include-order-between-config.h-and-stat.h.patch deleted +0 -156
@@ -1,156 +0,0 @@ -From 2fbc62e2a13fc22b6ae4910e295a2c10fb790486 Mon Sep 17 00:00:00 2001 -From: Zoltan Karcagi <[email protected]> -Date: Mon, 12 Aug 2019 13:27:16 -0400 -Subject: [PATCH] Fix include order between config.h and stat.h - -At least on Arch linux ARM, the definition of struct stat in stat.h depends -on __USE_FILE_OFFSET64. This symbol comes from config.h when defined, -therefore config.h must always be included before stat.h. Fix all -occurrences where the order is wrong by moving config.h to the top. - -This fixes the client side error "Stale file handle" when mounting from -a server running Arch Linux ARM. - -Signed-off-by: Zoltan Karcagi <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> - -Upstream-Status: Backport -[http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=2fbc62e2a13fc22b6ae4910e295a2c10fb790486] - -Signed-off-by: Yi Zhao <[email protected]> ---- - support/misc/nfsd_path.c | 5 ++++- - support/misc/xstat.c | 5 ++++- - support/nfs/conffile.c | 8 +++++++- - utils/blkmapd/device-discovery.c | 8 ++++---- - utils/idmapd/idmapd.c | 8 ++++---- - 5 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c -index 84e4802..f078a66 100644 ---- a/support/misc/nfsd_path.c -+++ b/support/misc/nfsd_path.c -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <errno.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -5,7 +9,6 @@ - #include <stdlib.h> - #include <unistd.h> - --#include "config.h" - #include "conffile.h" - #include "xmalloc.h" - #include "xlog.h" -diff --git a/support/misc/xstat.c b/support/misc/xstat.c -index fa04788..4c997ee 100644 ---- a/support/misc/xstat.c -+++ b/support/misc/xstat.c -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <errno.h> - #include <sys/types.h> - #include <fcntl.h> -@@ -5,7 +9,6 @@ - #include <sys/sysmacros.h> - #include <unistd.h> - --#include "config.h" - #include "xstat.h" - - #ifdef HAVE_FSTATAT -diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c -index b6400be..6ba8a35 100644 ---- a/support/nfs/conffile.c -+++ b/support/nfs/conffile.c -@@ -500,7 +500,7 @@ conf_readfile(const char *path) - - if ((stat (path, &sb) == 0) || (errno != ENOENT)) { - char *new_conf_addr = NULL; -- size_t sz = sb.st_size; -+ off_t sz; - int fd = open (path, O_RDONLY, 0); - - if (fd == -1) { -@@ -517,6 +517,11 @@ conf_readfile(const char *path) - - /* only after we have the lock, check the file size ready to read it */ - sz = lseek(fd, 0, SEEK_END); -+ if (sz < 0) { -+ xlog_warn("conf_readfile: unable to determine file size: %s", -+ strerror(errno)); -+ goto fail; -+ } - lseek(fd, 0, SEEK_SET); - - new_conf_addr = malloc(sz+1); -@@ -2162,6 +2167,7 @@ conf_write(const char *filename, const char *section, const char *arg, - ret = 0; - - cleanup: -+ flush_outqueue(&inqueue, NULL); - flush_outqueue(&outqueue, NULL); - - if (buff) -diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c -index e811703..f5f9b10 100644 ---- a/utils/blkmapd/device-discovery.c -+++ b/utils/blkmapd/device-discovery.c -@@ -26,6 +26,10 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif /* HAVE_CONFIG_H */ -+ - #include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -51,10 +55,6 @@ - #include <errno.h> - #include <libdevmapper.h> - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif /* HAVE_CONFIG_H */ -- - #include "device-discovery.h" - #include "xcommon.h" - #include "nfslib.h" -diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c -index 62e37b8..267acea 100644 ---- a/utils/idmapd/idmapd.c -+++ b/utils/idmapd/idmapd.c -@@ -34,6 +34,10 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif /* HAVE_CONFIG_H */ -+ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/inotify.h> -@@ -62,10 +66,6 @@ - #include <libgen.h> - #include <nfsidmap.h> - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif /* HAVE_CONFIG_H */ -- - #include "xlog.h" - #include "conffile.h" - #include "queue.h" --- -2.7.4 -
meta/recipes-connectivity/nfs-utils/nfs-utils/clang-format-string.patch deleted +0 -183
183 lines not on this page · raw message
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb +3 -6
@@ -29,16 +29,13 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-utils-debianize-start-statd.patch \ file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ - file://clang-format-string.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ - file://0001-Fix-include-order-between-config.h-and-stat.h.patch \ -" + " SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" -SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" -SRC_URI[md5sum] = "161efe469ec1b06f1c750bd87f8ba6dd" -SRC_URI[sha256sum] = "85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736" +SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" +SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.
Signature · 1 line
2.17.1
Re: [PATCH 29/30] nfs-utils: update to 2.4.2
clang format patch is still needed see
https://errors.yoctoproject.org/Errors/Details/297313/
Quoted 453 lines · Alexander Kanavin
Drop backports, and a musl patch that is no longer needed.
Signed-off-by Alexander Kanavin <[email protected]>--- ...de-order-between-config.h-and-stat.h.patch | 156 --------------- .../nfs-utils/clang-format-string.patch | 183 ------------------ .../nfs-utils-musl-res_querydomain.patch | 46 ----- ...{nfs-utils_2.4.1.bb => nfs-utils_2.4.2.bb} | 9 +- 4 files changed, 3 insertions(+), 391 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-include-order-between-config.h-and-stat.h.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/clang-format-string.patch delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.4.1.bb => nfs-utils_2.4.2.bb} (94%)meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-include-order-between-config.h-and-stat.h.patch deleted +0
-156@@ -1,156 +0,0 @@ -From 2fbc62e2a13fc22b6ae4910e295a2c10fb790486 Mon Sep 17 00:00:00 2001 -From: Zoltan Karcagi <[email protected]> -Date: Mon, 12 Aug 2019 13:27:16 -0400 -Subject: [PATCH] Fix include order between config.h and stat.h - -At least on Arch linux ARM, the definition of struct stat in stat.h depends -on __USE_FILE_OFFSET64. This symbol comes from config.h when defined, -therefore config.h must always be included before stat.h. Fix all -occurrences where the order is wrong by moving config.h to the top. - -This fixes the client side error "Stale file handle" when mounting from -a server running Arch Linux ARM. - -Signed-off-by: Zoltan Karcagi <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> - -Upstream-Status: Backport -[http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=2fbc62e2a13fc22b6ae4910e295a2c10fb790486] - -Signed-off-by: Yi Zhao <[email protected]> ---- - support/misc/nfsd_path.c | 5 ++++- - support/misc/xstat.c | 5 ++++- - support/nfs/conffile.c | 8 +++++++- - utils/blkmapd/device-discovery.c | 8 ++++---- - utils/idmapd/idmapd.c | 8 ++++---- - 5 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c -index 84e4802..f078a66 100644 ---- a/support/misc/nfsd_path.c -+++ b/support/misc/nfsd_path.c -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <errno.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -5,7 +9,6 @@ - #include <stdlib.h> - #include <unistd.h> - --#include "config.h" - #include "conffile.h" - #include "xmalloc.h" - #include "xlog.h" -diff --git a/support/misc/xstat.c b/support/misc/xstat.c -index fa04788..4c997ee 100644 ---- a/support/misc/xstat.c -+++ b/support/misc/xstat.c -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <errno.h> - #include <sys/types.h> - #include <fcntl.h> -@@ -5,7 +9,6 @@ - #include <sys/sysmacros.h> - #include <unistd.h> - --#include "config.h" - #include "xstat.h" - - #ifdef HAVE_FSTATAT -diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c -index b6400be..6ba8a35 100644 ---- a/support/nfs/conffile.c -+++ b/support/nfs/conffile.c -@@ -500,7 +500,7 @@ conf_readfile(const char *path) - - if ((stat (path, &sb) == 0) || (errno != ENOENT)) { - char *new_conf_addr = NULL; -- size_t sz = sb.st_size; -+ off_t sz; - int fd = open (path, O_RDONLY, 0); - - if (fd == -1) { -@@ -517,6 +517,11 @@ conf_readfile(const char *path) - - /* only after we have the lock, check the file size ready to read it */ - sz = lseek(fd, 0, SEEK_END); -+ if (sz < 0) { -+ xlog_warn("conf_readfile: unable to determine file size: %s", -+ strerror(errno)); -+ goto fail; -+ } - lseek(fd, 0, SEEK_SET); - - new_conf_addr = malloc(sz+1); -@@ -2162,6 +2167,7 @@ conf_write(const char *filename, const char *section, const char *arg, - ret = 0; - - cleanup: -+ flush_outqueue(&inqueue, NULL); - flush_outqueue(&outqueue, NULL); - - if (buff) -diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c -index e811703..f5f9b10 100644 ---- a/utils/blkmapd/device-discovery.c -+++ b/utils/blkmapd/device-discovery.c -@@ -26,6 +26,10 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif /* HAVE_CONFIG_H */ -+ - #include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -51,10 +55,6 @@ - #include <errno.h> - #include <libdevmapper.h> - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif /* HAVE_CONFIG_H */ -- - #include "device-discovery.h" - #include "xcommon.h" - #include "nfslib.h" -diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c -index 62e37b8..267acea 100644 ---- a/utils/idmapd/idmapd.c -+++ b/utils/idmapd/idmapd.c -@@ -34,6 +34,10 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif /* HAVE_CONFIG_H */ -+ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/inotify.h> -@@ -62,10 +66,6 @@ - #include <libgen.h> - #include <nfsidmap.h> - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif /* HAVE_CONFIG_H */ -- - #include "xlog.h" - #include "conffile.h" - #include "queue.h" --- -2.7.4 -meta/recipes-connectivity/nfs-utils/nfs-utils/clang-format-string.patch deleted +0
-183@@ -1,183 +0,0 @@ -Clang comes up with more printf format warnings -Correcting “format string is not a string literal” warning -requires us to declare that parameter is a printf style -format using the attribute flag - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> - -Index: nfs-utils-2.3.3/support/include/xcommon.h -=================================================================== ---- nfs-utils-2.3.3.orig/support/include/xcommon.h -+++ nfs-utils-2.3.3/support/include/xcommon.h -@@ -27,7 +27,7 @@ - - /* Functions in sundries.c that are used in mount.c and umount.c */ - char *canonicalize (const char *path); --void nfs_error (const char *fmt, ...); -+void nfs_error (const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2))); - void *xmalloc (size_t size); - void *xrealloc(void *p, size_t size); - void xfree(void *); -@@ -36,9 +36,9 @@ char *xstrndup (const char *s, int n); - char *xstrconcat2 (const char *, const char *); - char *xstrconcat3 (const char *, const char *, const char *); - char *xstrconcat4 (const char *, const char *, const char *, const char *); --void die (int errcode, const char *fmt, ...); -+void die (int errcode, const char *fmt, ...) __attribute__((__format__ (__printf__, 2, 3))); - --extern void die(int err, const char *fmt, ...); -+extern void die(int err, const char *fmt, ...) __attribute__((__format__ (__printf__, 2, 3))); - extern void (*at_die)(void); - - /* exit status - bits below are ORed */ -Index: nfs-utils-2.3.3/support/include/xlog.h -=================================================================== ---- nfs-utils-2.3.3.orig/support/include/xlog.h -+++ nfs-utils-2.3.3/support/include/xlog.h -@@ -43,10 +43,10 @@ void xlog_config(int fac, int on); - void xlog_sconfig(char *, int on); - void xlog_from_conffile(char *); - int xlog_enabled(int fac); --void xlog(int fac, const char *fmt, ...); --void xlog_warn(const char *fmt, ...); --void xlog_err(const char *fmt, ...); --void xlog_errno(int err, const char *fmt, ...); --void xlog_backend(int fac, const char *fmt, va_list args); -+void xlog(int fac, const char *fmt, ...) __attribute__((__format__ (__printf__, 2, 3))); -+void xlog_warn(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2))); -+void xlog_err(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2))); -+void xlog_errno(int err, const char *fmt, ...) __attribute__((__format__ (__printf__, 2, 3))); -+void xlog_backend(int fac, const char *fmt, va_list args) __attribute__((__format__ (__printf__, 2, 0))); - - #endif /* XLOG_H */ -Index: nfs-utils-2.3.3/support/nfs/xcommon.c -=================================================================== ---- nfs-utils-2.3.3.orig/support/nfs/xcommon.c -+++ nfs-utils-2.3.3/support/nfs/xcommon.c -@@ -93,7 +93,10 @@ nfs_error (const char *fmt, ...) { - - fmt2 = xstrconcat2 (fmt, "\n"); - va_start (args, fmt); -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wformat-nonliteral" - vfprintf (stderr, fmt2, args); -+#pragma clang diagnostic pop - va_end (args); - free (fmt2); - } -Index: nfs-utils-2.3.3/utils/exportfs/exportfs.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/exportfs/exportfs.c -+++ nfs-utils-2.3.3/utils/exportfs/exportfs.c -@@ -644,6 +644,7 @@ out: - return result; - } - -+__attribute__((__format__ (__printf__, 2, 3))) - static char - dumpopt(char c, char *fmt, ...) - { -Index: nfs-utils-2.3.3/utils/statd/statd.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/statd/statd.c -+++ nfs-utils-2.3.3/utils/statd/statd.c -@@ -136,7 +136,7 @@ static void log_modes(void) - strcat(buf, "TI-RPC "); - #endif - -- xlog_warn(buf); -+ xlog_warn("%s", buf); - } - - /* -Index: nfs-utils-2.3.3/support/nfs/svc_create.c -=================================================================== ---- nfs-utils-2.3.3.orig/support/nfs/svc_create.c -+++ nfs-utils-2.3.3/support/nfs/svc_create.c -@@ -184,7 +184,7 @@ svc_create_sock(const struct sockaddr *s - type = SOCK_STREAM; - break; - default: -- xlog(D_GENERAL, "%s: Unrecognized bind address semantics: %u", -+ xlog(D_GENERAL, "%s: Unrecognized bind address semantics: %lu", - __func__, nconf->nc_semantics); - return -1; - } -Index: nfs-utils-2.3.3/support/nsm/rpc.c -=================================================================== ---- nfs-utils-2.3.3.orig/support/nsm/rpc.c -+++ nfs-utils-2.3.3/support/nsm/rpc.c -@@ -182,7 +182,7 @@ nsm_xmit_getport(const int sock, const s - uint32_t xid; - XDR xdr; - -- xlog(D_CALL, "Sending PMAP_GETPORT for %u, %u, udp", program, version); -+ xlog(D_CALL, "Sending PMAP_GETPORT for %lu, %lu, udp", program, version); - - nsm_init_xdrmem(msgbuf, NSM_MAXMSGSIZE, &xdr); - xid = nsm_init_rpc_header(PMAPPROG, PMAPVERS, -Index: nfs-utils-2.3.3/utils/mountd/cache.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/mountd/cache.c -+++ nfs-utils-2.3.3/utils/mountd/cache.c -@@ -968,8 +968,7 @@ lookup_export(char *dom, char *path, str - } else if (found_type == i && found->m_warned == 0) { - xlog(L_WARNING, "%s exported to both %s and %s, " - "arbitrarily choosing options from first", -- path, found->m_client->m_hostname, exp->m_client->m_hostname, -- dom); -+ path, found->m_client->m_hostname, exp->m_client->m_hostname); - found->m_warned = 1; - } - } -Index: nfs-utils-2.3.3/utils/mountd/mountd.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/mountd/mountd.c -+++ nfs-utils-2.3.3/utils/mountd/mountd.c -@@ -213,7 +213,7 @@ static void - sig_hup (int sig) - { - /* don't exit on SIGHUP */ -- xlog (L_NOTICE, "Received SIGHUP... Ignoring.\n", sig); -+ xlog (L_NOTICE, "Received SIGHUP(%d)... Ignoring.\n", sig); - return; - } - -Index: nfs-utils-2.3.3/utils/statd/rmtcall.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/statd/rmtcall.c -+++ nfs-utils-2.3.3/utils/statd/rmtcall.c -@@ -247,7 +247,7 @@ process_reply(FD_SET_TYPE *rfds) - xlog_warn("%s: service %d not registered on localhost", - __func__, NL_MY_PROG(lp)); - } else { -- xlog(D_GENERAL, "%s: Callback to %s (for %d) succeeded", -+ xlog(D_GENERAL, "%s: Callback to %s (for %s) succeeded", - __func__, NL_MY_NAME(lp), NL_MON_NAME(lp)); - } - nlist_free(¬ify, lp); -Index: nfs-utils-2.3.3/utils/statd/svc_run.c -=================================================================== ---- nfs-utils-2.3.3.orig/utils/statd/svc_run.c -+++ nfs-utils-2.3.3/utils/statd/svc_run.c -@@ -53,6 +53,7 @@ - - #include <errno.h> - #include <time.h> -+#include <inttypes.h> - #include "statd.h" - #include "notlist.h" - -@@ -104,8 +105,8 @@ my_svc_run(int sockfd) - - tv.tv_sec = NL_WHEN(notify) - now; - tv.tv_usec = 0; -- xlog(D_GENERAL, "Waiting for reply... (timeo %d)", -- tv.tv_sec); -+ xlog(D_GENERAL, "Waiting for reply... (timeo %jd)", -+ (intmax_t)tv.tv_sec); - selret = select(FD_SETSIZE, &readfds, - (void *) 0, (void *) 0, &tv); - } else {meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch deleted +0
-46@@ -1,46 +0,0 @@ -From caa19231196d73541445728e6813c8fa70345acb Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Tue, 26 Jun 2018 15:59:00 +0800 -Subject: [PATCH] nfs-utils: 2.1.1 -> 2.3.1 - -Fixed: -configure: error: res_querydomain needed - -Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main/nfs-utils/musl-configure_ac.patch] - -Signed-off-by: Robert Yang <[email protected]> - ---- - configure.ac | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 50002b4..dcadb23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -582,10 +582,10 @@ my_am_cflags="\ - -Wall \ - -Wextra \ - $rpcgen_cflags \ -- -Werror=missing-prototypes \ -- -Werror=missing-declarations \ -+ -Wmissing-prototypes \ -+ -Wmissing-declarations \ - -Werror=format=2 \ -- -Werror=undef \ -+ -Wundef \ - -Werror=missing-include-dirs \ - -Werror=strict-aliasing=2 \ - -Werror=init-self \ -@@ -614,10 +614,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ - - CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) - CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) --CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) - CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) - --AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) -+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"]) - - # Make sure that $ACLOCAL_FLAGS are used during a rebuild - AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb +3
-7@@ -29,16 +29,13 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-utils-debianize-start-statd.patch \ file://bugfix-adjust-statd-service-name.patch \ file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ - file://clang-format-string.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ - file://0001-Fix-include-order-between-config.h-and-stat.h.patch \ -" + " SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" -SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" -SRC_URI[md5sum] = "161efe469ec1b06f1c750bd87f8ba6dd" -SRC_URI[sha256sum] = "85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736" +SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" +SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 30/30 debianutils: update to 4.9.1
In reply to Alexander Kanavin---
.../{debianutils_4.8.6.3.bb => debianutils_4.9.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/debianutils/{debianutils_4.8.6.3.bb => debianutils_4.9.1.bb} (87%)meta/recipes-support/debianutils/debianutils_4.9.1.bb renamed from meta/recipes-support/debianutils/debianutils_4.8.6.3.bb +3 -3
@@ -3,13 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20190717T213444Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" -SRC_URI[md5sum] = "ca57cc6621275346d7d516ab0b5fa1f5" -SRC_URI[sha256sum] = "2cc7de3afc6df1cf6d00af9938efac7ee8f739228e548e512ddc186b6a7be221" +SRC_URI[md5sum] = "95633416680bfd249b7cb07d94137048" +SRC_URI[sha256sum] = "af826685d9c56abfa873e84cd392539cd363cb0ba04a09d21187377e1b764091" inherit autotools update-alternatives
Signature · 1 line
2.17.1
✗ patchtest: failure for "rpm: upgrade to 4.15.1..." and 29 more
In reply to Alexander Kanavin== Series Details ==
Series: "rpm: upgrade to 4.15.1..." and 29 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21597/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch)
* Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format]
Suggested fix Include a brief reason why use-pkgconfig.patch is inappropriate Current Upstream-Status: Inappropriate (upstream still refuse to consider pkg-config) Standard format Upstream-Status: Inappropriate [reason]
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe