From cb685ae5746cda6175e97e0758dc3c669eaa6633 Mon Sep 17 00:00:00 2001 From: Lee Chee Yang Date: Tue, 3 Oct 2023 11:30:24 +0800 Subject: dpdk/23: update to 23.07 Drop CVE IGNORE as both CVE-2021-3839 and CVE-2022-0669 were fixed in 22.03. Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_23.03.bb | 58 ----------------------- recipes-extended/dpdk/dpdk-module_23.07.bb | 50 ++++++++++++++++++++ recipes-extended/dpdk/dpdk_23.03.bb | 76 ------------------------------ recipes-extended/dpdk/dpdk_23.07.bb | 67 ++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 134 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_23.03.bb create mode 100644 recipes-extended/dpdk/dpdk-module_23.07.bb delete mode 100644 recipes-extended/dpdk/dpdk_23.03.bb create mode 100644 recipes-extended/dpdk/dpdk_23.07.bb diff --git a/recipes-extended/dpdk/dpdk-module_23.03.bb b/recipes-extended/dpdk/dpdk-module_23.03.bb deleted file mode 100644 index b8f6c95..0000000 --- a/recipes-extended/dpdk/dpdk-module_23.03.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 = "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-module_23.07.bb b/recipes-extended/dpdk/dpdk-module_23.07.bb new file mode 100644 index 0000000..c76ed87 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_23.07.bb @@ -0,0 +1,50 @@ +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 = "12fcafcd62286933e6b167b14856d21f642efa5f" +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} +} + diff --git a/recipes-extended/dpdk/dpdk_23.03.bb b/recipes-extended/dpdk/dpdk_23.03.bb deleted file mode 100644 index 0f4d255..0000000 --- a/recipes-extended/dpdk/dpdk_23.03.bb +++ /dev/null @@ -1,76 +0,0 @@ -include dpdk.inc - -SRC_URI = "git://dpdk.org/git/dpdk;branch=${BRANCH};protocol=https \ - file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto-21.11.patch \ -" - -BRANCH = "releases" -SRCREV = "189c02f5ec891ed02927062e124e8ca03adf74e7" -S = "${WORKDIR}/git" - -# 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 \ -" - -# kernel module is provide by dpdk-module recipe, so disable here -EXTRA_OEMESON = " -Denable_kmods=false \ - -Dexamples=all \ -" - -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST:libc-musl:class-target = "null" -COMPATIBLE_HOST:linux-gnux32 = "null" - -PACKAGECONFIG ??= " " -PACKAGECONFIG[afxdp] = ",,libbpf xdp-tools" -PACKAGECONFIG[libvirt] = ",,libvirt" - -RDEPENDS:${PN} += "pciutils python3-core" -RDEPENDS:${PN}-examples += "bash" -DEPENDS = "numactl python3-pyelftools-native" - -inherit meson pkgconfig - -INSTALL_PATH = "${prefix}/share/dpdk" - -do_install:append(){ - # remove source files - rm -rf ${D}/${INSTALL_PATH}/examples/* - - # Install examples - install -m 0755 -d ${D}/${INSTALL_PATH}/examples/ - for dirname in ${B}/examples/dpdk-* - do - if [ ! -d ${dirname} ] && [ -x ${dirname} ]; then - install -m 0755 ${dirname} ${D}/${INSTALL_PATH}/examples/ - fi - done - -} - -PACKAGES =+ "${PN}-examples ${PN}-tools" - -FILES:${PN} += " ${bindir}/dpdk-testpmd \ - ${bindir}/dpdk-proc-info \ - ${libdir}/*.so* \ - ${libdir}/dpdk/pmds-22.0/*.so* \ - " -FILES:${PN}-examples = " \ - ${prefix}/share/dpdk/examples/* \ - " - -FILES:${PN}-tools = " \ - ${bindir}/dpdk-pdump \ - ${bindir}/dpdk-test \ - ${bindir}/dpdk-test-* \ - ${bindir}/dpdk-*.py \ - " - -CVE_PRODUCT = "data_plane_development_kit" - -INSANE_SKIP:${PN} = "dev-so" diff --git a/recipes-extended/dpdk/dpdk_23.07.bb b/recipes-extended/dpdk/dpdk_23.07.bb new file mode 100644 index 0000000..3a1b0a8 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_23.07.bb @@ -0,0 +1,67 @@ +include dpdk.inc + +SRC_URI = "git://dpdk.org/git/dpdk;branch=${BRANCH};protocol=https \ + file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto-21.11.patch \ +" + +BRANCH = "releases" +SRCREV = "12fcafcd62286933e6b167b14856d21f642efa5f" +S = "${WORKDIR}/git" + +# kernel module is provide by dpdk-module recipe, so disable here +EXTRA_OEMESON = " -Denable_kmods=false \ + -Dexamples=all \ +" + +COMPATIBLE_MACHINE = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" + +PACKAGECONFIG ??= " " +PACKAGECONFIG[afxdp] = ",,libbpf xdp-tools" +PACKAGECONFIG[libvirt] = ",,libvirt" + +RDEPENDS:${PN} += "pciutils python3-core" +RDEPENDS:${PN}-examples += "bash" +DEPENDS = "numactl python3-pyelftools-native" + +inherit meson pkgconfig + +INSTALL_PATH = "${prefix}/share/dpdk" + +do_install:append(){ + # remove source files + rm -rf ${D}/${INSTALL_PATH}/examples/* + + # Install examples + install -m 0755 -d ${D}/${INSTALL_PATH}/examples/ + for dirname in ${B}/examples/dpdk-* + do + if [ ! -d ${dirname} ] && [ -x ${dirname} ]; then + install -m 0755 ${dirname} ${D}/${INSTALL_PATH}/examples/ + fi + done + +} + +PACKAGES =+ "${PN}-examples ${PN}-tools" + +FILES:${PN} += " ${bindir}/dpdk-testpmd \ + ${bindir}/dpdk-proc-info \ + ${libdir}/*.so* \ + ${libdir}/dpdk/pmds-22.0/*.so* \ + " +FILES:${PN}-examples = " \ + ${prefix}/share/dpdk/examples/* \ + " + +FILES:${PN}-tools = " \ + ${bindir}/dpdk-pdump \ + ${bindir}/dpdk-test \ + ${bindir}/dpdk-test-* \ + ${bindir}/dpdk-*.py \ + " + +CVE_PRODUCT = "data_plane_development_kit" + +INSANE_SKIP:${PN} = "dev-so" -- cgit v1.2.3-54-g00ecf