summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-08-03 23:48:18 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-08-03 23:48:18 +0800
commit770364576514c867b8ef5b56c94d0b1b569bae44 (patch)
tree00ea1842387692bd77f5021a70c7a672c4ba9701
parentfb2dd96868a3eb51673e4a1e122e0b375aa1832f (diff)
downloadmeta-dpdk-770364576514c867b8ef5b56c94d0b1b569bae44.tar.gz
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>
-rw-r--r--recipes-extended/dpdk/dpdk-module_20.11.1.bb2
-rw-r--r--recipes-extended/dpdk/dpdk_19.11.5.bb24
-rw-r--r--recipes-extended/dpdk/dpdk_20.11.1.bb18
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 @@
1include dpdk.inc 1include dpdk.inc
2 2
3FILESEXTRAPATHS_prepend := "${THISDIR}/dpdk:" 3FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:"
4 4
5SRC_URI += " \ 5SRC_URI += " \
6 file://0001-Makefile-add-makefile.patch \ 6 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"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16COMPATIBLE_MACHINE = "null" 16COMPATIBLE_MACHINE = "null"
17COMPATIBLE_HOST_libc-musl_class-target = "null" 17COMPATIBLE_HOST:libc-musl:class-target = "null"
18COMPATIBLE_HOST_linux-gnux32 = "null" 18COMPATIBLE_HOST:linux-gnux32 = "null"
19 19
20# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat. 20# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
21# fuse is in meta-filesystems and qat is not yet upstreamed. 21# 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
37# specific directory 37# specific directory
38datadir[unexport] = "1" 38datadir[unexport] = "1"
39 39
40RDEPENDS_${PN} += "pciutils python3-core" 40RDEPENDS:${PN} += "pciutils python3-core"
41DEPENDS = "virtual/kernel" 41DEPENDS = "virtual/kernel"
42do_configure[depends] += "virtual/kernel:do_shared_workdir" 42do_configure[depends] += "virtual/kernel:do_shared_workdir"
43 43
@@ -60,9 +60,9 @@ export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac"
60export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" 60export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
61export ARCHDIR = "generic" 61export ARCHDIR = "generic"
62 62
63DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc" 63DPDK_RTE_TARGET:x86-64 = "x86_64-native-linuxapp-gcc"
64DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc" 64DPDK_RTE_TARGET:x86 = "i686-native-linuxapp-gcc"
65DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc" 65DPDK_RTE_TARGET:aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
66export RTE_TARGET = "${DPDK_RTE_TARGET}" 66export RTE_TARGET = "${DPDK_RTE_TARGET}"
67 67
68# Workaround failure on gcc10 68# Workaround failure on gcc10
@@ -163,16 +163,16 @@ do_install () {
163 163
164PACKAGES += "${PN}-examples ${PN}-test" 164PACKAGES += "${PN}-examples ${PN}-test"
165 165
166FILES_${PN}-dbg += " \ 166FILES:${PN}-dbg += " \
167 ${INSTALL_PATH}/.debug \ 167 ${INSTALL_PATH}/.debug \
168 ${INSTALL_PATH}/examples/*/.debug \ 168 ${INSTALL_PATH}/examples/*/.debug \
169 " 169 "
170 170
171FILES_${PN}-doc += "\ 171FILES:${PN}-doc += "\
172 ${INSTALL_PATH}/doc \ 172 ${INSTALL_PATH}/doc \
173 " 173 "
174 174
175FILES_${PN}-dev += " \ 175FILES:${PN}-dev += " \
176 ${INSTALL_PATH}/${RTE_TARGET}/.config \ 176 ${INSTALL_PATH}/${RTE_TARGET}/.config \
177 ${includedir} \ 177 ${includedir} \
178 ${includedir}/${ARCHDIR} \ 178 ${includedir}/${ARCHDIR} \
@@ -183,15 +183,15 @@ FILES_${PN}-dev += " \
183 ${INSTALL_PATH}/mk \ 183 ${INSTALL_PATH}/mk \
184 " 184 "
185 185
186FILES_${PN} += " ${INSTALL_PATH}/usertools/ \ 186FILES:${PN} += " ${INSTALL_PATH}/usertools/ \
187 ${prefix}/sbin/ \ 187 ${prefix}/sbin/ \
188 ${prefix}/bin/ \ 188 ${prefix}/bin/ \
189 ${libdir}/ \ 189 ${libdir}/ \
190 " 190 "
191FILES_${PN}-examples += " \ 191FILES:${PN}-examples += " \
192 ${INSTALL_PATH}/examples/* \ 192 ${INSTALL_PATH}/examples/* \
193 " 193 "
194 194
195FILES_${PN}-test += " \ 195FILES:${PN}-test += " \
196 ${INSTALL_PATH}/test \ 196 ${INSTALL_PATH}/test \
197 " 197 "
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 \
16" 16"
17 17
18COMPATIBLE_MACHINE = "null" 18COMPATIBLE_MACHINE = "null"
19COMPATIBLE_HOST_libc-musl_class-target = "null" 19COMPATIBLE_HOST:libc-musl:class-target = "null"
20COMPATIBLE_HOST_linux-gnux32 = "null" 20COMPATIBLE_HOST:linux-gnux32 = "null"
21 21
22PACKAGECONFIG ??= " " 22PACKAGECONFIG ??= " "
23PACKAGECONFIG[afxdp] = ",,libbpf" 23PACKAGECONFIG[afxdp] = ",,libbpf"
24PACKAGECONFIG[libvirt] = ",,libvirt" 24PACKAGECONFIG[libvirt] = ",,libvirt"
25 25
26RDEPENDS_${PN} += "pciutils python3-core" 26RDEPENDS:${PN} += "pciutils python3-core"
27RDEPENDS_${PN}-examples += "bash" 27RDEPENDS:${PN}-examples += "bash"
28DEPENDS = "numactl" 28DEPENDS = "numactl"
29 29
30inherit meson 30inherit meson
31 31
32INSTALL_PATH = "${prefix}/share/dpdk" 32INSTALL_PATH = "${prefix}/share/dpdk"
33 33
34do_install_append(){ 34do_install:append(){
35 # remove source files 35 # remove source files
36 rm -rf ${D}/${INSTALL_PATH}/examples/* 36 rm -rf ${D}/${INSTALL_PATH}/examples/*
37 37
@@ -48,16 +48,16 @@ do_install_append(){
48 48
49PACKAGES =+ "${PN}-examples ${PN}-tools" 49PACKAGES =+ "${PN}-examples ${PN}-tools"
50 50
51FILES_${PN} = " ${bindir}/dpdk-testpmd \ 51FILES:${PN} = " ${bindir}/dpdk-testpmd \
52 ${bindir}/dpdk-proc-info \ 52 ${bindir}/dpdk-proc-info \
53 ${libdir}/*.so* \ 53 ${libdir}/*.so* \
54 ${libdir}/dpdk/pmds-21.0/*.so* \ 54 ${libdir}/dpdk/pmds-21.0/*.so* \
55 " 55 "
56FILES_${PN}-examples = " \ 56FILES:${PN}-examples = " \
57 ${prefix}/share/dpdk/examples/* \ 57 ${prefix}/share/dpdk/examples/* \
58 " 58 "
59 59
60FILES_${PN}-tools = " \ 60FILES:${PN}-tools = " \
61 ${bindir}/dpdk-pdump \ 61 ${bindir}/dpdk-pdump \
62 ${bindir}/dpdk-test \ 62 ${bindir}/dpdk-test \
63 ${bindir}/dpdk-test-* \ 63 ${bindir}/dpdk-test-* \
@@ -66,4 +66,4 @@ FILES_${PN}-tools = " \
66 66
67CVE_PRODUCT = "data_plane_development_kit" 67CVE_PRODUCT = "data_plane_development_kit"
68 68
69INSANE_SKIP_${PN} = "dev-so" 69INSANE_SKIP:${PN} = "dev-so"