[meta-virtualization][PATCH] nagios-core: WORKDIR -> UNPACKDIR transition

[meta-virtualization][PATCH] nagios-core: WORKDIR -> UNPACKDIR transition

[changqing.li]

From: Changqing Li <changqing.li@windriver.com>

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>
---
 recipes-extended/nagios/nagios-core_4.4.6.bb | 6 +++---
 1 file 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() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
+        install -m 644 ${UNPACKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
         # use our own service file
         rm -f ${D}${systemd_unitdir}/system/nagios.service
         install -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 755 ${WORKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
+        install -m 755 ${UNPACKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
     else
         install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
+        install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
     fi
 }
 
-- 
2.34.1

Re: [meta-virtualization][PATCH] nagios-core: WORKDIR -> UNPACKDIR transition

[Bruce Ashfield]

staged to master-next.

Bruce


In message: [meta-virtualization][PATCH] nagios-core: WORKDIR -> UNPACKDIR transition
on 21/02/2025 Changqing Li via lists.yoctoproject.org wrote:

> From: Changqing Li <changqing.li@windriver.com>
> 
> 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>
> ---
>  recipes-extended/nagios/nagios-core_4.4.6.bb | 6 +++---
>  1 file 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() {
>  
>      if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
>          install -d ${D}${systemd_unitdir}/system
> -        install -m 644 ${WORKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
> +        install -m 644 ${UNPACKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
>          # use our own service file
>          rm -f ${D}${systemd_unitdir}/system/nagios.service
>          install -d ${D}${sysconfdir}/tmpfiles.d
> -        install -m 755 ${WORKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
> +        install -m 755 ${UNPACKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
>      else
>          install -d ${D}${sysconfdir}/default/volatiles
> -        install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
> +        install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
>      fi
>  }
>  
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9148): https://lists.yoctoproject.org/g/meta-virtualization/message/9148
> Mute This Topic: https://lists.yoctoproject.org/mt/111302140/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>