diff options
-rw-r--r-- | meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb | 40 | ||||
-rw-r--r-- | meta-oe/recipes-core/dropbear/dropbear/dropbear.socket (renamed from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-core/dropbear/dropbear/dropbear@.service (renamed from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service (renamed from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend | 33 |
5 files changed, 33 insertions, 40 deletions
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb b/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb deleted file mode 100644 index b46c0e2a4..000000000 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | DESCRIPTION = "Socket based activation for dropbear ssh server" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | ||
4 | |||
5 | inherit allarch | ||
6 | |||
7 | SRC_URI = "file://dropbearkey.service \ | ||
8 | file://dropbear@.service \ | ||
9 | file://dropbear.socket \ | ||
10 | " | ||
11 | |||
12 | do_configure() { | ||
13 | : | ||
14 | } | ||
15 | |||
16 | do_compile() { | ||
17 | : | ||
18 | } | ||
19 | |||
20 | do_install() { | ||
21 | install -d ${D}${base_libdir}/systemd/system | ||
22 | install -m 0644 ${WORKDIR}/dropbear*.* ${D}${base_libdir}/systemd/system/ | ||
23 | } | ||
24 | |||
25 | pkg_postinst_${PN} () { | ||
26 | if test "x$D" != "x"; then | ||
27 | exit 1 | ||
28 | fi | ||
29 | systemctl enable dropbear.socket | ||
30 | ln -sf /dev/null ${base_libdir}/systemd/system/dropbear.service | ||
31 | } | ||
32 | |||
33 | pkg_postrm_${PN} () { | ||
34 | systemctl disable dropbear.socket | ||
35 | rm -f ${base_libdir}/systemd/system/dropbear.service | ||
36 | } | ||
37 | |||
38 | RDEPENDS_${PN} = "systemd dropbear" | ||
39 | FILES_${PN} = "${base_libdir}/systemd/system" | ||
40 | |||
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket index e5c61b755..e5c61b755 100644 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket | |||
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service index 4fba3f05c..4fba3f05c 100644 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service | |||
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service index 7f03000eb..7f03000eb 100644 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service | |||
diff --git a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend new file mode 100644 index 000000000..664b6ded3 --- /dev/null +++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | inherit systemd | ||
2 | |||
3 | PR .= ".meta-oe.1" | ||
4 | |||
5 | # look for files in the layer first | ||
6 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | ||
7 | |||
8 | SRC_URI += "file://dropbearkey.service \ | ||
9 | file://dropbear@.service \ | ||
10 | file://dropbear.socket" | ||
11 | |||
12 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
13 | SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" | ||
14 | |||
15 | do_install_append() { | ||
16 | install -d ${D}${base_libdir}/systemd/system | ||
17 | install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/ | ||
18 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${base_libdir}/systemd/system/ | ||
19 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/ | ||
20 | } | ||
21 | |||
22 | PACKAGES += "${PN}-systemd" | ||
23 | |||
24 | RDEPENDS_${PN}-systemd += "dropbear" | ||
25 | FILES_${PN}-systemd = "${base_libdir}/systemd" | ||
26 | |||
27 | pkg_postinst_${PN}-systemd_append() { | ||
28 | ln -sf /dev/null $D${base_libdir}/systemd/system/dropbear.service | ||
29 | } | ||
30 | |||
31 | pkg_postrm_${PN}-systemd_append() { | ||
32 | rm -f ${base_libdir}/systemd/system/dropbear.service | ||
33 | } | ||