From c5db14ace20e4a34ff21f5fe90257de1774b9da6 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 17 2023 13:57:47 +0000 Subject: Move bpftool version patch from repository to patch This allows us to easily apply it to any systemd git tree that we want to build from, specifically latest upstream. --- diff --git a/hyperscale-drop-bpftool-version-requirement-to-4.18.0.patch b/hyperscale-drop-bpftool-version-requirement-to-4.18.0.patch new file mode 100644 index 0000000..492a3bf --- /dev/null +++ b/hyperscale-drop-bpftool-version-requirement-to-4.18.0.patch @@ -0,0 +1,39 @@ +From 8d1b5fe8ee53ffd5885bee6131606d79dbbdde91 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Tue, 3 Jan 2023 13:29:27 +0100 +Subject: [PATCH] Drop bpftool version requirement to 4.18.0 + +The CentOS Stream 8 bpftool package has the skeleton and object +generation features introduced in bpftool 5.6.0 and 5.13.0 +respectively backported to 4.18.0. The meson script doesn't know +this, so we downgrade the required bpftool version to 4.18.0 to +allow builds to pass on CentOS Stream 8. +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 35704947e3..6dff92bafb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1060,7 +1060,7 @@ endif + libbpf = dependency('libbpf', required : bpf_framework_required, version : libbpf_version_requirement) + conf.set10('HAVE_LIBBPF', libbpf.found()) + +-bpftool_strip_version_requirement = '>= 5.13.0' ++bpftool_strip_version_requirement = '>= 4.18.0' + if bpf_compiler == 'gcc' + bpftool_strip_version_requirement = '>= 7.0.0' + endif +@@ -1121,7 +1121,7 @@ else + bpftool = find_program('bpftool', + '/usr/sbin/bpftool', + required : bpf_framework_required, +- version : '>= 5.6.0') ++ version : '>= 4.18.0') + endif + + # We use `llvm-strip` as a fallback if `bpftool gen object` strip support is not available. +-- +2.41.0 + diff --git a/systemd.spec b/systemd.spec index 85c2912..6140a2c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,9 +2,9 @@ %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %if 0%{?facebook} -%global hs_commit 56f097a40674300444908809da2c7f2962a4c072 +%global hs_commit 71ccd05c9bc4ea613e33077c4c3532257bcd50fe %else -%global hs_commit c8cecf12d59b11f1e75db1e49b20ba07c7db4c69 +%global hs_commit 0b9452a89eb4b49876acd4897ddeab3d8af7e816 %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -105,6 +105,7 @@ Patch0001: https://github.com/systemd/systemd/pull/26494.patch # Adjust upstream config to use our shared stack Patch0491: fedora-use-system-auth-in-pam-systemd-user.patch +Patch0901: hyperscale-drop-bpftool-version-requirement-to-4.18.0.patch %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1