merged Bruce
On Tue, Aug 6, 2019 at 3:54 AM <[email protected]> wrote: > From: Changqing Li <[email protected]> > > fix below error: > Error: Transaction check error: > file /var/nagios from install of nagios-core-4.4.3-r0.core2_64 conflicts > with file from package nagios-nrpe-daemon-3.2.1-r0.core2_64 > > Signed-off-by: Changqing Li <[email protected]> > --- > recipes-extended/nagios/nagios-core_4.4.3.bb | 6 +++++- > recipes-extended/nagios/nagios-nrpe_3.2.1.bb | 5 ++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/recipes-extended/nagios/nagios-core_4.4.3.bb > b/recipes-extended/nagios/nagios-core_4.4.3.bb > index fcf04e9..7a86653 100644 > --- a/recipes-extended/nagios/nagios-core_4.4.3.bb > +++ b/recipes-extended/nagios/nagios-core_4.4.3.bb > @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = > "bba8f0e8dc8cf72f7a7ae4e8ce9c60f5bd315629421b9ec34818a28b8d > > S = "${WORKDIR}/${SRCNAME}-${PV}" > > -inherit autotools-brokensep update-rc.d systemd > +inherit autotools-brokensep update-rc.d systemd update-alternatives > > DEPENDS = "gd unzip-native" > > @@ -151,3 +151,7 @@ INITSCRIPT_NAME = "nagios" > INITSCRIPT_PARAMS = "defaults" > > CVE_PRODUCT = "nagios_core" > + > +ALTERNATIVE_PRIORITY_${PN} = '20' > +ALTERNATIVE_${PN} = "nagios" > +ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios" > diff --git a/recipes-extended/nagios/nagios-nrpe_3.2.1.bb > b/recipes-extended/nagios/nagios-nrpe_3.2.1.bb > index 3afa5dd..04917f7 100644 > --- a/recipes-extended/nagios/nagios-nrpe_3.2.1.bb > +++ b/recipes-extended/nagios/nagios-nrpe_3.2.1.bb > @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = > "8ad2d1846ab9011fdd2942b8fc0c99dfad9a97e57f4a3e6e394a4ead99 > > S = "${WORKDIR}/${SRCNAME}-${PV}" > > -inherit autotools-brokensep update-rc.d systemd > +inherit autotools-brokensep update-rc.d systemd update-alternatives > > # IP address of server which proxy should connect to > MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" > @@ -97,3 +97,6 @@ SYSTEMD_AUTO_ENABLE_${PN}-daemon = "enable" > INITSCRIPT_PACKAGES = "${PN}-daemon" > INITSCRIPT_NAME_${PN}-daemon = "nrpe" > INITSCRIPT_PARAMS_${PN}-daemon = "defaults" > + > +ALTERNATIVE_${PN}-daemon = "nagios" > +ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios" > -- > 2.7.4 > > -- > _______________________________________________ > meta-virtualization mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-virtualization > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
