From efd76cd0e70a32b43a4d341072e954164ede2e04 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 25 Mar 2013 11:00:16 -0400 Subject: [PATCH 1/6] Automated weekly systemtap rawhide release: 0.94.g48bf64d --- .gitignore | 1 + sources | 2 +- systemtap.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75fc225..d3644cb 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.70.g23c2c25.tar.gz /systemtap-2.2-0.74.gb1e0e10.tar.gz /systemtap-2.2-0.84.g74fc0fe.tar.gz +/systemtap-2.2-0.94.g48bf64d.tar.gz diff --git a/sources b/sources index 5665472..4f80cce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94b92904e429a969bc9c7ec5a9ecf17f systemtap-2.2-0.84.g74fc0fe.tar.gz +04c24b445d7ad17bb2d6f9243d1f1fd9 systemtap-2.2-0.94.g48bf64d.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 89bb358..86215a6 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -31,7 +31,7 @@ Name: systemtap Version: 2.2 -Release: 0.84.g74fc0fe%{?dist} +Release: 0.94.g48bf64d%{?dist} # for version, see also configure.ac @@ -61,7 +61,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.84.g74fc0fe.tar.gz +Source: %{name}-%{version}-0.94.g48bf64d.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -694,6 +694,9 @@ exit 0 # ------------------------------------------------------------------------ %changelog +* Mon Mar 25 2013 Lukas Berk - 2.2-0.94.g48bf64d +- Automated weekly rawhide release + * Wed Mar 20 2013 Lukas Berk - 2.2-0.84.g74fc0fe - Automated weekly rawhide release From 1a0e5394ab14e82e9ad323e1e46a979a2fe25751 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Tue, 26 Mar 2013 10:30:50 -0400 Subject: [PATCH 2/6] BZ926602 Updated autoconf to version 2.69 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d3644cb..a364aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.74.gb1e0e10.tar.gz /systemtap-2.2-0.84.g74fc0fe.tar.gz /systemtap-2.2-0.94.g48bf64d.tar.gz +/systemtap-2.2-0.103.g5c607f5.tar.gz diff --git a/sources b/sources index 4f80cce..4f19d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04c24b445d7ad17bb2d6f9243d1f1fd9 systemtap-2.2-0.94.g48bf64d.tar.gz +37cb01ac4c505387c8acdc691e51db0e systemtap-2.2-0.103.g5c607f5.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 86215a6..edb21a0 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -31,7 +31,7 @@ Name: systemtap Version: 2.2 -Release: 0.94.g48bf64d%{?dist} +Release: 0.103.g5c607f5%{?dist} # for version, see also configure.ac @@ -61,7 +61,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.94.g48bf64d.tar.gz +Source: %{name}-%{version}-0.103.g5c607f5.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -694,6 +694,9 @@ exit 0 # ------------------------------------------------------------------------ %changelog +* Tue Mar 26 2013 Lukas Berk - 2.2-0.103.g5c607f5 +- BZ926602 Updated autoconf to version 2.69 + * Mon Mar 25 2013 Lukas Berk - 2.2-0.94.g48bf64d - Automated weekly rawhide release From daf27544e9f3d4a9de0102c8f61b5e5a66995675 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Tue, 26 Mar 2013 11:07:47 -0400 Subject: [PATCH 3/6] Added stap-prep.1 man page --- .gitignore | 1 + sources | 2 +- systemtap.spec | 27 +++++++-------------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index a364aa5..d685b12 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.84.g74fc0fe.tar.gz /systemtap-2.2-0.94.g48bf64d.tar.gz /systemtap-2.2-0.103.g5c607f5.tar.gz +/systemtap-2.2-0.104.gd142b86.tar.gz diff --git a/sources b/sources index 4f19d9f..6e5c31f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37cb01ac4c505387c8acdc691e51db0e systemtap-2.2-0.103.g5c607f5.tar.gz +06ed4ce30061ba0e9e58fad5ac443caa systemtap-2.2-0.104.gd142b86.tar.gz diff --git a/systemtap.spec b/systemtap.spec index edb21a0..fbac0c8 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -14,7 +14,7 @@ %ifarch ppc ppc64 %{sparc} %{!?with_publican: %global with_publican 0} %else -%{!?with_publican: %global with_publican 0} +%{!?with_publican: %global with_publican 1} %endif %if 0%{?rhel} %{!?publican_brand: %global publican_brand RedHat} @@ -31,7 +31,7 @@ Name: systemtap Version: 2.2 -Release: 0.103.g5c607f5%{?dist} +Release: 0.104.gd142b86%{?dist} # for version, see also configure.ac @@ -61,7 +61,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.103.g5c607f5.tar.gz +Source: %{name}-%{version}-0.104.gd142b86.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -602,6 +602,7 @@ exit 0 %{_datadir}/systemtap/runtime %{_datadir}/systemtap/tapset %{_mandir}/man1/stap.1* +%{_mandir}/man1/stap-prep.1* %{_mandir}/man7/error* %{_mandir}/man7/stappaths.7* %{_mandir}/man7/warning* @@ -654,6 +655,7 @@ exit 0 %{_bindir}/stap-prep %{_bindir}/stap-report %{_mandir}/man1/stap.1* +%{_mandir}/man1/stap-prep.1* %{_mandir}/man1/stap-merge.1* %{_mandir}/man3/* %{_mandir}/man7/error* @@ -694,23 +696,8 @@ exit 0 # ------------------------------------------------------------------------ %changelog -* Tue Mar 26 2013 Lukas Berk - 2.2-0.103.g5c607f5 -- BZ926602 Updated autoconf to version 2.69 - -* Mon Mar 25 2013 Lukas Berk - 2.2-0.94.g48bf64d -- Automated weekly rawhide release - -* Wed Mar 20 2013 Lukas Berk - 2.2-0.84.g74fc0fe -- Automated weekly rawhide release - -* Wed Mar 20 2013 Lukas Berk - 2.2-0.84.g74fc0fe -- Automated weekly rawhide release - -* Mon Mar 11 2013 Lukas Berk - 2.2-0.74.gb1e0e10 -- Automated weekly rawhide release - -* Mon Mar 11 2013 Lukas Berk - 2.2-0.70.g23c2c25 -- Automated weekly rawhide release +* Tue Mar 26 2013 Lukas Berk - 2.2-0.104.gd142b86 +- Added stap-prep.1 man page * Wed Feb 13 2013 Serguei Makarov - 2.1-1 - Upstream release. From 5d61ce482d20da6010bc357e96f7e66fe52d8a07 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Tue, 26 Mar 2013 12:01:25 -0400 Subject: [PATCH 4/6] Turned off doc generation until BZ920216 resolved --- .gitignore | 1 + sources | 2 +- systemtap.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d685b12..68af2af 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.94.g48bf64d.tar.gz /systemtap-2.2-0.103.g5c607f5.tar.gz /systemtap-2.2-0.104.gd142b86.tar.gz +/systemtap-2.2-0.104.gd142b86.1.tar.gz diff --git a/sources b/sources index 6e5c31f..fcd575d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06ed4ce30061ba0e9e58fad5ac443caa systemtap-2.2-0.104.gd142b86.tar.gz +06ed4ce30061ba0e9e58fad5ac443caa systemtap-2.2-0.104.gd142b86.1.tar.gz diff --git a/systemtap.spec b/systemtap.spec index fbac0c8..89d2a55 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -14,7 +14,7 @@ %ifarch ppc ppc64 %{sparc} %{!?with_publican: %global with_publican 0} %else -%{!?with_publican: %global with_publican 1} +%{!?with_publican: %global with_publican 0} %endif %if 0%{?rhel} %{!?publican_brand: %global publican_brand RedHat} @@ -31,7 +31,7 @@ Name: systemtap Version: 2.2 -Release: 0.104.gd142b86%{?dist} +Release: 0.104.gd142b86.1%{?dist} # for version, see also configure.ac @@ -61,7 +61,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.104.gd142b86.tar.gz +Source: %{name}-%{version}-0.104.gd142b86.1.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -696,6 +696,9 @@ exit 0 # ------------------------------------------------------------------------ %changelog +* Tue Mar 26 2013 Lukas Berk - 2.2-0.104.gd142b86.1 +- Turned off doc generation until BZ920216 resolved + * Tue Mar 26 2013 Lukas Berk - 2.2-0.104.gd142b86 - Added stap-prep.1 man page From ce2ce131467f334caa1981c6b09649109dba256e Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 22 Apr 2013 10:13:11 -0400 Subject: [PATCH 5/6] Automated weekly systemtap rawhide release: 0.125.ga88f5ee, disable publican --- .gitignore | 1 + sources | 2 +- systemtap.spec | 22 ++++++++++------------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 68af2af..3b8067a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.103.g5c607f5.tar.gz /systemtap-2.2-0.104.gd142b86.tar.gz /systemtap-2.2-0.104.gd142b86.1.tar.gz +/systemtap-2.2-0.125.ga88f5ee.tar.gz diff --git a/sources b/sources index fcd575d..4b7973b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06ed4ce30061ba0e9e58fad5ac443caa systemtap-2.2-0.104.gd142b86.1.tar.gz +0be7dcc482eb2c3c920c3dfc0d340a04 systemtap-2.2-0.125.ga88f5ee.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 89d2a55..8658474 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,5 +1,5 @@ %{!?with_sqlite: %global with_sqlite 1} -%{!?with_docs: %global with_docs 1} +%{!?with_docs: %global with_docs 0} # crash is not available %ifarch ppc ppc64 %{sparc} %{!?with_crash: %global with_crash 0} @@ -31,7 +31,7 @@ Name: systemtap Version: 2.2 -Release: 0.104.gd142b86.1%{?dist} +Release: 0.125.ga88f5ee%{?dist} # for version, see also configure.ac @@ -61,7 +61,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.104.gd142b86.1.tar.gz +Source: %{name}-%{version}-0.125.ga88f5ee.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -696,11 +696,9 @@ exit 0 # ------------------------------------------------------------------------ %changelog -* Tue Mar 26 2013 Lukas Berk - 2.2-0.104.gd142b86.1 -- Turned off doc generation until BZ920216 resolved - -* Tue Mar 26 2013 Lukas Berk - 2.2-0.104.gd142b86 -- Added stap-prep.1 man page +* Mon Apr 22 2013 Lukas Berk - 2.2-0.125.ga88f5ee +- Automated weekly rawhide release +- Applied spec changes from upstream git * Wed Feb 13 2013 Serguei Makarov - 2.1-1 - Upstream release. @@ -724,7 +722,7 @@ exit 0 * Mon Jul 25 2011 Stan Cox - 1.6-1 - Upstream release. -* Tue May 23 2011 Stan Cox - 1.5-1 +* Mon May 23 2011 Stan Cox - 1.5-1 - Upstream release. * Mon Jan 17 2011 Frank Ch. Eigler - 1.4-1 @@ -783,7 +781,7 @@ exit 0 * Wed Jul 11 2007 Will Cohen - 0.5.14-2 - Fix Requires and BuildRequires for sqlite. -* Tue Jul 2 2007 Frank Ch. Eigler - 0.5.14-1 +* Mon Jul 2 2007 Frank Ch. Eigler - 0.5.14-1 - Many robustness improvements: 1117, 1134, 1305, 1307, 1570, 1806, 2033, 2116, 2224, 2339, 2341, 2406, 2426, 2438, 2583, 3037, 3261, 3282, 3331, 3428 3519, 3545, 3625, 3648, 3880, 3888, 3911, @@ -846,7 +844,7 @@ exit 0 * Wed Sep 7 2005 Frank Ch. Eigler - Bump version. -* Wed Aug 16 2005 Frank Ch. Eigler +* Tue Aug 16 2005 Frank Ch. Eigler - Bump version. * Wed Aug 3 2005 Martin Hunt - 0.2.2-1 @@ -867,5 +865,5 @@ exit 0 - Fix up some of the path names. - Add Requires and BuildRequires. -* Wed Jul 19 2005 Will Cohen +* Tue Jul 19 2005 Will Cohen - Initial creation of RPM. From 4c0906314ea14c4ca889f52a7b3de836a1d25e93 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 14 May 2013 12:29:34 -0400 Subject: [PATCH 6/6] systemtap 2.2 release --- .gitignore | 1 + sources | 2 +- systemtap.spec | 88 ++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3b8067a..f43b257 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ systemtap-1.3.tar.gz /systemtap-2.2-0.104.gd142b86.tar.gz /systemtap-2.2-0.104.gd142b86.1.tar.gz /systemtap-2.2-0.125.ga88f5ee.tar.gz +/systemtap-2.2.tar.gz diff --git a/sources b/sources index 4b7973b..610df7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0be7dcc482eb2c3c920c3dfc0d340a04 systemtap-2.2-0.125.ga88f5ee.tar.gz +e52c71d1736a1ccc2fe6367305d83d44 systemtap-2.2.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 8658474..3b6a1a5 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -28,10 +28,11 @@ %endif %{!?with_systemd: %global with_systemd 0%{?fedora} >= 19} %{!?with_emacsvim: %global with_emacsvim 1} +%{!?with_java: %global with_java 1} Name: systemtap Version: 2.2 -Release: 0.125.ga88f5ee%{?dist} +Release: 1%{?dist} # for version, see also configure.ac @@ -45,6 +46,7 @@ Release: 0.125.ga88f5ee%{?dist} # systemtap-initscript /etc/init.d/systemtap, 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 # # Typical scenarios: # @@ -61,7 +63,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.125.ga88f5ee.tar.gz +Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -110,6 +112,9 @@ BuildRequires: /usr/share/publican/Common_Content/%{publican_brand}/defaults.cfg %if %{with_emacsvim} BuildRequires: emacs %endif +%if %{with_java} +BuildRequires: jpackage-utils java-devel +%endif # Install requirements Requires: systemtap-client = %{version}-%{release} @@ -260,6 +265,22 @@ suite. This may be used by system administrators to thoroughly check systemtap on the current system. +%if %{with_java} +%package runtime-java +Summary: Systemtap Java Runtime Support +Group: Development/System +License: GPLv2+ +URL: http://sourceware.org/systemtap/ +Requires: systemtap-runtime = %{version}-%{release} +Requires: byteman > 2.0 + +%description runtime-java +This package includes support files needed to run systemtap scripts +that probe Java processes running on the OpenJDK 1.6 and OpenJDK 1.7 +runtimes using Byteman. +%endif + + # ------------------------------------------------------------------------ %prep @@ -339,8 +360,13 @@ cd .. %global publican_config --disable-publican %endif +%if %{with_java} +%global java_config --with-java=%{_jvmdir}/java +%else +%global java_config --without-java +%endif -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{publican_config} %{rpm_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{publican_config} %{rpm_config} %{java_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -557,6 +583,42 @@ exit 0 # ------------------------------------------------------------------------ +%if %{with_java} + +%triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do + arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` + 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 + done +done + +%triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do + arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` + for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do + rm -f ${archdir}/libHelperSDT_${arch}.so + rm -f ${archdir}/../ext/HelperSDT.jar + done +done + +%triggerpostun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +# Restore links for any JDKs remaining after a package removal: +for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do + arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` + 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 + done +done + +# XXX: analogous support for other types of JRE/JDK?? + +%endif + +# ------------------------------------------------------------------------ + %files -f systemtap.lang # The master "systemtap" rpm doesn't include any files. @@ -607,6 +669,10 @@ exit 0 %{_mandir}/man7/stappaths.7* %{_mandir}/man7/warning* %doc README README.unprivileged AUTHORS NEWS COPYING +%if %{with_java} +%dir %{_libexecdir}/systemtap +%{_libexecdir}/systemtap/libHelperSDT_*.so +%endif %if %{with_bundled_elfutils} %dir %{_libdir}/systemtap %{_libdir}/systemtap/lib*.so* @@ -678,7 +744,7 @@ exit 0 %doc initscript/README.systemtap -%files sdt-devel -f systemtap.lang +%files sdt-devel %defattr(-,root,root) %{_bindir}/dtrace %{_includedir}/sys/sdt.h @@ -693,12 +759,20 @@ exit 0 %{_datadir}/systemtap/testsuite +%if %{with_java} +%files runtime-java +%dir %{_libexecdir}/systemtap +%{_libexecdir}/systemtap/libHelperSDT_*.so +%{_libexecdir}/systemtap/HelperSDT.jar +%{_libexecdir}/systemtap/stapbm +%endif + + # ------------------------------------------------------------------------ %changelog -* Mon Apr 22 2013 Lukas Berk - 2.2-0.125.ga88f5ee -- Automated weekly rawhide release -- Applied spec changes from upstream git +* Tue May 14 2013 Frank Ch. Eigler - 2.2-1 +- Upstream release. * Wed Feb 13 2013 Serguei Makarov - 2.1-1 - Upstream release.