diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-11-11 02:36:31 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-11 17:04:09 +0000 |
| commit | c436124eb9a98400cc6872b252971477bb451551 (patch) | |
| tree | 0d3eddb80644e7cb4e71dce1d99c5c5ea8066528 /meta/recipes-core | |
| parent | b3334c7134e812fe839e47a3d06aa5379b7b8bd8 (diff) | |
| download | openembedded-core-contrib-c436124eb9a98400cc6872b252971477bb451551.tar.gz | |
systemd-conf: Revert inappropriate use of ${systemd_system_unitdir}
This is a partial revert of commit 5ace3ada (systemd:
'${systemd_unitdir}/system' => '${systemd_system_unitdir}') where
the string '${systemd_unitdir}/system' matched something other than the
intended directory.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd-conf_1.0.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index 53af7c616a..61ce7939d3 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb @@ -21,7 +21,7 @@ SRC_URI = "\ do_install() { install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf - install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_system_unitdir}.conf.d/00-${PN}.conf + install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network @@ -30,7 +30,7 @@ do_install() { # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 do_install:append:qemuall() { - install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf + install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -38,6 +38,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" FILES:${PN} = "\ ${systemd_unitdir}/journald.conf.d/ \ ${systemd_unitdir}/logind.conf.d/ \ - ${systemd_system_unitdir}.conf.d/ \ + ${systemd_unitdir}/system.conf.d/ \ ${systemd_unitdir}/network/ \ " |