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

2024-04-16 Thread Lukasz Czechowski
From: 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 
Cc: Bruce Ashfield 
---
 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 (#8682): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8682
Mute This Topic: https://lists.yoctoproject.org/mt/105567244/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



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

2024-04-22 Thread Bruce Ashfield
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.czechow...@thaumatec.com wrote:

> From: 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 
> Cc: Bruce Ashfield 
> ---
>  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 (#8691): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8691
Mute This Topic: https://lists.yoctoproject.org/mt/105567244/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



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

2024-04-30 Thread Theodore A. Roth
On Mon, Apr 22, 2024 at 9:03 AM Bruce Ashfield via lists.yoctoproject.org
 wrote:

> 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.czechow...@thaumatec.com wrote:
>
> > From: 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 
> > Cc: Bruce Ashfield 
> > ---
> >  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/* \
>

Just noticed that this is missing the closing brace. This typo is on master
and scarthgap branches.

Would you like me to send a patch?

Ted Roth

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8707): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8707
Mute This Topic: https://lists.yoctoproject.org/mt/105567244/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



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

2024-04-30 Thread Bruce Ashfield
On Tue, Apr 30, 2024 at 10:45 AM Theodore A. Roth  wrote:

>
>
> On Mon, Apr 22, 2024 at 9:03 AM Bruce Ashfield via lists.yoctoproject.org
>  wrote:
>
>> 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.czechow...@thaumatec.com wrote:
>>
>> > From: 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 
>> > Cc: Bruce Ashfield 
>> > ---
>> >  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/* \
>>
>
> Just noticed that this is missing the closing brace. This typo is on
> master and scarthgap branches.
>
> Would you like me to send a patch?
>
>
Sure! I'm doing some other major package additions and updates right now,
so a patch is easier for me.

Bruce



> Ted Roth
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8708): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8708
Mute This Topic: https://lists.yoctoproject.org/mt/105567244/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-