Signed-off-by: Paul Eggleton <[email protected]> --- .../recipes-core/dropbear/dropbear/dropbear.socket | 10 ---------- .../recipes-core/dropbear/dropbear/[email protected] | 11 ----------- .../recipes-core/dropbear/dropbear/dropbearkey.service | 10 ---------- .../oe-core/recipes-core/dropbear/dropbear_%.bbappend | 17 ----------------- 4 files changed, 48 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected] delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket deleted file mode 100644 index e5c61b7..0000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Conflicts=dropbear.service - -[Socket] -ListenStream=22 -Accept=yes - -[Install] -WantedBy=sockets.target -Also=dropbearkey.service diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected] b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected] deleted file mode 100644 index 59ed07b..0000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/[email protected] +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SSH Per-Connection Server -Requires=dropbearkey.service -After=syslog.target dropbearkey.service - -[Service] -EnvironmentFile=-/etc/default/dropbear -ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 $DROPBEAR_EXTRA_ARGS -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -KillMode=process diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index 7f03000..0000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SSH Key Generation -ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key - -[Service] -ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend index fc18ea8..181b878 100644 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend +++ b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend @@ -1,21 +1,4 @@ -inherit systemd - -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://dropbearkey.service \ - file://[email protected] \ - file://dropbear.socket" - RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dropbear.socket" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/[email protected] ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service -} -- 1.9.3 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
