Patchwork [meta-webserver] : add Monkey HTTP Server.

login
register
mail settings
Submitter Eduardo Silva
Date June 5, 2014, 5 p.m.
Message ID <1401987607-32495-1-git-send-email-eduardo@monkey.io>
Download mbox | patch
Permalink /patch/73319/
State Accepted
Headers show

Comments

Eduardo Silva - June 5, 2014, 5 p.m.
This patch adds the Monkey HTTP Server v1.5.0 recipes. The content
on this patch includes the modifications suggested by people in the
Maling List.

Signed-off-by: Eduardo Silva <eduardo@monkey.io>
---
 .../recipes-httpd/monkey/monkey_1.5.0.bb           | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
Robert Yang - June 11, 2014, 4:17 a.m.
On 06/06/2014 01:00 AM, Eduardo Silva wrote:
> This patch adds the Monkey HTTP Server v1.5.0 recipes. The content
> on this patch includes the modifications suggested by people in the
> Maling List.
>
> Signed-off-by: Eduardo Silva <eduardo@monkey.io>
> ---
>   .../recipes-httpd/monkey/monkey_1.5.0.bb           | 36 ++++++++++++++++++++++
>   1 file changed, 36 insertions(+)
>   create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
>
> diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> new file mode 100644
> index 0000000..07a202f
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> @@ -0,0 +1,36 @@
> +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"
> +SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
> +SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7"
> +
> +EXTRA_OECONF = " \
> +             --plugdir=${libdir}/monkey/ \
> +             --logdir=${localstatedir}/log/monkey/ \
> +             --pidfile=${localstatedir}/run/monkey.pid \
> +             --default-user=www-data \
> +             --datadir= ${localstatedir}/www/monkey/ \

Here is an extra space, perhaps a typo, please ?

// Robert

> +             --sysconfdir=${sysconfdir}/monkey/ \
> +             --enable-plugins=* \
> +             --disable-plugins=polarssl \
> +             --debug \
> +             --malloc-libc \
> +"
> +
> +inherit autotools 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/"
>
Paul Eggleton - June 11, 2014, 1:19 p.m.
On Wednesday 11 June 2014 12:17:28 Robert Yang wrote:
> On 06/06/2014 01:00 AM, Eduardo Silva wrote:
> > This patch adds the Monkey HTTP Server v1.5.0 recipes. The content
> > on this patch includes the modifications suggested by people in the
> > Maling List.
> > 
> > Signed-off-by: Eduardo Silva <eduardo@monkey.io>
> > ---
> > 
> >   .../recipes-httpd/monkey/monkey_1.5.0.bb           | 36
> >   ++++++++++++++++++++++ 1 file changed, 36 insertions(+)
> >   create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> > 
> > diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> > b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb new file mode
> > 100644
> > index 0000000..07a202f
> > --- /dev/null
> > +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
> > @@ -0,0 +1,36 @@
> > +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"
> > +SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
> > +SRC_URI[sha256sum] =
> > "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7" +
> > +EXTRA_OECONF = " \
> > +             --plugdir=${libdir}/monkey/ \
> > +             --logdir=${localstatedir}/log/monkey/ \
> > +             --pidfile=${localstatedir}/run/monkey.pid \
> > +             --default-user=www-data \
> > +             --datadir= ${localstatedir}/www/monkey/ \
> 
> Here is an extra space, perhaps a typo, please ?

Yes, also I just tried building it with that fixed and with the change in 
master to use separate build directories for autotools the build fails:

----------------- snip ------------------
ERROR: Function failed: do_compile (log file is located at 
/media/large/tmp/work/core2-64-poky-linux/monkey/1.5.0-
r0/temp/log.do_compile.22474)
ERROR: Logfile of failure stored in: /media/large/tmp/work/core2-64-poky-
linux/monkey/1.5.0-r0/temp/log.do_compile.22474
Log data follows:
| DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 
'x86_64-linux', 'common']
| DEBUG: Executing shell function do_compile
| NOTE: make -j 8
| sed: can't read monkey.pc.in: No such file or directory
| make: *** [monkey.pc] Error 2
| ERROR: oe_runmake failed
| WARNING: /media/large/tmp/work/core2-64-poky-linux/monkey/1.5.0-
r0/temp/run.do_compile.22474:1 exit 1 from
|   exit 1
| ERROR: Function failed: do_compile (log file is located at 
/media/large/tmp/work/core2-64-poky-linux/monkey/1.5.0-
r0/temp/log.do_compile.22474)
ERROR: Task 6 (/home/paul/poky/meta-oe/meta-webserver/recipes-
httpd/monkey/monkey_1.5.0.bb, do_compile) failed with exit code '1'
----------------- snip ------------------

The quick fix for this is to inherit autotools-brokensep; a more desirable 
long-term fix would be to fix monkey to allow building it in a separate build 
directory.

Eduardo, could you please send patches for these?

Thanks,
Paul
Eduardo Silva - June 11, 2014, 5:47 p.m.
Hi all,

/media/large/tmp/work/core2-64-poky-linux/monkey/1.5.0-
> r0/temp/log.do_compile.22474)
> ERROR: Task 6 (/home/paul/poky/meta-oe/meta-webserver/recipes-
> httpd/monkey/monkey_1.5.0.bb, do_compile) failed with exit code '1'
> ----------------- snip ------------------
>
> The quick fix for this is to inherit autotools-brokensep; a more desirable
> long-term fix would be to fix monkey to allow building it in a separate
> build
> directory.
>
> Eduardo, could you please send patches for these?
>

thanks for tracking down this problem.

After verify, our configure script miss that feature (i am wondering why
this problem did not happened on our local tests), as this is something
that is breaking the build we will work in a long-term fix. You should
receive today a patch for the quickfix plus the new recipe for Monkey
v1.5.1 (minor release).

cheers,
Robert Yang - June 12, 2014, 9:12 a.m.
On 06/12/2014 01:47 AM, Eduardo Silva wrote:
> Hi all,
>
>     /media/large/tmp/work/core2-64-poky-linux/monkey/1.5.0-
>     r0/temp/log.do_compile.22474)
>     ERROR: Task 6 (/home/paul/poky/meta-oe/meta-webserver/recipes-
>     httpd/monkey/monkey_1.5.0.bb <http://monkey_1.5.0.bb>, do_compile) failed
>     with exit code '1'
>     ----------------- snip ------------------
>
>     The quick fix for this is to inherit autotools-brokensep; a more desirable
>     long-term fix would be to fix monkey to allow building it in a separate build
>     directory.
>
>     Eduardo, could you please send patches for these?
>
>
> thanks for tracking down this problem.
>
> After verify, our configure script miss that feature (i am wondering why this
> problem did not happened on our local tests), as this is something that is

Are you using oe-core's master branch ? Separate builds by default is enabled
after daisy released.

// Robert

> breaking the build we will work in a long-term fix. You should receive today a
> patch for the quickfix plus the new recipe for Monkey v1.5.1 (minor release).
>
> cheers,
>
>

Patch

diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
new file mode 100644
index 0000000..07a202f
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb
@@ -0,0 +1,36 @@ 
+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"
+SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3"
+SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7"
+
+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 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/"