diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb')
| -rw-r--r-- | meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 698f8608fd..ee5dc16198 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -7,17 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" -SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ +SRC_URI = "git://github.com/monkey/monkey;branch=1.6;protocol=https \ + file://0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch \ file://monkey.service \ file://monkey.init" -SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" +SRCREV = "7999b487fded645381d387ec0e057e92407b0d2c" +S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ - -DPID_FILE=${localstatedir}/run/monkey.pid \ + -DPID_FILE=/run/monkey.pid \ -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ -DWITH_PLUGINS=* \ -DWITHOUT_PLUGINS=mbedtls \ @@ -26,7 +28,7 @@ EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ -DWITH_SYSTEM_MALLOC=1 \ " -EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 " +EXTRA_OECMAKE:append:libc-musl = " -DWITH_MUSL=1 " # GCC-10+ defaults to -fno-common CFLAGS += "-fcommon" @@ -37,11 +39,23 @@ 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 +do_configure:append() { + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h +} +do_install:append() { + rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + # Create /var/log/monkey in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} 0755 ${BPN} ${BPN} -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d ${BPN} ${BPN} 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service fi @@ -50,16 +64,15 @@ do_install_append() { INITSCRIPT_NAME = "monkey" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_SERVICE_${PN} = "monkey.service" +SYSTEMD_SERVICE:${PN} = "monkey.service" PACKAGES += "${PN}-plugins" -FILES_${PN}-plugins = "${libdir}/monkey-*.so" - -FILES_${PN} += "${localstatedir}/www/monkey/ /run" +FILES:${PN}-plugins = "${libdir}/monkey-*.so" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ +CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \ ${sysconfdir}/monkey/sites/default \ ${sysconfdir}/monkey/monkey.mime \ ${sysconfdir}/monkey/plugins.load \ |