From: Lee Chee Yang <[email protected]> drop the dpdk-module, kni driver now dropped. https://github.com/DPDK/dpdk/commit/f78c100bc87119c6a94130a6689d773afdaa9d98
EXTRA_OEMESON remove enable_kmods. Signed-off-by: Lee Chee Yang <[email protected]> --- recipes-extended/dpdk/dpdk-module_23.07.bb | 50 ---------------- ...ld-march-and-mcpu-already-passed-by-.patch | 60 +++++++++++++++++++ .../dpdk/{dpdk_23.07.bb => dpdk_23.11.bb} | 13 ++-- 3 files changed, 65 insertions(+), 58 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk-module_23.07.bb create mode 100644 recipes-extended/dpdk/dpdk/0001-dpdk_23.11-config-meson.build-march-and-mcpu-already-passed-by-.patch rename recipes-extended/dpdk/{dpdk_23.07.bb => dpdk_23.11.bb} (77%) diff --git a/recipes-extended/dpdk/dpdk-module_23.07.bb b/recipes-extended/dpdk/dpdk-module_23.07.bb deleted file mode 100644 index c76ed87..0000000 --- a/recipes-extended/dpdk/dpdk-module_23.07.bb +++ /dev/null @@ -1,50 +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 = "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/0001-dpdk_23.11-config-meson.build-march-and-mcpu-already-passed-by-.patch b/recipes-extended/dpdk/dpdk/0001-dpdk_23.11-config-meson.build-march-and-mcpu-already-passed-by-.patch new file mode 100644 index 0000000..db781b1 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0001-dpdk_23.11-config-meson.build-march-and-mcpu-already-passed-by-.patch @@ -0,0 +1,60 @@ +From 280d08791609985524694c2d837a5edad12a2706 Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang <[email protected]> +Date: Mon, 4 Dec 2023 13:38:09 +0800 +Subject: [PATCH] config/meson.build -march and -mcpu already passed by Yocto + +Signed-off-by: Lee Chee Yang <[email protected]> +--- + config/meson.build | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/config/meson.build b/config/meson.build +index a9ccd56deb..6a463ac9f8 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -159,25 +159,25 @@ endif + dpdk_conf.set('RTE_MACHINE', cpu_instruction_set) + machine_args = [] + +-if not is_ms_compiler ++#if not is_ms_compiler + # ppc64 does not support -march= at all, use -mcpu and -mtune for that +- if host_machine.cpu_family().startswith('ppc') +- machine_args += '-mcpu=' + cpu_instruction_set +- machine_args += '-mtune=' + cpu_instruction_set +- compiler_arch_support = cc.has_argument('-mcpu=' + cpu_instruction_set) +- else +- machine_args += '-march=' + cpu_instruction_set ++# if host_machine.cpu_family().startswith('ppc') ++# machine_args += '-mcpu=' + cpu_instruction_set ++# machine_args += '-mtune=' + cpu_instruction_set ++# compiler_arch_support = cc.has_argument('-mcpu=' + cpu_instruction_set) ++# else ++# machine_args += '-march=' + cpu_instruction_set + # arm manages generic/auto config in config/arm/meson.build +- if cpu_instruction_set != 'generic' and cpu_instruction_set != 'auto' +- compiler_arch_support = cc.has_argument('-march=' + cpu_instruction_set) +- else +- compiler_arch_support = true +- endif +- endif +- if not compiler_arch_support +- error('Compiler does not support "@0@" arch flag.'.format(cpu_instruction_set)) +- endif +-endif ++# if cpu_instruction_set != 'generic' and cpu_instruction_set != 'auto' ++# compiler_arch_support = cc.has_argument('-march=' + cpu_instruction_set) ++# else ++# compiler_arch_support = true ++# endif ++# endif ++# if not compiler_arch_support ++# error('Compiler does not support "@0@" arch flag.'.format(cpu_instruction_set)) ++# endif ++#endif + + toolchain = cc.get_id() + dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain) +-- +2.37.3 + diff --git a/recipes-extended/dpdk/dpdk_23.07.bb b/recipes-extended/dpdk/dpdk_23.11.bb similarity index 77% rename from recipes-extended/dpdk/dpdk_23.07.bb rename to recipes-extended/dpdk/dpdk_23.11.bb index 3a1b0a8..103d352 100644 --- a/recipes-extended/dpdk/dpdk_23.07.bb +++ b/recipes-extended/dpdk/dpdk_23.11.bb @@ -1,17 +1,14 @@ 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 \ +SRC_URI += " file://0001-dpdk_23.11-config-meson.build-march-and-mcpu-already-passed-by-.patch \ " -BRANCH = "releases" -SRCREV = "12fcafcd62286933e6b167b14856d21f642efa5f" +STABLE = "-stable" +BRANCH = "23.11" +SRCREV = "eeb0605f118dae66e80faa44f7b3e88748032353" S = "${WORKDIR}/git" -# kernel module is provide by dpdk-module recipe, so disable here -EXTRA_OEMESON = " -Denable_kmods=false \ - -Dexamples=all \ -" +EXTRA_OEMESON = " -Dexamples=all " COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST:libc-musl:class-target = "null" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8177): https://lists.yoctoproject.org/g/meta-intel/message/8177 Mute This Topic: https://lists.yoctoproject.org/mt/102989665/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
