Accepting request 578343 from devel:tools
- Add Conflicts with systemtap-sdt-devel, as that one again provides the headers as well. - Care for pecularities of build counter syncs between different build rings: the Requires from sdt-devel can't use %release for systemtap-headers, but we also don't want to just include %version, so separate both totally: * Add the include headers to sdt-devel again. * Add Conflicts with systemtap-headers to care for the resulting file conflicts. * Remove Require from sdt-devel to systemtap-headers again. (forwarded request 578031 from matz2) OBS-URL: https://build.opensuse.org/request/show/578343 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=99
This commit is contained in:
commit
4e20aa823f
12
systemtap-headers.changes
Normal file
12
systemtap-headers.changes
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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]
|
71
systemtap-headers.spec
Normal file
71
systemtap-headers.spec
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
#
|
||||||
|
# spec file for package systemtap-headers
|
||||||
|
#
|
||||||
|
# Copyright (c) 2018 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 http://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: 3.2
|
||||||
|
Release: 0
|
||||||
|
Summary: SystemTap headers
|
||||||
|
License: GPL-2.0+
|
||||||
|
Group: Development/Tools/Debuggers
|
||||||
|
Url: http://sourceware.org/systemtap/
|
||||||
|
# sdt-devel provides the same header files as us, so we
|
||||||
|
# must conflict
|
||||||
|
Conflicts: systemtap-sdt-devel
|
||||||
|
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
|
||||||
|
Source1: http://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
|
||||||
|
Patch2: systemtap-change-extra_cflags-escape-processing.patch
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%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
|
||||||
|
%patch2 -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
|
@ -1,3 +1,22 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 16 15:28:22 UTC 2018 - matz@suse.com
|
||||||
|
|
||||||
|
- Care for pecularities of build counter syncs between different
|
||||||
|
build rings: the Requires from sdt-devel can't use %release
|
||||||
|
for systemtap-headers, but we also don't want to just include
|
||||||
|
%version, so separate both totally:
|
||||||
|
* Add the include headers to sdt-devel again.
|
||||||
|
* Add Conflicts with systemtap-headers to care for the resulting
|
||||||
|
file conflicts.
|
||||||
|
* Remove Require from sdt-devel to systemtap-headers again.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 8 15:28:32 UTC 2018 - matz@suse.com
|
||||||
|
|
||||||
|
- Don't include the headers files in sdt-devel
|
||||||
|
- Add systemtap-headers to Requires of sdt-devel, so that it
|
||||||
|
provides the same files as before. [fate#324969]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 20 23:01:35 UTC 2017 - tonyj@suse.com
|
Mon Nov 20 23:01:35 UTC 2017 - tonyj@suse.com
|
||||||
|
|
||||||
|
@ -84,6 +84,9 @@ This package contains the server component of systemtap.
|
|||||||
%package sdt-devel
|
%package sdt-devel
|
||||||
Summary: Static probe support tools
|
Summary: Static probe support tools
|
||||||
Group: Development/Tools/Debuggers
|
Group: Development/Tools/Debuggers
|
||||||
|
# systemtap-headers provides the same header files
|
||||||
|
# as sdt-devel, so we must conflict.
|
||||||
|
Conflicts: systemtap-headers
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description sdt-devel
|
%description sdt-devel
|
||||||
@ -173,7 +176,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
|
|||||||
|
|
||||||
%files sdt-devel
|
%files sdt-devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/dtrace
|
|
||||||
%{_includedir}/sys/*.h
|
%{_includedir}/sys/*.h
|
||||||
|
%{_bindir}/dtrace
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user