lttng: Update packaging

Signed-off-by: Adam Crume <adamcrume@gmail.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index d28b53399c404e79a72880cf0ab9567027e67453..de8141afba758e56c67990bca8d1fee96ab31cce 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -252,6 +252,7 @@ Requires:   librbd1 = %{version}-%{release}
 Requires:      libcephfs1 = %{version}-%{release}
 %if (0%{?fedora} >= 20 || 0%{?rhel} == 6)
 BuildRequires: lttng-ust-devel
+BuildRequires: libbabeltrace-devel
 %endif
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.

diff --git a/configure.ac b/configure.ac
index cd940950046067662bc463e4e8c8abe7cfc80a12..b51a018fd2d81c52765ad033c21902f945691132 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -810,7 +810,10 @@ AM_COND_IF([WITH_LTTNG], [
   AC_DEFINE([WITH_LTTNG], [1], [Define if you want to use LTTng])
 
   AC_CHECK_HEADER([lttng/tracepoint.h], [],
-    AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev)]))
+    AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev, lttng-ust-devel)]))
+
+  AC_CHECK_HEADER([babeltrace/ctf/events.h], [],
+    AC_MSG_ERROR([babeltrace/ctf/events.h not found (libbabeltrace-ctf-dev, libbabeltrace-devel)]))
 
   AC_CHECK_PROG([LTTNG_GEN_TP_CHECK], [lttng-gen-tp], [yes])
   if test x"$LTTNG_GEN_TP_CHECK" != "xyes"; then

diff --git a/debian/control b/debian/control
index 7388ea44df2f49e4565b014227b7bd2e1b5ee5c3..439f34ca8f673c402564c4512070bdb69398d2a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,8 @@ Build-Depends: autoconf,
                junit4,
                libaio-dev,
                libatomic-ops-dev,
+               libbabeltrace-ctf-dev,
+               libbabeltrace-dev,
                libblkid-dev (>= 2.17),
                libboost-dev (>= 1.42),
                libboost-program-options-dev (>= 1.42),

diff --git a/debian/rules b/debian/rules
index 09397a4c30076879014e2e910d4d65402ccab51c..06ae8d729224c14d855db583215c1b76132e48f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,11 +33,8 @@ ifeq ($(DEB_HOST_ARCH), armel)
   extraopts += --without-libatomic-ops
 endif
 
-ifeq ($(shell dpkg-vendor --derives-from ubuntu && echo yes),yes)
-  codename = $(shell lsb_release -a | sed -rn 's/Codename:\s([^\s]*)/\1/p')
-  ifeq ($(codename),trusty)
-    extraopts += --without-lttng
-  endif
+ifeq ($(shell lsb_release -sc | egrep -q '(precise|quantal|raring|saucy|wheezy)' && echo yes),yes)
+  extraopts += --without-lttng
 endif
 
 configure: configure-stamp

diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am
index cd004b67392523f4c8811f7902d0da0752995fda..03e73c71ee841cfabddc00e08f8aadd5e649b836 100644 (file)
--- a/src/rbd_replay/Makefile.am
+++ b/src/rbd_replay/Makefile.am
@@ -40,4 +40,6 @@ rbd_replay_prep_LDADD = $(LIBRBD) \
        -lbabeltrace \
        -lbabeltrace-ctf \
        -lboost_date_time
+if WITH_LTTNG
 bin_PROGRAMS += rbd-replay-prep
+endif

diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am
index 0e67567e1c9e2982516faeb83379889ec9a30cf0..fb601fe9f7ad6f35f3ce0afdc7aafa8c4b7a886f 100644 (file)
--- a/src/tracing/Makefile.am
+++ b/src/tracing/Makefile.am
@@ -1,7 +1,9 @@
 EXTRA_DIST = tracing-common.h
 
+if WITH_LTTNG
 %.c %.h: %.tp
        $(LTTNG_GEN_TP_PROG) $< -o $*.c -o $*.h
+endif
 
 dist_noinst_DATA = \
        librados.tp \