From 1a78228cf3c07f8166c4c2a317331ca8f1477906 Mon Sep 17 00:00:00 2001
From: Yogesh Tyagi <yogesh.tyagi@intel.com>
Date: Tue, 9 May 2023 17:12:15 +0530
Subject: dpdk-module: upgrade 22.07.0 -> 23.03

Refresh patch to fix following build error in dpdk-module:
~build/tmp-glibc/work/intel_skylake_64-oe-linux/dpdk-module/23.03-r0/git/kernel/linux/kni/kni_net.c:22:10: fatal error: rte_kni_common.h: No such file or directory

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-extended/dpdk/dpdk-module_22.07.0.bb       | 58 ----------------------
 recipes-extended/dpdk/dpdk-module_23.03.bb         | 58 ++++++++++++++++++++++
 .../dpdk/dpdk/0001-Makefile-add-makefile.patch     |  1 +
 3 files changed, 59 insertions(+), 58 deletions(-)
 delete mode 100644 recipes-extended/dpdk/dpdk-module_22.07.0.bb
 create mode 100644 recipes-extended/dpdk/dpdk-module_23.03.bb

diff --git a/recipes-extended/dpdk/dpdk-module_22.07.0.bb b/recipes-extended/dpdk/dpdk-module_22.07.0.bb
deleted file mode 100644
index 3fcbf1e..0000000
--- a/recipes-extended/dpdk/dpdk-module_22.07.0.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-include dpdk.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:"
-
-SRC_URI = "git://dpdk.org/git/dpdk;branch=${BRANCH};protocol=https \
-            file://0001-Makefile-add-makefile.patch \
-"
-
-BRANCH = "releases"
-SRCREV = "4fceceed5b5e9fbf04acffd66239c79d81e79260"
-S = "${WORKDIR}/git"
-
-inherit module
-
-#kernel module needs 'rte_build_config.h', which is generated at buid time
-DEPENDS += "dpdk"
-
-COMPATIBLE_MACHINE = "null"
-COMPATIBLE_HOST:libc-musl:class-target = "null"
-COMPATIBLE_HOST:linux-gnux32 = "null"
-
-export S
-export STAGING_KERNEL_DIR
-export STAGING_INCDIR
-export INSTALL_MOD_DIR="dpdk"
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    cd ${S}/kernel/linux/kni
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-           KERNEL_VERSION=${KERNEL_VERSION}    \
-           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-           AR="${KERNEL_AR}" \
-               O=${STAGING_KERNEL_BUILDDIR} \
-           KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \
-           ${MAKE_TARGETS}
-}
-
-do_install() {
-    cd ${S}/kernel/linux/kni
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
-               INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \
-               CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-               O=${STAGING_KERNEL_BUILDDIR} \
-               ${MODULES_INSTALL_TARGET}
-}
-
-# CVE-2021-3839 has been fixed by commit 4c40d30d2b in 21.11.1
-# NVD database is incomplete
-# CVE-2022-0669 has been fixed by commit 6cb68162e4 in 21.11.1
-# NVD database is incomplete
-CVE_CHECK_IGNORE += "\
-    CVE-2021-3839 \
-    CVE-2022-0669 \
-"
diff --git a/recipes-extended/dpdk/dpdk-module_23.03.bb b/recipes-extended/dpdk/dpdk-module_23.03.bb
new file mode 100644
index 0000000..b8f6c95
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk-module_23.03.bb
@@ -0,0 +1,58 @@
+include dpdk.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:"
+
+SRC_URI = "git://dpdk.org/git/dpdk;branch=${BRANCH};protocol=https \
+            file://0001-Makefile-add-makefile.patch \
+"
+
+BRANCH = "releases"
+SRCREV = "189c02f5ec891ed02927062e124e8ca03adf74e7"
+S = "${WORKDIR}/git"
+
+inherit module
+
+#kernel module needs 'rte_build_config.h', which is generated at buid time
+DEPENDS += "dpdk"
+
+COMPATIBLE_MACHINE = "null"
+COMPATIBLE_HOST:libc-musl:class-target = "null"
+COMPATIBLE_HOST:linux-gnux32 = "null"
+
+export S
+export STAGING_KERNEL_DIR
+export STAGING_INCDIR
+export INSTALL_MOD_DIR="dpdk"
+
+do_configure[noexec] = "1"
+
+do_compile() {
+    cd ${S}/kernel/linux/kni
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+           KERNEL_VERSION=${KERNEL_VERSION}    \
+           CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+           AR="${KERNEL_AR}" \
+               O=${STAGING_KERNEL_BUILDDIR} \
+           KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \
+           ${MAKE_TARGETS}
+}
+
+do_install() {
+    cd ${S}/kernel/linux/kni
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake DEPMOD=echo MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
+               INSTALL_FW_PATH="${D}${nonarch_base_libdir}/firmware" \
+               CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+               O=${STAGING_KERNEL_BUILDDIR} \
+               ${MODULES_INSTALL_TARGET}
+}
+
+# CVE-2021-3839 has been fixed by commit 4c40d30d2b in 21.11.1
+# NVD database is incomplete
+# CVE-2022-0669 has been fixed by commit 6cb68162e4 in 21.11.1
+# NVD database is incomplete
+CVE_CHECK_IGNORE += "\
+    CVE-2021-3839 \
+    CVE-2022-0669 \
+"
diff --git a/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch b/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch
index 18b75fb..0fc849b 100644
--- a/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch
+++ b/recipes-extended/dpdk/dpdk/0001-Makefile-add-makefile.patch
@@ -41,6 +41,7 @@ index 0000000000..19897ee06e
 +MODULE_CFLAGS += -I$(S)/lib/librte_eal/include
 +MODULE_CFLAGS += -I$(S)/lib/librte_kni
 +MODULE_CFLAGS += -I$(S)/kernel/linux/kni
++MODULE_CFLAGS += -I$(S)/lib/kni
 +MODULE_CFLAGS += -I$(S)
 +MODULE_CFLAGS += -I$(STAGING_INCDIR)
 +
-- 
cgit v1.2.3-54-g00ecf