From 64c4ba6c3c88b7aeebb128f5cf0b197f0a277a5f 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 --- contrib/ci/configure.sh | 1 + contrib/ci/deps.sh | 1 + contrib/sssd.spec.in | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index c850eb9ce9a4228c1a89b8b2b49311e1c748b7de..8e779cfe634a7555e0e8e3b52f42c07e62980fbc 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -28,6 +28,7 @@ declare -a CONFIGURE_ARG_LIST=( "--disable-static" "--enable-ldb-version-check" "--with-syslog=journald" + "--enable-systemtap" ) diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh index c9a8a6384a31c796a7b79e4f94d89f3e94ce6542..4fc1d2d0b84825add4d02692a7e44d18311f300d 100644 --- a/contrib/ci/deps.sh +++ b/contrib/ci/deps.sh @@ -114,6 +114,7 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then python-ldap ldap-utils slapd + systemtap-sdt-dev ) DEPS_INTGCHECK_SATISFIED=true fi diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index ad072204cec41e764c6f46263fb5af8f2a37913e..7b4188ae3f90546e64b662a1eb3887d3bde55440 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 @@ -779,6 +789,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