From 1fb0eacf0349c4b886e89aea275f43b973b78245 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 13 Apr 2013 13:23:05 +0200
Subject: dropbear: move bbappend to oe-core subdirectory

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-core/dropbear/dropbear/dropbear.socket | 10 ----------
 .../dropbear/dropbear/dropbear@.service            | 10 ----------
 .../dropbear/dropbear/dropbearkey.service          | 10 ----------
 .../dropbear/dropbear_2012.55.bbappend             | 23 ----------------------
 4 files changed, 53 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
 delete mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
 delete mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
 delete mode 100644 meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend

(limited to 'meta-systemd/meta-oe')

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 e5c61b755..000000000
--- a/meta-systemd/meta-oe/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/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
deleted file mode 100644
index 813788fe3..000000000
--- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
+++ /dev/null
@@ -1,10 +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
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 7f03000eb..000000000
--- a/meta-systemd/meta-oe/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/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 23e282000..000000000
--- a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 4}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://dropbearkey.service \
-            file://dropbear@.service \
-            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}/dropbear@.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system
-	ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
-}
-- 
cgit v1.2.3-54-g00ecf