merged to master and scarthgap.

Bruce

In message: [meta-virtualization][PATCH v2] podman: fix location of user systemd service units
on 17/04/2024 lukasz.czechowski@thaumatec.com wrote:

> From: Lukasz Czechowski <lukasz.czechowski@thaumatec.com>
>
> 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>
> Cc: Bruce Ashfield <bruce.ashfield@gmail.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/* \