summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2021-11-11 02:36:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-11 17:09:16 +0000
commit04c99437a3e4e33e459b03986a2673363fe78f2b (patch)
tree02d399dae355b691968118b7c5b7d299040dbf99 /meta/recipes-core
parentc758988cb7f232a5df940c533272164e794f5a6c (diff)
downloadpoky-04c99437a3e4e33e459b03986a2673363fe78f2b.tar.gz
systemd: 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. (From OE-Core rev: b3334c7134e812fe839e47a3d06aa5379b7b8bd8) 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_249.5.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_249.5.bb b/meta/recipes-core/systemd/systemd_249.5.bb
index c0c1f9bcfc..8bdc0ca028 100644
--- a/meta/recipes-core/systemd/systemd_249.5.bb
+++ b/meta/recipes-core/systemd/systemd_249.5.bb
@@ -267,7 +267,7 @@ do_install() {
267 install -d ${D}${sysconfdir}/init.d 267 install -d ${D}${sysconfdir}/init.d
268 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd 268 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
269 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 269 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
270 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_system_unitdir}d-sysv-install 270 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
271 fi 271 fi
272 272
273 if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then 273 if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then
@@ -341,7 +341,7 @@ do_install() {
341 341
342 # install default policy for presets 342 # install default policy for presets
343 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto 343 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
344 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_system_unitdir}-preset/99-default.preset 344 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset
345 345
346 # add a profile fragment to disable systemd pager with busybox less 346 # add a profile fragment to disable systemd pager with busybox less
347 install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh 347 install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh