Compare commits

...

3 Commits

Author SHA1 Message Date
c7d43f84cb import CS bpftool-7.5.0-803.el9 2025-09-15 11:47:36 +00:00
22333007a4 import CS bpftool-7.5.0-802.el9_6 2025-03-31 09:44:14 +00:00
73a57d0b2c import CS bpftool-7.5.0-800.el9 2025-03-19 07:49:51 +00:00
8 changed files with 32 additions and 75 deletions

1
.bpftool.metadata Normal file
View File

@ -0,0 +1 @@
bb002fae706f82e1d632cebbce5d1d87d0d4b7ca SOURCES/linux-5.14.0-598.el9.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
/linux-6.12.0-31.el10.tar.xz
SOURCES/linux-5.14.0-598.el9.tar.xz

View File

@ -1,18 +1,24 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autochangelog
## END: Set by rpmautospec
# We build bpftool from RHEL kernel sources, that's why we use
# directly kernel tar for RHEL kernel build.
# We update bpftool's 'sources' file with proper hash that's
# used as kernel tar.
# RHEL kernel version-release
%define kver 6.12.0-31
%define source linux-%{kver}%{?dist}
%define kver 5.14.0-598
%define kdist .el9
%define source linux-%{kver}%{kdist}
Name: bpftool
Version: 7.5.0
# Currently, bpftool built from kernel uses kernel's release version.
# 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: 803%{?dist}
Summary: Inspection and simple manipulation of eBPF programs and maps
%global libname libbpf
@ -44,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
@ -56,4 +62,22 @@ pushd tools/bpf/bpftool
%{_mandir}/man8/bpftool*.8*
%changelog
%autochangelog
## START: Generated by rpmautospec
* Wed Jul 09 2025 Viktor Malik <vmalik@redhat.com> - 7.5.0-6
- Update to BPF 6.14 stable backport
* Thu Mar 06 2025 Viktor Malik <vmalik@redhat.com> - 7.5.0-5
- Make kernel tarball dist independent of %%{dist}
* Wed Mar 05 2025 Viktor Malik <vmalik@redhat.com> - 7.5.0-4
- Update to BPF 6.12 rebase
* Wed Mar 05 2025 Viktor Malik <vmalik@redhat.com> - 7.5.0-3
- Fix LLVM feature detection
* Fri Jan 10 2025 Ziqian SUN (Zamir) <zsun@redhat.com> - 7.5.0-2
- Initial gating test for bpftool
* Tue Jan 07 2025 Viktor Malik <vmalik@redhat.com> - 7.5.0-1
- Initial commit on c9s
## END: Generated by rpmautospec

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1 +0,0 @@
SHA512 (linux-6.12.0-31.el10.tar.xz) = d02a04e09ec1f2f962acea2c2efe800b16e059ba8ff1aebcd905c54024772344ac30e652f5e69f82ff9739573877af0f247e751e520d29ea7b7683c658cbc83a

View File

@ -1,13 +0,0 @@
[General]
name=bpftool gating test
owner=Ziqian SUN <zsun@redhat.com>
description=bpftool gating test
license=GPLv2
confidential=no
destructive=no
[restraint]
entry_point=./runtest.sh
max_time=15m
use_pty=false

View File

@ -1,38 +0,0 @@
#!/bin/bash
. /usr/share/beakerlib/beakerlib.sh
rlJournalStart
CONFIG_FILE=/boot/config-$(uname -r)
if ! grep "CONFIG_BPF_SYSCALL=y" $CONFIG_FILE; then
rstrnt-report-result $TEST SKIP 0
exit 0
fi
rlPhaseStartSetup
dnf install -y kernel-devel
rpm -q bpftool || dnf install -y -q bpftool
BEAHARCH=${ARCH}
unset ARCH
rlPhaseEnd
for cmds in prog map link perf net; do
if ! bpftool help 2>&1 | grep " OBJECT" | grep -q "${cmds}"; then
continue
fi
rlPhaseStartTest "bpftool ${cmds}"
rlRun -l "bpftool ${cmds}"
rlPhaseEnd
done
for cmds in feature btf; do
if ! bpftool help 2>&1 | grep " OBJECT" | grep -q "${cmds}"; then
continue
fi
rlPhaseStartTest "bpftool ${cmds}"
rlRun -l "bpftool ${cmds} &> bpftool-${cmds}.log"
rstrnt-report-log bpftool-${cmds}.log
rlPhaseEnd
done
rlPhaseStartCleanup
ARCH=${BEAHARCH}
rlPhaseEnd
rlJournalEnd

View File

@ -1,10 +0,0 @@
- hosts: localhost
tags:
- classic
roles:
- role: standard-test-basic
tests:
- sanity
required_packages:
- kernel-devel
- bpftool