From b2ee534bca22501c386a7085b680eaf67008c95b Mon Sep 17 00:00:00 2001 From: yangchen Date: Wed, 30 Jul 2025 11:58:54 +0800 Subject: [PATCH] linux/igb_uio: fix build error in kernel-6.12 (cherry picked from commit dea4139e2b88a3bcd31568ce9db57a692a4484b5) --- ...b_uio-fix-build-error-in-kernel-6.12.patch | 49 +++++++++++++++++++ dpdk.spec | 7 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0095-linux-igb_uio-fix-build-error-in-kernel-6.12.patch diff --git a/0095-linux-igb_uio-fix-build-error-in-kernel-6.12.patch b/0095-linux-igb_uio-fix-build-error-in-kernel-6.12.patch new file mode 100644 index 0000000..a4d5f32 --- /dev/null +++ b/0095-linux-igb_uio-fix-build-error-in-kernel-6.12.patch @@ -0,0 +1,49 @@ +From 2314af01b3dd18a2ca4a67fc372afb1017a1fe16 Mon Sep 17 00:00:00 2001 +From: yangchen +Date: Wed, 30 Jul 2025 13:12:17 +0800 +Subject: [PATCH] linux/igb_uio: fix build error in kernel-6.12 + +--- + kernel/linux/igb_uio/meson.build | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build +index ff8f97c..6167122 100644 +--- a/kernel/linux/igb_uio/meson.build ++++ b/kernel/linux/igb_uio/meson.build +@@ -5,17 +5,27 @@ + # Ref: https://jira.devtools.intel.com/browse/DPDK-29263 + kmod_cflags = '' + +-igb_uio_mkfile = custom_target('igb_uio_makefile', +- output: 'Makefile', +- command: ['touch', '@OUTPUT@']) +- + igb_uio_sources = files( + 'igb_uio.c', + 'Kbuild', ++ 'compat.h', + ) + ++igb_uio_files = [] ++foreach src : igb_uio_sources ++ igb_uio_files += configure_file( ++ input: src, ++ output: '@PLAINNAME@', ++ copy: true ++ ) ++endforeach ++ ++igb_uio_mkfile = custom_target('igb_uio_makefile', ++ output: 'Makefile', ++ command: ['touch', '@OUTPUT@']) ++ + custom_target('igb_uio', +- input: igb_uio_sources, ++ input: igb_uio_files, + output: 'igb_uio.ko', + command: ['make', '-j4', '-C', kernel_build_dir, + 'M=' + meson.current_build_dir(), +-- +2.33.0 + diff --git a/dpdk.spec b/dpdk.spec index 80e8618..851ae3d 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -11,7 +11,7 @@ Name: dpdk Version: 23.11 -Release: 32 +Release: 33 URL: http://dpdk.org Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz @@ -127,6 +127,8 @@ Patch6093: 0093-net-hns3-fix-unrelease-some-resources-on-reset-case.patch Patch6094: 0094-net-xsc-optimize-rx.patch +Patch9095: 0095-linux-igb_uio-fix-build-error-in-kernel-6.12.patch + BuildRequires: meson BuildRequires: python3-pyelftools BuildRequires: diffutils @@ -330,6 +332,9 @@ fi /usr/sbin/depmod %changelog +* Wed Jul 30 2025 yangchen - 23.11-33 +- linux/igb_uio: fix build error in kernel-6.12 + * Tue May 27 2025 qianrong - 23.11-32 - optimize xsc rx -- Gitee