summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2021-08-26 09:42:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-07 20:54:11 (GMT)
commitabeb2e95c6e5b286283dfe7198d5a222f7139458 (patch)
tree1a1f5526ee2b663abf27252c02bb33573f6205dc /meta/recipes-kernel
parent3a702623573a973ff9b4d3d5f934ef55497de167 (diff)
downloadpoky-abeb2e95c6e5b286283dfe7198d5a222f7139458.tar.gz
systemd: '${systemd_unitdir}/system' => '${systemd_system_unitdir}'
Repo-wide replacement to use newer variable to represent systemd system unitdir directory. (From OE-Core rev: 5ace3ada5c54500c71becc8e0c6eddeb8bc053e3) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb6
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb4
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
index d12ad4e..95ff5e6 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
@@ -54,8 +54,8 @@ do_install:append () {
54 54
55 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 55 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
56 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper 56 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
57 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service 57 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service
58 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service 58 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service
59 fi 59 fi
60} 60}
61 61
@@ -69,7 +69,7 @@ FILES:kdump = "${sbindir}/kdump \
69 ${sysconfdir}/sysconfig/kdump.conf \ 69 ${sysconfdir}/sysconfig/kdump.conf \
70 ${sysconfdir}/init.d/kdump \ 70 ${sysconfdir}/init.d/kdump \
71 ${libexecdir}/kdump-helper \ 71 ${libexecdir}/kdump-helper \
72 ${systemd_unitdir}/system/kdump.service \ 72 ${systemd_system_unitdir}/kdump.service \
73" 73"
74 74
75FILES:vmcore-dmesg = "${sbindir}/vmcore-dmesg" 75FILES:vmcore-dmesg = "${sbindir}/vmcore-dmesg"
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 dc2e1f3..ba26c15 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -64,8 +64,8 @@ PRIVATE_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_system_unitdir}
68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system 68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir}
69} 69}
70 70
71do_install_ptest () { 71do_install_ptest () {
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 8161a44..8f0de5f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -35,7 +35,7 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base
35PACKAGES =+ "${PN}-exporter" 35PACKAGES =+ "${PN}-exporter"
36FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \ 36FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \
37 ${sysconfdir}/sysconfig/stap-exporter \ 37 ${sysconfdir}/sysconfig/stap-exporter \
38 ${systemd_unitdir}/system/stap-exporter.service \ 38 ${systemd_system_unitdir}/stap-exporter.service \
39 ${sbindir}/stap-exporter" 39 ${sbindir}/stap-exporter"
40RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient" 40RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient"
41SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service" 41SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service"