<div dir="ltr"><div class="gmail_default" style="font-family:courier new,monospace;font-size:small"><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 16, 2013 at 10:27 AM, Shakeel, Muhammad <span dir="ltr"><<a href="mailto:muhammad_shakeel@mentor.com" target="_blank">muhammad_shakeel@mentor.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Muhammad Shakeel <<a href="mailto:muhammad_shakeel@mentor.com">muhammad_shakeel@mentor.com</a>><br>
<br>
-Remove dependency on meta-systemd<br>
<br>
Signed-off-by: Muhammad Shakeel <<a href="mailto:muhammad_shakeel@mentor.com">muhammad_shakeel@mentor.com</a>><br>
---<br>
.../openssh/openssh-6.2p2/sshd.socket | 11 +++++++++++<br>
.../openssh/openssh-6.2p2/sshd@.service | 9 +++++++++<br>
.../openssh/openssh-6.2p2/sshdgenkeys.service | 10 ++++++++++<br>
meta/recipes-connectivity/openssh/<a href="http://openssh_6.2p2.bb" target="_blank">openssh_6.2p2.bb</a> | 20 ++++++++++++++++++--<br>
4 files changed, 48 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket<br>
new file mode 100644<br>
index 0000000..753a33b<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket<br>
@@ -0,0 +1,11 @@<br>
+[Unit]<br>
+Conflicts=sshd.service<br>
+<br>
+[Socket]<br>
+ExecStartPre=/bin/mkdir -p /var/run/sshd<br>
+ListenStream=22<br>
+Accept=yes<br>
+<br>
+[Install]<br>
+WantedBy=sockets.target<br>
+Also=sshdgenkeys.service<br>
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service<br>
new file mode 100644<br>
index 0000000..d118490<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service<br>
@@ -0,0 +1,9 @@<br>
+[Unit]<br>
+Description=OpenSSH Per-Connection Daemon<br>
+After=sshdgenkeys.service<br>
+<br>
+[Service]<br>
+ExecStart=-/usr/sbin/sshd -i<br>
+ExecReload=/bin/kill -HUP $MAINPID<br>
+StandardInput=socket<br>
+StandardError=syslog<br>
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service<br>
new file mode 100644<br>
index 0000000..c717214<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service<br>
@@ -0,0 +1,10 @@<br>
+[Unit]<br>
+Description=SSH Key Generation<br>
+<br>
+[Service]<br>
+ExecStart=/usr/bin/ssh-keygen -A<br>
+Type=oneshot<br>
+RemainAfterExit=yes<br>
+<br>
+[Install]<br>
+WantedBy=multi-user.target<br></blockquote><div><br></div><div><br></div><div><br></div><div style="font-family:'courier new',monospace;font-size:small" class="gmail_default">it would be nice if it was using libdir/bindir instead of hardcoded paths</div>
<div style="font-family:'courier new',monospace;font-size:small" class="gmail_default">coudld be achieved by generating the unit files from some sort of .in files at build time so it could benefit</div><div style="font-family:'courier new',monospace;font-size:small" class="gmail_default">
the distros which dont use /usr e.g.</div><div style="font-family:'courier new',monospace;font-size:small" class="gmail_default"><br></div><div style="font-family:'courier new',monospace;font-size:small" class="gmail_default">
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/meta/recipes-connectivity/openssh/<a href="http://openssh_6.2p2.bb" target="_blank">openssh_6.2p2.bb</a> b/meta/recipes-connectivity/openssh/<a href="http://openssh_6.2p2.bb" target="_blank">openssh_6.2p2.bb</a><br>
index c76f9ac..8dac2f1 100644<br>
--- a/meta/recipes-connectivity/openssh/<a href="http://openssh_6.2p2.bb" target="_blank">openssh_6.2p2.bb</a><br>
+++ b/meta/recipes-connectivity/openssh/<a href="http://openssh_6.2p2.bb" target="_blank">openssh_6.2p2.bb</a><br>
@@ -26,14 +26,17 @@ SRC_URI = "<a href="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar" target="_blank">ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar</a>.<br>
file://init \<br>
file://openssh-CVE-2011-4327.patch \<br>
file://mac.patch \<br>
- ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"<br>
+ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \<br>
+ file://sshd.socket \<br>
+ file://sshd@.service \<br>
+ file://sshdgenkeys.service "<br>
<br>
PAM_SRC_URI = "file://sshd"<br>
<br>
SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"<br>
SRC_URI[sha256sum] = "7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"<br>
<br>
-inherit useradd update-rc.d update-alternatives<br>
+inherit useradd update-rc.d update-alternatives systemd<br>
<br>
USERADD_PACKAGES = "${PN}-sshd"<br>
USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd"<br>
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"<br>
INITSCRIPT_NAME_${PN}-sshd = "sshd"<br>
INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"<br>
<br>
+SYSTEMD_PACKAGES = "${PN}-sshd"<br>
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"<br>
+SYSTEMD_AUTO_ENABLE = "enable"<br>
+<br>
PACKAGECONFIG ??= "tcp-wrappers"<br>
PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"<br>
<br>
@@ -93,6 +100,14 @@ do_install_append () {<br>
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly<br>
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly<br>
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly<br>
+<br>
+ install -d ${D}${systemd_unitdir}/system<br>
+ install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system<br>
+ install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system<br>
+ install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system<br>
+ sed -i 's,/bin/,${base_bindir}/,g' ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/sshd@.service<br>
+ sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/sshd@.service<br>
+ sed -i 's,/usr/bin/,${bindir}/,g' ${D}${systemd_unitdir}/system/sshdgenkeys.service<br>
}<br>
<br>
ALLOW_EMPTY_${PN} = "1"<br>
@@ -102,6 +117,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"<br>
FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"<br>
FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"<br>
FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly"<br>
+FILES_${PN}-sshd += "${systemd_unitdir}"<br>
FILES_${PN}-sftp = "${bindir}/sftp"<br>
FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"<br>
FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.5<br>
<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div></div>