All 5 in the series are now merged Bruce
In message: [meta-virtualization][PATCH 1/5] nagios-*: add conditional PNBLACKLIST, because of the dependency on meta-webserver on 03/04/2021 Martin Jansa wrote: > Signed-off-by: Martin Jansa <[email protected]> > --- > 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, 8 insertions(+) > > diff --git a/recipes-extended/nagios/nagios-core_4.4.6.bb > b/recipes-extended/nagios/nagios-core_4.4.6.bb > index 8bcd6c0..fc3d2c5 100644 > --- a/recipes-extended/nagios/nagios-core_4.4.6.bb > +++ b/recipes-extended/nagios/nagios-core_4.4.6.bb > @@ -38,6 +38,8 @@ RDEPENDS_${PN} += "\ > nagios-base \ > " > > +PNBLACKLIST[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', > 'webserver', '', 'Depends on apache2 from meta-webserver which is not > included', d)}" > + > acpaths = "-I ${S}/autoconf-macros" > > # Set default password for the hardcoded Nagios admin user "nagiosadmin". > diff --git a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb > b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb > index d9c7b15..7f81172 100644 > --- a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb > +++ b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb > @@ -26,6 +26,8 @@ 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)}" > + > # 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 66f8da5..1fce198 100644 > --- a/recipes-extended/nagios/nagios-nsca_2.9.2.bb > +++ b/recipes-extended/nagios/nagios-nsca_2.9.2.bb > @@ -22,6 +22,8 @@ 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)}" > + > DEPENDS = "libmcrypt" > > EXTRA_OECONF += "--with-nsca-user=${NAGIOS_USER} \ > diff --git a/recipes-extended/nagios/nagios-plugins_2.2.1.bb > b/recipes-extended/nagios/nagios-plugins_2.2.1.bb > index 0793365..b97d80c 100644 > --- a/recipes-extended/nagios/nagios-plugins_2.2.1.bb > +++ b/recipes-extended/nagios/nagios-plugins_2.2.1.bb > @@ -18,6 +18,8 @@ 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)}" > + > EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \ > --with-nagios-user=${NAGIOS_USER} \ > --with-nagios-group=${NAGIOS_GROUP} \ > -- > 2.30.2 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6320): https://lists.yoctoproject.org/g/meta-virtualization/message/6320 Mute This Topic: https://lists.yoctoproject.org/mt/81831762/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
