MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

nagios-core to git (and update)

Browse Source 
Move nagios-core away from the sourceforge and tarball releases
to a git based fetch and build.

We update the configuration to adapt to the newer nagios core,
but otherwise, this is largely unchanged.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2025-03-25 16:24:25 +00:00
parent db81cacee3
commit b24f0a3152
2 changed files with 15 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
recipes-extended/nagios/nagios-core/0001-fix-autoheader-error.patch
View File

@ -1,63 +0,0 @@
From 3c51d942f6da08045351ce61cc7f426fa0855489 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Fri, 31 Aug 2018 10:51:36 +0800
Subject: [PATCH] fix autoheader error
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
configure.ac | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 17e436d..16b3e71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,7 +388,7 @@ AC_ARG_WITH(iobroker,
case $IOBROKER_METHOD in
epoll*)
if test "$GLIBC_NEWER_2_4" -eq 1 -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_EPOLL])
+ AC_DEFINE([IOBROKER_USES_EPOLL], [1], [iobroker uses epoll])
else
echo "\"epoll\" is not available as an iobroker method."
echo "Please use one of the other options."
@@ -397,7 +397,7 @@ epoll*)
;;
poll*)
if test "x$ac_cv_header_sys_poll_h" = "xyes" -o "x$ac_cv_header_poll_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_POLL])
+ AC_DEFINE([IOBROKER_USES_POLL], [1], [iobroker uses poll])
else
echo "\"poll\" is not available as an iobroker method."
echo "Please use one of the other options."
@@ -406,7 +406,7 @@ poll*)
;;
select*)
if test "x$ac_cv_header_sys_select_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_SELECT])
+ AC_DEFINE([IOBROKER_USES_SELECT], [1], [iobroker uses select])
else
echo "\"select\" is not available as an iobroker method."
echo "Please use one of the other options."
@@ -415,13 +415,13 @@ select*)
;;
none*)
if test "$GLIBC_NEWER_2_4" -eq 1 -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_EPOLL])
+ AC_DEFINE([IOBROKER_USES_EPOLL], [1], [iobroker uses epoll])
IOBROKER_METHOD="epoll"
elif test "x$ac_cv_header_sys_poll_h" = "xyes" -o "x$ac_cv_header_poll_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_POLL])
+ AC_DEFINE([IOBROKER_USES_POLL], [1], [iobroker uses poll])
IOBROKER_METHOD="poll"
elif test "x$ac_cv_header_sys_select_h" = "xyes"; then
- AC_DEFINE([IOBROKER_USES_SELECT])
+ AC_DEFINE([IOBROKER_USES_SELECT], [1], [iobroker uses select])
IOBROKER_METHOD="select"
else
echo "There are no available options for iobroker polling"
--
2.7.4

24
recipes-extended/nagios/nagios-core_4.4.6.bb → recipes-extended/nagios/nagios-core_git.bb
View File

@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4c4203caac58013115c9ca4b85f296ae"
SRCNAME = "nagios"
SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
SRCREV = "2706fa7a451afe48bd4dc240d72d23fdcec0d9ef"
SRC_URI = "git://github.com/NagiosEnterprises/nagioscore.git;protocol=https;branch=master \
file://eventhandlers_nagioscmd_path.patch \
file://0001-fix-autoheader-error.patch \
file://0001-fix-compile-error-of-missing-headers.patch \
file://0001-fix-segment-fault.patch \
file://volatiles \
@ -20,14 +21,13 @@ SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/${SRCNAME}/${SRCNAME}-
file://nagios-core-systemd-volatile.conf \
"
SRC_URI[md5sum] = "ba849e9487e13859381eb117127bfee2"
SRC_URI[sha256sum] = "ab0d5a52caf01e6f4dcd84252c4eb5df5a24f90bb7f951f03875eef54f5ab0f4"
PV = "4.5.9+git"
S = "${WORKDIR}/${SRCNAME}-${PV}"
S = "${WORKDIR}/git"
inherit autotools-brokensep update-rc.d systemd update-alternatives
inherit autotools-brokensep update-rc.d systemd update-alternatives pkgconfig
DEPENDS = "gd unzip-native"
DEPENDS = "gd unzip-native openssl"
RDEPENDS:${PN} += "\
gd \
@ -41,6 +41,7 @@ RDEPENDS:${PN} += "\
SKIP_RECIPE[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}"
acpaths = "-I ${S}/autoconf-macros"
EXTRA_AUTORECONF += "-I ${S}/m4 -I ${S}/autoconf-macros"
# Set default password for the hardcoded Nagios admin user "nagiosadmin".
# If this variable is empty then will prompt user for password.
@ -52,7 +53,9 @@ EXTRA_OECONF += "--sbindir=${NAGIOS_CGIBIN_DIR} \
--with-command-group=nagcmd \
--with-httpd-conf=${sysconfdir}/apache2/conf.d \
--with-lockfile=${localstatedir}/run/nagios/nagios.pid \
--with-init-dir=${sysconfdir}/init.d \
--with-initdir=${sysconfdir}/init.d \
--with-init-type=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'sysv', d)} \
--with-inetd-type=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'inetd', d)} \
"
# Prevent nagios from stripping binaries, bitbake will take care of that
@ -108,7 +111,10 @@ do_install() {
install -d ${D}${systemd_unitdir}/system
install -m 644 ${UNPACKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
# use our own service file
rm -f ${D}${systemd_unitdir}/system/nagios.service
nagios_default_service=$(find ${D} -name 'nagios.service')
if [ -n "$nagios_default_service" ]; then
rm -f $nagios_default_service
fi
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 755 ${UNPACKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
else