Drop upstreamed patches Signed-off-by: Khem Raj <[email protected]> --- ...usl-backtrace-APIs-are-glibc-specifi.patch | 49 ------------------- .../sysdig/sysdig/fix-uint64-const.patch | 16 ------ meta-oe/recipes-extended/sysdig/sysdig_git.bb | 6 +-- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch delete mode 100644 meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch deleted file mode 100644 index cb80611578..0000000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 290703a5d21f34ea5ec23efc815a9f4df241e7e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 23 Oct 2015 00:33:32 -0700 -Subject: [PATCH] Fix build with musl, backtrace() APIs are glibc specific - -Signed-off-by: Khem Raj <[email protected]> ---- - userspace/libsinsp/utils.cpp | 4 +++- - userspace/libsinsp/utils.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - ---- a/userspace/libsinsp/utils.cpp -+++ b/userspace/libsinsp/utils.cpp -@@ -22,7 +22,7 @@ limitations under the License. - #include <limits.h> - #include <stdlib.h> - #include <sys/time.h> --#ifndef CYGWING_AGENT -+#if !defined(CYGWING_AGENT) || defined(__GLIBC__) - #include <execinfo.h> - #endif - #include <unistd.h> -@@ -780,6 +780,7 @@ bool sinsp_utils::glob_match(const char - - #ifndef CYGWING_AGENT - #ifndef _WIN32 -+#ifdef __GLIBC__ - void sinsp_utils::bt(void) - { - static const char start[] = "BACKTRACE ------------"; -@@ -801,6 +802,7 @@ void sinsp_utils::bt(void) - - free(bt_syms); - } -+#endif // Glibc - #endif // _WIN32 - #endif // CYGWING_AGENT - ---- a/userspace/libsinsp/utils.h -+++ b/userspace/libsinsp/utils.h -@@ -104,7 +104,7 @@ public: - - static bool glob_match(const char *pattern, const char *string); - --#ifndef _WIN32 -+#if not defined(_WIN32) && defined(__GLIBC__) - // - // Print the call stack - // diff --git a/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch b/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch deleted file mode 100644 index 5c756294b9..0000000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix x86 build - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - ---- a/userspace/libsinsp/cgroup_limits.cpp -+++ b/userspace/libsinsp/cgroup_limits.cpp -@@ -9,7 +9,7 @@ namespace { - // This reports extremely large values (e.g. almost-but-not-quite 9EiB as set by k8s) as unlimited. - // Note: we use the same maximum value for cpu shares/quotas as well; the typical values are much lower - // and so should never exceed CGROUP_VAL_MAX either --constexpr const int64_t CGROUP_VAL_MAX = (1UL << 42u) - 1; -+constexpr const int64_t CGROUP_VAL_MAX = (1ULL << 42u) - 1; - - /** - * \brief Read a single int64_t value from cgroupfs diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 04a022af4f..bb9f2da7c3 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -20,12 +20,10 @@ RDEPENDS_${PN} = "bash" SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ - file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ - file://fix-uint64-const.patch \ file://aarch64.patch \ " -SRCREV = "8daeef8da752c5f07f439391bc20c5948eb11470" -PV = "0.26.6" +SRCREV = "67833b2aca06bd9d11cff7cb29f04fbf4ef96cad" +PV = "0.27.1" S = "${WORKDIR}/git" -- 2.31.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#90392): https://lists.openembedded.org/g/openembedded-devel/message/90392 Mute This Topic: https://lists.openembedded.org/mt/81667801/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
