From 4a929f90a6721b49d32002b30ac4c09f280f003c Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 6 May 2016 15:51:12 +0200 Subject: [PATCH 10/10] BUILD: Enable systemtap during RPM build and CI So far, systemtap is only enabled for Red Hat distributions. --- contrib/ci/configure.sh | 6 ++++++ contrib/sssd.spec.in | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index c850eb9ce9a4228c1a89b8b2b49311e1c748b7de..823d3277c0467d1abf0e746c910d2a0e16783693 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -47,6 +47,12 @@ if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*- || ) fi +if [[ "$DISTRO_FAMILY" == "redhat" ]]; then + CONFIGURE_ARG_LIST+=( + "--enable-systemtap" + ) +fi + declare -r -a CONFIGURE_ARG_LIST fi # _CONFIGURE_SH diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 2ba6a4d4c919a0697b18c4293f5e33e12b996cac..a18599f157a2459fd0e6b47fdca32ddc0bf626a6 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -63,6 +63,11 @@ %global with_python3_option --without-python3-bindings %endif +%global enable_systemtap 1 +%if (0%{?enable_systemtap} == 1) + %global enable_systemtap_opt --enable-systemtap +%endif + Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 0@PRERELEASE_VERSION@%{?dist} @@ -160,6 +165,10 @@ BuildRequires: nfs-utils-lib-devel BuildRequires: samba4-devel BuildRequires: libsmbclient-devel +%if (0%{?enable_systemtap} == 1) +BuildRequires: systemtap-sdt-devel +%endif + %description Provides a set of daemons to manage access to remote directories and authentication mechanisms. It provides an NSS and PAM interface toward @@ -596,6 +605,7 @@ autoreconf -ivf %{?with_cifs_utils_plugin_option} \ %{?with_python3_option} \ %{?enable_polkit_rules_option} \ + %{?enable_systemtap_opt} \ %{?experimental} make %{?_smp_mflags} all @@ -776,6 +786,15 @@ done %{_mandir}/man5/sss_rpcidmapd.5* %{_mandir}/man8/sssd.8* %{_mandir}/man8/sss_cache.8* +%if (0%{?enable_systemtap} == 1) +%dir %{_datadir}/sssd/systemtap +%{_datadir}/sssd/systemtap/id_perf.stp +%{_datadir}/sssd/systemtap/nested_group_perf.stp +%dir %{_datadir}/systemtap +%dir %{_datadir}/systemtap/tapset +%{_datadir}/systemtap/tapset/sssd.stp +%{_datadir}/systemtap/tapset/sssd_functions.stp +%endif %if (0%{?install_pcscd_polkit_rule} == 1) %files polkit-rules -- 2.4.11