From 217d14d8551e395e517607373cd65b0eeaf8f2a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Thu, 9 Feb 2023 21:44:19 +0100
Subject: [PATCH] Update xdp-tools to 1.3.0-2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Restore building on i686 by patching the build environment to exclude the
bits that require bpftool.

Resolves: rhbz#2160066

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 .gitignore     |  1 +
 sources        |  1 +
 xdp-tools.spec | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc42b47..c10c961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /xdp-tools-1.2.3.tar.gz
 /xdp-tools-1.2.6.tar.gz
 /xdp-tools-1.3.0.tar.gz
+/xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch
diff --git a/sources b/sources
index 564b0c3..ab6f777 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (xdp-tools-1.3.0.tar.gz) = 3f5845c425c6698fb10e80253b39b10e8b8b1eb73ff4615a8e16374de5dc2dc313087ad2b019fe6cbaf3efa041f15c46fb30efe70e23267a89ca1f658c19c528
+SHA512 (xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch) = f57c82d29581b47bc0ce6962650b4aec45d00dd4f4ecc854fccf17ea40655b20ff50e0817aec517a77ed6a6bf766c82930ece76708ab93b910f211a85366a7ff
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 66ff9be..25453f5 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,12 +1,13 @@
 Name:             xdp-tools
 Version:          1.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Utilities and example programs for use with XDP
 %global _soversion 1.3.0
 
 License:          GPLv2
 URL:              https://github.com/xdp-project/%{name}
 Source0:          https://github.com/xdp-project/%{name}/releases/download/v%{version}/xdp-tools-%{version}.tar.gz
+Patch0:           xdp-tools-configure-Don-t-fail-on-missing-bpftool.patch
 
 BuildRequires:    libbpf-devel
 BuildRequires:    elfutils-libelf-devel
@@ -20,9 +21,10 @@ BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    emacs-nox
 BuildRequires:    wireshark-cli
-BuildRequires:    bpftool
 
-ExcludeArch:      i386 i686
+%ifnarch i686
+BuildRequires:    bpftool
+%endif
 
 # Always keep xdp-tools and libxdp packages in sync
 Requires:         libxdp = %{version}-%{release}
@@ -92,9 +94,11 @@ make install V=1
 %{_sbindir}/xdp-filter
 %{_sbindir}/xdp-loader
 %{_sbindir}/xdpdump
+%ifnarch i686
 %{_sbindir}/xdp-bench
 %{_sbindir}/xdp-monitor
 %{_sbindir}/xdp-trafficgen
+%endif
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
@@ -118,6 +122,9 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Thu Feb 9 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-2
+- Restore building on i686, by patching the build to exclude the bits that require bpftool
+
 * Tue Feb 7 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-1
 - Upstream version bump
 - Don't build on i686 (because of missing bpftool)