]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
deb: strip tracepoint libraries from Wheezy/Precise builds 7316/head
authorJason Dillaman <dillaman@redhat.com>
Thu, 21 Jan 2016 20:36:37 +0000 (15:36 -0500)
committerJason Dillaman <dillaman@redhat.com>
Thu, 21 Jan 2016 20:54:07 +0000 (15:54 -0500)
These releases do not (by default) have a sane LTTng-UST environment,
which results in autoconf disabling support for tracing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
debian/control
debian/rules

index 559843e9129f6108cf87383c0f82cf5d8e376b69..535da30f9c0cd656f963b92554b90e86e1f5bd42 100644 (file)
@@ -15,6 +15,7 @@ Build-Depends: autoconf,
                default-jdk,
                git,
               gdisk,
+               grep,
                javahelper,
                junit4,
                libaio-dev,
@@ -48,6 +49,7 @@ Build-Depends: autoconf,
                python-nose,
                python-virtualenv,
                sdparm | hdparm,
+               sed,
                uuid-dev,
                uuid-runtime,
                xfslibs-dev,
index 1fd2d6660098c522e6026126502cb5366182ec92..44ea7adeb6714d27cf9574ecfd6fbf5f478b00d6 100755 (executable)
@@ -40,6 +40,14 @@ configure-stamp:
        ./configure --prefix=/usr --localstatedir=/var \
          --sysconfdir=/etc $(extraopts) $(confflags) \
          $(CEPH_EXTRA_CONFIGURE_ARGS)
+
+       # Wheezy and Precise do not support tracepoints
+       if ! grep -q 'define WITH_LTTNG' src/acconfig.h ; then   \
+         sed -i.orig '/lib.*_tp\.so/d' debian/ceph.install      \
+                                       debian/librados2.install \
+                                       debian/librbd1.install ; \
+       fi
+
        touch $@
 
 build-arch: build