]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
lttng: Add distro packaging
authorAdam Crume <adamcrume@gmail.com>
Fri, 15 Aug 2014 04:33:43 +0000 (21:33 -0700)
committerSage Weil <sage@redhat.com>
Thu, 21 Aug 2014 17:57:33 +0000 (10:57 -0700)
Signed-off-by: Adam Crume <adamcrume@gmail.com>
ceph.spec.in
debian/control
debian/rules

index b985511775ec27eef8b161f68bee1d9820517c7d..8308d082b90a6c141e4af48a58c765f939675bfa 100644 (file)
@@ -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.
 
index c0064e8cc990819cde237825d25a08e3016415bf..7388ea44df2f49e4565b014227b7bd2e1b5ee5c3 100644 (file)
@@ -32,6 +32,7 @@ Build-Depends: autoconf,
                libleveldb-dev,
                libnss3-dev,
                libsnappy-dev,
+               liblttng-ust-dev,
                libtool,
                libudev-dev,
                libxml2-dev,
index 1fd2d6660098c522e6026126502cb5366182ec92..09397a4c30076879014e2e910d4d65402ccab51c 100755 (executable)
@@ -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