From ba6360e08877b5c68f954b5da7e2618d71e92f0f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 5 Nov 2024 03:47:10 +0300 Subject: [PATCH] import bpftrace-0.21.1-3.el10 --- ....1-cmake-Bump-max-LLVM-version-to-19.patch | 26 +++++++++++++++++++ SPECS/bpftrace.spec | 11 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 SOURCES/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch diff --git a/SOURCES/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch b/SOURCES/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch new file mode 100644 index 0000000..ce33c19 --- /dev/null +++ b/SOURCES/bpftrace-0.21.1-cmake-Bump-max-LLVM-version-to-19.patch @@ -0,0 +1,26 @@ +From 6531fcc5da47ec8c161b08587f69eb90bffa53b8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 16 Feb 2024 10:14:41 -0800 +Subject: [PATCH] cmake: Bump max LLVM version to 19 + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e1a32bd..3f095dba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ else() + endif() + + set(MIN_LLVM_MAJOR 6) +-set(MAX_LLVM_MAJOR 18) ++set(MAX_LLVM_MAJOR 19) + + if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR})) + message(SEND_ERROR "Unsupported LLVM version found via ${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}") +-- +2.47.0 + diff --git a/SPECS/bpftrace.spec b/SPECS/bpftrace.spec index ed696e7..d967491 100644 --- a/SPECS/bpftrace.spec +++ b/SPECS/bpftrace.spec @@ -1,12 +1,13 @@ Name: bpftrace Version: 0.21.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: High-level tracing language for Linux eBPF License: Apache-2.0 URL: https://github.com/iovisor/bpftrace Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-cmake-Bump-max-LLVM-version-to-19.patch Patch10: %{name}-%{version}-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch # Arches will be included as upstream support is added and dependencies are @@ -83,6 +84,14 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ %changelog +* Tue Oct 29 2024 Troy Dawson - 0.21.1-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Tue Oct 29 2024 Viktor Malik - 0.21.1-2 +- Rebuild for LLVM 19 +- Resolves: RHEL-64926 + * Fri Oct 25 2024 MSVSphere Packaging Team - 0.21.1-1 - Rebuilt for MSVSphere 10