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.kjellerst...@axis.com>
---
 meta/recipes-core/systemd/systemd_249.5.bb | 4 ++--
 1 file 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() {
                install -d ${D}${sysconfdir}/init.d
                install -m 0755 ${WORKDIR}/init 
${D}${sysconfdir}/init.d/systemd-udevd
                sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% 
${D}${sysconfdir}/init.d/systemd-udevd
-               install -Dm 0755 
${S}/src/systemctl/systemd-sysv-install.SKELETON 
${D}${systemd_system_unitdir}d-sysv-install
+               install -Dm 0755 
${S}/src/systemctl/systemd-sysv-install.SKELETON 
${D}${systemd_unitdir}/systemd-sysv-install
        fi
 
        if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 
'false'}"; then
@@ -341,7 +341,7 @@ do_install() {
 
        # install default policy for presets
        # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
-       install -Dm 0644 ${WORKDIR}/99-default.preset 
${D}${systemd_system_unitdir}-preset/99-default.preset
+       install -Dm 0644 ${WORKDIR}/99-default.preset 
${D}${systemd_unitdir}/system-preset/99-default.preset
 
        # add a profile fragment to disable systemd pager with busybox less
        install -Dm 0644 ${WORKDIR}/systemd-pager.sh 
${D}${sysconfdir}/profile.d/systemd-pager.sh
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158123): 
https://lists.openembedded.org/g/openembedded-core/message/158123
Mute This Topic: https://lists.openembedded.org/mt/86972848/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to