diff options
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-httpd/monkey')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb) | 68 |
3 files changed, 37 insertions, 35 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init index 40b21182e..55446f0e8 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init @@ -1,7 +1,7 @@ #!/bin/sh PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/monkey +DAEMON=/usr/sbin/monkey NAME=monkey DESC="Monkey HTTP Server" OPTS="--daemon" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service index f9aa57f91..4f3b7be4e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service @@ -4,7 +4,7 @@ After=network.target remote-fs.target [Service] Type=forking -ExecStart=/usr/bin/monkey --daemon +ExecStart=/usr/sbin/monkey --daemon PIDFile=/var/run/monkey.pid.2001 TimeoutSec=10 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 559d251bd..698f8608f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -7,45 +7,57 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" -DEPENDS_append_libc-musl = " libexecinfo" - -SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ - file://0001-configure-Respect-LIBS-variable-from-env.patch \ +SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ file://monkey.service \ file://monkey.init" -SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" -SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" +SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" -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=mbedtls \ - --debug \ - --malloc-libc" - -do_configure_prepend_libc-musl() { - export LIBS="-lexecinfo" -} +EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ + -DPID_FILE=${localstatedir}/run/monkey.pid \ + -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ + -DWITH_PLUGINS=* \ + -DWITHOUT_PLUGINS=mbedtls \ + -DWITH_DEBUG=1 \ + -DDEFAULT_USER='www-data' \ + -DWITH_SYSTEM_MALLOC=1 \ + " + +EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 " + +# GCC-10+ defaults to -fno-common +CFLAGS += "-fcommon" DISABLE_STATIC = "" -CLEANBROKEN = "1" -inherit autotools-brokensep pkgconfig update-rc.d systemd +inherit cmake pkgconfig update-rc.d systemd + +OECMAKE_GENERATOR = "Unix Makefiles" + +do_install_append() { + rm -rf ${D}/run + rm -rf ${D}${localstatedir}/run + install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service + fi +} INITSCRIPT_NAME = "monkey" INITSCRIPT_PARAMS = "defaults 70" SYSTEMD_SERVICE_${PN} = "monkey.service" -FILES_${PN} += "${localstatedir}/www/monkey/" +PACKAGES += "${PN}-plugins" + +FILES_${PN}-plugins = "${libdir}/monkey-*.so" + +FILES_${PN} += "${localstatedir}/www/monkey/ /run" + CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ ${sysconfdir}/monkey/sites/default \ @@ -65,13 +77,3 @@ CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ ${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 ${@bb.utils.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 -} |