From 9a6cdf59a45ebf2f28836b94bec34a8452027bbb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 8 Dec 2011 14:23:57 +0000 Subject: dropbear: move dropbear-systemd to a bbappend While on it, the recipe has been updated to use systemd.bbclass and cleaned up. Signed-off-by: Otavio Salvador --- .../dropbear/dropbear-systemd/dropbear.socket | 10 ------ .../dropbear/dropbear-systemd/dropbear@.service | 9 ----- .../dropbear/dropbear-systemd/dropbearkey.service | 10 ------ .../recipes-core/dropbear/dropbear-systemd_v1.bb | 40 ---------------------- .../recipes-core/dropbear/dropbear/dropbear.socket | 10 ++++++ .../dropbear/dropbear/dropbear@.service | 9 +++++ .../dropbear/dropbear/dropbearkey.service | 10 ++++++ .../dropbear/dropbear_2011.54.bbappend | 33 ++++++++++++++++++ 8 files changed, 62 insertions(+), 69 deletions(-) delete mode 100644 meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket delete mode 100644 meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service delete mode 100644 meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service delete mode 100644 meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb create mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbear.socket create mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbear@.service create mode 100644 meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service create mode 100644 meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket deleted file mode 100644 index e5c61b755e..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/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-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service deleted file mode 100644 index 4fba3f05c8..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SSH Per-Connection Server -Requires=dropbearkey.service -After=syslog.target dropbearkey.service - -[Service] -ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service deleted file mode 100644 index 7f03000ebc..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd/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-oe/recipes-core/dropbear/dropbear-systemd_v1.bb b/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb deleted file mode 100644 index b46c0e2a4a..0000000000 --- a/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Socket based activation for dropbear ssh server" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -inherit allarch - -SRC_URI = "file://dropbearkey.service \ - file://dropbear@.service \ - file://dropbear.socket \ - " - -do_configure() { - : -} - -do_compile() { - : -} - -do_install() { - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/dropbear*.* ${D}${base_libdir}/systemd/system/ -} - -pkg_postinst_${PN} () { -if test "x$D" != "x"; then - exit 1 -fi -systemctl enable dropbear.socket -ln -sf /dev/null ${base_libdir}/systemd/system/dropbear.service -} - -pkg_postrm_${PN} () { -systemctl disable dropbear.socket -rm -f ${base_libdir}/systemd/system/dropbear.service -} - -RDEPENDS_${PN} = "systemd dropbear" -FILES_${PN} = "${base_libdir}/systemd/system" - diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket new file mode 100644 index 0000000000..e5c61b755e --- /dev/null +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket @@ -0,0 +1,10 @@ +[Unit] +Conflicts=dropbear.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=dropbearkey.service diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service new file mode 100644 index 0000000000..4fba3f05c8 --- /dev/null +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service @@ -0,0 +1,9 @@ +[Unit] +Description=SSH Per-Connection Server +Requires=dropbearkey.service +After=syslog.target dropbearkey.service + +[Service] +ExecStart=-/usr/sbin/dropbear -i -r /etc/dropbear/dropbear_rsa_host_key -p 22 +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service new file mode 100644 index 0000000000..7f03000ebc --- /dev/null +++ b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service @@ -0,0 +1,10 @@ +[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-oe/recipes-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend new file mode 100644 index 0000000000..664b6ded36 --- /dev/null +++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend @@ -0,0 +1,33 @@ +inherit systemd + +PR .= ".meta-oe.1" + +# look for files in the layer first +FILESEXTRAPATHS := "${THISDIR}/${PN}" + +SRC_URI += "file://dropbearkey.service \ + file://dropbear@.service \ + file://dropbear.socket" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket" + +do_install_append() { + install -d ${D}${base_libdir}/systemd/system + install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/ + install -m 0644 ${WORKDIR}/dropbear@.service ${D}${base_libdir}/systemd/system/ + install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/ +} + +PACKAGES += "${PN}-systemd" + +RDEPENDS_${PN}-systemd += "dropbear" +FILES_${PN}-systemd = "${base_libdir}/systemd" + +pkg_postinst_${PN}-systemd_append() { +ln -sf /dev/null $D${base_libdir}/systemd/system/dropbear.service +} + +pkg_postrm_${PN}-systemd_append() { +rm -f ${base_libdir}/systemd/system/dropbear.service +} -- cgit v1.2.3-54-g00ecf