From ad5fdb707f44dddd276b864d2098c3abede90067 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 6 May 2022 17:55:41 +0800 Subject: dpdk/20.11: update to v20.11.5 Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_20.11.1.bb | 50 ---------------- recipes-extended/dpdk/dpdk-module_20.11.5.bb | 50 ++++++++++++++++ ...eson-Fix-finding-librt-using-find_library.patch | 35 ----------- recipes-extended/dpdk/dpdk_20.11.1.bb | 69 ---------------------- recipes-extended/dpdk/dpdk_20.11.5.bb | 68 +++++++++++++++++++++ 5 files changed, 118 insertions(+), 154 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_20.11.1.bb create mode 100644 recipes-extended/dpdk/dpdk-module_20.11.5.bb delete mode 100644 recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch delete mode 100644 recipes-extended/dpdk/dpdk_20.11.1.bb create mode 100644 recipes-extended/dpdk/dpdk_20.11.5.bb diff --git a/recipes-extended/dpdk/dpdk-module_20.11.1.bb b/recipes-extended/dpdk/dpdk-module_20.11.1.bb deleted file mode 100644 index 42fe229..0000000 --- a/recipes-extended/dpdk/dpdk-module_20.11.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -include dpdk.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" - -SRC_URI += " \ - file://0001-Makefile-add-makefile.patch \ - file://0002-kni-update-kernel-API-to-set-random-MAC-address.patch \ -" -STABLE = "-stable" -BRANCH = "20.11" -SRCREV = "b1e71cf43153cca07db6cbb69fdca030ccf52234" -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-module_20.11.5.bb b/recipes-extended/dpdk/dpdk-module_20.11.5.bb new file mode 100644 index 0000000..64defa8 --- /dev/null +++ b/recipes-extended/dpdk/dpdk-module_20.11.5.bb @@ -0,0 +1,50 @@ +include dpdk.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" + +SRC_URI += " \ + file://0001-Makefile-add-makefile.patch \ + file://0002-kni-update-kernel-API-to-set-random-MAC-address.patch \ +" +STABLE = "-stable" +BRANCH = "20.11" +SRCREV = "abf68ccc8b1f923f0eb0b6bf2a8b944378e1ebeb" +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/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch b/recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch deleted file mode 100644 index 4df28c4..0000000 --- a/recipes-extended/dpdk/dpdk/0001-ifpga-meson-Fix-finding-librt-using-find_library.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 308409d72671b7978b20d40748ad985a235b6c86 Mon Sep 17 00:00:00 2001 -From: Mohamad Noor Alim Hussin -Date: Thu, 24 Jun 2021 11:30:09 +0800 -Subject: [PATCH] ifpga/meson: Fix finding librt using find_library() - -Finding with "librt" keyword would give the output -with full path of librt such as /usr/lib/librt.so -instead of -lrt. - -Assume find_library() will prepend "lib", thus remove -"lib" from "librt" keyword. The output will shows as --lrt. - -Upstream-Status: Submitted [https://mails.dpdk.org/archives/stable/2021-June/031840.html] - -Signed-off-by: Mohamad Noor Alim Hussin ---- - drivers/raw/ifpga/base/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build -index da2d6e33c..949f7f127 100644 ---- a/drivers/raw/ifpga/base/meson.build -+++ b/drivers/raw/ifpga/base/meson.build -@@ -25,7 +25,7 @@ sources = [ - - rtdep = dependency('librt', required: false) - if not rtdep.found() -- rtdep = cc.find_library('librt', required: false) -+ rtdep = cc.find_library('rt', required: false) - endif - if not rtdep.found() - build = false --- -2.32.0 diff --git a/recipes-extended/dpdk/dpdk_20.11.1.bb b/recipes-extended/dpdk/dpdk_20.11.1.bb deleted file mode 100644 index 061ed8e..0000000 --- a/recipes-extended/dpdk/dpdk_20.11.1.bb +++ /dev/null @@ -1,69 +0,0 @@ -include dpdk.inc - -SRC_URI += " \ - file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ - file://0001-ifpga-meson-Fix-finding-librt-using-find_library.patch \ -" - -STABLE = "-stable" -BRANCH = "20.11" -SRCREV = "b1e71cf43153cca07db6cbb69fdca030ccf52234" -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" -PACKAGECONFIG[libvirt] = ",,libvirt" - -RDEPENDS:${PN} += "pciutils python3-core" -RDEPENDS:${PN}-examples += "bash" -DEPENDS = "numactl" - -inherit meson - -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-21.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_20.11.5.bb b/recipes-extended/dpdk/dpdk_20.11.5.bb new file mode 100644 index 0000000..1e537f5 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_20.11.5.bb @@ -0,0 +1,68 @@ +include dpdk.inc + +SRC_URI += " \ + file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ +" + +STABLE = "-stable" +BRANCH = "20.11" +SRCREV = "abf68ccc8b1f923f0eb0b6bf2a8b944378e1ebeb" +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" +PACKAGECONFIG[libvirt] = ",,libvirt" + +RDEPENDS:${PN} += "pciutils python3-core" +RDEPENDS:${PN}-examples += "bash" +DEPENDS = "numactl" + +inherit meson + +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-21.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