mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
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>
This commit is contained in:
parent
44e95d9471
commit
48c9b9a891
|
@ -38,7 +38,7 @@ RDEPENDS:${PN} += "\
|
||||||
nagios-base \
|
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"
|
acpaths = "-I ${S}/autoconf-macros"
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
|
||||||
|
|
||||||
inherit autotools-brokensep update-rc.d systemd update-alternatives
|
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
|
# IP address of server which proxy should connect to
|
||||||
MONITORING_PROXY_SERVER_IP ??= "192.168.7.2"
|
MONITORING_PROXY_SERVER_IP ??= "192.168.7.2"
|
||||||
|
|
|
@ -22,7 +22,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
|
||||||
|
|
||||||
inherit update-rc.d autotools-brokensep systemd dos2unix
|
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"
|
DEPENDS = "libmcrypt"
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ S = "${WORKDIR}/${BPN}-${PV}"
|
||||||
|
|
||||||
inherit autotools gettext
|
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} \
|
EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \
|
||||||
--with-nagios-user=${NAGIOS_USER} \
|
--with-nagios-user=${NAGIOS_USER} \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user