From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Sun, 13 Oct 2024 13:12:58 +0000 (+0300)
Subject: xdp-tools: bump to 1.4.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2d350fded62d559d5a037d0febc9c806ae4f1d6e;p=openwrt%2Fstaging%2Fansuel.git

xdp-tools: bump to 1.4.3

Release notes:
https://github.com/xdp-project/xdp-tools/releases/tag/v1.4.3

Remove upstreamed patch
023-libxdp-fix-compilation-on-multiarch-systems.patch.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

diff --git a/package/network/utils/xdp-tools/Makefile b/package/network/utils/xdp-tools/Makefile
index 4d6ca312f6..8c4071991f 100644
--- a/package/network/utils/xdp-tools/Makefile
+++ b/package/network/utils/xdp-tools/Makefile
@@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xdp-tools
 PKG_RELEASE:=1
-PKG_VERSION:=1.4.2
-PKG_HASH:=49c2b96b2be878449a797a74ca515a63e13418cb8ea904df08f8ef9cb2ac5570
+PKG_VERSION:=1.4.3
+PKG_HASH:=6e727e2c7c079dec86575c5d0e7aac7ecd582aabe04b3b176d7ef50e653b60c0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/xdp-project/xdp-tools/tar.gz/v$(PKG_VERSION)?
diff --git a/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch b/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch
deleted file mode 100644
index 89276fca89..0000000000
--- a/package/network/utils/xdp-tools/patches/023-libxdp-fix-compilation-on-multiarch-systems.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cb1ef3322671a67e2050a3eee18b49cdb4ed4bed Mon Sep 17 00:00:00 2001
-From: Andre Heider <a.heider@gmail.com>
-Date: Wed, 18 Jan 2023 20:54:41 +0100
-Subject: [PATCH] libxdp: fix compilation on multiarch systems
-
-Multiarch systems require an additional include path, which is covered
-by ARCH_INCLUDES here. Just as lib/util, add it to BPF_CFLAGS.
-
-Fixes compilation on debian:
-
-In file included from xdp-dispatcher.c:3:
-In file included from ../../headers/linux/bpf.h:11:
-/usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found
-
-Signed-off-by: Andre Heider <a.heider@gmail.com>
----
- lib/libxdp/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -28,7 +28,7 @@ PC_FILE := $(OBJDIR)/libxdp.pc
- TEMPLATED_SOURCES := xdp-dispatcher.c
- 
- CFLAGS += -I$(HEADER_DIR)
--BPF_CFLAGS += -I$(HEADER_DIR)
-+BPF_CFLAGS += -I$(HEADER_DIR) $(ARCH_INCLUDES)
- 
- 
- ifndef BUILD_STATIC_ONLY