Merge branch 'master' into f20
* master: (24 commits) %changelog time order tweakage upstream release Automated weekly systemtap rawhide release: 0.535.g9d4241d37eb1 Automated weekly systemtap rawhide release: 0.491.gd0e1cd9d2fcb Automated weekly systemtap rawhide release: 0.458.g15afd83e99da Automated weekly systemtap rawhide release: 0.446.ga404e997732d Automated weekly systemtap rawhide release: 0.415.g7caa63eb91fd Automated weekly systemtap rawhide release: 0.376.g450056a8faa6 Automated weekly systemtap rawhide release: 0.349.g2dd920e34796 Automated weekly systemtap rawhide release: 0.318.g9ee1bfe9ac1c Automated weekly systemtap rawhide release: 0.296.g4f53b72c1d47 Automated weekly systemtap rawhide release: 0.294.g09c16468eb17 Automated weekly systemtap rawhide release: 0.274.gde6aa5194bf4 Automated weekly systemtap rawhide release: 0.239.g873c6f49b639 Automated weekly systemtap rawhide release: 0.191.g651a87924c22 Automated weekly systemtap rawhide release: 0.186.gf1753911ada8 Automated weekly systemtap rawhide release: 0.185.g4a3f6fd34498 Automated weekly systemtap rawhide release: 0.151.g6ded984aa63f Automated weekly systemtap rawhide release: 0.123.gc60517ca2f99 Automated weekly systemtap rawhide release: 0.87.g540c750cf41f ... Conflicts: systemtap.spec
This commit is contained in:
Frank Ch. Eigler
commit
1b083f84cd
|
|
@ -74,3 +74,26 @@ systemtap-1.3.tar.gz
|
|||
/systemtap-2.4-0.186.gc1cb76c.tar.gz
|
||||
/systemtap-2.4-0.233.g5c0aabb.tar.gz
|
||||
/systemtap-2.4.tar.gz
|
||||
/systemtap-2.5-0.36.g1bbf3f9.tar.gz
|
||||
/systemtap-2.5-0.47.gb72512c.tar.gz
|
||||
/systemtap-2.5-0.70.g2200b70.tar.gz
|
||||
/systemtap-2.5-0.78.ga7dd945a54f2.tar.gz
|
||||
/systemtap-2.5-0.87.g540c750cf41f.tar.gz
|
||||
/systemtap-2.5-0.123.gc60517ca2f99.tar.gz
|
||||
/systemtap-2.5-0.151.g6ded984aa63f.tar.gz
|
||||
/systemtap-2.5-0.185.g4a3f6fd34498.tar.gz
|
||||
/systemtap-2.5-0.186.gf1753911ada8.tar.gz
|
||||
/systemtap-2.5-0.191.g651a87924c22.tar.gz
|
||||
/systemtap-2.5-0.239.g873c6f49b639.tar.gz
|
||||
/systemtap-2.5-0.274.gde6aa5194bf4.tar.gz
|
||||
/systemtap-2.5-0.294.g09c16468eb17.tar.gz
|
||||
/systemtap-2.5-0.296.g4f53b72c1d47.tar.gz
|
||||
/systemtap-2.5-0.318.g9ee1bfe9ac1c.tar.gz
|
||||
/systemtap-2.5-0.349.g2dd920e34796.tar.gz
|
||||
/systemtap-2.5-0.376.g450056a8faa6.tar.gz
|
||||
/systemtap-2.5-0.415.g7caa63eb91fd.tar.gz
|
||||
/systemtap-2.5-0.446.ga404e997732d.tar.gz
|
||||
/systemtap-2.5-0.458.g15afd83e99da.tar.gz
|
||||
/systemtap-2.5-0.491.gd0e1cd9d2fcb.tar.gz
|
||||
/systemtap-2.5-0.535.g9d4241d37eb1.tar.gz
|
||||
/systemtap-2.5.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
ca39cff33087b3ec549d6fd78c7e8555 systemtap-2.4.tar.gz
|
||||
a33c6f2ac5d6b77d8d02246685ee5105 systemtap-2.5.tar.gz
|
||||
|
|
|
|||
111
systemtap.spec
111
systemtap.spec
|
|
@ -1,7 +1,7 @@
|
|||
%{!?with_sqlite: %global with_sqlite 1}
|
||||
%{!?with_docs: %global with_docs 1}
|
||||
# crash is not available
|
||||
%ifarch ppc ppc64 %{sparc} aarch64
|
||||
%ifarch ppc ppc64 %{sparc} aarch64 ppc64le
|
||||
%{!?with_crash: %global with_crash 0}
|
||||
%else
|
||||
%{!?with_crash: %global with_crash 1}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
%{!?elfutils_version: %global elfutils_version 0.142}
|
||||
%{!?pie_supported: %global pie_supported 1}
|
||||
%{!?with_boost: %global with_boost 0}
|
||||
%ifarch ppc ppc64 %{sparc} aarch64
|
||||
%ifarch ppc ppc64 %{sparc} aarch64 ppc64le
|
||||
%{!?with_publican: %global with_publican 0}
|
||||
%else
|
||||
%{!?with_publican: %global with_publican 1}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
%else
|
||||
%{!?publican_brand: %global publican_brand fedora}
|
||||
%endif
|
||||
%ifnarch s390 s390x %{arm} aarch64
|
||||
%ifnarch s390 s390x %{arm} aarch64 ppc64le
|
||||
%{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
|
||||
%else
|
||||
%{!?with_dyninst: %global with_dyninst 0}
|
||||
|
|
@ -32,6 +32,18 @@
|
|||
# don't want to build runtime-virthost for f18 or RHEL5/6
|
||||
%{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
|
||||
%{!?with_virtguest: %global with_virtguest 1}
|
||||
%{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
|
||||
%ifarch x86_64
|
||||
%{!?with_mokutil: %global with_mokutil 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
|
||||
%{!?with_openssl: %global with_openssl 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
|
||||
%else
|
||||
%{!?with_mokutil: %global with_mokutil 0}
|
||||
%{!?with_openssl: %global with_openssl 0}
|
||||
%endif
|
||||
|
||||
%ifarch ppc64le
|
||||
%global with_virthost 0
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
|
||||
%define initdir %{_initddir}
|
||||
|
|
@ -40,16 +52,23 @@
|
|||
%endif
|
||||
|
||||
%if %{with_virtguest}
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
|
||||
%define udevrulesdir /lib/udev/rules.d
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%define udevrulesdir /usr/lib/udev/rules.d
|
||||
%else
|
||||
%define udevrulesdir /etc/udev/rules.d
|
||||
%if 0%{?rhel} >= 6
|
||||
%define udevrulesdir /lib/udev/rules.d
|
||||
%else # RHEL5
|
||||
%define udevrulesdir /etc/udev/rules.d
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define dracutlibdir %{_prefix}/lib/dracut
|
||||
%define dracutstap %{dracutlibdir}/modules.d/99stap
|
||||
|
||||
Name: systemtap
|
||||
Version: 2.4
|
||||
Release: 2%{?dist}
|
||||
Version: 2.5
|
||||
Release: 1%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
|
|
@ -60,7 +79,7 @@ Release: 2%{?dist}
|
|||
# systemtap-devel /usr/bin/stap, runtime, tapset, req:kernel-devel
|
||||
# systemtap-runtime /usr/bin/staprun, /usr/bin/stapsh, /usr/bin/stapdyn
|
||||
# systemtap-client /usr/bin/stap, samples, docs, tapset(bonus), req:-runtime
|
||||
# systemtap-initscript /etc/init.d/systemtap, req:systemtap
|
||||
# systemtap-initscript /etc/init.d/systemtap, dracut module, req:systemtap
|
||||
# systemtap-sdt-devel /usr/include/sys/sdt.h /usr/bin/dtrace
|
||||
# systemtap-testsuite /usr/share/systemtap/testsuite*, req:systemtap, req:sdt-devel
|
||||
# systemtap-runtime-java libHelperSDT.so, HelperSDT.jar, stapbm, req:-runtime
|
||||
|
|
@ -172,6 +191,9 @@ Requires(preun): chkconfig
|
|||
Requires(preun): initscripts
|
||||
Requires(postun): initscripts
|
||||
BuildRequires: nss-devel avahi-devel
|
||||
%if %{with_openssl}
|
||||
Requires: openssl
|
||||
%endif
|
||||
|
||||
%description server
|
||||
This is the remote script compilation server component of systemtap.
|
||||
|
|
@ -184,7 +206,6 @@ Summary: Programmable system-wide instrumentation system - development headers,
|
|||
Group: Development/System
|
||||
License: GPLv2+
|
||||
URL: http://sourceware.org/systemtap/
|
||||
Requires: kernel >= 2.6.9-11
|
||||
# Alternate kernel packages kernel-PAE-devel et al. have a virtual
|
||||
# provide for kernel-devel, so this requirement does the right thing,
|
||||
# at least past RHEL4.
|
||||
|
|
@ -206,7 +227,6 @@ Summary: Programmable system-wide instrumentation system - runtime
|
|||
Group: Development/System
|
||||
License: GPLv2+
|
||||
URL: http://sourceware.org/systemtap/
|
||||
Requires: kernel >= 2.6.9-11
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
%description runtime
|
||||
|
|
@ -224,6 +244,9 @@ Requires: zip unzip
|
|||
Requires: systemtap-runtime = %{version}-%{release}
|
||||
Requires: coreutils grep sed unzip zip
|
||||
Requires: openssh-clients
|
||||
%if %{with_mokutil}
|
||||
Requires: mokutil
|
||||
%endif
|
||||
|
||||
%description client
|
||||
This package contains/requires the components needed to develop
|
||||
|
|
@ -245,7 +268,9 @@ Requires(preun): initscripts
|
|||
Requires(postun): initscripts
|
||||
|
||||
%description initscript
|
||||
Sysvinit scripts to launch selected systemtap scripts at system startup.
|
||||
This package includes a SysVinit script to launch selected systemtap
|
||||
scripts at system startup, along with a dracut module for early
|
||||
boot-time probing if supported.
|
||||
|
||||
|
||||
%package sdt-devel
|
||||
|
|
@ -277,7 +302,7 @@ Requires: strace
|
|||
# that provides nc has changed over time (from 'nc' to
|
||||
# 'nmap-ncat'). So, we'll do a file-based require.
|
||||
Requires: /usr/bin/nc
|
||||
%ifnarch ia64
|
||||
%ifnarch ia64 ppc64le
|
||||
Requires: prelink
|
||||
%endif
|
||||
# testsuite/systemtap.server/client.exp needs avahi
|
||||
|
|
@ -294,6 +319,9 @@ Requires: /usr/lib/libc.so
|
|||
# ... and /usr/lib/libgcc_s.so.*
|
||||
# ... and /usr/lib/libstdc++.so.*
|
||||
%endif
|
||||
%if 0%{?fedora} >= 18
|
||||
Requires: stress
|
||||
%endif
|
||||
|
||||
%description testsuite
|
||||
This package includes the dejagnu-based systemtap stress self-testing
|
||||
|
|
@ -309,6 +337,7 @@ License: GPLv2+
|
|||
URL: http://sourceware.org/systemtap/
|
||||
Requires: systemtap-runtime = %{version}-%{release}
|
||||
Requires: byteman > 2.0
|
||||
Requires: net-tools
|
||||
|
||||
%description runtime-java
|
||||
This package includes support files needed to run systemtap scripts
|
||||
|
|
@ -545,6 +574,13 @@ done
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_dracut}
|
||||
mkdir -p $RPM_BUILD_ROOT%{dracutstap}
|
||||
install -p -m 755 initscript/99stap/module-setup.sh $RPM_BUILD_ROOT%{dracutstap}
|
||||
install -p -m 755 initscript/99stap/start-staprun.sh $RPM_BUILD_ROOT%{dracutstap}
|
||||
touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
|
|
@ -574,7 +610,11 @@ test -e ~stap-server && chmod 750 ~stap-server
|
|||
if [ ! -f ~stap-server/.systemtap/rc ]; then
|
||||
mkdir -p ~stap-server/.systemtap
|
||||
chown stap-server:stap-server ~stap-server/.systemtap
|
||||
echo "--rlimit-as=614400000 --rlimit-cpu=60 --rlimit-nproc=20 --rlimit-stack=1024000 --rlimit-fsize=51200000" > ~stap-server/.systemtap/rc
|
||||
# PR16276: guess at a reasonable number for a default --rlimit-nproc
|
||||
numcpu=`/usr/bin/getconf _NPROCESSORS_ONLN`
|
||||
if [ -z "$numcpu" -o "$numcpu" -lt 1 ]; then numcpu=1; fi
|
||||
nproc=`expr $numcpu \* 30`
|
||||
echo "--rlimit-as=614400000 --rlimit-cpu=60 --rlimit-nproc=$nproc --rlimit-stack=1024000 --rlimit-fsize=51200000" > ~stap-server/.systemtap/rc
|
||||
chown stap-server:stap-server ~stap-server/.systemtap/rc
|
||||
fi
|
||||
|
||||
|
|
@ -588,9 +628,10 @@ test -e %{_localstatedir}/log/stap-server/log || {
|
|||
if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then
|
||||
runuser -s /bin/sh - stap-server -c %{_libexecdir}/systemtap/stap-gen-cert >/dev/null
|
||||
fi
|
||||
# Activate the service
|
||||
# Prepare the service
|
||||
%if %{with_systemd}
|
||||
/bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
|
||||
# Note, Fedora policy doesn't allow network services enabled by default
|
||||
# /bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemd-tmpfiles --create %{_tmpfilesdir}/stap-server.conf >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/chkconfig --add stap-server
|
||||
|
|
@ -615,7 +656,7 @@ if [ $1 = 0 ] ; then
|
|||
/bin/systemctl stop stap-server.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service stap-server stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del stap-server
|
||||
/sbin/chkconfig --del stap-server
|
||||
%endif
|
||||
fi
|
||||
exit 0
|
||||
|
|
@ -625,7 +666,7 @@ exit 0
|
|||
# If so, restart the service if it's running
|
||||
if [ "$1" -ge "1" ] ; then
|
||||
%if %{with_systemd}
|
||||
/bin/systemctl restart stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl condrestart stap-server.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service stap-server condrestart >/dev/null 2>&1 || :
|
||||
%endif
|
||||
|
|
@ -634,8 +675,7 @@ exit 0
|
|||
|
||||
%post initscript
|
||||
%if %{with_systemd}
|
||||
/bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemd-tmpfiles --create %{_tmpfilesdir}/stap-server.conf >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/chkconfig --add systemtap
|
||||
%endif
|
||||
|
|
@ -646,11 +686,11 @@ exit 0
|
|||
# just removing the old package on upgrade.
|
||||
if [ $1 = 0 ] ; then
|
||||
%if %{with_systemd}
|
||||
/bin/systemctl --no-reload disable stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl stop stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl --no-reload disable systemtap.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl stop systemtap.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service systemtap stop >/dev/null 2>&1
|
||||
/sbin/chkconfig --del systemtap
|
||||
/sbin/chkconfig --del systemtap
|
||||
%endif
|
||||
fi
|
||||
exit 0
|
||||
|
|
@ -660,7 +700,7 @@ exit 0
|
|||
# If so, restart the service if it's running
|
||||
if [ "$1" -ge "1" ] ; then
|
||||
%if %{with_systemd}
|
||||
/bin/systemctl restart stap-server.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl condrestart systemtap.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service systemtap condrestart >/dev/null 2>&1 || :
|
||||
%endif
|
||||
|
|
@ -741,8 +781,10 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
|
|||
arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
|
||||
%endif
|
||||
for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
|
||||
ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
|
||||
ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
|
||||
if [ -d ${archdir} ]; then
|
||||
ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
|
||||
ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
|
|
@ -776,8 +818,10 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
|
|||
arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
|
||||
%endif
|
||||
for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
|
||||
ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
|
||||
ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
|
||||
if [ -d ${archdir} ]; then
|
||||
ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
|
||||
ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
|
|
@ -820,7 +864,6 @@ done
|
|||
%dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server
|
||||
%ghost %config(noreplace) %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log
|
||||
%ghost %attr(0755,stap-server,stap-server) %{_localstatedir}/run/stap-server
|
||||
%doc initscript/README.stap-server
|
||||
%doc README README.unprivileged AUTHORS NEWS COPYING
|
||||
|
||||
|
||||
|
|
@ -916,7 +959,11 @@ done
|
|||
%config(noreplace) %{_sysconfdir}/systemtap/config
|
||||
%dir %{_localstatedir}/cache/systemtap
|
||||
%ghost %{_localstatedir}/run/systemtap
|
||||
%doc initscript/README.systemtap
|
||||
%{_mandir}/man8/systemtap.8*
|
||||
%if %{with_dracut}
|
||||
%dir %{dracutstap}
|
||||
%{dracutstap}/*
|
||||
%endif
|
||||
|
||||
|
||||
%files sdt-devel
|
||||
|
|
@ -970,6 +1017,10 @@ done
|
|||
# http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
|
||||
%changelog
|
||||
* Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
|
||||
- Upstream release. See wiki page below for detailed notes.
|
||||
http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
|
||||
* Wed Feb 19 2014 Frank Ch. Eigler <fche@redhat.com> - 2.4-2
|
||||
- Backport fix for BZ1043212: use of systemd-tmpfiles --create without PATH
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue