diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-util/sysdig/files | |
parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) |
gentoo resync : 02.06.2019
Diffstat (limited to 'dev-util/sysdig/files')
-rw-r--r-- | dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch | 34 | ||||
-rw-r--r-- | dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch | 52 |
2 files changed, 52 insertions, 34 deletions
diff --git a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch deleted file mode 100644 index 711eb182751e..000000000000 --- a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2c8f0263382bf64800faec5fba5cc3e005d9fb1e Mon Sep 17 00:00:00 2001 -From: Colin Ian King <colin.king@canonical.com> -Date: Thu, 31 Jan 2019 10:54:00 +0000 -Subject: [PATCH] Update for change to access_ok in Linux 5.0 - -Linux 5.0 removed the 1st argument 'type' from the access_ok macro. -Update the ppm_access_ok() macro to cater for this change for Linux -5.0 - -Bug: https://github.com/draios/sysdig/issues/1299 -sysdig-CLA-1.0-signed-off-by: Colin Ian King <colin.king@canonical.com> - -Signed-off-by: Colin Ian King <colin.king@canonical.com> ---- - driver/ppm_events.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/driver/ppm_events.c b/driver/ppm_events.c -index 717590888..cc3eb98d2 100644 ---- a/driver/ppm_events.c -+++ b/driver/ppm_events.c -@@ -46,7 +46,11 @@ or GPL2.txt for full copies of the license. - #ifdef access_ok_noprefault - #define ppm_access_ok access_ok_noprefault - #else --#define ppm_access_ok access_ok -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) -+#define ppm_access_ok(type, addr, size) access_ok(type, addr, size) -+#else -+#define ppm_access_ok(type, addr, size) access_ok(addr, size) -+#endif - #endif - - extern bool g_tracers_enabled; diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch new file mode 100644 index 000000000000..8e0dfd606a16 --- /dev/null +++ b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch @@ -0,0 +1,52 @@ +diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c +index 452353a6..6eb7cd16 100644 +--- a/userspace/libscap/scap_fds.c ++++ b/userspace/libscap/scap_fds.c +@@ -49,6 +49,7 @@ limitations under the License. + #include <errno.h> + #include <netinet/tcp.h> + #if defined(__linux__) ++#include <sys/sysmacros.h> + #include <linux/netlink.h> + #include <linux/rtnetlink.h> + //#include <linux/sock_diag.h> +diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt +index bc851319..ec454de7 100644 +--- a/userspace/libsinsp/CMakeLists.txt ++++ b/userspace/libsinsp/CMakeLists.txt +@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES}) + + target_link_libraries(sinsp + scap +- "${JSONCPP_LIB}") ++ "${CURL_LIBRARIES}" ++ "${JSONCPP_LIB}" ++ "${TBB_LIB}") + + if(USE_BUNDLED_LUAJIT) + add_dependencies(sinsp luajit) +@@ -157,13 +159,12 @@ if(NOT WIN32) + endif() + if(USE_BUNDLED_CURL) + add_dependencies(sinsp curl) +- target_link_libraries(sinsp +- "${CURL_LIBRARIES}") + endif() + if(USE_BUNDLED_TBB) + add_dependencies(sinsp tbb) +- target_link_libraries(sinsp +- "${TBB_LIB}") ++ endif() ++ if(USE_BUNDLED_GRPC) ++ add_dependencies(sinsp grpc) + endif() + + if(NOT APPLE) +@@ -177,7 +178,6 @@ if(NOT WIN32) + COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + +- add_dependencies(sinsp grpc) + target_link_libraries(sinsp + "${GRPCPP_LIB}" + "${GRPC_LIB}" |