]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
lttng: Add distro packaging 2253/head 2260/head
authorAdam Crume <adamcrume@gmail.com>
Fri, 15 Aug 2014 04:33:43 +0000 (21:33 -0700)
committerAdam Crume <adamcrume@gmail.com>
Fri, 15 Aug 2014 04:33:43 +0000 (21:33 -0700)
Signed-off-by: Adam Crume <adamcrume@gmail.com>
ceph.spec.in
debian/control
debian/rules

index 0580642e8674bd8d5eaab4c43de757673947b00b..8df2224fd5567c7583a67a8f926136e0db912f2c 100644 (file)
@@ -249,6 +249,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.
 
index b264efc5de83656bb19269e1651c14397c9e08e5..e3de1a0a3ed801afe2cb80414fa0e38a6eedb33f 100644 (file)
@@ -31,6 +31,7 @@ Build-Depends: autoconf,
                libleveldb-dev,
                libnss3-dev,
                libsnappy-dev,
+               liblttng-ust-dev,
                libtool,
                libudev-dev,
                libxml2-dev,
index 91773313e5ce4339f9162c3a719bdf964bd6c62e..500258cb96fba967156273389d89276bd42b4f5b 100755 (executable)
@@ -30,6 +30,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