From fed22f496e1b26e5b5b71a78e84d479678348e6d Mon Sep 17 00:00:00 2001 From: Adam Crume Date: Thu, 14 Aug 2014 21:33:43 -0700 Subject: [PATCH] lttng: Add distro packaging Signed-off-by: Adam Crume --- ceph.spec.in | 1 + debian/control | 1 + debian/rules | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index b985511775ec2..8308d082b90a6 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 c0064e8cc9908..7388ea44df2f4 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 1fd2d6660098c..09397a4c30076 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 -- 2.39.5