Update spec files for newest source code sync

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
oracle · Dec 10, 2020 · 027d648 · 027d648
1 parent 1278716
commit 027d648
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 24 deletions.
diff --git a/buildrpm/ol7/dtrace.spec b/buildrpm/ol7/dtrace.spec
@@ -9,6 +9,12 @@
 # something like 'kernel-uek-dtrace'.
 %define variant %{?build_variant:%{build_variant}}%{!?build_variant:-uek}
 
+# Allow building against libdtrace-ctf even when libctf is available.  Specify
+# "--without libctf" to the rpmbuild command to bypass libctf.
+#
+# OL7 does not have libctf in binutils, so we cannot build with libctf there.
+%define with_libctf 0
+
 # Kernel lists
 #
 # Translators are automatically generated by M4 macros from selected kernels.
@@ -40,14 +46,24 @@ BuildRequires: rpm
 Name:         dtrace
 License:      Universal Permissive License (UPL), Version 1.0
 Group:        Development/Tools
-Requires:     cpp elfutils-libelf zlib libdtrace-ctf >= 1.1.0 yum libpcap
+Requires:     cpp elfutils-libelf zlib yum libpcap
 BuildRequires: glibc-headers bison flex zlib-devel elfutils-libelf-devel
-BuildRequires: libdtrace-ctf-devel >= 1.1.0 libpcap-devel
-# BuildRequires: glibc-static %{glibc32} wireshark
+BuildRequires: glibc-static %{glibc32} wireshark libpcap-devel
 BuildRequires: kernel%{variant}-devel = %{build_kernel}
+BuildRequires: gcc-bpf-unknown-none
+BuildRequires: binutils-bpf-unknown-none
+%if %{with_libctf}
+Requires:     binutils >= 2.30-58.0.8
+BuildRequires: binutils-devel >= 2.30-58.0.8
+%else
+Requires:     libdtrace-ctf >= 1.1.0
+BuildRequires: libdtrace-ctf-devel >= 1.1.0
+%endif
+Conflicts:    systemtap-sdt-devel
+Provides:     systemtap-sdt-devel
 Summary:      DTrace user interface.
 Version:      2.0.0
-Release:      0.3%{?dist}
+Release:      0.8%{?dist}
 Source:       dtrace-%{version}.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:    x86_64 aarch64
@@ -82,7 +98,11 @@ DTrace external development mailing list <dtrace-devel@oss.oracle.com>
 
 %package devel
 Summary:      DTrace development headers.
+%if %{with_libctf}
+Requires:     binutils-devel >= 2.30-58.0.8
+%else
 Requires:     libdtrace-ctf-devel >= 1.1.0
+%endif
 Requires:     elfutils-libelf-devel
 Requires:     %{name}%{?_isa} = %{version}-%{release}
 Provides:     dtrace-headers = 2.0.0
@@ -103,13 +123,11 @@ replacements for dtrace(1) itself.
 %package testsuite
 Summary:      DTrace testsuite.
 Requires:     make glibc-devel(%{__isa_name}-64) libgcc(%{__isa_name}-64)
-# Requires:     %{glibc32}
-Requires:     dtrace-headers > 0.6.0 module-init-tools
+Requires:     dtrace-headers >= 2.0.0 module-init-tools
 Requires:     %{name}-devel = %{version}-%{release} perl gcc java
 Requires:     java-1.8.0-openjdk-devel perl-IO-Socket-IP xfsprogs
 Requires:     exportfs vim-minimal %{name}%{?_isa} = %{version}-%{release}
-Requires:     coreutils
-Requires:     wireshark
+Requires:     coreutils wireshark %{glibc32}
 Autoreq:      0
 Group:	      Development/System
 
@@ -194,8 +212,6 @@ fi
 %{_libdir}/libdtrace.so.*
 %{_sbindir}/dtrace
 %{_mandir}/man1/orcl-dtrace.1.gz
