Re: [meta-webserver][PATCH] monkey: new v1.5.2 release.

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 6741 bytes --]

On Wed, Aug 06, 2014 at 10:49:36PM -0600, Eduardo Silva wrote:
> This patch add the new Monkey HTTP Server v1.5.2. The new Bitbake file
> contains the modifications suggested over the patch set for v1.5.1. It
> specify each configuration file for CONFFILES_${PN}.
> 
> For more details about software changes please visit:
> 
>   http://monkey-project.com/Announcements/v1.5.2

Can you please resend with -M?

> === Build Tests ==
> 
> This version and new Bitbake file have been tested on Yocto/Daisy being
> packaged and deployed on images based on rpm and ipk successfully.
> 
> monkey-yocto/70d57bfd19c01ec055db57e35385ffc4185ae186
> 
> Signed-off-by: Eduardo Silva <eduardo@monkey.io>
> ---
>  .../recipes-httpd/monkey/monkey_1.5.1.bb           | 50 -----------------
>  .../recipes-httpd/monkey/monkey_1.5.2.bb           | 64 ++++++++++++++++++++++
>  2 files changed, 64 insertions(+), 50 deletions(-)
>  delete mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
>  create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.2.bb
> 
> diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> deleted file mode 100644
> index 2de98f4..0000000
> --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -SUMMARY = "Fast and Lightweight HTTP Server for Linux"
> -HOMEPAGE = "http://monkey-project.com"
> -BUGTRACKER = "https://github.com/monkey/monkey/issues"
> -
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> -
> -SECTION = "net"
> -
> -SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \
> -           file://monkey.service \
> -           file://monkey.init"
> -
> -SRC_URI[md5sum] = "2fe04135728f5c3a86c3a412059e0da3"
> -SRC_URI[sha256sum] = "28dfc5e57bbcd305727e7af6a1a0587868db1c1286498757bfeb72edddf457e7"
> -
> -EXTRA_OECONF = " \
> -             --plugdir=${libdir}/monkey/ \
> -             --logdir=${localstatedir}/log/monkey/ \
> -             --pidfile=${localstatedir}/run/monkey.pid \
> -             --default-user=www-data \
> -             --datadir=${localstatedir}/www/monkey/ \
> -             --sysconfdir=${sysconfdir}/monkey/ \
> -             --enable-plugins=* \
> -             --disable-plugins=polarssl \
> -             --debug \
> -             --malloc-libc"
> -
> -inherit autotools-brokensep pkgconfig update-rc.d systemd
> -
> -INITSCRIPT_NAME = "monkey"
> -INITSCRIPT_PARAMS = "defaults 70"
> -
> -SYSTEMD_SERVICE_${PN} = "monkey.service"
> -
> -FILES_${PN} += "${localstatedir}/www/monkey/"
> -
> -# temporarily remove, because ipk doesn't allow directories in CONFFILES
> -# CONFFILES_${PN} = "${sysconfdir}/monkey/"
> -
> -do_install_append() {
> -
> -    mkdir -p ${D}${sysconfdir}/init.d
> -    install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey
> -
> -    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> -        install -d ${D}${systemd_unitdir}/system
> -        install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system
> -    fi
> -}
> diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.2.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.2.bb
> new file mode 100644
> index 0000000..fcd40e0
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.2.bb
> @@ -0,0 +1,64 @@
> +SUMMARY = "Fast and Lightweight HTTP Server for Linux"
> +HOMEPAGE = "http://monkey-project.com"
> +BUGTRACKER = "https://github.com/monkey/monkey/issues"
> +
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> +
> +SECTION = "net"
> +
> +SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \
> +           file://monkey.service \
> +           file://monkey.init"
> +
> +SRC_URI[md5sum] = "c90ccba23a814265c7e0fd3a75f883fd"
> +SRC_URI[sha256sum] = "2048d49662895f83df475e22d87c45ea8022c0b1565bba222bda2192fd02c349"
> +
> +EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \
> +                --logdir=${localstatedir}/log/monkey/ \
> +                --pidfile=${localstatedir}/run/monkey.pid \
> +                --default-user=www-data \
> +                --datadir=${localstatedir}/www/monkey/ \
> +                --sysconfdir=${sysconfdir}/monkey/ \
> +                --enable-plugins=* \
> +                --disable-plugins=polarssl \
> +                --debug \
> +                --malloc-libc"
> +
> +inherit autotools-brokensep pkgconfig update-rc.d systemd
> +
> +INITSCRIPT_NAME = "monkey"
> +INITSCRIPT_PARAMS = "defaults 70"
> +
> +SYSTEMD_SERVICE_${PN} = "monkey.service"
> +
> +FILES_${PN} += "${localstatedir}/www/monkey/"
> +
> +CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \
> +                   ${sysconfdir}/monkey/sites/default \
> +                   ${sysconfdir}/monkey/monkey.mime \
> +                   ${sysconfdir}/monkey/plugins.load \
> +                   ${sysconfdir}/monkey/plugins/proxy_reverse/proxy_reverse.conf \
> +                   ${sysconfdir}/monkey/plugins/mandril/mandril.conf \
> +                   ${sysconfdir}/monkey/plugins/fastcgi/fastcgi.conf \
> +                   ${sysconfdir}/monkey/plugins/logger/logger.conf \
> +                   ${sysconfdir}/monkey/plugins/cgi/cgi.conf \
> +                   ${sysconfdir}/monkey/plugins/cheetah/cheetah.conf \
> +                   ${sysconfdir}/monkey/plugins/dirlisting/dirhtml.conf \
> +                   ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/header.theme \
> +                   ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/footer.theme \
> +                   ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/entry.theme \
> +                   ${sysconfdir}/monkey/plugins/auth/README \
> +                   ${sysconfdir}/monkey/plugins/auth/monkey.users \
> +                   "
> +
> +do_install_append() {
> +
> +    mkdir -p ${D}${sysconfdir}/init.d
> +    install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey
> +
> +    if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> +        install -d ${D}${systemd_unitdir}/system
> +        install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system
> +    fi
> +}
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]