[systemtap] Automated weekly systemtap rawhide release: 0.151.g6ded984aa63f
lukas berk
lberk at fedoraproject.org
Mon Jan 20 14:22:47 UTC 2014
commit a11507df757872b57c1c734afd2af39306e4868a
Author: Lukas Berk <lberk at redhat.com>
Date: Mon Jan 20 09:22:59 2014 -0500
Automated weekly systemtap rawhide release: 0.151.g6ded984aa63f
.gitignore | 1 +
sources | 2 +-
systemtap.spec | 47 +++++++++++++++++++++++++++++++++++------------
3 files changed, 37 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 971793e..b0b4f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ systemtap-1.3.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
diff --git a/sources b/sources
index 9d72ff3..3062af4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d406e5739f78f3008ed81c347a307464 systemtap-2.5-0.123.gc60517ca2f99.tar.gz
+ad95a6a158a9c878a099425423e0cdbb systemtap-2.5-0.151.g6ded984aa63f.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 1b21d79..04aa673 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -32,6 +32,7 @@
# 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}
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
%define initdir %{_initddir}
@@ -51,9 +52,12 @@
%endif
%endif
+%define dracutlibdir %{_prefix}/lib/dracut
+%define dracutstap %{dracutlibdir}/modules.d/99stap
+
Name: systemtap
Version: 2.5
-Release: 0.123.gc60517ca2f99%{?dist}
+Release: 0.151.g6ded984aa63f%{?dist}
# for version, see also configure.ac
@@ -64,7 +68,7 @@ Release: 0.123.gc60517ca2f99%{?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
@@ -86,7 +90,7 @@ Summary: Programmable system-wide instrumentation system
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.123.gc60517ca2f99.tar.gz
+Source: %{name}-%{version}-0.151.g6ded984aa63f.tar.gz
# Build*
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -249,7 +253,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
@@ -298,6 +304,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
@@ -549,6 +558,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}
@@ -623,7 +639,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
@@ -633,7 +649,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 restart stap-server.service >/dev/null 2>&1 || :
%else
/sbin/service stap-server condrestart >/dev/null 2>&1 || :
%endif
@@ -642,8 +658,7 @@ exit 0
%post initscript
%if %{with_systemd}
- /bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
- /bin/systemd-tmpfiles --create >/dev/null 2>&1 || :
+ /bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
%else
/sbin/chkconfig --add systemtap
%endif
@@ -654,11 +669,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
@@ -668,7 +683,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
@@ -925,6 +940,10 @@ done
%dir %{_localstatedir}/cache/systemtap
%ghost %{_localstatedir}/run/systemtap
%doc initscript/README.systemtap
+%if %{with_dracut}
+ %dir %{dracutstap}
+ %{dracutstap}/*
+%endif
%files sdt-devel
@@ -978,6 +997,10 @@ done
# http://sourceware.org/systemtap/wiki/SystemTapReleases
%changelog
+* Mon Jan 20 2014 Lukas Berk <lberk at redhat.com> - 2.5-0.151.g6ded984aa63f
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
* Mon Jan 13 2014 Lukas Berk <lberk at redhat.com> - 2.5-0.123.gc60517ca2f99
- Automated weekly rawhide release
- Applied spec changes from upstream git
More information about the scm-commits
mailing list