summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel/lttng
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-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/lttng')
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb6
-rw-r--r--meta/recipes-kernel/lttng/babeltrace_1.5.8.bb2
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb16
-rw-r--r--meta/recipes-kernel/lttng/lttng-platforms.inc12
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb30
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb16
6 files changed, 41 insertions, 41 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
index 7fb524eeb0..2aafe81734 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
@@ -24,12 +24,12 @@ EXTRA_OECONF = "--disable-debug-info"
24PACKAGECONFIG ??= "manpages" 24PACKAGECONFIG ??= "manpages"
25PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" 25PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native"
26 26
27FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" 27FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a"
28FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" 28FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so"
29 29
30ASNEEDED = "" 30ASNEEDED = ""
31 31
32RDEPENDS_${PN}-ptest += "bash gawk python3" 32RDEPENDS:${PN}-ptest += "bash gawk python3"
33 33
34do_compile_ptest () { 34do_compile_ptest () {
35 make -C tests all 35 make -C tests all
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
index 9e5d3a7a97..9f8b035128 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
@@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-debug-info"
21 21
22ASNEEDED = "" 22ASNEEDED = ""
23 23
24RDEPENDS_${PN}-ptest += "bash gawk" 24RDEPENDS:${PN}-ptest += "bash gawk"
25 25
26addtask do_patch_ptest_path after do_patch before do_configure 26addtask do_patch_ptest_path after do_patch before do_configure
27do_patch_ptest_path () { 27do_patch_ptest_path () {
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
index 94e849de59..c46faaee58 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
@@ -19,24 +19,24 @@ export INSTALL_MOD_DIR="kernel/lttng-modules"
19 19
20EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" 20EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
21 21
22do_install_append() { 22do_install:append() {
23 # Delete empty directories to avoid QA failures if no modules were built 23 # Delete empty directories to avoid QA failures if no modules were built
24 find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; 24 find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
25} 25}
26 26
27python do_package_prepend() { 27python do_package:prepend() {
28 if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): 28 if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
29 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) 29 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
30} 30}
31 31
32BBCLASSEXTEND = "devupstream:target" 32BBCLASSEXTEND = "devupstream:target"
33LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" 33LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4"
34DEFAULT_PREFERENCE_class-devupstream = "-1" 34DEFAULT_PREFERENCE:class-devupstream = "-1"
35SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \ 35SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \
36 file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ 36 file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
37 " 37 "
38 38
39SRCREV_class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933" 39SRCREV:class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933"
40PV_class-devupstream = "2.13.0-rc2+git${SRCPV}" 40PV:class-devupstream = "2.13.0-rc2+git${SRCPV}"
41S_class-devupstream = "${WORKDIR}/git" 41S:class-devupstream = "${WORKDIR}/git"
42SRCREV_FORMAT ?= "lttng_git" 42SRCREV_FORMAT ?= "lttng_git"
diff --git a/meta/recipes-kernel/lttng/lttng-platforms.inc b/meta/recipes-kernel/lttng/lttng-platforms.inc
index aa8220bbb4..933c65d85d 100644
--- a/meta/recipes-kernel/lttng/lttng-platforms.inc
+++ b/meta/recipes-kernel/lttng/lttng-platforms.inc
@@ -2,16 +2,16 @@
2# Whether the platform supports kernel tracing 2# Whether the platform supports kernel tracing
3# 3#
4LTTNGMODULES = "lttng-modules" 4LTTNGMODULES = "lttng-modules"
5LTTNGMODULES_arc = "" 5LTTNGMODULES:arc = ""
6LTTNGMODULES_riscv64 = "" 6LTTNGMODULES:riscv64 = ""
7 7
8COMPATIBLE_HOST_riscv64_pn-lttng-modules = "null" 8COMPATIBLE_HOST:riscv64:pn-lttng-modules = "null"
9COMPATIBLE_HOST_arc_pn-lttng-modules = "null" 9COMPATIBLE_HOST:arc:pn-lttng-modules = "null"
10 10
11# Whether the platform supports userspace tracing 11# Whether the platform supports userspace tracing
12# lttng-ust uses sched_getcpu() which is not there on for some platforms. 12# lttng-ust uses sched_getcpu() which is not there on for some platforms.
13LTTNGUST = "lttng-ust" 13LTTNGUST = "lttng-ust"
14LTTNGUST_arc = "" 14LTTNGUST:arc = ""
15 15
16COMPATIBLE_HOST_arc_pn-lttng-ust = "null" 16COMPATIBLE_HOST:arc:pn-lttng-ust = "null"
17 17
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
index 133d7561b8..dc2e1f3248 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -13,13 +13,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=40ef17463fbd6f377db3c47b1cbaded8 \
13include lttng-platforms.inc 13include lttng-platforms.inc
14 14
15DEPENDS = "liburcu popt libxml2 util-linux" 15DEPENDS = "liburcu popt libxml2 util-linux"
16RDEPENDS_${PN} = "libgcc" 16RDEPENDS:${PN} = "libgcc"
17RRECOMMENDS_${PN} += "${LTTNGMODULES}" 17RRECOMMENDS:${PN} += "${LTTNGMODULES}"
18RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep" 18RDEPENDS:${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep"
19RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" 19RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils"
20RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" 20RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils"
21# babelstats.pl wants getopt-long 21# babelstats.pl wants getopt-long
22RDEPENDS_${PN}-ptest += "perl-module-getopt-long" 22RDEPENDS:${PN}-ptest += "perl-module-getopt-long"
23 23
24PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ 24PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
25 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ 25 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -43,26 +43,26 @@ SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a5
43 43
44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
45 45
46SYSTEMD_SERVICE_${PN} = "lttng-sessiond.service" 46SYSTEMD_SERVICE:${PN} = "lttng-sessiond.service"
47SYSTEMD_AUTO_ENABLE = "disable" 47SYSTEMD_AUTO_ENABLE = "disable"
48 48
49USERADD_PACKAGES = "${PN}" 49USERADD_PACKAGES = "${PN}"
50GROUPADD_PARAM_${PN} = "tracing" 50GROUPADD_PARAM:${PN} = "tracing"
51 51
52FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ 52FILES:${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \
53 ${PYTHON_SITEPACKAGES_DIR}/*" 53 ${PYTHON_SITEPACKAGES_DIR}/*"
54FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" 54FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
55FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" 55FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
56 56
57# Since files are installed into ${libdir}/lttng/libexec we match 57# Since files are installed into ${libdir}/lttng/libexec we match
58# the libexec insane test so skip it. 58# the libexec insane test so skip it.
59# Python module needs to keep _lttng.so 59# Python module needs to keep _lttng.so
60INSANE_SKIP_${PN} = "libexec dev-so" 60INSANE_SKIP:${PN} = "libexec dev-so"
61INSANE_SKIP_${PN}-dbg = "libexec" 61INSANE_SKIP:${PN}-dbg = "libexec"
62 62
63PRIVATE_LIBS_${PN}-ptest = "libfoo.so" 63PRIVATE_LIBS:${PN}-ptest = "libfoo.so"
64 64
65do_install_append () { 65do_install:append () {
66 # install systemd unit file 66 # install systemd unit file
67 install -d ${D}${systemd_unitdir}/system 67 install -d ${D}${systemd_unitdir}/system
68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system 68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
index e340ff3460..54a473d2cb 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
@@ -20,12 +20,12 @@ include lttng-platforms.inc
20EXTRA_OECONF = "--disable-numa" 20EXTRA_OECONF = "--disable-numa"
21 21
22DEPENDS = "liburcu util-linux" 22DEPENDS = "liburcu util-linux"
23RDEPENDS_${PN}-bin = "python3-core" 23RDEPENDS:${PN}-bin = "python3-core"
24 24
25# For backwards compatibility after rename 25# For backwards compatibility after rename
26RPROVIDES_${PN} = "lttng2-ust" 26RPROVIDES:${PN} = "lttng2-ust"
27RREPLACES_${PN} = "lttng2-ust" 27RREPLACES:${PN} = "lttng2-ust"
28RCONFLICTS_${PN} = "lttng2-ust" 28RCONFLICTS:${PN} = "lttng2-ust"
29 29
30PE = "2" 30PE = "2"
31 31
@@ -41,11 +41,11 @@ PACKAGECONFIG[examples] = "--enable-examples, --disable-examples,"
41PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" 41PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
42PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3" 42PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3"
43 43
44FILES_${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*" 44FILES:${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*"
45FILES_${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a" 45FILES:${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a"
46FILES_${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la" 46FILES:${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la"
47 47
48do_install_append() { 48do_install:append() {
49 # Patch python tools to use Python 3; they should be source compatible, but 49 # Patch python tools to use Python 3; they should be source compatible, but
50 # still refer to Python 2 in the shebang 50 # still refer to Python 2 in the shebang
51 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp 51 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp