From b4b2d839665fcbefd97da7c62023133d872c8794 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Tue, 9 May 2023 19:16:13 +0530 Subject: dpdk-module/21.11: upgrade 21.11.2 -> 21.11.3 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_21.11.2.bb | 58 ---------------------------- recipes-extended/dpdk/dpdk-module_21.11.3.bb | 58 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_21.11.2.bb create mode 100644 recipes-extended/dpdk/dpdk-module_21.11.3.bb diff --git a/recipes-extended/dpdk/dpdk-module_21.11.2.bb b/recipes-extended/dpdk/dpdk-module_21.11.2.bb deleted file mode 100644 index 307ff40..0000000 --- a/recipes-extended/dpdk/dpdk-module_21.11.2.bb +++ /dev/null @@ -1,58 +0,0 @@ -include dpdk.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" - -SRC_URI += " \ - file://0001-Makefile-add-makefile.patch \ -" -STABLE = "-stable" -BRANCH = "21.11" -SRCREV = "7bcd45ce824d0ea2a9f30d16855613a93521851b" -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_21.11.3.bb b/recipes-extended/dpdk/dpdk-module_21.11.3.bb new file mode 100644 index 0000000..1e5c512 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_21.11.3.bb @@ -0,0 +1,58 @@ +include dpdk.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" + +SRC_URI += " \ + file://0001-Makefile-add-makefile.patch \ +" +STABLE = "-stable" +BRANCH = "21.11" +SRCREV = "31608e4db56893c896375288671b5ee38723a211" +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 \ +" -- cgit v1.2.3-54-g00ecf