From 770364576514c867b8ef5b56c94d0b1b569bae44 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 3 Aug 2021 23:48:18 +0800 Subject: Convert to using new override syntax Use the script convert-overrides.py to convert to new syntax. Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_20.11.1.bb | 2 +- recipes-extended/dpdk/dpdk_19.11.5.bb | 24 ++++++++++++------------ recipes-extended/dpdk/dpdk_20.11.1.bb | 18 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/recipes-extended/dpdk/dpdk-module_20.11.1.bb b/recipes-extended/dpdk/dpdk-module_20.11.1.bb index ac931bc..1860087 100644 --- a/recipes-extended/dpdk/dpdk-module_20.11.1.bb +++ b/recipes-extended/dpdk/dpdk-module_20.11.1.bb @@ -1,6 +1,6 @@ include dpdk.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/dpdk:" +FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:" SRC_URI += " \ file://0001-Makefile-add-makefile.patch \ diff --git a/recipes-extended/dpdk/dpdk_19.11.5.bb b/recipes-extended/dpdk/dpdk_19.11.5.bb index 2ae9b43..41f56b0 100644 --- a/recipes-extended/dpdk/dpdk_19.11.5.bb +++ b/recipes-extended/dpdk/dpdk_19.11.5.bb @@ -14,8 +14,8 @@ SRCREV = "1d28832feb881d4512993791d30d695cc9c7160b" S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST_libc-musl_class-target = "null" -COMPATIBLE_HOST_linux-gnux32 = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:linux-gnux32 = "null" # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. # fuse is in meta-filesystems and qat is not yet upstreamed. @@ -37,7 +37,7 @@ export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n # specific directory datadir[unexport] = "1" -RDEPENDS_${PN} += "pciutils python3-core" +RDEPENDS:${PN} += "pciutils python3-core" DEPENDS = "virtual/kernel" do_configure[depends] += "virtual/kernel:do_shared_workdir" @@ -60,9 +60,9 @@ export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac" export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" export ARCHDIR = "generic" -DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc" -DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc" -DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" +DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc" +DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc" +DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" export RTE_TARGET = "${DPDK_RTE_TARGET}" # Workaround failure on gcc10 @@ -163,16 +163,16 @@ do_install () { PACKAGES += "${PN}-examples ${PN}-test" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${INSTALL_PATH}/.debug \ ${INSTALL_PATH}/examples/*/.debug \ " -FILES_${PN}-doc += "\ +FILES:${PN}-doc += "\ ${INSTALL_PATH}/doc \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${INSTALL_PATH}/${RTE_TARGET}/.config \ ${includedir} \ ${includedir}/${ARCHDIR} \ @@ -183,15 +183,15 @@ FILES_${PN}-dev += " \ ${INSTALL_PATH}/mk \ " -FILES_${PN} += " ${INSTALL_PATH}/usertools/ \ +FILES:${PN} += " ${INSTALL_PATH}/usertools/ \ ${prefix}/sbin/ \ ${prefix}/bin/ \ ${libdir}/ \ " -FILES_${PN}-examples += " \ +FILES:${PN}-examples += " \ ${INSTALL_PATH}/examples/* \ " -FILES_${PN}-test += " \ +FILES:${PN}-test += " \ ${INSTALL_PATH}/test \ " diff --git a/recipes-extended/dpdk/dpdk_20.11.1.bb b/recipes-extended/dpdk/dpdk_20.11.1.bb index 19e8bcc..061ed8e 100644 --- a/recipes-extended/dpdk/dpdk_20.11.1.bb +++ b/recipes-extended/dpdk/dpdk_20.11.1.bb @@ -16,22 +16,22 @@ EXTRA_OEMESON = " -Denable_kmods=false \ " COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST_libc-musl_class-target = "null" -COMPATIBLE_HOST_linux-gnux32 = "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" +RDEPENDS:${PN} += "pciutils python3-core" +RDEPENDS:${PN}-examples += "bash" DEPENDS = "numactl" inherit meson INSTALL_PATH = "${prefix}/share/dpdk" -do_install_append(){ +do_install:append(){ # remove source files rm -rf ${D}/${INSTALL_PATH}/examples/* @@ -48,16 +48,16 @@ do_install_append(){ PACKAGES =+ "${PN}-examples ${PN}-tools" -FILES_${PN} = " ${bindir}/dpdk-testpmd \ +FILES:${PN} = " ${bindir}/dpdk-testpmd \ ${bindir}/dpdk-proc-info \ ${libdir}/*.so* \ ${libdir}/dpdk/pmds-21.0/*.so* \ " -FILES_${PN}-examples = " \ +FILES:${PN}-examples = " \ ${prefix}/share/dpdk/examples/* \ " -FILES_${PN}-tools = " \ +FILES:${PN}-tools = " \ ${bindir}/dpdk-pdump \ ${bindir}/dpdk-test \ ${bindir}/dpdk-test-* \ @@ -66,4 +66,4 @@ FILES_${PN}-tools = " \ CVE_PRODUCT = "data_plane_development_kit" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -- cgit v1.2.3-54-g00ecf