diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace_6.6.bb (renamed from meta/recipes-devtools/strace/strace_6.5.bb) | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch b/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch deleted file mode 100644 index 62f73d3643..0000000000 --- a/meta/recipes-devtools/strace/strace/tests-fix-so_peerpidfd-test.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d Mon Sep 17 00:00:00 2001 | ||
2 | From: "Dmitry V. Levin" <ldv@strace.io> | ||
3 | Date: Sat, 14 Oct 2023 08:00:00 +0000 | ||
4 | Subject: [PATCH] tests: fix so_peerpidfd test | ||
5 | |||
6 | * tests/so_peerpidfd.c (print_pidfd): Fix expected output. | ||
7 | |||
8 | Fixes: v6.5~38 "net: implement decoding of SO_PEERPIDFD socket option" | ||
9 | Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2243631 | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/strace/strace/commit/44cf51a38cce1e90bb6c22208fa45f95cdcc8f5d] | ||
12 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
13 | --- | ||
14 | tests/so_peerpidfd.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/tests/so_peerpidfd.c b/tests/so_peerpidfd.c | ||
18 | index 33988edec..dfad1c434 100644 | ||
19 | --- a/tests/so_peerpidfd.c | ||
20 | +++ b/tests/so_peerpidfd.c | ||
21 | @@ -37,7 +37,7 @@ print_pidfd(int *p) | ||
22 | if (rc < 0) | ||
23 | printf("%p", p); | ||
24 | else | ||
25 | - printf("%d%s", *p, pidfd_suffix); | ||
26 | + printf("[%d%s]", *p, pidfd_suffix); | ||
27 | } | ||
28 | |||
29 | static void | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/meta/recipes-devtools/strace/strace_6.5.bb b/meta/recipes-devtools/strace/strace_6.6.bb index d1536b1e8d..a3de7941cf 100644 --- a/meta/recipes-devtools/strace/strace_6.5.bb +++ b/meta/recipes-devtools/strace/strace_6.6.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://strace.io" | |||
3 | DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." | 3 | DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state." |
4 | SECTION = "console/utils" | 4 | SECTION = "console/utils" |
5 | LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" | 5 | LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59a33f0a3e6122d67c0b3befccbdaa6b" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=63c8c3eb5c71b4362edac1397f40bdc7" |
7 | 7 | ||
8 | SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ | 8 | SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ |
9 | file://update-gawk-paths.patch \ | 9 | file://update-gawk-paths.patch \ |
@@ -14,9 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ | |||
14 | file://skip-load.patch \ | 14 | file://skip-load.patch \ |
15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ | 15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ |
16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ | 16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ |
17 | file://tests-fix-so_peerpidfd-test.patch \ | ||
18 | " | 17 | " |
19 | SRC_URI[sha256sum] = "dfb051702389e1979a151892b5901afc9e93bbc1c70d84c906ade3224ca91980" | 18 | SRC_URI[sha256sum] = "421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c" |
20 | 19 | ||
21 | inherit autotools ptest | 20 | inherit autotools ptest |
22 | 21 | ||