Convert to using new override syntax

Use the script convert-overrides.py to convert to new syntax.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2021-08-03 23:48:18 +08:00
parent fb2dd96868
commit 7703645765
3 changed files with 22 additions and 22 deletions

View File

@ -1,6 +1,6 @@
include dpdk.inc include dpdk.inc
FILESEXTRAPATHS_prepend := "${THISDIR}/dpdk:" FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:"
SRC_URI += " \ SRC_URI += " \
file://0001-Makefile-add-makefile.patch \ file://0001-Makefile-add-makefile.patch \

View File

@ -14,8 +14,8 @@ SRCREV = "1d28832feb881d4512993791d30d695cc9c7160b"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "null" COMPATIBLE_MACHINE = "null"
COMPATIBLE_HOST_libc-musl_class-target = "null" COMPATIBLE_HOST:libc-musl:class-target = "null"
COMPATIBLE_HOST_linux-gnux32 = "null" COMPATIBLE_HOST:linux-gnux32 = "null"
# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
# fuse is in meta-filesystems and qat is not yet upstreamed. # 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 # specific directory
datadir[unexport] = "1" datadir[unexport] = "1"
RDEPENDS_${PN} += "pciutils python3-core" RDEPENDS:${PN} += "pciutils python3-core"
DEPENDS = "virtual/kernel" DEPENDS = "virtual/kernel"
do_configure[depends] += "virtual/kernel:do_shared_workdir" 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 EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
export ARCHDIR = "generic" export ARCHDIR = "generic"
DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc" DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc"
DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc" DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc"
DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
export RTE_TARGET = "${DPDK_RTE_TARGET}" export RTE_TARGET = "${DPDK_RTE_TARGET}"
# Workaround failure on gcc10 # Workaround failure on gcc10
@ -163,16 +163,16 @@ do_install () {
PACKAGES += "${PN}-examples ${PN}-test" PACKAGES += "${PN}-examples ${PN}-test"
FILES_${PN}-dbg += " \ FILES:${PN}-dbg += " \
${INSTALL_PATH}/.debug \ ${INSTALL_PATH}/.debug \
${INSTALL_PATH}/examples/*/.debug \ ${INSTALL_PATH}/examples/*/.debug \
" "
FILES_${PN}-doc += "\ FILES:${PN}-doc += "\
${INSTALL_PATH}/doc \ ${INSTALL_PATH}/doc \
" "
FILES_${PN}-dev += " \ FILES:${PN}-dev += " \
${INSTALL_PATH}/${RTE_TARGET}/.config \ ${INSTALL_PATH}/${RTE_TARGET}/.config \
${includedir} \ ${includedir} \
${includedir}/${ARCHDIR} \ ${includedir}/${ARCHDIR} \
@ -183,15 +183,15 @@ FILES_${PN}-dev += " \
${INSTALL_PATH}/mk \ ${INSTALL_PATH}/mk \
" "
FILES_${PN} += " ${INSTALL_PATH}/usertools/ \ FILES:${PN} += " ${INSTALL_PATH}/usertools/ \
${prefix}/sbin/ \ ${prefix}/sbin/ \
${prefix}/bin/ \ ${prefix}/bin/ \
${libdir}/ \ ${libdir}/ \
" "
FILES_${PN}-examples += " \ FILES:${PN}-examples += " \
${INSTALL_PATH}/examples/* \ ${INSTALL_PATH}/examples/* \
" "
FILES_${PN}-test += " \ FILES:${PN}-test += " \
${INSTALL_PATH}/test \ ${INSTALL_PATH}/test \
" "

View File

@ -16,22 +16,22 @@ EXTRA_OEMESON = " -Denable_kmods=false \
" "
COMPATIBLE_MACHINE = "null" COMPATIBLE_MACHINE = "null"
COMPATIBLE_HOST_libc-musl_class-target = "null" COMPATIBLE_HOST:libc-musl:class-target = "null"
COMPATIBLE_HOST_linux-gnux32 = "null" COMPATIBLE_HOST:linux-gnux32 = "null"
PACKAGECONFIG ??= " " PACKAGECONFIG ??= " "
PACKAGECONFIG[afxdp] = ",,libbpf" PACKAGECONFIG[afxdp] = ",,libbpf"
PACKAGECONFIG[libvirt] = ",,libvirt" PACKAGECONFIG[libvirt] = ",,libvirt"
RDEPENDS_${PN} += "pciutils python3-core" RDEPENDS:${PN} += "pciutils python3-core"
RDEPENDS_${PN}-examples += "bash" RDEPENDS:${PN}-examples += "bash"
DEPENDS = "numactl" DEPENDS = "numactl"
inherit meson inherit meson
INSTALL_PATH = "${prefix}/share/dpdk" INSTALL_PATH = "${prefix}/share/dpdk"
do_install_append(){ do_install:append(){
# remove source files # remove source files
rm -rf ${D}/${INSTALL_PATH}/examples/* rm -rf ${D}/${INSTALL_PATH}/examples/*
@ -48,16 +48,16 @@ do_install_append(){
PACKAGES =+ "${PN}-examples ${PN}-tools" PACKAGES =+ "${PN}-examples ${PN}-tools"
FILES_${PN} = " ${bindir}/dpdk-testpmd \ FILES:${PN} = " ${bindir}/dpdk-testpmd \
${bindir}/dpdk-proc-info \ ${bindir}/dpdk-proc-info \
${libdir}/*.so* \ ${libdir}/*.so* \
${libdir}/dpdk/pmds-21.0/*.so* \ ${libdir}/dpdk/pmds-21.0/*.so* \
" "
FILES_${PN}-examples = " \ FILES:${PN}-examples = " \
${prefix}/share/dpdk/examples/* \ ${prefix}/share/dpdk/examples/* \
" "
FILES_${PN}-tools = " \ FILES:${PN}-tools = " \
${bindir}/dpdk-pdump \ ${bindir}/dpdk-pdump \
${bindir}/dpdk-test \ ${bindir}/dpdk-test \
${bindir}/dpdk-test-* \ ${bindir}/dpdk-test-* \
@ -66,4 +66,4 @@ FILES_${PN}-tools = " \
CVE_PRODUCT = "data_plane_development_kit" CVE_PRODUCT = "data_plane_development_kit"
INSANE_SKIP_${PN} = "dev-so" INSANE_SKIP:${PN} = "dev-so"