OE-Core has been updated to support openssh with systemd. Stuff here is not required anymore.
Signed-off-by: Muhammad Shakeel <[email protected]> --- .../openssh/openssh/sshd.socket | 11 ----------- .../openssh/openssh/[email protected] | 9 --------- .../openssh/openssh/sshdgenkeys.service | 10 ---------- .../openssh/openssh_6.2p2.bbappend | 16 ---------------- 4 files changed, 46 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/[email protected] delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket deleted file mode 100644 index 753a33b..0000000 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshd.socket +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Conflicts=sshd.service - -[Socket] -ExecStartPre=/bin/mkdir -p /var/run/sshd -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/[email protected] b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/[email protected] deleted file mode 100644 index d118490..0000000 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/[email protected] +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=OpenSSH Per-Connection Daemon -After=sshdgenkeys.service - -[Service] -ExecStart=-/usr/sbin/sshd -i -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -StandardError=syslog diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service deleted file mode 100644 index c717214..0000000 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh/sshdgenkeys.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SSH Key Generation - -[Service] -ExecStart=/usr/bin/ssh-keygen -A -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend index d9ad9ba..dadbc14 100644 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend @@ -1,19 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SYSTEMD_PACKAGES = "${PN}-sshd" -SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" -FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket" RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd" - -inherit systemd - -SRC_URI += "file://sshd.socket file://[email protected] file://sshdgenkeys.service" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system -} - -- 1.7.9.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
