diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 13:23:05 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:02 +0200 |
| commit | 1fb0eacf0349c4b886e89aea275f43b973b78245 (patch) | |
| tree | 55fb9f1ae8acade3cdba09adf6a002f6350eebff /meta-systemd/meta-oe/recipes-core | |
| parent | 7be95a25e0c794a5b4e308185242e284447da288 (diff) | |
| download | meta-openembedded-1fb0eacf0349c4b886e89aea275f43b973b78245.tar.gz | |
dropbear: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd/meta-oe/recipes-core')
4 files changed, 0 insertions, 53 deletions
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket deleted file mode 100644 index e5c61b755e..0000000000 --- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Conflicts=dropbear.service | ||
| 3 | |||
| 4 | [Socket] | ||
| 5 | ListenStream=22 | ||
| 6 | Accept=yes | ||
| 7 | |||
| 8 | [Install] | ||
| 9 | WantedBy=sockets.target | ||
| 10 | Also=dropbearkey.service | ||
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service deleted file mode 100644 index 813788fe38..0000000000 --- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=SSH Per-Connection Server | ||
| 3 | Requires=dropbearkey.service | ||
| 4 | After=syslog.target dropbearkey.service | ||
| 5 | |||
| 6 | [Service] | ||
| 7 | EnvironmentFile=-/etc/default/dropbear | ||
| 8 | ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 $DROPBEAR_EXTRA_ARGS | ||
| 9 | ExecReload=/bin/kill -HUP $MAINPID | ||
| 10 | StandardInput=socket | ||
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index 7f03000ebc..0000000000 --- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=SSH Key Generation | ||
| 3 | ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key | ||
| 4 | |||
| 5 | [Service] | ||
| 6 | ExecStart=/usr/sbin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key | ||
| 7 | RemainAfterExit=yes | ||
| 8 | |||
| 9 | [Install] | ||
| 10 | WantedBy=multi-user.target | ||
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend deleted file mode 100644 index 23e282000c..0000000000 --- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | inherit systemd | ||
| 2 | |||
| 3 | PRINC := "${@int(PRINC) + 4}" | ||
| 4 | |||
| 5 | # look for files in the layer first | ||
| 6 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 7 | |||
| 8 | SRC_URI += "file://dropbearkey.service \ | ||
| 9 | file://dropbear@.service \ | ||
| 10 | file://dropbear.socket" | ||
| 11 | |||
| 12 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 13 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 14 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
| 15 | SYSTEMD_SERVICE_${PN} = "dropbear.socket" | ||
| 16 | |||
| 17 | do_install_append() { | ||
| 18 | install -d ${D}${systemd_unitdir}/system | ||
| 19 | install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system | ||
| 20 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system | ||
| 21 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system | ||
| 22 | ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service | ||
| 23 | } | ||
