[PATCH] spec: drop special-casing for naming of OL10 BPF crosses
Nick Alcock <[email protected]>
| Newsgroups | dev.linux.lists.dtrace |
|---|---|
| Message-ID | <[email protected]> |
Since 14.1.1-1.0.1.1 in June 2025, these have had the same name as everywhere else: no numeric suffix. Signed-off-by: Nick Alcock <[email protected]> --- dtrace.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dtrace.spec b/dtrace.spec index 115cea60ec98b..2345ace1bc522 100644 --- a/dtrace.spec +++ b/dtrace.spec @@ -17,15 +17,6 @@ %define with_libctf 0 %endif -# OL10 requires an explicit BPF toolset version. -%if "%{?dist}" == ".el10" -%define bpfv -14 -%define bpfc BPFC=bpf-unknown-none-gcc-14 -%else -%define bpfv %{nil} -%define bpfc %{nil} -%endif - # By default, do not build with 32-on-64 support. %define glibc32 %{nil} @@ -58,7 +49,7 @@ BuildRequires: fuse3-devel >= 3.2.0 %define maybe_use_fuse2 %{nil} %endif %{?systemd_requires} -BuildRequires: gcc-bpf-unknown-none%{bpfv} +BuildRequires: gcc-bpf-unknown-none BuildRequires: binutils-bpf-unknown-none %ifnarch aarch64 Requires: binutils @@ -132,7 +123,7 @@ it always tests the installed DTrace. %build make -j $(getconf _NPROCESSORS_ONLN) VERSION=%{version} \ - %{bpfc} %{maybe_use_fuse2} + %{maybe_use_fuse2} # Force off debuginfo splitting. We have no debuginfo in dtrace proper, # and the testsuite requires debuginfo for proper operation. base-commit: b420f057c85b0a57bc31e106aa2440b2ada3a4ea -- 2.48.1.283.g18c60a128c