From d21309c22b070fd0c148596a63a8c353ed442c71 Mon Sep 17 00:00:00 2001 From: Steven Luong Date: Wed, 23 Jul 2025 09:18:23 -0700 Subject: [PATCH] af_xdp: bump xdp-tools to 1.5.5 Type: feature Change-Id: Ia6d32305045f51b859c4b888f5912f8d4cbbd766 Signed-off-by: Steven Luong --- build/external/packages/xdp-tools.mk | 4 ++-- ...001-libxdp-add-fPIC-with-static-lib-build.patch | 26 ++++++++++++++++++++++ ...-fix-maybe-uninitialized-compiler-warning.patch | 26 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 build/external/patches/xdp-tools_1.5.5/0001-libxdp-add-fPIC-with-static-lib-build.patch create mode 100644 build/external/patches/xdp-tools_1.5.5/0003-libxdp-fix-maybe-uninitialized-compiler-warning.patch diff --git a/build/external/packages/xdp-tools.mk b/build/external/packages/xdp-tools.mk index 57f5e0ae83a..f33c220e5b2 100644 --- a/build/external/packages/xdp-tools.mk +++ b/build/external/packages/xdp-tools.mk @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -xdp-tools_version := 1.2.9 +xdp-tools_version := 1.5.5 xdp-tools_tarball := xdp-tools-$(xdp-tools_version).tar.gz -xdp-tools_tarball_sha256sum_1.2.9 := 3f8d30bd2e00c522103d224014f59a95400144aba1f3b322c6ad473541a0f99e +xdp-tools_tarball_sha256sum_1.5.5 := 9a4339ffc40df178c4ddf919cb2b23585a75b3023517c75e82c4dfb0899249c7 xdp-tools_tarball_sha256sum := $(xdp-tools_tarball_sha256sum_$(xdp-tools_version)) xdp-tools_tarball_strip_dirs := 1 diff --git a/build/external/patches/xdp-tools_1.5.5/0001-libxdp-add-fPIC-with-static-lib-build.patch b/build/external/patches/xdp-tools_1.5.5/0001-libxdp-add-fPIC-with-static-lib-build.patch new file mode 100644 index 00000000000..e0e6050de7e --- /dev/null +++ b/build/external/patches/xdp-tools_1.5.5/0001-libxdp-add-fPIC-with-static-lib-build.patch @@ -0,0 +1,26 @@ +From e83f80443a2f23a68037bf4c7ba16b3723d193a4 Mon Sep 17 00:00:00 2001 +From: Yulong +Date: Tue, 3 Jan 2023 14:16:17 +0000 +Subject: [PATCH] libxdp: add fPIC with static lib build + +Signed-off-by: Yulong +--- + lib/libxdp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile +index 4716fb0..403c2d9 100644 +--- a/lib/libxdp/Makefile ++++ b/lib/libxdp/Makefile +@@ -87,7 +87,7 @@ $(SHARED_OBJDIR): + $(Q)mkdir -p $(SHARED_OBJDIR) + + $(STATIC_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(STATIC_OBJDIR) +- $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(STATIC_CFLAGS) -Wall -I../../headers -c $< -o $@ ++ $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(STATIC_CFLAGS) -fPIC -Wall -I../../headers -c $< -o $@ + + $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DEPS) | $(SHARED_OBJDIR) + $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(SHARED_CFLAGS) -Wall -I../../headers -c $< -o $@ +-- +2.25.1 + diff --git a/build/external/patches/xdp-tools_1.5.5/0003-libxdp-fix-maybe-uninitialized-compiler-warning.patch b/build/external/patches/xdp-tools_1.5.5/0003-libxdp-fix-maybe-uninitialized-compiler-warning.patch new file mode 100644 index 00000000000..3927c534f41 --- /dev/null +++ b/build/external/patches/xdp-tools_1.5.5/0003-libxdp-fix-maybe-uninitialized-compiler-warning.patch @@ -0,0 +1,26 @@ +From 3033b9bdbcdb270f15373b27933d554f847e01d4 Mon Sep 17 00:00:00 2001 +From: Yulong +Date: Fri, 6 Jan 2023 14:31:24 +0000 +Subject: [PATCH 3/3] libxdp: fix maybe-uninitialized compiler warning + +Signed-off-by: Yulong +--- + lib/common.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/common.mk b/lib/common.mk +index ce24c48..e964bd8 100644 +--- a/lib/common.mk ++++ b/lib/common.mk +@@ -104,7 +104,7 @@ $(LIB_OBJS): %.o: %.c %.h $(LIB_H) + + ALL_EXEC_TARGETS=$(USER_TARGETS) $(TEST_TARGETS) + $(ALL_EXEC_TARGETS): %: %.c $(OBJECT_LIBBPF) $(OBJECT_LIBXDP) $(LIBMK) $(LIB_OBJS) $(KERN_USER_H) $(EXTRA_DEPS) $(EXTRA_USER_DEPS) $(BPF_SKEL_H) $(USER_EXTRA_C) +- $(QUIET_CC)$(CC) -Wall $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(LIB_OBJS) \ ++ $(QUIET_CC)$(CC) -Wall -Wno-maybe-uninitialized $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(LIB_OBJS) \ + $< $(USER_EXTRA_C) $(LDLIBS) + + $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK) +-- +2.25.1 + -- 2.16.6