[oe] [meta-networking][PATCH] proftpd: add systemd support
Joe MacDonald
Joe_MacDonald at mentor.com
Thu Feb 12 03:23:30 UTC 2015
Merged, thanks Roy. I corrected the whitespace issue I noticed while I
was there.
-J.
[[oe] [meta-networking][PATCH] proftpd: add systemd support] On 15.02.09 (Mon 10:39) rongqing.li at windriver.com wrote:
> From: Roy Li <rongqing.li at windriver.com>
>
> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> ---
> .../recipes-daemons/proftpd/files/proftpd.service | 7 +++++++
> meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb | 15 +++++++++++++--
> 2 files changed, 20 insertions(+), 2 deletions(-)
> create mode 100644 meta-networking/recipes-daemons/proftpd/files/proftpd.service
>
> diff --git a/meta-networking/recipes-daemons/proftpd/files/proftpd.service b/meta-networking/recipes-daemons/proftpd/files/proftpd.service
> new file mode 100644
> index 0000000..ba97f8e
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/proftpd/files/proftpd.service
> @@ -0,0 +1,7 @@
> +[Unit]
> +Description=proftpd Daemon
> +
> +[Service]
> +Type=forking
> +ExecStart=- at SBINDIR@/proftpd -c @SYSCONFDIR@/proftpd.conf
> +StandardError=syslog
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
> index cba39e8..ca629be 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5.bb
> @@ -11,12 +11,13 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
> file://close-RequireValidShell-check.patch \
> file://contrib.patch \
> file://build_fixup.patch \
> - "
> + file://proftpd.service \
> + "
>
> SRC_URI[md5sum] = "aff1bff40e675244d72c4667f203e5bb"
> SRC_URI[sha256sum] = "c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715"
>
> -inherit autotools-brokensep useradd update-rc.d
> +inherit autotools-brokensep useradd update-rc.d systemd
>
> PACKAGECONFIG ??= "sia shadow"
> PACKAGECONFIG += " ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
> @@ -87,11 +88,21 @@ do_install () {
> # create the pub directory
> mkdir -p ${D}/home/${FTPUSER}/pub/
> chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub
> +
> + install -d ${D}/${systemd_unitdir}/system
> + install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system
> + sed -e 's, at BASE_SBINDIR@,${base_sbindir},g' \
> + -e 's, at SYSCONFDIR@,${sysconfdir},g' \
> + -e 's, at SBINDIR@,${sbindir},g' \
> + -i ${D}${systemd_unitdir}/system/*.service
> }
>
> INITSCRIPT_NAME = "proftpd"
> INITSCRIPT_PARAM = "defaults 85 15"
>
> +SYSTEMD_PACKAGES = "${PN}"
> +SYSTEMD_SERVICE_${PN} = "proftpd.service"
> +
> USERADD_PACKAGES = "${PN}"
> GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}"
> USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \
> --
> 2.1.0
>
--
-Joe MacDonald.
:wq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20150211/d9ddeb8f/attachment-0002.sig>
More information about the Openembedded-devel
mailing list