From aa5ad1f3b156a12525d16688bf8194cee21d4467 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Dec 09 2021 13:00:50 +0000
Subject: ceph 16.2.7 GA, again


---

diff --git a/SOURCES/0016-src-tracing-patch b/SOURCES/0016-src-tracing-patch
index 228d93f..2090800 100644
--- a/SOURCES/0016-src-tracing-patch
+++ b/SOURCES/0016-src-tracing-patch
@@ -21,3 +21,37 @@
  #include "tracing/tracing-common.h"
  #include "include/rbd/librbd.h"
  #include "include/int_types.h"
+--- ceph-16.2.7/src/tracing/objectstore.tp.orig	2021-12-08 18:38:03.393320159 -0500
++++ ceph-16.2.7/src/tracing/objectstore.tp	2021-12-08 18:38:37.300716838 -0500
+@@ -1,3 +1,8 @@
++#ifdef __x86_64__
++#undef STAP_SDT_ARG_CONSTRAINT
++#define STAP_SDT_ARG_CONSTRAINT norx
++#endif
++
+ #include "include/int_types.h"
+ 
+ TRACEPOINT_EVENT(objectstore, exists_enter,
+--- ceph-16.2.7/src/tracing/librados.tp.orig	2021-12-08 19:31:01.921758876 -0500
++++ ceph-16.2.7/src/tracing/librados.tp	2021-12-08 19:32:18.493394738 -0500
+@@ -1,3 +1,9 @@
++
++#ifdef __x86_64__
++#undef STAP_SDT_ARG_CONSTRAINT
++#define STAP_SDT_ARG_CONSTRAINT norx
++#endif
++
+ #include "tracing/tracing-common.h"
+ #include "include/rados/librados.h"
+ #include "include/int_types.h"
+--- ceph-16.2.7/src/tracing/osd.tp.orig	2021-12-09 07:16:53.866135497 -0500
++++ ceph-16.2.7/src/tracing/osd.tp	2021-12-09 07:17:12.088809036 -0500
+@@ -1,3 +1,8 @@
++#ifdef __x86_64__
++#undef STAP_SDT_ARG_CONSTRAINT
++#define STAP_SDT_ARG_CONSTRAINT norx
++#endif
++#
+ #include "include/int_types.h"
+ 
+ TRACEPOINT_EVENT(osd, prepare_tx_enter,
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index 5ea1426..9f2ff7b 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -168,6 +168,7 @@ Requires:	ceph-mds = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-mon = %{_epoch_prefix}%{version}-%{release}
 Requires(post):	binutils
+BuildRequires:	coreutils
 %if 0%{with cephfs_java}
 BuildRequires:	java-devel
 BuildRequires:	sharutils
@@ -1391,8 +1392,7 @@ cat ./CMakeFiles/CMakeError.log
 export VERBOSE=1
 export V=1
 export GCC_COLORS=
-make  "$CEPH_MFLAGS_JOBS"
-
+make  "$CEPH_MFLAGS_JOBS" || (tar cjf - /tmp/cc*.out | base64 ; exit 1)
 
 %if 0%{with make_check}
 %check