[OE-core] [PATCH 10/42] openssh: Fix usage of systemd unitdir vars

[Pau Espin Pedrol]

Signed-off-by: Pau Espin Pedrol <pespin.s...@gmail.com>
---
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb 
b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index 3b5e28a..103f751 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
@@ -114,14 +114,14 @@ do_install_append () {
        echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
        echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
 
-       install -d ${D}${systemd_unitdir}/system
-       install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
-       install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_unitdir}/system
-       install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+       install -d ${D}${systemd_system_unitdir}
+       install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
+       install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_system_unitdir}
+       install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_system_unitdir}
        sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
                -e 's,@SBINDIR@,${sbindir},g' \
                -e 's,@BINDIR@,${bindir},g' \
-               ${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/*.service
+               ${D}${systemd_system_unitdir}/sshd.socket 
${D}${systemd_system_unitdir}/*.service
 }
 
 do_install_ptest () {
@@ -134,7 +134,7 @@ ALLOW_EMPTY_${PN} = "1"
 PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc 
${PN}-sftp-server"
 FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
-FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd 
${systemd_unitdir}/system"
+FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd 
${systemd_system_unitdir}"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config 
${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd 
${sysconfdir}/pam.d/sshd"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
-- 
2.7.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core