From 9e5f1791964ec88799563d22583490ba96df2faa Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Dec 08 2021 20:47:45 +0000 Subject: ceph-16.2.7 GA, again --- diff --git a/SOURCES/0016-src-tracing-patch b/SOURCES/0016-src-tracing-patch new file mode 100644 index 0000000..228d93f --- /dev/null +++ b/SOURCES/0016-src-tracing-patch @@ -0,0 +1,23 @@ +--- ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp.orig 2021-12-07 08:02:04.682972474 -0500 ++++ ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp 2021-12-07 08:03:13.840771852 -0500 +@@ -1,3 +1,9 @@ ++ ++#ifdef __x86_64__ ++#undef STAP_SDT_ARG_CONSTRAINT ++#define STAP_SDT_ARG_CONSTRAINT norx ++#endif ++ + #include "include/int_types.h" + + TRACEPOINT_EVENT(bluestore, transaction_state_duration, +--- ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp.orig 2021-12-07 09:50:16.467579483 -0500 ++++ ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp 2021-12-07 09:50:47.620026940 -0500 +@@ -1,3 +1,8 @@ ++#ifdef __x86_64__ ++#undef STAP_SDT_ARG_CONSTRAINT ++#define STAP_SDT_ARG_CONSTRAINT norx ++#endif ++ + #include "tracing/tracing-common.h" + #include "include/rbd/librbd.h" + #include "include/int_types.h" diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 268ca17..5ea1426 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -152,6 +152,7 @@ Patch0007: 0007-src-test-neorados-CMakeLists.txt.patch Patch0008: 0008-cmake-modules-Finduring.cmake.patch Patch0014: 0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch Patch0015: 0015-src-kv-rocksdb_cache.patch +Patch0016: 0016-src-tracing-patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl