]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
debian: remove lttng checking from rules
authorJosh Durgin <jdurgin@redhat.com>
Mon, 6 Apr 2015 18:08:33 +0000 (11:08 -0700)
committerSage Weil <sage@redhat.com>
Mon, 6 Apr 2015 18:36:35 +0000 (11:36 -0700)
This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a294daff0bb69a7e0951f98c9497ccb22e91e705)

debian/rules

index 34f6939e007b92ab0c6d4f299933f8d4b341e2f6..1fd2d6660098c522e6026126502cb5366182ec92 100755 (executable)
@@ -33,12 +33,6 @@ ifeq ($(DEB_HOST_ARCH), armel)
   extraopts += --without-libatomic-ops
 endif
 
-ifeq ($(shell lsb_release -sc | egrep -q '(precise|quantal|raring|saucy|wheezy|squeeze)' && echo yes),yes)
-  extraopts += --without-lttng --without-babeltrace
-else
-  extraopts += --with-lttng --with-babeltrace
-endif
-
 configure: configure-stamp
 configure-stamp:
        dh_testdir