]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
LTTng-UST disabled for openSUSE 10794/head
authorMichel Normand <normand@linux.vnet.ibm.com>
Fri, 5 Aug 2016 13:19:50 +0000 (15:19 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 19 Aug 2016 15:55:39 +0000 (17:55 +0200)
LTTng-UST not yet supported in openSUSE so do not enable lltng for it.
The (1) is where is defined "is_opensuse"

Remove value for test of suse_version in spec file
and change related comment from SLES12 to SLE
as per comment in https://github.com/ceph/ceph/pull/10592

(1) https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code

Fixes: http://tracker.ceph.com/issues/16937
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
(cherry picked from commit 7da19b6db7eaefb5fe159375cc5a465a722d3897)

ceph.spec.in

index 630d9d286ca7b8007a4be665814aa0912e435a39..9292be246085fd09eff68dc2d86c1859e8bb9753 100644 (file)
 %bcond_with selinux
 %endif
 
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLES 12
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} == 1315
+# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if ! 0%{?is_opensuse}
 %bcond_without lttng
 %endif
+%endif
 
 %if %{with selinux}
 # get selinux policy version