diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-12 21:55:54 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:32:07 -0700 |
commit | 45b327ba1620febf3dd8a8b415d601c9c9e78bc5 (patch) | |
tree | c161518f63ae896b7e425023d6cbea8729e7eaec /meta-webserver/recipes-httpd | |
parent | 6c0961786bf8a4978daf5198b53834dbe77e3017 (diff) | |
download | meta-openembedded-45b327ba1620febf3dd8a8b415d601c9c9e78bc5.tar.gz |
monkey: Upgrade to 1.6.9
Switch to using cmake
Use CMake option to select musl support
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r-- | meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb (renamed from meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb) | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 559d251bd..289f069b1 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | |||
@@ -7,45 +7,56 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" | |||
7 | 7 | ||
8 | SECTION = "net" | 8 | SECTION = "net" |
9 | 9 | ||
10 | DEPENDS_append_libc-musl = " libexecinfo" | 10 | SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ |
11 | |||
12 | SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ | ||
13 | file://0001-configure-Respect-LIBS-variable-from-env.patch \ | ||
14 | file://monkey.service \ | 11 | file://monkey.service \ |
15 | file://monkey.init" | 12 | file://monkey.init" |
16 | 13 | ||
17 | SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" | 14 | SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" |
18 | SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" | ||
19 | 15 | ||
20 | UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" |
21 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" | 17 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" |
22 | 18 | ||
23 | EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ | 19 | EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ |
24 | --logdir=${localstatedir}/log/monkey/ \ | 20 | -DPID_FILE=${localstatedir}/run/monkey.pid \ |
25 | --pidfile=${localstatedir}/run/monkey.pid \ | 21 | -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ |
26 | --default-user=www-data \ | 22 | -DWITH_PLUGINS=* \ |
27 | --datadir=${localstatedir}/www/monkey/ \ | 23 | -DWITHOUT_PLUGINS=mbedtls \ |
28 | --sysconfdir=${sysconfdir}/monkey/ \ | 24 | -DWITH_DEBUG=1 \ |
29 | --enable-plugins=* \ | 25 | -DDEFAULT_USER='www-data' \ |
30 | --disable-plugins=mbedtls \ | 26 | -DWITH_SYSTEM_MALLOC=1 \ |
31 | --debug \ | 27 | " |
32 | --malloc-libc" | 28 | |
33 | 29 | EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 " | |
34 | do_configure_prepend_libc-musl() { | 30 | |
35 | export LIBS="-lexecinfo" | 31 | # GCC-10+ defaults to -fno-common |
36 | } | 32 | CFLAGS += "-fcommon" |
37 | 33 | ||
38 | DISABLE_STATIC = "" | 34 | DISABLE_STATIC = "" |
39 | CLEANBROKEN = "1" | ||
40 | 35 | ||
41 | inherit autotools-brokensep pkgconfig update-rc.d systemd | 36 | inherit cmake pkgconfig update-rc.d systemd |
37 | |||
38 | OECMAKE_GENERATOR = "Unix Makefiles" | ||
39 | |||
40 | do_install_append() { | ||
41 | rm -rf ${D}/run | ||
42 | install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey | ||
43 | |||
44 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
45 | install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service | ||
46 | fi | ||
47 | } | ||
42 | 48 | ||
43 | INITSCRIPT_NAME = "monkey" | 49 | INITSCRIPT_NAME = "monkey" |
44 | INITSCRIPT_PARAMS = "defaults 70" | 50 | INITSCRIPT_PARAMS = "defaults 70" |
45 | 51 | ||
46 | SYSTEMD_SERVICE_${PN} = "monkey.service" | 52 | SYSTEMD_SERVICE_${PN} = "monkey.service" |
47 | 53 | ||
48 | FILES_${PN} += "${localstatedir}/www/monkey/" | 54 | PACKAGES += "${PN}-plugins" |
55 | |||
56 | FILES_${PN}-plugins = "${libdir}/monkey-*.so" | ||
57 | |||
58 | FILES_${PN} += "${localstatedir}/www/monkey/ /run" | ||
59 | |||
49 | 60 | ||
50 | CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ | 61 | CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ |
51 | ${sysconfdir}/monkey/sites/default \ | 62 | ${sysconfdir}/monkey/sites/default \ |
@@ -65,13 +76,3 @@ CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ | |||
65 | ${sysconfdir}/monkey/plugins/auth/monkey.users \ | 76 | ${sysconfdir}/monkey/plugins/auth/monkey.users \ |
66 | " | 77 | " |
67 | 78 | ||
68 | do_install_append() { | ||
69 | |||
70 | mkdir -p ${D}${sysconfdir}/init.d | ||
71 | install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey | ||
72 | |||
73 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
74 | install -d ${D}${systemd_unitdir}/system | ||
75 | install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system | ||
76 | fi | ||
77 | } | ||