Re: [meta-webserver][PATCH v5] hiawatha: add initial 8.5 recipe and associated files

[Paul Eggleton <paul.eggleton@linux.intel.com>]

On Thursday 18 October 2012 15:08:16 Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> 
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> --
> 
> v1:
> - hiawatha: add initial 8.5 recipe and associated files
> 
> v2:
> - update hiawatha init file with LSB headers
> - use sed to put in correct sbin path
> ---
>  .../recipes-httpd/hiawatha/files/hiawatha-init     | 44
> +++++++++++++++++++++ .../recipes-httpd/hiawatha/hiawatha_8.5.bb         |
> 45 ++++++++++++++++++++++ 2 files changed, 89 insertions(+)
>  create mode 100644
> meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init create mode
> 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
> 
> diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
> b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init new file mode
> 100644
> index 0000000..47fc087
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
> @@ -0,0 +1,44 @@
> +#!/bin/sh
> +
> +### BEGIN INIT INFO
> +# Provides:          hiawatha httpd httpd-cgi
> +# Required-Start:    $syslog $network $remote_fs
> +# Required-Stop:     $syslog $network $remote_fs
> +# Default-Start:     2 3 4 5
> +# Default-Stop:      0 1 6
> +# Short-Description: Hiawatha webserver
> +# Description:       Hiawatha, a secure and advanced webserver.
> +### END INIT INFO
> +
> +PATH=/sbin:/bin:/usr/sbin:/usr/bin
> +DAEMON=sed_sbin_path/hiawatha
> +NAME=hiawatha
> +DESC="Hiawatha Web Server"
> +OPTS=""
> +
> +case "$1" in
> +  start)
> +	echo -n "Starting $DESC: "
> +	start-stop-daemon --start -x "$DAEMON" -- $OPTS
> +	echo "$NAME."
> +	;;
> +  stop)
> +	echo -n "Stopping $DESC: "
> +	start-stop-daemon --stop -x "$DAEMON"
> +	echo "$NAME."
> +	;;
> +  restart|force-reload)
> +	echo -n "Restarting $DESC: "
> +	start-stop-daemon --stop -x "$DAEMON"
> +	sleep 1
> +	start-stop-daemon --start -x "$DAEMON" -- $OPTS
> +	echo "$NAME."
> +	;;
> +  *)
> +	N=/etc/init.d/$NAME
> +	echo "Usage: $N {start|stop|restart|force-reload}" >&2
> +	exit 1
> +	;;
> +esac
> +
> +exit 0
> diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
> b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb new file mode
> 100644
> index 0000000..b4462bb
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
> @@ -0,0 +1,45 @@
> +DESCRIPTION = "Lightweight secure web server"
> +HOMEPAGE = "http://www.hiawatha-webserver.org"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
> +DEPENDS = "libxml2 libxslt"
> +
> +SECTION = "net"
> +
> +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
> +					 file://hiawatha-init"
> +
> +SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d"
> +SRC_URI[sha256sum] =
> "2567e6b4b4c6666388087b586238e6e91a4afd80e10a879920020a097fcdc946" +
> +inherit cmake update-rc.d
> +
> +INITSCRIPT_NAME = "hiawatha"
> +INITSCRIPT_PARAMS = "defaults 70"
> +
> +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
> +                  -DENABLE_CACHE=ON \
> +                  -DENABLE_DEBUG=OFF \
> +                  -DENABLE_SSL=OFF \
> +                  -DENABLE_TOOLKIT=OFF \
> +                  -DENABLE_CHROOT=OFF \
> +                  -DENABLE_XSLT=ON \
> +                  -DENABLE_TOMAHAWK=OFF \
> +                  -DCMAKE_INSTALL_MANDIR=${mandir} \
> +                  -DCMAKE_INSTALL_BINDIR=${bindir} \
> +                  -DCMAKE_INSTALL_SBINDIR=${sbindir} \
> +                  -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
> +                  -DCMAKE_INSTALL_LIBDIR=${libdir} \
> +                  -DLOG_DIR=/var/log/hiawatha \
> +                  -DPID_DIR=/var/run \
> +                  -DWEBROOT_DIR=/var/www/hiawatha \
> +                  -DWORK_DIR=/var/lib/hiawatha "
> +
> +do_install_append() {
> +
> +    # Copy over init script and sed in the correct sbin path
> +    sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
> +    mkdir -p ${D}${sysconfdir}/init.d
> +    install -m 0755 ${WORKDIR}/hiawatha-init
> ${D}${sysconfdir}/init.d/hiawatha +
> +}

I merged this with a trivial whitespace fix (indenting of SRC_URI). Thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre