[meta-virtualization][PATCH] podman: fix location of user systemd service units

[meta-virtualization][PATCH] podman: fix location of user systemd service units

[Lukasz Czechowski]

The value of USERSYSTEMDDIR is currently set to
${systemd_unitdir}/user, which might not be present in user unit
search path.
Use dedicated bitbake variable ${systemd_user_unitdir} instead.

Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
---
 recipes-containers/podman/podman_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 3eadd202..f69dec16 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -62,7 +62,7 @@ do_configure[noexec] = "1"
 EXTRA_OEMAKE = " \
      PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir} \
      ETCDIR=${sysconfdir} TMPFILESDIR=${nonarch_libdir}/tmpfiles.d \
-     SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_unitdir}/user \
+     SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_user_unitdir} \
 "
 
 # remove 'docker' from the packageconfig if you don't want podman to
@@ -134,7 +134,7 @@ do_install_ptest () {
 FILES:${PN} += " \
     ${systemd_unitdir}/system/* \
     ${nonarch_libdir}/systemd/* \
-    ${systemd_unitdir}/user/* \
+    ${systemd_user_unitdir/* \
     ${nonarch_libdir}/tmpfiles.d/* \
     ${datadir}/user-tmpfiles.d/* \
     ${sysconfdir}/cni \
-- 
2.34.1

Re: [meta-virtualization][PATCH] podman: fix location of user systemd service units

[Bruce Ashfield]

Thanks for the fix.

Your author field has come through misconfigured:

remote: ##############################################
remote: Invalid author Lukasz Czechowski via lists.yoctoproject.org
remote: ##############################################

So I can't push the change

See: https://docs.yoctoproject.org/dev/contributor-guide/submit-changes.html#troubleshooting-email-issues

Bruce

In message: [meta-virtualization][PATCH] podman: fix location of user systemd service units
on 15/04/2024 Lukasz Czechowski via lists.yoctoproject.org wrote:

> The value of USERSYSTEMDDIR is currently set to
> ${systemd_unitdir}/user, which might not be present in user unit
> search path.
> Use dedicated bitbake variable ${systemd_user_unitdir} instead.
> 
> Signed-off-by: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
> ---
>  recipes-containers/podman/podman_git.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index 3eadd202..f69dec16 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -62,7 +62,7 @@ do_configure[noexec] = "1"
>  EXTRA_OEMAKE = " \
>       PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir} \
>       ETCDIR=${sysconfdir} TMPFILESDIR=${nonarch_libdir}/tmpfiles.d \
> -     SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_unitdir}/user \
> +     SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_user_unitdir} \
>  "
>  
>  # remove 'docker' from the packageconfig if you don't want podman to
> @@ -134,7 +134,7 @@ do_install_ptest () {
>  FILES:${PN} += " \
>      ${systemd_unitdir}/system/* \
>      ${nonarch_libdir}/systemd/* \
> -    ${systemd_unitdir}/user/* \
> +    ${systemd_user_unitdir/* \
>      ${nonarch_libdir}/tmpfiles.d/* \
>      ${datadir}/user-tmpfiles.d/* \
>      ${sysconfdir}/cni \
> -- 
> 2.34.1
> 

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