diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-devtools/strace | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/strace')
-rw-r--r-- | poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch | 70 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/strace/strace_5.9.bb (renamed from poky/meta/recipes-devtools/strace/strace_5.10.bb) | 9 |
2 files changed, 73 insertions, 6 deletions
diff --git a/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch b/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch new file mode 100644 index 0000000000..cd53f33f60 --- /dev/null +++ b/poky/meta/recipes-devtools/strace/strace/0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch @@ -0,0 +1,70 @@ +From 387d3b6fba95cb47c4dacc6bcd330148a9168850 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Oct 2020 12:54:03 -0700 +Subject: [PATCH] xlat: Mark IPPROTO_MAX last in IPPROTO_* constants + +* xlat/inet_protocols.in (IPPROTO_MAX): It should be the last entry + after adding IPPROTO_MPTCP this should have new value as + IPPROTO_MPTCP + 1. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2020-October/010253.html] +--- + xlat/inet_protocols.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/xlat/inet_protocols.in ++++ b/xlat/inet_protocols.in +@@ -32,5 +32,5 @@ IPPROTO_UDPLITE 136 + IPPROTO_MPLS 137 + IPPROTO_ETHERNET 143 + IPPROTO_RAW 255 +-IPPROTO_MAX 256 + IPPROTO_MPTCP 262 ++IPPROTO_MAX 263 +--- a/xlat/inet_protocols.h ++++ b/xlat/inet_protocols.h +@@ -234,19 +234,19 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else + # define IPPROTO_RAW 255 + #endif +-#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) ++#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((IPPROTO_MAX) == (256), "IPPROTO_MAX != 256"); ++static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define IPPROTO_MAX 256 ++# define IPPROTO_MPTCP 262 + #endif +-#if defined(IPPROTO_MPTCP) || (defined(HAVE_DECL_IPPROTO_MPTCP) && HAVE_DECL_IPPROTO_MPTCP) ++#if defined(IPPROTO_MAX) || (defined(HAVE_DECL_IPPROTO_MAX) && HAVE_DECL_IPPROTO_MAX) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((IPPROTO_MPTCP) == (262), "IPPROTO_MPTCP != 262"); ++static_assert((IPPROTO_MAX) == (263), "IPPROTO_MAX != 263"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define IPPROTO_MPTCP 262 ++# define IPPROTO_MAX 263 + #endif + + #ifndef XLAT_MACROS_ONLY +@@ -353,12 +353,12 @@ static const struct xlat_data inet_proto + XLAT(IPPROTO_RAW), + #define XLAT_VAL_32 ((unsigned) (IPPROTO_RAW)) + #define XLAT_STR_32 STRINGIFY(IPPROTO_RAW) +- XLAT(IPPROTO_MAX), +- #define XLAT_VAL_33 ((unsigned) (IPPROTO_MAX)) +- #define XLAT_STR_33 STRINGIFY(IPPROTO_MAX) + XLAT(IPPROTO_MPTCP), +- #define XLAT_VAL_34 ((unsigned) (IPPROTO_MPTCP)) +- #define XLAT_STR_34 STRINGIFY(IPPROTO_MPTCP) ++ #define XLAT_VAL_33 ((unsigned) (IPPROTO_MPTCP)) ++ #define XLAT_STR_33 STRINGIFY(IPPROTO_MPTCP) ++ XLAT(IPPROTO_MAX), ++ #define XLAT_VAL_34 ((unsigned) (IPPROTO_MAX)) ++ #define XLAT_STR_34 STRINGIFY(IPPROTO_MAX) + }; + const struct xlat inet_protocols[1] = { { + .data = inet_protocols_xdata, diff --git a/poky/meta/recipes-devtools/strace/strace_5.10.bb b/poky/meta/recipes-devtools/strace/strace_5.9.bb index 22572fb935..bee2616a44 100644 --- a/poky/meta/recipes-devtools/strace/strace_5.10.bb +++ b/poky/meta/recipes-devtools/strace/strace_5.9.bb @@ -14,8 +14,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ + file://0001-xlat-Mark-IPPROTO_MAX-last-in-IPPROTO_-constants.patch \ " -SRC_URI[sha256sum] = "fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c" +SRC_URI[sha256sum] = "39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9" inherit autotools ptest @@ -46,14 +47,10 @@ do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} install -m 755 ${S}/test-driver ${D}${PTEST_PATH} install -m 644 ${B}/config.h ${D}${PTEST_PATH} - sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile + sed -i -e '/^src/s/strace.*[1-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ - locale-base-en-us.iso-8859-1 \ -" - BBCLASSEXTEND = "native" TOOLCHAIN = "gcc" |