From b022402abafc988354a899b9f63376322fb667b0 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 12 Apr 2022 10:26:11 +0200 Subject: [PATCH] Do not require bpftool for i386 builds --- systemd.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index b93c278..78bec97 100644 --- a/systemd.spec +++ b/systemd.spec @@ -150,7 +150,6 @@ BuildRequires: pkgconfig(tss2-esys) BuildRequires: pkgconfig(tss2-rc) BuildRequires: pkgconfig(tss2-mu) BuildRequires: pkgconfig(libbpf) -BuildRequires: bpftool BuildRequires: systemtap-sdt-devel BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -174,6 +173,12 @@ BuildRequires: pkgconfig(bash-completion) BuildRequires: perl BuildRequires: perl(IPC::SysV) +%ifnarch %ix86 +# bpftool is not built for i368 +BuildRequires: bpftool +%global have_bpf 1 +%endif + Requires(post): coreutils Requires(post): grep # systemd-machine-id-setup requires libssl @@ -474,7 +479,7 @@ CONFIGURE_OPTS=( -Dseccomp=true -Dima=true -Dselinux=true - -Dbpf-framework=true + -Dbpf-framework=%[0%{?have_bpf}?"true":"false"] -Dapparmor=false -Dpolkit=true -Dxz=true