From 590c01813e352f3e47dc927adda61599c355e4c4 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Tue, 25 Oct 2022 11:33:12 +0800 Subject: dpdk/20.11: drop recipe Recipe for dpdk 22.07 already has been added. So time to drop it. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_20.11.6.bb | 49 ---------------- ...ld-march-and-mcpu-already-passed-by-Yocto.patch | 38 ------------ recipes-extended/dpdk/dpdk_20.11.6.bb | 68 ---------------------- 3 files changed, 155 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_20.11.6.bb delete mode 100644 recipes-extended/dpdk/dpdk/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch delete mode 100644 recipes-extended/dpdk/dpdk_20.11.6.bb diff --git a/recipes-extended/dpdk/dpdk-module_20.11.6.bb b/recipes-extended/dpdk/dpdk-module_20.11.6.bb deleted file mode 100644 index 29b055d..0000000 --- a/recipes-extended/dpdk/dpdk-module_20.11.6.bb +++ /dev/null @@ -1,49 +0,0 @@ -include dpdk.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" - -SRC_URI += " \ - file://0001-Makefile-add-makefile.patch \ -" -STABLE = "-stable" -BRANCH = "20.11" -SRCREV = "73655c6414914c99a33010e9e7bdae9cafd24404" -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-meson.build-march-and-mcpu-already-passed-by-Yocto.patch b/recipes-extended/dpdk/dpdk/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch deleted file mode 100644 index bef1f45..0000000 --- a/recipes-extended/dpdk/dpdk/0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cf8f15824dc2dd306d9c7e111641bef045d623c2 Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Wed, 14 Apr 2021 16:03:10 +0800 -Subject: [PATCH] meson.build:-march and -mcpu already passed by Yocto - -Upstream-Status: Inappropriate - -Signed-off-by: Naveen Saini ---- - config/meson.build | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/config/meson.build b/config/meson.build -index 2f150de3b8..41bb3e9ec4 100644 ---- a/config/meson.build -+++ b/config/meson.build -@@ -94,12 +94,12 @@ dpdk_conf.set('RTE_MACHINE', machine) - machine_args = [] - - # ppc64 does not support -march= at all, use -mcpu and -mtune for that --if host_machine.cpu_family().startswith('ppc') -- machine_args += '-mcpu=' + machine -- machine_args += '-mtune=' + machine --else -- machine_args += '-march=' + machine --endif -+#if host_machine.cpu_family().startswith('ppc') -+# machine_args += '-mcpu=' + machine -+# machine_args += '-mtune=' + machine -+#else -+# machine_args += '-march=' + machine -+#endif - - toolchain = cc.get_id() - dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain) --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk_20.11.6.bb b/recipes-extended/dpdk/dpdk_20.11.6.bb deleted file mode 100644 index db585d5..0000000 --- a/recipes-extended/dpdk/dpdk_20.11.6.bb +++ /dev/null @@ -1,68 +0,0 @@ -include dpdk.inc - -SRC_URI += " \ - file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch \ -" - -STABLE = "-stable" -BRANCH = "20.11" -SRCREV = "73655c6414914c99a33010e9e7bdae9cafd24404" -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