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>
This commit is contained in:
Khem Raj
2020-08-12 21:55:54 -07:00
parent 6c0961786b
commit 45b327ba16
@@ -7,45 +7,56 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
SECTION = "net" SECTION = "net"
DEPENDS_append_libc-musl = " libexecinfo" SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \
SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \
file://0001-configure-Respect-LIBS-variable-from-env.patch \
file://monkey.service \ file://monkey.service \
file://monkey.init" file://monkey.init"
SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb"
SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22"
UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases"
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \
--logdir=${localstatedir}/log/monkey/ \ -DPID_FILE=${localstatedir}/run/monkey.pid \
--pidfile=${localstatedir}/run/monkey.pid \ -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \
--default-user=www-data \ -DWITH_PLUGINS=* \
--datadir=${localstatedir}/www/monkey/ \ -DWITHOUT_PLUGINS=mbedtls \
--sysconfdir=${sysconfdir}/monkey/ \ -DWITH_DEBUG=1 \
--enable-plugins=* \ -DDEFAULT_USER='www-data' \
--disable-plugins=mbedtls \ -DWITH_SYSTEM_MALLOC=1 \
--debug \ "
--malloc-libc"
do_configure_prepend_libc-musl() { EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 "
export LIBS="-lexecinfo"
} # GCC-10+ defaults to -fno-common
CFLAGS += "-fcommon"
DISABLE_STATIC = "" 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
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_NAME = "monkey"
INITSCRIPT_PARAMS = "defaults 70" INITSCRIPT_PARAMS = "defaults 70"
SYSTEMD_SERVICE_${PN} = "monkey.service" 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 \ CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \
${sysconfdir}/monkey/sites/default \ ${sysconfdir}/monkey/sites/default \
@@ -65,13 +76,3 @@ CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \
${sysconfdir}/monkey/plugins/auth/monkey.users \ ${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
}