summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-28 21:04:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:53:26 +0000
commit34ec636f192d739cfbf43590b04b48d2cf7994d7 (patch)
tree19af7f11c5ed329d83f4a3b5b46b58d9672c1686 /meta/recipes-devtools/strace
parentb0384720a46fb25c4ad180e3f256ffdeb53dc8a6 (diff)
downloadpoky-34ec636f192d739cfbf43590b04b48d2cf7994d7.tar.gz
strace: update 5.9 -> 5.10
Drop 0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch as upstream has removed IPPROTO_MAX altogether. (From OE-Core rev: ea6f27e35b6cac4db9e1ab0d9a888d15daba6c09) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch70
-rw-r--r--meta/recipes-devtools/strace/strace_5.10.bb (renamed from meta/recipes-devtools/strace/strace_5.9.bb)9
2 files changed, 6 insertions, 73 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch b/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch
deleted file mode 100644
index cd53f33f60..0000000000
--- a/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 387d3b6fba95cb47c4dacc6bcd330148a9168850 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 7 Oct 2020 12:54:03 -0700
4Subject: [PATCH] xlat: Mark IPPROTO_MAX last in IPPROTO_* constants
5
6* xlat/inet_protocols.in (IPPROTO_MAX): It should be the last entry
7 after adding IPPROTO_MPTCP this should have new value as
8 IPPROTO_MPTCP + 1.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2020-October/010253.html]
12---
13 xlat/inet_protocols.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16--- a/xlat/inet_protocols.in
17+++ b/xlat/inet_protocols.in
18@@ -32,5 +32,5 @@ IPPROTO_UDPLITE 136
19 IPPROTO_MPLS 137
20 IPPROTO_ETHERNET 143
21 IPPROTO_RAW 255
22-IPPROTO_MAX 256
23 IPPROTO_MPTCP 262
24+IPPROTO_MAX 263
25--- a/xlat/inet_protocols.h
26+++ b/xlat/inet_protocols.h
27@@ -234,19 +234,19 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
28 #else
29 # define IPPROTO_RAW 255
30 #endif
31-#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX)
32+#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP)
33 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
34-static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256");
35+static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262");
36 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
37 #else
38-# define IPPROTO_MAX 256
39+# define IPPROTO_MPTCP 262
40 #endif
41-#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP)
42+#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX)
43 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
44-static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262");
45+static_assert((IPPROTO_MAX) == (263), "IPPROTO_MAX != 263");
46 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
47 #else
48-# define IPPROTO_MPTCP 262
49+# define IPPROTO_MAX 263
50 #endif
51
52 #ifndef XLAT_MACROS_ONLY
53@@ -353,12 +353,12 @@ static const struct xlat_data inet_proto
54 XLAT(IPPROTO_RAW),
55 #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW))
56 #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW)
57- XLAT(IPPROTO_MAX),
58- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX))
59- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX)
60 XLAT(IPPROTO_MPTCP),
61- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP))
62- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP)
63+ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP))
64+ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP)
65+ XLAT(IPPROTO_MAX),
66+ #define XLAT_VAL_34 ((unsigned) (IPPROTO_MAX))
67+ #define XLAT_STR_34 STRINGIFY(IPPROTO_MAX)
68 };
69 const struct xlat inet_protocols[1] = { {
70 .data = inet_protocols_xdata,
diff --git a/meta/recipes-devtools/strace/strace_5.9.bb b/meta/recipes-devtools/strace/strace_5.10.bb
index bee2616a44..22572fb935 100644
--- a/meta/recipes-devtools/strace/strace_5.9.bb
+++ b/meta/recipes-devtools/strace/strace_5.10.bb
@@ -14,9 +14,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
14 file://ptest-spacesave.patch \ 14 file://ptest-spacesave.patch \
15 file://uintptr_t.patch \ 15 file://uintptr_t.patch \
16 file://0001-strace-fix-reproducibilty-issues.patch \ 16 file://0001-strace-fix-reproducibilty-issues.patch \
17 file://0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch \
18 " 17 "
19SRC_URI[sha256sum] = "39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9" 18SRC_URI[sha256sum] = "fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c"
20 19
21inherit autotools ptest 20inherit autotools ptest
22 21
@@ -47,10 +46,14 @@ do_install_ptest() {
47 oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} 46 oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
48 install -m 755 ${S}/test-driver ${D}${PTEST_PATH} 47 install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
49 install -m 644 ${B}/config.h ${D}${PTEST_PATH} 48 install -m 644 ${B}/config.h ${D}${PTEST_PATH}
50 sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile 49 sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
51} 50}
52 51
53RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" 52RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed"
54 53
54RDEPENDS_${PN}-ptest_append_libc-glibc = "\
55 locale-base-en-us.iso-8859-1 \
56"
57
55BBCLASSEXTEND = "native" 58BBCLASSEXTEND = "native"
56TOOLCHAIN = "gcc" 59TOOLCHAIN = "gcc"