diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-08-06 14:54:40 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-06 23:13:58 -0400 |
| commit | 91c23e6a9c3adf2d9493b9263d114b40d8b3ec1b (patch) | |
| tree | d2f4b8a32adc34f5df625eb6e51614b97e4c9c6d /recipes-extended | |
| parent | 7acb70c53fa77733155042184340d30f1cb62f40 (diff) | |
| download | meta-virtualization-91c23e6a9c3adf2d9493b9263d114b40d8b3ec1b.tar.gz | |
nagios-core/nagios-nrpe: use update-alternatives for /var/nagios
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 <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
| -rw-r--r-- | recipes-extended/nagios/nagios-core_4.4.3.bb | 6 | ||||
| -rw-r--r-- | 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 fcf04e98..7a86653b 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 | |||
| 25 | 25 | ||
| 26 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 26 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
| 27 | 27 | ||
| 28 | inherit autotools-brokensep update-rc.d systemd | 28 | inherit autotools-brokensep update-rc.d systemd update-alternatives |
| 29 | 29 | ||
| 30 | DEPENDS = "gd unzip-native" | 30 | DEPENDS = "gd unzip-native" |
| 31 | 31 | ||
| @@ -151,3 +151,7 @@ INITSCRIPT_NAME = "nagios" | |||
| 151 | INITSCRIPT_PARAMS = "defaults" | 151 | INITSCRIPT_PARAMS = "defaults" |
| 152 | 152 | ||
| 153 | CVE_PRODUCT = "nagios_core" | 153 | CVE_PRODUCT = "nagios_core" |
| 154 | |||
| 155 | ALTERNATIVE_PRIORITY_${PN} = '20' | ||
| 156 | ALTERNATIVE_${PN} = "nagios" | ||
| 157 | 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 3afa5dd9..04917f73 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 | |||
| 20 | 20 | ||
| 21 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 21 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
| 22 | 22 | ||
| 23 | inherit autotools-brokensep update-rc.d systemd | 23 | inherit autotools-brokensep update-rc.d systemd update-alternatives |
| 24 | 24 | ||
| 25 | # IP address of server which proxy should connect to | 25 | # IP address of server which proxy should connect to |
| 26 | MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" | 26 | MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" |
| @@ -97,3 +97,6 @@ SYSTEMD_AUTO_ENABLE_${PN}-daemon = "enable" | |||
| 97 | INITSCRIPT_PACKAGES = "${PN}-daemon" | 97 | INITSCRIPT_PACKAGES = "${PN}-daemon" |
| 98 | INITSCRIPT_NAME_${PN}-daemon = "nrpe" | 98 | INITSCRIPT_NAME_${PN}-daemon = "nrpe" |
| 99 | INITSCRIPT_PARAMS_${PN}-daemon = "defaults" | 99 | INITSCRIPT_PARAMS_${PN}-daemon = "defaults" |
| 100 | |||
| 101 | ALTERNATIVE_${PN}-daemon = "nagios" | ||
| 102 | ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios" | ||