|
 |
c5db14 |
From 8d1b5fe8ee53ffd5885bee6131606d79dbbdde91 Mon Sep 17 00:00:00 2001
|
|
|
c5db14 |
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
|
|
c5db14 |
Date: Tue, 3 Jan 2023 13:29:27 +0100
|
|
|
c5db14 |
Subject: [PATCH] Drop bpftool version requirement to 4.18.0
|
|
|
c5db14 |
|
|
|
c5db14 |
The CentOS Stream 8 bpftool package has the skeleton and object
|
|
|
c5db14 |
generation features introduced in bpftool 5.6.0 and 5.13.0
|
|
|
c5db14 |
respectively backported to 4.18.0. The meson script doesn't know
|
|
|
c5db14 |
this, so we downgrade the required bpftool version to 4.18.0 to
|
|
|
c5db14 |
allow builds to pass on CentOS Stream 8.
|
|
|
c5db14 |
---
|
|
|
c5db14 |
meson.build | 4 ++--
|
|
|
c5db14 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
c5db14 |
|
|
|
c5db14 |
diff --git a/meson.build b/meson.build
|
|
|
c5db14 |
index 35704947e3..6dff92bafb 100644
|
|
|
c5db14 |
--- a/meson.build
|
|
|
c5db14 |
+++ b/meson.build
|
|
|
c5db14 |
@@ -1060,7 +1060,7 @@ endif
|
|
|
c5db14 |
libbpf = dependency('libbpf', required : bpf_framework_required, version : libbpf_version_requirement)
|
|
|
c5db14 |
conf.set10('HAVE_LIBBPF', libbpf.found())
|
|
|
c5db14 |
|
|
|
c5db14 |
-bpftool_strip_version_requirement = '>= 5.13.0'
|
|
|
c5db14 |
+bpftool_strip_version_requirement = '>= 4.18.0'
|
|
|
c5db14 |
if bpf_compiler == 'gcc'
|
|
|
c5db14 |
bpftool_strip_version_requirement = '>= 7.0.0'
|
|
|
c5db14 |
endif
|
|
|
c5db14 |
@@ -1121,7 +1121,7 @@ else
|
|
|
c5db14 |
bpftool = find_program('bpftool',
|
|
|
c5db14 |
'/usr/sbin/bpftool',
|
|
|
c5db14 |
required : bpf_framework_required,
|
|
|
c5db14 |
- version : '>= 5.6.0')
|
|
|
c5db14 |
+ version : '>= 4.18.0')
|
|
|
c5db14 |
endif
|
|
|
c5db14 |
|
|
|
c5db14 |
# We use `llvm-strip` as a fallback if `bpftool gen object` strip support is not available.
|
|
|
c5db14 |
--
|
|
|
c5db14 |
2.41.0
|
|
|
c5db14 |
|