Fixed version no longer confuses uses sthttpd as service name to prevent issues with sysv compatibility and removes extraneous RPROVIDES/RCONFLICTS and RREPLACES.
Signed-off-by: Nick Glynn <[email protected]> --- meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service | 10 ++++++++++ meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service new file mode 100644 index 0000000..b75f751 --- /dev/null +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Tiny/Turbo/Throttling Web Server + +[Service] +Type=forking +ExecStart=/usr/sbin/thttpd -d /srv/www -c cgi-bin/* -i /var/run/thttpd.pid +PIDFile=/var/run/thttpd.pid + +[Install] +WantedBy=multi-user.target diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb index b720314..a4118ac 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb @@ -5,6 +5,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dcbe9eb18815516502872" SRC_URI = "http://opensource.dyc.edu/pub/sthttpd/sthttpd-${PV}.tar.gz \ + file://thttpd.service \ file://init" SRC_URI[md5sum] = "e645a85a97d3cb883011a35bc2211815" @@ -12,7 +13,7 @@ SRC_URI[sha256sum] = "78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b S = "${WORKDIR}/sthttpd-${PV}" -inherit autotools update-rc.d +inherit autotools update-rc.d systemd EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'" @@ -21,6 +22,9 @@ do_install_append () { install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd sed -i -e 's,@@SRVDIR,${servicedir}/www,g' ${D}${sysconfdir}/init.d/thttpd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/thttpd + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/thttpd.service ${D}${systemd_unitdir}/system } INITSCRIPT_NAME = "thttpd" @@ -28,3 +32,4 @@ INITSCRIPT_PARAMS = "defaults" FILES_${PN} += "${servicedir}" FILES_${PN}-dbg += "${servicedir}/www/cgi-bin/.debug" +SYSTEMD_SERVICE_${PN} = "thttpd.service" -- 1.8.3.1 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
