diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-02-21 10:40:06 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2025-03-11 06:06:33 +0000 |
| commit | 152bec3dd7ae1040afa4945b47213afc279e22eb (patch) | |
| tree | b0f0fb6079c20a92358d36e341908892da14bff2 | |
| parent | 9aa357c451d597fefc390b63f0e976b6e6c65c91 (diff) | |
| download | meta-virtualization-152bec3dd7ae1040afa4945b47213afc279e22eb.tar.gz | |
nagios-core: WORKDIR -> UNPACKDIR transition
This adapts to the oe-core rework to enforce a separate directory
for unpacking local sources (UNPACKDIR) instead of directly using
WORKDIR.
Follows the preliminary guideline from:
https://lists.openembedded.org/g/openembedded-architecture/message/2007
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-extended/nagios/nagios-core_4.4.6.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-extended/nagios/nagios-core_4.4.6.bb b/recipes-extended/nagios/nagios-core_4.4.6.bb index 59b70895..7ec930cd 100644 --- a/recipes-extended/nagios/nagios-core_4.4.6.bb +++ b/recipes-extended/nagios/nagios-core_4.4.6.bb | |||
| @@ -106,14 +106,14 @@ do_install() { | |||
| 106 | 106 | ||
| 107 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 107 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 108 | install -d ${D}${systemd_unitdir}/system | 108 | install -d ${D}${systemd_unitdir}/system |
| 109 | install -m 644 ${WORKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/ | 109 | install -m 644 ${UNPACKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/ |
| 110 | # use our own service file | 110 | # use our own service file |
| 111 | rm -f ${D}${systemd_unitdir}/system/nagios.service | 111 | rm -f ${D}${systemd_unitdir}/system/nagios.service |
| 112 | install -d ${D}${sysconfdir}/tmpfiles.d | 112 | install -d ${D}${sysconfdir}/tmpfiles.d |
| 113 | install -m 755 ${WORKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf | 113 | install -m 755 ${UNPACKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf |
| 114 | else | 114 | else |
| 115 | install -d ${D}${sysconfdir}/default/volatiles | 115 | install -d ${D}${sysconfdir}/default/volatiles |
| 116 | install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios | 116 | install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios |
| 117 | fi | 117 | fi |
| 118 | } | 118 | } |
| 119 | 119 | ||
