[oe] [meta-oe][PATCH] Hiawatha: update to 9.0, add systemd support

[Martin Jansa]

On Tue, Apr 16, 2013 at 10:28:44AM +0100, Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell at dbbroadcast.co.uk>
> 
> Signed-off-by: Jack Mitchell <jack.mitchell at dbbroadcast.co.uk>
> ---
>  .../recipes-httpd/hiawatha/files/hiawatha.service     | 16 ++++++++++++++++
>  .../hiawatha/{hiawatha_8.8.1.bb => hiawatha_9.0.bb}   | 19 ++++++++++++++-----
>  2 files changed, 30 insertions(+), 5 deletions(-)
>  create mode 100644 meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
>  rename meta-webserver/recipes-httpd/hiawatha/{hiawatha_8.8.1.bb => hiawatha_9.0.bb} (79%)
> 
> diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
> new file mode 100644
> index 0000000..26cb8d0
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
> @@ -0,0 +1,16 @@
> +[Unit]
> +Description=Hiawatha Web Server
> +After=network.target remote-fs.target nss-lookup.target
> +
> +[Service]
> +Type=simple
> +SyslogIdentifier=hiawatha
> +ExecStartPre=/usr/sbin/hiawatha -k ; /usr/sbin/wigwam
> +ExecStart= /usr/sbin/hiawatha -d
> +TimeoutSec=10
> +#(doesn't like this setting. Can't find files) PrivateTmp=true
> +LimitNOFILE=infinity
> +CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID 
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb
> similarity index 79%
> rename from meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb
> rename to meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb
> index 9e4f119..79fdc59 100644
> --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb
> +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb
> @@ -7,16 +7,19 @@ DEPENDS = "libxml2 libxslt"
>  SECTION = "net"
>  
>  SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
> -           file://hiawatha-init "
> +           file://hiawatha-init \
> +           file://hiawatha.service "
>  
> -SRC_URI[md5sum] = "5def93779bbc10a021796abd3609caf7"
> -SRC_URI[sha256sum] = "2583d8e7f48ddc6cdedc27bb51d3e130679fc2f4411622bae9ddce3ef965d063"
> -
> -inherit cmake update-rc.d
> +SRC_URI[md5sum] = "8abc4f85dbb9a76ed66e7f35de520064"
> +SRC_URI[sha256sum] = "e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc"

Can you recheck checksums? It could be issue in jenkins download, but
yesterday it failed with:

WARNING: Checksum failure encountered with download of http://hiawatha-webserver.org/files/hiawatha-9.0.tar.gz - will attempt other sources if available
ERROR: Fetcher failure for URL: 'http://hiawatha-webserver.org/files/hiawatha-9.0.tar.gz'. Checksum mismatch!
File: '/home/jenkins/oe/shr-core-branches/shr-core/downloads/hiawatha-9.0.tar.gz' has sha256 checksum 5e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc when e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc was expected
If this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:
SRC_URI[md5sum] = "8abc4f85dbb9a76ed66e7f35de520064"
SRC_URI[sha256sum] = "5e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc"
Otherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.

So I guess the first '5' in sha256sum is missing in your recipe (one char shorter 256 is good hint :))

I'll fix it locally, no need to resend.
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130418/d62e0935/attachment-0002.sig>