diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel/perf | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/perf')
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 99808d636b..8ebd7d7cb5 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -30,9 +30,9 @@ PACKAGECONFIG[cap] = ",,libcap" | |||
30 | PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd" | 30 | PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd" |
31 | 31 | ||
32 | # libunwind is not yet ported for some architectures | 32 | # libunwind is not yet ported for some architectures |
33 | PACKAGECONFIG_remove_arc = "libunwind" | 33 | PACKAGECONFIG:remove:arc = "libunwind" |
34 | PACKAGECONFIG_remove_riscv64 = "libunwind" | 34 | PACKAGECONFIG:remove:riscv64 = "libunwind" |
35 | PACKAGECONFIG_remove_riscv32 = "libunwind" | 35 | PACKAGECONFIG:remove:riscv32 = "libunwind" |
36 | 36 | ||
37 | DEPENDS = " \ | 37 | DEPENDS = " \ |
38 | virtual/${MLPREFIX}libc \ | 38 | virtual/${MLPREFIX}libc \ |
@@ -110,7 +110,7 @@ EXTRA_OEMAKE += "\ | |||
110 | # that it has to be done this way rather than by passing -j1, since | 110 | # that it has to be done this way rather than by passing -j1, since |
111 | # perf's build system by default ignores any -j argument, but does | 111 | # perf's build system by default ignores any -j argument, but does |
112 | # honour a JOBS variable. | 112 | # honour a JOBS variable. |
113 | EXTRA_OEMAKE_append_task-configure = " JOBS=1" | 113 | EXTRA_OEMAKE:append_task-configure = " JOBS=1" |
114 | 114 | ||
115 | PERF_SRC ?= "Makefile \ | 115 | PERF_SRC ?= "Makefile \ |
116 | tools/arch \ | 116 | tools/arch \ |
@@ -127,8 +127,8 @@ PERF_SRC ?= "Makefile \ | |||
127 | PERF_EXTRA_LDFLAGS = "" | 127 | PERF_EXTRA_LDFLAGS = "" |
128 | 128 | ||
129 | # MIPS N32 | 129 | # MIPS N32 |
130 | PERF_EXTRA_LDFLAGS_mipsarchn32eb = "-m elf32btsmipn32" | 130 | PERF_EXTRA_LDFLAGS:mipsarchn32eb = "-m elf32btsmipn32" |
131 | PERF_EXTRA_LDFLAGS_mipsarchn32el = "-m elf32ltsmipn32" | 131 | PERF_EXTRA_LDFLAGS:mipsarchn32el = "-m elf32ltsmipn32" |
132 | 132 | ||
133 | do_compile() { | 133 | do_compile() { |
134 | # Linux kernel build system is expected to do the right thing | 134 | # Linux kernel build system is expected to do the right thing |
@@ -166,7 +166,7 @@ python copy_perf_source_from_kernel() { | |||
166 | bb.utils.copyfile(src, dest) | 166 | bb.utils.copyfile(src, dest) |
167 | } | 167 | } |
168 | 168 | ||
169 | do_configure_prepend () { | 169 | do_configure:prepend () { |
170 | # If building a multlib based perf, the incorrect library path will be | 170 | # If building a multlib based perf, the incorrect library path will be |
171 | # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit | 171 | # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit |
172 | # build, with a 64 bit multilib, the arch won't match and the detection of a | 172 | # build, with a 64 bit multilib, the arch won't match and the detection of a |
@@ -311,7 +311,7 @@ do_configure_prepend () { | |||
311 | done | 311 | done |
312 | } | 312 | } |
313 | 313 | ||
314 | python do_package_prepend() { | 314 | python do_package:prepend() { |
315 | d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) | 315 | d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) |
316 | } | 316 | } |
317 | 317 | ||
@@ -320,25 +320,25 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
320 | 320 | ||
321 | PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" | 321 | PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" |
322 | 322 | ||
323 | RDEPENDS_${PN} += "elfutils bash" | 323 | RDEPENDS:${PN} += "elfutils bash" |
324 | RDEPENDS_${PN}-archive =+ "bash" | 324 | RDEPENDS:${PN}-archive =+ "bash" |
325 | RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" | 325 | RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" |
326 | RDEPENDS_${PN}-perl =+ "bash perl perl-modules" | 326 | RDEPENDS:${PN}-perl =+ "bash perl perl-modules" |
327 | RDEPENDS_${PN}-tests =+ "python3 bash" | 327 | RDEPENDS:${PN}-tests =+ "python3 bash" |
328 | 328 | ||
329 | RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}" | 329 | RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}" |
330 | RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" | 330 | RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" |
331 | 331 | ||
332 | FILES_SOLIBSDEV = "" | 332 | FILES_SOLIBSDEV = "" |
333 | FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so" | 333 | FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so" |
334 | FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" | 334 | FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive" |
335 | FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" | 335 | FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" |
336 | FILES_${PN}-python = " \ | 336 | FILES:${PN}-python = " \ |
337 | ${PYTHON_SITEPACKAGES_DIR} \ | 337 | ${PYTHON_SITEPACKAGES_DIR} \ |
338 | ${libexecdir}/perf-core/scripts/python \ | 338 | ${libexecdir}/perf-core/scripts/python \ |
339 | " | 339 | " |
340 | FILES_${PN}-perl = "${libexecdir}/perf-core/scripts/perl" | 340 | FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" |
341 | 341 | ||
342 | 342 | ||
343 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" | 343 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" |
344 | DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" | 344 | DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" |