From: Adam Crume <adamcrume@gmail.com>
Date: Fri, 15 Aug 2014 04:33:43 +0000 (-0700)
Subject: lttng: Add distro packaging
X-Git-Tag: v0.86~231^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fed22f496e1b26e5b5b71a78e84d479678348e6d;p=ceph.git

lttng: Add distro packaging

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

diff --git a/ceph.spec.in b/ceph.spec.in
index b985511775ec..8308d082b90a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -250,6 +250,7 @@ License:	LGPL-2.0
 Requires:	librados2 = %{version}-%{release}
 Requires:	librbd1 = %{version}-%{release}
 Requires:	libcephfs1 = %{version}-%{release}
+BuildRequires:	lttng-ust-devel
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.
 
diff --git a/debian/control b/debian/control
index c0064e8cc990..7388ea44df2f 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Build-Depends: autoconf,
                libleveldb-dev,
                libnss3-dev,
                libsnappy-dev,
+               liblttng-ust-dev,
                libtool,
                libudev-dev,
                libxml2-dev,
diff --git a/debian/rules b/debian/rules
index 1fd2d6660098..09397a4c3007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,13 @@ 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
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir