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/systemtap | |
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/systemtap')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 26 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb index 6ee0be5e3e..2181e45a8d 100644 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb | |||
@@ -5,13 +5,13 @@ require systemtap_git.inc | |||
5 | DEPENDS = "systemtap virtual/kernel" | 5 | DEPENDS = "systemtap virtual/kernel" |
6 | 6 | ||
7 | # On systems without CONFIG_UTRACE, this package is empty. | 7 | # On systems without CONFIG_UTRACE, this package is empty. |
8 | ALLOW_EMPTY_${PN} = "1" | 8 | ALLOW_EMPTY:${PN} = "1" |
9 | 9 | ||
10 | inherit module-base gettext | 10 | inherit module-base gettext |
11 | 11 | ||
12 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" | 12 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" |
13 | 13 | ||
14 | FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" | 14 | FILES:${PN} += "${datadir}/systemtap/runtime/uprobes" |
15 | 15 | ||
16 | # Compile and install the uprobes kernel module on machines with utrace | 16 | # Compile and install the uprobes kernel module on machines with utrace |
17 | # support. Note that staprun expects it in the systemtap/runtime directory, | 17 | # support. Note that staprun expects it in the systemtap/runtime directory, |
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index c4a6eef59a..8161a448c8 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb | |||
@@ -33,46 +33,46 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base | |||
33 | 33 | ||
34 | # exporter comes with python3-probes | 34 | # exporter comes with python3-probes |
35 | PACKAGES =+ "${PN}-exporter" | 35 | PACKAGES =+ "${PN}-exporter" |
36 | FILES_${PN}-exporter = "${sysconfdir}/stap-exporter/* \ | 36 | FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \ |
37 | ${sysconfdir}/sysconfig/stap-exporter \ | 37 | ${sysconfdir}/sysconfig/stap-exporter \ |
38 | ${systemd_unitdir}/system/stap-exporter.service \ | 38 | ${systemd_unitdir}/system/stap-exporter.service \ |
39 | ${sbindir}/stap-exporter" | 39 | ${sbindir}/stap-exporter" |
40 | RDEPENDS_${PN}-exporter = "${PN} python3-core python3-netclient" | 40 | RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient" |
41 | SYSTEMD_SERVICE_${PN}-exporter = "stap-exporter.service" | 41 | SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service" |
42 | 42 | ||
43 | PACKAGES =+ "${PN}-runtime" | 43 | PACKAGES =+ "${PN}-runtime" |
44 | FILES_${PN}-runtime = "\ | 44 | FILES:${PN}-runtime = "\ |
45 | ${bindir}/staprun \ | 45 | ${bindir}/staprun \ |
46 | ${bindir}/stap-merge \ | 46 | ${bindir}/stap-merge \ |
47 | ${bindir}/stapsh \ | 47 | ${bindir}/stapsh \ |
48 | ${libexecdir}/${BPN}/stapio \ | 48 | ${libexecdir}/${BPN}/stapio \ |
49 | " | 49 | " |
50 | RDEPENDS_${PN}_class-target += "${PN}-runtime" | 50 | RDEPENDS:${PN}:class-target += "${PN}-runtime" |
51 | 51 | ||
52 | PACKAGES =+ "${PN}-examples" | 52 | PACKAGES =+ "${PN}-examples" |
53 | FILES_${PN}-examples = "${datadir}/${BPN}/examples/" | 53 | FILES:${PN}-examples = "${datadir}/${BPN}/examples/" |
54 | RDEPENDS_${PN}-examples += "${PN}" | 54 | RDEPENDS:${PN}-examples += "${PN}" |
55 | 55 | ||
56 | # don't complain that some examples involve bash, perl, php... | 56 | # don't complain that some examples involve bash, perl, php... |
57 | INSANE_SKIP_${PN}-examples += "file-rdeps" | 57 | INSANE_SKIP:${PN}-examples += "file-rdeps" |
58 | 58 | ||
59 | PACKAGES =+ "${PN}-python" | 59 | PACKAGES =+ "${PN}-python" |
60 | FILES_${PN}-python += "\ | 60 | FILES:${PN}-python += "\ |
61 | ${bindir}/dtrace \ | 61 | ${bindir}/dtrace \ |
62 | ${libdir}/python*/ \ | 62 | ${libdir}/python*/ \ |
63 | ${libexecdir}/${BPN}/python/ \ | 63 | ${libexecdir}/${BPN}/python/ \ |
64 | " | 64 | " |
65 | # python material requires sdt headers | 65 | # python material requires sdt headers |
66 | RDEPENDS_${PN}-python += "${PN}-dev python3-core" | 66 | RDEPENDS:${PN}-python += "${PN}-dev python3-core" |
67 | INSANE_SKIP_${PN}-python += "dev-deps" | 67 | INSANE_SKIP:${PN}-python += "dev-deps" |
68 | 68 | ||
69 | do_configure_prepend () { | 69 | do_configure:prepend () { |
70 | # Improve reproducibility for c++ object files | 70 | # Improve reproducibility for c++ object files |
71 | reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" | 71 | reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" |
72 | sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h | 72 | sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h |
73 | } | 73 | } |
74 | 74 | ||
75 | do_install_append () { | 75 | do_install:append () { |
76 | if [ ! -f ${D}${bindir}/stap ]; then | 76 | if [ ! -f ${D}${bindir}/stap ]; then |
77 | # translator disabled case, need to leave only minimal runtime | 77 | # translator disabled case, need to leave only minimal runtime |
78 | rm -rf ${D}${datadir}/${PN} | 78 | rm -rf ${D}${datadir}/${PN} |
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index dc046a679c..97d4435f82 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
@@ -11,7 +11,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ | |||
11 | " | 11 | " |
12 | 12 | ||
13 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' | 13 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' |
14 | COMPATIBLE_HOST_libc-musl = 'null' | 14 | COMPATIBLE_HOST:libc-musl = 'null' |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||