-%{_includedir}/sys/dtrace.h
-%{_includedir}/sys/dtrace_types.h
 %{_includedir}/sys/sdt-dtrace.h
 %{_includedir}/sys/sdt_internal.h
 %doc %{_docdir}/dtrace-%{version}/*
@@ -205,14 +221,39 @@ fi
 %{_bindir}/ctf_module_dump
 %{_libdir}/libdtrace.so
 %{_includedir}/dtrace.h
+%{_includedir}/sys/dtrace.h
+%{_includedir}/sys/dtrace_types.h
 
 %files testsuite
 %defattr(-,root,root,-)
 %{_libdir}/dtrace/testsuite
 
 %changelog
-* Tue Nov  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.3
-- Change the kernel build version to 5.4.0-1944.
+* Tue Mar 10 2020 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.8
+- Sync with latest development code.
+- Implement perf event output buffer management and processing.
+- Introduce dt_calloc() to use in all array allocations.
+- Provide support for building against libdtrace-ctf and libctf, with
+  preference given to libctf (if available).
+- Implement association of BPF programs with probe events.
+
+* Sun Jan 26 2020 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.7
+- Update spec file for build requirements.
+- Sync with latest development code.
+- Ensure that pre-release banner does not interfere with test result
+  comparison.
+
+* Thu Dec  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.6
+- Update spec file for build requirements.
+
+* Thu Dec  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.5
+- Support building on aarch64.
+
+* Wed Dec  4 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.4
+- Support building on systems with older kernels and/or glibc.
+
+* Tue Nov 26 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.3
+- Change the kernel build version to 5.4.0-1948.2.
 
 * Wed Aug 14 2019 Kris van Hees <kris.van.hees@oracle.com> - 2.0.0-0.2
 - Change the kernel build version to 5.2.8-1933.

diff --git a/buildrpm/ol8/dtrace.spec b/buildrpm/ol8/dtrace.spec
@@ -9,6 +9,10 @@
 # something like 'kernel-uek-dtrace'.
 %define variant %{?build_variant:%{build_variant}}%{!?build_variant:-uek}
 
+# Allow building against libdtrace-ctf even when libctf is available.  Specify
+# "--without libctf" to the rpmbuild command to bypass libctf.
+%define with_libctf %{?_without_libctf: 0} %{?!_without_libctf: 1}
+
 # Kernel lists
 #
 # Translators are automatically generated by M4 macros from selected kernels.
@@ -40,14 +44,24 @@ BuildRequires: rpm
 Name:         dtrace
 License:      Universal Permissive License (UPL), Version 1.0
 Group:        Development/Tools
-Requires:     cpp elfutils-libelf zlib libdtrace-ctf >= 1.1.0 yum libpcap
+Requires:     cpp elfutils-libelf zlib yum libpcap
 BuildRequires: glibc-headers bison flex zlib-devel elfutils-libelf-devel
-BuildRequires: libdtrace-ctf-devel >= 1.1.0 libpcap-devel
-# BuildRequires: glibc-static %{glibc32} wireshark
+BuildRequires: glibc-static %{glibc32} wireshark libpcap-devel
 BuildRequires: kernel%{variant}-devel = %{build_kernel}
+BuildRequires: gcc-bpf-unknown-none >= 8.3.1-1.0.4
+BuildRequires: binutils-bpf-unknown-none >= 2.30-58.0.2
+%if %{with_libctf}
+Requires:     binutils >= 2.30-58.0.8
+BuildRequires: binutils-devel >= 2.30-58.0.8
+%else
+Requires:     libdtrace-ctf >= 1.1.0
+BuildRequires: libdtrace-ctf-devel >= 1.1.0
+%endif
+Conflicts:    systemtap-sdt-devel
+Provides:     systemtap-sdt-devel
 Summary:      DTrace user interface.
 Version:      2.0.0
-Release:      0.3%{?dist}
+Release:      0.8%{?dist}
 Source:       dtrace-%{version}.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:    x86_64 aarch64
@@ -82,7 +96,11 @@ DTrace external development mailing list <dtrace-devel@oss.oracle.com>
 
 %package devel
 Summary:      DTrace development headers.
+%if %{with_libctf}
+Requires:     binutils-devel >= 2.30-58.0.8
+%else
 Requires:     libdtrace-ctf-devel >= 1.1.0
+%endif
 Requires:     elfutils-libelf-devel
 Requires:     %{name}%{?_isa} = %{version}-%{release}
 Provides:     dtrace-headers = 2.0.0
@@ -103,13 +121,11 @@ replacements for dtrace(1) itself.
 %package testsuite
 Summary:      DTrace testsuite.
 Requires:     make glibc-devel(%{__isa_name}-64) libgcc(%{__isa_name}-64)
-# Requires:     %{glibc32}
-Requires:     dtrace-headers > 0.6.0 module-init-tools
+Requires:     dtrace-headers >= 2.0.0 module-init-tools
 Requires:     %{name}-devel = %{version}-%{release} perl gcc java
 Requires:     java-1.8.0-openjdk-devel perl-IO-Socket-IP xfsprogs
 Requires:     exportfs vim-minimal %{name}%{?_isa} = %{version}-%{release}
-Requires:     coreutils
-Requires:     wireshark
+Requires:     coreutils wireshark %{glibc32}
 Autoreq:      0
 Group:	      Development/System
 
@@ -194,8 +210,6 @@ fi
 %{_libdir}/libdtrace.so.*
 %{_sbindir}/dtrace
 %{_mandir}/man1/orcl-dtrace.1.gz
-%{_includedir}/sys/dtrace.h
-%{_includedir}/sys/dtrace_types.h
 %{_includedir}/sys/sdt-dtrace.h
 %{_includedir}/sys/sdt_internal.h
 %doc %{_docdir}/dtrace-%{version}/*
@@ -205,14 +219,39 @@ fi
 %{_bindir}/ctf_module_dump
 %{_libdir}/libdtrace.so
 %{_includedir}/dtrace.h
+%{_includedir}/sys/dtrace.h
+%{_includedir}/sys/dtrace_types.h
 
 %files testsuite
 %defattr(-,root,root,-)
 %{_libdir}/dtrace/testsuite
 
 %changelog
-* Tue Nov  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.3
-- Change the kernel build version to 5.4.0-1944.
+* Tue Mar 10 2020 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.8
+- Sync with latest development code.
+- Implement perf event output buffer management and processing.
+- Introduce dt_calloc() to use in all array allocations.
+- Provide support for building against libdtrace-ctf and libctf, with
+  preference given to libctf (if available).
+- Implement association of BPF programs with probe events.
+
+* Sun Jan 26 2020 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.7
+- Update spec file for build requirements.
+- Sync with latest development code.
+- Ensure that pre-release banner does not interfere with test result
+  comparison.
+
+* Thu Dec  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.6
+- Update spec file for build requirements.
+
+* Thu Dec  5 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.5
+- Support building on aarch64.
+
+* Wed Dec  4 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.4
+- Support building on systems with older kernels and/or glibc.
+
+* Tue Nov 26 2019 Kris Van Hees <kris.van.hees@oracle.com> - 2.0.0-0.3
+- Change the kernel build version to 5.4.0-1948.2.
 
 * Wed Aug 14 2019 Kris van Hees <kris.van.hees@oracle.com> - 2.0.0-0.2
 - Change the kernel build version to 5.2.8-1933.