diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-02-04 12:10:12 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-02-04 12:21:32 -0500 |
commit | 48c9b9a891709b9761a39553cd8a96e543e0b0b9 (patch) | |
tree | 86e301f949dfc1989aabad72247039d8b8bd1b59 | |
parent | 44e95d94718cd181ec9d06f7c3708da3ac02a28b (diff) | |
download | meta-virtualization-48c9b9a891709b9761a39553cd8a96e543e0b0b9.tar.gz |
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 <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-extended/nagios/nagios-core_4.4.6.bb | 2 | ||||
-rw-r--r-- | recipes-extended/nagios/nagios-nrpe_4.0.2.bb | 2 | ||||
-rw-r--r-- | recipes-extended/nagios/nagios-nsca_2.9.2.bb | 2 | ||||
-rw-r--r-- | 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} += "\ | |||
38 | nagios-base \ | 38 | nagios-base \ |
39 | " | 39 | " |
40 | 40 | ||
41 | PNBLACKLIST[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}" | 41 | SKIP_RECIPE[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}" |
42 | 42 | ||
43 | acpaths = "-I ${S}/autoconf-macros" | 43 | acpaths = "-I ${S}/autoconf-macros" |
44 | 44 | ||
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}" | |||
26 | 26 | ||
27 | inherit autotools-brokensep update-rc.d systemd update-alternatives | 27 | inherit autotools-brokensep update-rc.d systemd update-alternatives |
28 | 28 | ||
29 | 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)}" | 29 | 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)}" |
30 | 30 | ||
31 | # IP address of server which proxy should connect to | 31 | # IP address of server which proxy should connect to |
32 | MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" | 32 | 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}" | |||
22 | 22 | ||
23 | inherit update-rc.d autotools-brokensep systemd dos2unix | 23 | inherit update-rc.d autotools-brokensep systemd dos2unix |
24 | 24 | ||
25 | 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)}" | 25 | 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)}" |
26 | 26 | ||
27 | DEPENDS = "libmcrypt" | 27 | DEPENDS = "libmcrypt" |
28 | 28 | ||
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}" | |||
18 | 18 | ||
19 | inherit autotools gettext | 19 | inherit autotools gettext |
20 | 20 | ||
21 | 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)}" | 21 | 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)}" |
22 | 22 | ||
23 | EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \ | 23 | EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \ |
24 | --with-nagios-user=${NAGIOS_USER} \ | 24 | --with-nagios-user=${NAGIOS_USER} \ |