diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2021-08-26 05:42:06 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-07 21:54:11 +0100 |
commit | abeb2e95c6e5b286283dfe7198d5a222f7139458 (patch) | |
tree | 1a1f5526ee2b663abf27252c02bb33573f6205dc /meta/recipes-connectivity/openssh | |
parent | 3a702623573a973ff9b4d3d5f934ef55497de167 (diff) | |
download | poky-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-connectivity/openssh')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.7p1.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb index 8a2e7611af..07cd6b74cd 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb | |||
@@ -126,15 +126,15 @@ do_install:append () { | |||
126 | echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly | 126 | echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly |
127 | echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly | 127 | echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly |
128 | 128 | ||
129 | install -d ${D}${systemd_unitdir}/system | 129 | install -d ${D}${systemd_system_unitdir} |
130 | install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system | 130 | install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir} |
131 | install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system | 131 | install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_system_unitdir} |
132 | install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system | 132 | install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_system_unitdir} |
133 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 133 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
134 | -e 's,@SBINDIR@,${sbindir},g' \ | 134 | -e 's,@SBINDIR@,${sbindir},g' \ |
135 | -e 's,@BINDIR@,${bindir},g' \ | 135 | -e 's,@BINDIR@,${bindir},g' \ |
136 | -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ | 136 | -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ |
137 | ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service | 137 | ${D}${systemd_system_unitdir}/sshd.socket ${D}${systemd_system_unitdir}/*.service |
138 | 138 | ||
139 | sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ | 139 | sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ |
140 | ${D}${sysconfdir}/init.d/sshd | 140 | ${D}${sysconfdir}/init.d/sshd |
@@ -152,7 +152,7 @@ ALLOW_EMPTY:${PN} = "1" | |||
152 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" | 152 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" |
153 | FILES:${PN}-scp = "${bindir}/scp.${BPN}" | 153 | FILES:${PN}-scp = "${bindir}/scp.${BPN}" |
154 | FILES:${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" | 154 | FILES:${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" |
155 | FILES:${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" | 155 | FILES:${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_system_unitdir}" |
156 | FILES:${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" | 156 | FILES:${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" |
157 | FILES:${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" | 157 | FILES:${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" |
158 | FILES:${PN}-sftp = "${bindir}/sftp" | 158 | FILES:${PN}-sftp = "${bindir}/sftp" |