From 48c9b9a891709b9761a39553cd8a96e543e0b0b9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 4 Feb 2022 12:10:12 -0500 Subject: nagios: update to use SKIP_RECIPE oe-core has remove PNBLACKLIST in favour of SKIP_RECIPE, so we update our recipe accordingly to avoid warnings. Signed-off-by: Bruce Ashfield --- recipes-extended/nagios/nagios-core_4.4.6.bb | 2 +- recipes-extended/nagios/nagios-nrpe_4.0.2.bb | 2 +- recipes-extended/nagios/nagios-nsca_2.9.2.bb | 2 +- recipes-extended/nagios/nagios-plugins_2.2.1.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-extended/nagios/nagios-core_4.4.6.bb b/recipes-extended/nagios/nagios-core_4.4.6.bb index 01c8c0cc..eca9f3f1 100644 --- a/recipes-extended/nagios/nagios-core_4.4.6.bb +++ b/recipes-extended/nagios/nagios-core_4.4.6.bb @@ -38,7 +38,7 @@ RDEPENDS:${PN} += "\ nagios-base \ " -PNBLACKLIST[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}" +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" diff --git a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb index 71604534..bd18f8e7 100644 --- a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb +++ b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb @@ -26,7 +26,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools-brokensep update-rc.d systemd update-alternatives -PNBLACKLIST[nagios-nrpe] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +SKIP_RECIPE[nagios-nrpe] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" # IP address of server which proxy should connect to MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" diff --git a/recipes-extended/nagios/nagios-nsca_2.9.2.bb b/recipes-extended/nagios/nagios-nsca_2.9.2.bb index 74e5b5b2..568dcf7a 100644 --- a/recipes-extended/nagios/nagios-nsca_2.9.2.bb +++ b/recipes-extended/nagios/nagios-nsca_2.9.2.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit update-rc.d autotools-brokensep systemd dos2unix -PNBLACKLIST[nagios-nsca] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Rdepends on nagios-base provided by nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +SKIP_RECIPE[nagios-nsca] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Rdepends on nagios-base provided by nagios-core which depends on apache2 from meta-webserver which is not included', d)}" DEPENDS = "libmcrypt" diff --git a/recipes-extended/nagios/nagios-plugins_2.2.1.bb b/recipes-extended/nagios/nagios-plugins_2.2.1.bb index f61262ee..0b0c33c2 100644 --- a/recipes-extended/nagios/nagios-plugins_2.2.1.bb +++ b/recipes-extended/nagios/nagios-plugins_2.2.1.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/${BPN}-${PV}" inherit autotools gettext -PNBLACKLIST[nagios-plugins] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +SKIP_RECIPE[nagios-plugins] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \ --with-nagios-user=${NAGIOS_USER} \ -- cgit v1.2.3-54-g00ecf