diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..30ffdbe --- /dev/null +++ b/_multibuild @@ -0,0 +1,5 @@ + + docs + headers + dtrace + diff --git a/systemtap-docs.changes b/systemtap-docs.changes deleted file mode 100644 index 42b4f7f..0000000 --- a/systemtap-docs.changes +++ /dev/null @@ -1,546 +0,0 @@ -------------------------------------------------------------------- -Fri Aug 9 20:06:57 UTC 2019 - Tony Jones - -- Upgrade to version 4.1. See systemtap.spec for changelog -- Remove systemtap-exporter files (built due to BuildRequires: python3-devel) - -------------------------------------------------------------------- -Fri Aug 3 16:50:41 UTC 2018 - sschricker@suse.de - -- Upgrade to version 3.3: - - Changelog: https://lwn.net/Articles/757030/ - - eBPF backend extensions, easier access to examples, adapting to - meltdown/spectre complications, real-time / high-cpu-count - concurrency fixes - -- Added public key of "Frank Ch. Eigler ", - since he signed the new package - -------------------------------------------------------------------- -Fri Feb 2 23:31:59 UTC 2018 - tonyj@suse.com - -- Fix python3 build failures - -------------------------------------------------------------------- -Mon Nov 20 23:06:17 UTC 2017 - tonyj@suse.com - -- Upgrade to version 3.2. See systemtap.spec for changelog - Drop patch: systemtap-doc-back-down-gettext-version.diff - -------------------------------------------------------------------- -Tue Mar 28 20:04:44 UTC 2017 - jeffm@suse.com - -- Update to version 3.1. See systemtap.spec for changelog - Added patch: systemtap-doc-back-down-gettext-version.diff - -------------------------------------------------------------------- -Fri Apr 1 17:29:31 UTC 2016 - tonyj@suse.com - -- Update to version 3.0. See systemtap.spec for changelog - Drop patch: systemtap-xmlto-fop.diff - -------------------------------------------------------------------- -Tue Nov 10 00:40:17 UTC 2015 - tonyj@suse.com - -- Update to version 2.9. See systemtap.spec for changelog - -------------------------------------------------------------------- -Fri Sep 11 18:00:49 UTC 2015 - tonyj@suse.com - -- Update to version 2.8. See systemtap.spec for changelog - Update patch 'systemtap-docdir-fix.diff' (package beginners guide) - -------------------------------------------------------------------- -Fri Mar 27 14:11:25 UTC 2015 - p.drouand@gmail.com - -- Update to version 2.7. See systemtap.spec for changelog -- Update systemtap-docdir-fix.diff - -------------------------------------------------------------------- -Tue Feb 17 20:51:58 UTC 2015 - mpluskal@suse.com - -- Add gpg signature and keyring -- Cleanup spec file with spec-cleaner - -------------------------------------------------------------------- -Tue Sep 9 06:06:42 UTC 2014 - tonyj@suse.com - -- Update to version 2.6. See systemtap.spec for changelog - -------------------------------------------------------------------- -Fri May 2 19:50:28 UTC 2014 - tonyj@suse.com - -- Update to version 2.5. See systemtap.spec for changelog -- Drop patch: langref.tex-add-option-to-babel-setup.patch (upstream) -- Patch systemtap-docs-autoconf-version.diff was still present - despite being "dropped" in 2.4, really delete it - -------------------------------------------------------------------- -Thu Dec 19 22:05:14 UTC 2013 - tonyj@suse.com - -- Fix build errors due to changes in LaTeX packaging -- Add patch 'langref.tex-add-option-to-babel-setup.patch' - -------------------------------------------------------------------- -Fri Nov 15 18:51:03 UTC 2013 - tonyj@suse.com - -- Update to version 2.4. See systemtap.spec for changelog -- Drop patch systemtap-docs-autoconf-version.diff - -------------------------------------------------------------------- -Wed Aug 7 17:44:37 UTC 2013 - tonyj@suse.com - -- Update to version 2.3. See systemtap.spec for changelog - -------------------------------------------------------------------- -Wed May 22 17:47:56 UTC 2013 - tonyj@suse.com - -- Update to version 2.2.1. See systemtap.spec for changelog - -------------------------------------------------------------------- -Sat Jan 12 05:10:48 UTC 2013 - tonyj@suse.com - -- Update to version 2.0. See systemtap.spec for changelog - -------------------------------------------------------------------- -Fri Jul 27 10:29:23 UTC 2012 - aj@suse.de - -- Fix build with glibc 2.16 - -------------------------------------------------------------------- -Mon Jun 18 09:47:49 CEST 2012 - jslaby@suse.de - -- Upgrade to version 1.8 - -------------------------------------------------------------------- -Thu Jun 14 20:11:49 UTC 2012 - dimstar@opensuse.org - -- Add systemtap-automake112.patch: Fix build with automake 1.12: - + Support for automatic de-ANSI-fication has been removed. - + Patch taken from upstream, git commit id 5b2bc70. - -------------------------------------------------------------------- -Sat Feb 18 01:36:46 UTC 2012 - tonyj@suse.com - -- Update to version 1.7. See systemtap.spec for changelog - -------------------------------------------------------------------- -Sun Jan 29 06:34:11 UTC 2012 - coolo@suse.com - -- add automake too - -------------------------------------------------------------------- -Wed Dec 21 10:44:28 UTC 2011 - coolo@suse.com - -- add autoconf as buildrequire to avoid implicit dependency - -------------------------------------------------------------------- -Wed Nov 2 10:54:46 CET 2011 - jslaby@suse.de - -- update to 1.6 - -------------------------------------------------------------------- -Tue Jun 7 08:11:15 UTC 2011 - coolo@novell.com - -- fix file dependencies of examples and testsuite - -------------------------------------------------------------------- -Tue May 17 11:28:27 CEST 2011 - jslaby@suse.de - -- fix gcc 4.6 build - -------------------------------------------------------------------- -Fri Jan 21 18:45:18 UTC 2011 - tonyj@novell.com - -- Update to version 1.4. See systemtap.changes for full changelog. - -------------------------------------------------------------------- -Thu Aug 26 02:15:11 UTC 2010 - tonyj@novell.com - -- Update to version 1.3 - -------------------------------------------------------------------- -Thu Mar 11 22:49:52 UTC 2010 - tonyj@novell.com - -- Update to version 1.1. See systemtap.changes for full changelog. - -------------------------------------------------------------------- -Wed Dec 2 23:52:10 UTC 2009 - tonyj@novell.com - -- Minor changes to spec file - -------------------------------------------------------------------- -Fri Oct 2 18:57:14 CEST 2009 - tonyj@suse.de - -- updated to version 1.0. See systemtap.changes for full changelog. - -------------------------------------------------------------------- -Tue Jul 21 08:47:33 CEST 2009 - tiwai@suse.de - -- corrected to use libexecdir -- fix summary and description - -------------------------------------------------------------------- -Thu Jun 18 12:46:08 CEST 2009 - tiwai@suse.de - -- change to noarch - -------------------------------------------------------------------- -Tue Jun 16 16:26:52 CEST 2009 - tiwai@suse.de - -- updated to version 0.9.8: - * Module signing support - * Debuginfo suggestions when a script fails - * Using %M in print formats for hex dumps can now print entire - buffers - * Dwarfless syscalls: The nd_syscalls tapset is now available to - probe system calls without requiring kernel debug info. - * sid() returns the session ID of the current process - * stringat() indexes a single character from a string. - * New script examples - -------------------------------------------------------------------- -Fri May 22 09:38:19 CEST 2009 - tiwai@suse.de - -- add missing examples installation in docs subpackage - -------------------------------------------------------------------- -Wed May 20 13:02:00 CEST 2009 - tiwai@suse.de - -- split docs and examples to docs subpackage and generate from its - own spec file to cut off the dependency loop - -------------------------------------------------------------------- -Fri May 15 11:46:11 CEST 2009 - tiwai@suse.de - -- split to several subpackages, systemtap-runtime, -client, -server - and -sdt-devel (bnc#503088). - -------------------------------------------------------------------- -Fri May 8 16:43:08 CEST 2009 - tiwai@suse.de - -- updated to released version 0.9.7: - * Lots of fixes, improvements, see NEWS file for details - -------------------------------------------------------------------- -Thu Feb 19 16:55:48 CET 2009 - tiwai@suse.de - -- updated to systemtap snashot 20090214: - * Version bump to 0.8 - * Bunch of fixes and updates, see ChangeLog - * Fix for recent 2.6.29 kernels -- fixed doc build, using fop instead of direct xmlto pdf - -------------------------------------------------------------------- -Thu Feb 12 16:32:29 CET 2009 - tiwai@suse.de - -- backport the blacklist additions from upstream to fix possible - system crash (bnc#459387, bnc#473277) - -------------------------------------------------------------------- -Thu Feb 5 13:31:19 CET 2009 - tiwai@suse.de - -- Backport tapset/signal.stp to fix the signal probe problem - (bnc#468321) - -------------------------------------------------------------------- -Tue Feb 3 14:39:38 CET 2009 - tiwai@suse.de - -- Fix debugpath.exp with $SYSTEMTAP_DEBUGINFO_PATH (bnc#471811) - -------------------------------------------------------------------- -Thu Jan 29 12:58:42 CET 2009 - tiwai@suse.de - -- Fix procfs dir_entry count warning (bnc#470526) -- Improve the parsing of lineno checks (bnc#468247) - -------------------------------------------------------------------- -Thu Jan 15 08:22:24 CET 2009 - tiwai@suse.de - -- Fix quoting in Tcl scripts (bnc#461588) - -------------------------------------------------------------------- -Mon Jan 12 12:55:06 CET 2009 - tiwai@suse.de - -- Fix syntax errors with Tcl send_log (bnc#460886) - -------------------------------------------------------------------- -Thu Dec 18 16:59:23 CET 2008 - tiwai@suse.de - -- Fix stap failures with signal tapsets (bnc#459387) - -------------------------------------------------------------------- -Tue Dec 16 13:50:32 CET 2008 - tiwai@suse.de - -- Fix dependency on libebl1 (bnc#448331, #445783) -- Fix stap for 2.6.28 kernels - -------------------------------------------------------------------- -Fri Dec 12 16:32:35 CET 2008 - tiwai@suse.de - -- Don't assert of dwarf_getsrcfiles(). This hits recent SUSE - kernels (bnc#455992) -- Backport fix patches for stap-*-server scripts to run with - netcat (bnc#446686) - -------------------------------------------------------------------- -Mon Dec 8 14:09:01 CET 2008 - tiwai@suse.de - -- fixed unresolved path in man pages (bnc#457217) -- fixed build for old distros on OBS - -------------------------------------------------------------------- -Thu Dec 4 18:08:23 CET 2008 - tiwai@suse.de - -- fix ioblock.stp for SUSE 2.6.27.x kernel (bnc#456175) - -------------------------------------------------------------------- -Fri Nov 21 14:09:21 CET 2008 - tiwai@suse.de - -- Add the bound check of parameters to fix segfault (bnc#447551) - -------------------------------------------------------------------- -Tue Nov 4 13:57:24 CET 2008 - tiwai@suse.de - -- Fix systemtap assertion with CONFIG_RELOCATABLE (bnc#440351) - -------------------------------------------------------------------- -Thu Sep 11 17:14:47 CEST 2008 - tiwai@suse.de - -- updated to snapshot 20080906 - * Fix / clean up autotools stuff - * Ugly workaround for 2.6.27 and later kernel - * stap-server updates - * Lots of small fixes - -------------------------------------------------------------------- -Tue Aug 12 18:11:10 CEST 2008 - tiwai@suse.de - -- updated to snapshot 20080809 - * bump to 0.7.1 - * tutorials - * examples - * i386-fix merged - * previous patches are all merged in -- add latex2html to buildrequires for generating documents - -------------------------------------------------------------------- -Fri Jun 20 15:58:30 CEST 2008 - tiwai@suse.de - -- fix run on i386 (bnc#401970) -- don't include obsolete linux/compile.h. - -------------------------------------------------------------------- -Wed Jun 18 16:04:01 CEST 2008 - tiwai@suse.de - -- updated to snapshot 20080614: - * bump to version 0.7, man page updates, misc fixes - see ChangeLog for details - -------------------------------------------------------------------- -Fri Mar 14 14:15:17 CET 2008 - tiwai@suse.de - -- updated to snapshot 20080308: - * configure fixes, compile option changes - * fixes for 2.6.25 kernel - -------------------------------------------------------------------- -Wed Jan 30 18:26:01 CET 2008 - tiwai@suse.de - -- updated to snapshot 20080126 - * fix configure and automake stuff - * gcc 4.3 fix is included - * ufprobes fixes, improvements - * reorganized probe condition implementation. - -------------------------------------------------------------------- -Fri Jan 11 17:10:09 CET 2008 - tiwai@suse.de - -- updated to snapshot 20080105 -- fixed build of the snapshot with gcc 4.3 - -------------------------------------------------------------------- -Mon Nov 19 14:53:53 CET 2007 - tiwai@suse.de - -- enable gcc-4.3 patch (yes, we use only gcc4.3 now) -- updated to snapshot 20071117 - -------------------------------------------------------------------- -Thu Oct 25 12:53:04 CEST 2007 - tiwai@suse.de - -- disable gcc-4.3 fix again since it breaks older gccs... - -------------------------------------------------------------------- -Wed Oct 24 16:33:35 CEST 2007 - tiwai@suse.de - -- fix build with gcc 4.3 - -------------------------------------------------------------------- -Mon Oct 22 15:23:15 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20071020: - * bump up version 0.6 - * bunch of updates and fixes, see ChangeLog - -------------------------------------------------------------------- -Tue Aug 14 16:53:57 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070811: - * Updated -m MODNAME usage - * Rework on line editing functions - -------------------------------------------------------------------- -Mon Jul 16 17:39:33 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070714: - * configure fix for sqlite - * support for crash extension module - * new enum for type column in coverage_element - -------------------------------------------------------------------- -Wed Jul 4 12:22:34 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070630: - * auto-tools fixes, sqlite3 requirement -- add sqlite-devel and glib2-devel to buildrequires - -------------------------------------------------------------------- -Wed Jun 6 16:13:15 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070602: - * fix for gcc4.3 - * minor fixes in elaborate.* -- include the snapshot date into version string -- clean up spec file - -------------------------------------------------------------------- -Tue May 22 17:09:38 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070519: - * Updated temporary handlings - * Autoconf tweaks - * Performance improvements with const and temporary handlings - * Removed do_write and do_read probles, added aio_write, - aio_read, writev and readv probes. - -------------------------------------------------------------------- -Mon May 21 12:24:15 CEST 2007 - tiwai@suse.de - -- use the external elfutils packages. - -------------------------------------------------------------------- -Tue Apr 24 18:15:56 CEST 2007 - tiwai@suse.de - -- updated to snapshot 20070421 and elfutils-0.127: - * minor compile warning fixes - * add interruptible parameter - * improvement on documents - * fix for debugfs and relayfs mounts - * see ChangeLog for other changes - -------------------------------------------------------------------- -Mon Mar 19 17:25:52 CET 2007 - tiwai@suse.de - -- updated to snapshot 20070317: - including all fix patches - -------------------------------------------------------------------- -Thu Mar 8 15:24:56 CET 2007 - tiwai@suse.de - -- fix the handling of function arguments in more generic way - (#245310, #252311) - added a new option -P to switch the prologue-search behavior - -------------------------------------------------------------------- -Wed Mar 7 15:47:20 CET 2007 - tiwai@suse.de - -- fix misalignment of exception table entry on s390x (#249576) - -------------------------------------------------------------------- -Mon Feb 26 12:42:41 CET 2007 - tiwai@suse.de - -- fix crash with large H value in hist_linear() (#248430) - -------------------------------------------------------------------- -Fri Feb 23 16:43:53 CET 2007 - tiwai@suse.de - -- fix mmap syscall on s390x (#248110) - -------------------------------------------------------------------- -Thu Feb 15 13:20:32 CET 2007 - tiwai@suse.de - -- fix a wrong name of store_deref definition (#245544) - -------------------------------------------------------------------- -Wed Feb 14 16:39:39 CET 2007 - tiwai@suse.de - -- fix the handling of function arguments on s390x (#245310) - -------------------------------------------------------------------- -Tue Feb 6 14:51:54 CET 2007 - tiwai@suse.de - -- update to snapshot 20070203, bugfixes including: - * add missing sockets tapset support (#239346) - * fix the array membership (#242481) - -------------------------------------------------------------------- -Wed Jan 31 13:44:43 CET 2007 - tiwai@suse.de - -- turn on Autoprov again to fix broken dependency. - -------------------------------------------------------------------- -Tue Jan 30 12:01:03 CET 2007 - tiwai@suse.de - -- update to snapshot 20070120 and elfutils-0.125 to fix major - bugs (#238710): - * fixed libdw known bugs in elfutils 0.124 - * add the missing support of tapsetr/errno.stp for s390x - * fix conditionals in syscall tapset for s390x - * new macros to safely read/write values from kernel pointers - * fix the non-standard C behavior to handle NULL in an array - * fixed support for benchmarking mode with off-line code - * added support to allow user to use array size declarations - * reduce number of calls to stp_module_relocate within $tvar - functions - -------------------------------------------------------------------- -Tue Jan 9 19:30:00 CET 2007 - tiwai@suse.de - -- updated to the recent snapshot version (FATE 301670). - * fix cache bugs - * auto-tools fixes - * probe registartion rework - * allow negative numeric literals - * bugfixes/optmizations -- elfutls 1.2.4 - removed codes with problematic license in elfutils (#232894) - -------------------------------------------------------------------- -Thu Aug 24 19:10:59 CEST 2006 - tiwai@suse.de - -- update elfutils to 1.2.3, including vmlinux.debuginfo fix. - -------------------------------------------------------------------- -Thu Aug 24 18:20:39 CEST 2006 - tiwai@suse.de - -- fix the auto-lookup of vmlinux debuginfo for SUSE systems -- fix the stp compilation with 2.6.18 kernel - -------------------------------------------------------------------- -Wed Aug 9 15:27:09 CEST 2006 - tiwai@suse.de - -- updated to latest snapshot (version 0.5.8) - with elfutils-1.2.2. - -------------------------------------------------------------------- -Tue Apr 18 03:14:22 CEST 2006 - mason@suse.de - -- Update to latest snapshot - -------------------------------------------------------------------- -Sun Apr 9 20:32:35 CEST 2006 - mason@suse.de - -- created package - diff --git a/systemtap-docs.spec b/systemtap-docs.spec deleted file mode 100644 index a0f0e30..0000000 --- a/systemtap-docs.spec +++ /dev/null @@ -1,94 +0,0 @@ -# -# spec file for package systemtap-docs -# -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -Name: systemtap-docs -Version: 4.1 -Release: 0 -Summary: Documents and examples for systemtap -License: GPL-2.0-or-later -Group: Development/Tools/Debuggers -Url: https://sourceware.org/systemtap/ -Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz -Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc -Source2: systemtap.keyring -Source3: README-BEFORE-ADDING-PATCHES -Source4: README-KEYRING -Patch1: systemtap-docdir-fix.diff -BuildRequires: autoconf -BuildRequires: automake -# for documents -BuildRequires: fop -BuildRequires: gcc-c++ -BuildRequires: latex2html -BuildRequires: libebl-devel -BuildRequires: pkgconfig -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: texlive-amsfonts -BuildRequires: texlive-babel-english -BuildRequires: texlive-collection-fontsrecommended -BuildRequires: texlive-metafont-bin -BuildRequires: xmlto -BuildRequires: tex(charter.sty) -BuildRequires: tex(fancybox.sty) -BuildRequires: tex(fancyhdr.sty) -BuildRequires: tex(fancyvrb.sty) -BuildRequires: tex(float.sty) -BuildRequires: tex(fullpage.sty) -BuildArch: noarch - -%description -SystemTap is an instrumentation system for systems running Linux. -This package contains the documents and examples for systemtap. - -%prep -%setup -q -n systemtap-%{version} -%patch1 -p1 - -%build -# fix interpreter -find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, %{_bindir}/env,' -find testsuite examples -type f | xargs chmod 644 -autoreconf -fi -%configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3 -make %{?_smp_mflags} - -%install -make DESTDIR=%{buildroot} install %{?_smp_mflags} doc -# COPYING packaged by main spec -cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/ -# remove binaries and runtime stuff -rm -rf %{buildroot}%{_bindir} -rm -rf %{buildroot}%{_sbindir} -rm -rf %{buildroot}%{_libdir} -rm -rf %{buildroot}%{_libexecdir} -rm -rf %{buildroot}%{_datadir}/systemtap -rm -rf %{buildroot}%{_includedir} -rm -rf %{buildroot}%{_sysconfdir} -rm -rf %{buildroot}%{_unitdir} -# these man pages are in each sub package -rm -rf %{buildroot}%{_mandir}/man[178] -rm -rf %{buildroot}%{_mandir}/cs/man[178] - -%files -%defattr(-,root,root) -%doc %{_docdir}/systemtap -%{_mandir}/man3/* -%{_mandir}/cs/man3/* - -%changelog diff --git a/systemtap-headers.changes b/systemtap-headers.changes deleted file mode 100644 index 00334cc..0000000 --- a/systemtap-headers.changes +++ /dev/null @@ -1,37 +0,0 @@ -------------------------------------------------------------------- -Fri Aug 9 20:06:57 UTC 2019 - Tony Jones - -- Upgrade to version 4.1. See systemtap.spec for changelog - -------------------------------------------------------------------- -Fri Aug 3 16:50:41 UTC 2018 - sschricker@suse.de - -- Upgrade to version 3.3: - - Changelog: https://lwn.net/Articles/757030/ - - eBPF backend extensions, easier access to examples, adapting to - meltdown/spectre complications, real-time / high-cpu-count - concurrency fixes - -- Remove patches, because the issues were fixed upstream: - systemtap-change-extra_cflags-escape-processing.patch - -- Adjust patch for version 3.3: - systemtap-build-source-dir.patch - -- Added public key of "Frank Ch. Eigler ", - since he signed the new package - -------------------------------------------------------------------- -Fri Feb 16 15:20:50 UTC 2018 - matz@suse.com - -- Add Conflicts with systemtap-sdt-devel, as that one again - provides the headers as well. - -------------------------------------------------------------------- -Thu Feb 8 15:26:17 UTC 2018 - matz@suse.com - -- Created new specfile systemtap-headers.spec, so bootstrap cycles - packages can use them without blowing up the cycle. - [fate#324969] diff --git a/systemtap-headers.spec b/systemtap-headers.spec deleted file mode 100644 index 57bada5..0000000 --- a/systemtap-headers.spec +++ /dev/null @@ -1,67 +0,0 @@ -# -# spec file for package systemtap-headers -# -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -# Note: this separate package systemtap-headers exists so that ring0 -# packages can make use of the SDT headers without pulling in all -# build requirements of the normal systemtap package. Normal use -# outside of BuildRequires in ring0 packages should use systemtap-sdt-devel -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif -Name: systemtap-headers -Version: 4.1 -Release: 0 -Summary: SystemTap headers -License: GPL-2.0-or-later -Group: Development/Tools/Debuggers -Url: http://sourceware.org/systemtap/ -Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz -Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc -Source2: systemtap.keyring -Source3: README-BEFORE-ADDING-PATCHES -Source4: README-KEYRING -Source5: stap-server.conf -Patch1: systemtap-build-source-dir.patch -# sdt-devel provides the same header files as us, so we -# must conflict -Conflicts: systemtap-sdt-devel - -%description -SystemTap is an instrumentation system for systems running Linux. -This package contains only the headers for static system probes and -exists only to limit build cycles. Normally you should install -systemtap-sdt-devel, which also contains these headers. - -%prep -%setup -q -n systemtap-%{version} -%patch1 -p1 - -%build -# Our binutils always support '?' in the section characters on all -# architectures, no need for configure tests -sed -e 's/@support_section_question@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h - -%install -mkdir -p %{buildroot}%{_includedir}/sys -cp -rp includes/sys/*.h %{buildroot}%{_includedir}/sys/ - -%files -%defattr(-,root,root) -%{_includedir}/sys/*.h - -%changelog diff --git a/systemtap.changes b/systemtap.changes index 7d7db8c..26ecb2e 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 16 21:14:39 UTC 2019 - Michael Gorse + +- Convert to multibuild. +- Move dtrace binary into its own package to allow building glib2 + with systemtap support while avoiding a build cycle + (bsc#1145438). +- Remove %defattr from %files: no longer needed. + ------------------------------------------------------------------- Fri Aug 9 20:06:57 UTC 2019 - Tony Jones diff --git a/systemtap.spec b/systemtap.spec index 27d36ed..c7de86a 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -16,45 +16,110 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" != "" +%define name_ext -%{flavor} +%else +%define name_ext %{nil} +%endif %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif -Name: systemtap +Name: systemtap%{name_ext} Version: 4.1 Release: 0 +%if "%{flavor}" == "" Summary: Instrumentation System License: GPL-2.0-or-later Group: Development/Tools/Debuggers +%endif +%if "%{flavor}" == "docs" +Summary: Documents and examples for systemtap +License: GPL-2.0-or-later +Group: Development/Tools/Debuggers +%endif +%if "%{flavor}" == "headers" +Summary: SystemTap Headers +License: GPL-2.0-or-later +Group: Development/Tools/Debuggers +%endif +%if "%{flavor}" == "dtrace" +Summary: SystemTap dtrace utility +License: GPL-2.0-or-later +Group: Development/Tools/Debuggers +%endif Url: https://sourceware.org/systemtap/ Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc -Source2: %{name}.keyring +Source2: systemtap.keyring Source3: README-BEFORE-ADDING-PATCHES Source4: README-KEYRING Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch +Patch2: systemtap-docdir-fix.diff +%if "%{flavor}" == "docs" || "%{flavor}" == "" BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ +BuildRequires: libebl-devel +BuildRequires: pkgconfig +%endif +%if "%{flavor}" == "docs" +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: texlive-amsfonts +BuildRequires: texlive-babel-english +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-metafont-bin +BuildRequires: xmlto +BuildRequires: tex(charter.sty) +BuildRequires: tex(fancybox.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(fancyvrb.sty) +BuildRequires: tex(float.sty) +BuildRequires: tex(fullpage.sty) +%endif +%if "%{flavor}" == "" BuildRequires: libavahi-devel BuildRequires: libcap-devel -BuildRequires: libebl-devel BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-tools -BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: sqlite-devel BuildRequires: pkgconfig(systemd) +Requires: %{name}-dtrace = %{version}-%{release} Requires: %{name}-runtime = %{version}-%{release} Requires: libebl1 Obsoletes: systemtap-client < 1.5 +%endif +%if "%{flavor}" == "docs" || "%{flavor}" == "dtrace" +BuildArch: noarch +%endif %description +%if "%{flavor}" == "" SystemTap is an instrumentation system for systems running Linux. Developers can write instrumentation to collect data on the operation of the system. +%endif +%if "%{flavor}" == "docs" +SystemTap is an instrumentation system for systems running Linux. +This package contains the documents and examples for systemtap. +%endif +%if "%{flavor}" == "headers" +SystemTap is an instrumentation system for systems running Linux. +This package contains only the headers for static system probes and +exists only to limit build cycles. Normally you should install +systemtap-sdt-devel, which also contains these headers. +%endif +%if "%{flavor}" == "dtrace" +SystemTap is an instrumentation system for systems running Linux. +This package contains the dtrace utility to build provider and probe +definitions. +%endif +%if "%{flavor}" == "" %package runtime Summary: Runtime environment for systemtap Group: Development/Tools/Debuggers @@ -90,21 +155,43 @@ Conflicts: systemtap-headers %description sdt-devel SystemTap is an instrumentation system for systems running Linux. This package contains the support tools for static probes. +%endif %prep -%setup -q +%setup -q -n systemtap-%{version} %patch1 -p1 +%patch2 -p1 %build +%if "%{flavor}" == "" autoreconf -fi %configure \ --disable-docs \ --with-python3 \ --docdir=%{_docdir}/systemtap make %{?_smp_mflags} V=1 +%endif +%if "%{flavor}" == "docs" +# fix interpreter +find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, %{_bindir}/env,' +find testsuite examples -type f | xargs chmod 644 +autoreconf -fi +%configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3 +make %{?_smp_mflags} +%endif +%if "%{flavor}" == "headers" +# Our binutils always support '?' in the section characters on all +# architectures, no need for configure tests +sed -e 's/@support_section_question@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h +%endif +%if "%{flavor}" == "dtrace" +sed s=@preferred_python@=%{_bindir}/python3= dtrace.in |sed s=@prefix@=%{prefix}= >dtrace +%endif %install +%if "%{flavor}" == "" %make_install +rm -f %{buildroot}%{_bindir}/dtrace rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request # README, AUTHORS, NEWS, man3 and all examples packaged by systemtap-docs # COPYING needs to stay in main for GPL @@ -121,13 +208,41 @@ mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %find_lang systemtap +%endif +%if "%{flavor}" == "docs" +make DESTDIR=%{buildroot} install %{?_smp_mflags} doc +# COPYING packaged by main spec +cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/ +# remove binaries and runtime stuff +rm -rf %{buildroot}%{_bindir} +rm -rf %{buildroot}%{_sbindir} +rm -rf %{buildroot}%{_libdir} +rm -rf %{buildroot}%{_libexecdir} +rm -rf %{buildroot}%{_datadir}/systemtap +rm -rf %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_sysconfdir} +rm -rf %{buildroot}%{_unitdir} +# these man pages are in each sub package +rm -rf %{buildroot}%{_mandir}/man[178] +rm -rf %{buildroot}%{_mandir}/cs/man[178] +%endif +%if "%{flavor}" == "headers" +mkdir -p %{buildroot}%{_includedir}/sys +cp -rp includes/sys/*.h %{buildroot}%{_includedir}/sys/ +%endif +%if "%{flavor}" == "dtrace" +mkdir -p %{buildroot}%{_bindir} +install -m 755 dtrace %{buildroot}%{_bindir} +%endif +%if "%{flavor}" == "" %post server # Create tmpfiles %tmpfiles_create %{_libexecdir}/tmpfiles.d/stap-server.conf +%endif %files -%defattr(-,root,root) +%if "%{flavor}" == "" %{_bindir}/stap %{_mandir}/man[17]/* %{_mandir}/cs/man[17]/* @@ -138,7 +253,6 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %dir %{_localstatedir}/cache/systemtap %files runtime -f systemtap.lang -%defattr(-,root,root) %doc %{_docdir}/systemtap %{_bindir}/staprun %{_bindir}/stapsh @@ -157,7 +271,6 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %{_mandir}/man8/stapbpf.8* %files server -%defattr(-,root,root) %dir %{_libexecdir}/tmpfiles.d %{_libexecdir}/tmpfiles.d/stap-server.conf %{_bindir}/stap-server @@ -172,8 +285,18 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %ghost %dir %{_rundir}/stap-server %files sdt-devel -%defattr(-,root,root) %{_includedir}/sys/*.h +%endif +%if "%{flavor}" == "docs" +%doc %{_docdir}/systemtap +%{_mandir}/man3/* +%{_mandir}/cs/man3/* +%endif +%if "%{flavor}" == "headers" +%{_includedir}/sys/*.h +%endif +%if "%{flavor}" == "dtrace" %{_bindir}/dtrace +%endif %changelog