From 22333007a44956babb1b7c6b279d7fb714781cd4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 31 Mar 2025 09:44:14 +0000 Subject: [PATCH] import CS bpftool-7.5.0-802.el9_6 --- .bpftool.metadata | 2 +- .gitignore | 2 +- SPECS/bpftool.spec | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.bpftool.metadata b/.bpftool.metadata index d03da7a..ae7c283 100644 --- a/.bpftool.metadata +++ b/.bpftool.metadata @@ -1 +1 @@ -9b239ceda508da104244567d18df093ec0fac059 SOURCES/linux-5.14.0-535.el9.tar.xz +4b27ad336caadb68190b286270b11569ebfb0a04 SOURCES/linux-5.14.0-557.el9.tar.xz diff --git a/.gitignore b/.gitignore index a3a9ba4..6ef7b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-5.14.0-535.el9.tar.xz +SOURCES/linux-5.14.0-557.el9.tar.xz diff --git a/SPECS/bpftool.spec b/SPECS/bpftool.spec index baad8ad..a709cf2 100644 --- a/SPECS/bpftool.spec +++ b/SPECS/bpftool.spec @@ -9,15 +9,16 @@ # used as kernel tar. # RHEL kernel version-release -%define kver 5.14.0-535 -%define source linux-%{kver}%{?dist} +%define kver 5.14.0-557 +%define kdist .el9 +%define source linux-%{kver}%{kdist} Name: bpftool Version: 7.5.0 # Currently, bpftool built from kernel uses kernel's release version (500+). # In order to do the transition smoothly, raise it to a sufficiently big number. # Once bpftool moves to 7.6.0, reset the release to 1. -Release: 800%{?dist} +Release: 802%{?dist} Summary: Inspection and simple manipulation of eBPF programs and maps %global libname libbpf @@ -49,7 +50,7 @@ manipulation of eBPF programs and maps. # We need to use vmlinux.h from kernel-devel rather than the one from the running system %define kernel_version %(rpm -q --qf "%%{VERSION}-%%{RELEASE}.%%{ARCH}" kernel-devel) pushd tools/bpf/bpftool -%make_build EXTRA_CFLAGS="%{build_cflags}" EXTRA_LDFLAGS="%{build_ldflags}" VMLINUX_H="/usr/src/kernels/%{kernel_version}/vmlinux.h" +%make_build EXTRA_CFLAGS="%{build_cflags}" EXTRA_CXXFLAGS="%{build_cflags}" EXTRA_LDFLAGS="%{build_ldflags}" VMLINUX_H="/usr/src/kernels/%{kernel_version}/vmlinux.h" %install pushd tools/bpf/bpftool @@ -62,6 +63,15 @@ pushd tools/bpf/bpftool %changelog ## START: Generated by rpmautospec +* Thu Mar 06 2025 Viktor Malik - 7.5.0-5 +- Make kernel tarball dist independent of %%{dist} + +* Wed Mar 05 2025 Viktor Malik - 7.5.0-4 +- Update to BPF 6.12 rebase + +* Wed Mar 05 2025 Viktor Malik - 7.5.0-3 +- Fix LLVM feature detection + * Fri Jan 10 2025 Ziqian SUN (Zamir) - 7.5.0-2 - Initial gating test for bpftool