[OE-core] [PATCH] systemd: enable portabled by default and install utilities in systemd-container

[Martin Hundebøll]

Hi Luca,

On 10/05/2019 12.45, Luca Boccassi wrote:
> On Fri, 2019-05-10 at 07:23 +0200, Martin Hundebøll wrote:
>> Hi Luca,
>>
>> On 09/05/2019 23.40,
>> luca.boccassi at gmail.com
>>   wrote:
>>> From: Luca Boccassi <
>>> luca.boccassi at microsoft.com
>>>>
>>>
>>> portable services have been declared production ready with v241, so
>>> enable
>>> by default and install the files in the container package.
>>
>> The systemd portables feature is not really related to
>> containers/VM's,
>> so I think it should stay in the primary package; or alternatively in
>> a
>> separate package.
>>
>> // Martin
> 
> Hello Martin,
> 
> IMHO if VM tools and containers tool can go together in this package,
> then portable services utilities can too - they are at different
> positions on the same scale after all :-)
> 
> But I've got no strong opinion, so I'll send a v2 with them moved to
> the main package.

I am planning to use portable services instead of going full container, 
so I would prefer not having the container/vm utils on target :)

// Martin

>>> Signed-off-by: Luca Boccassi <
>>> luca.boccassi at microsoft.com
>>>>
>>> ---
>>>    meta/recipes-core/systemd/systemd_242.bb | 10 ++++++++++
>>>    1 file changed, 10 insertions(+)
>>>
>>> diff --git a/meta/recipes-core/systemd/systemd_242.bb
>>> b/meta/recipes-core/systemd/systemd_242.bb
>>> index 73e03c7a77..83b00ba785 100644
>>> --- a/meta/recipes-core/systemd/systemd_242.bb
>>> +++ b/meta/recipes-core/systemd/systemd_242.bb
>>> @@ -81,6 +81,7 @@ PACKAGECONFIG ??= " \
>>>        nss \
>>>        nss-mymachines \
>>>        nss-resolve \
>>> +    portabled \
>>>        quotacheck \
>>>        randomseed \
>>>        resolved \
>>> @@ -403,8 +404,10 @@ SYSTEMD_SERVICE_${PN}-remote = "systemd-
>>> journal-remote.socket"
>>>    
>>>    FILES_${PN}-container = "${sysconfdir}/dbus-
>>> 1/system.d/org.freedesktop.import1.conf \
>>>                             ${sysconfdir}/dbus-
>>> 1/system.d/org.freedesktop.machine1.conf \
>>> +                         ${sysconfdir}/dbus-
>>> 1/system.d/org.freedesktop.portable1.conf \
>>>                             ${sysconfdir}/systemd/system/multi-
>>> user.target.wants/machines.target \
>>>                             ${base_bindir}/machinectl \
>>> +                         ${base_bindir}/portablectl \
>>>                             ${bindir}/systemd-nspawn \
>>>                             ${nonarch_libdir}/systemd/import-
>>> pubring.gpg \
>>>                             ${systemd_system_unitdir}/busnames.targe
>>> t.wants/org.freedesktop.import1.busname \
>>> @@ -418,21 +421,28 @@ FILES_${PN}-container = "${sysconfdir}/dbus-
>>> 1/system.d/org.freedesktop.import1.c
>>>                             ${systemd_system_unitdir}/org.freedeskto
>>> p.machine1.busname \
>>>                             ${systemd_system_unitdir}/systemd-
>>> importd.service \
>>>                             ${systemd_system_unitdir}/systemd-
>>> machined.service \
>>> +                         ${systemd_system_unitdir}/systemd-
>>> portabled.service \
>>>                             ${systemd_system_unitdir}/dbus-
>>> org.freedesktop.machine1.service \
>>> +                         ${systemd_system_unitdir}/dbus-
>>> org.freedesktop.portable1.service \
>>>                             ${systemd_system_unitdir}/var-lib-
>>> machines.mount \
>>>                             ${rootlibexecdir}/systemd/systemd-import
>>> \
>>>                             ${rootlibexecdir}/systemd/systemd-
>>> importd \
>>>                             ${rootlibexecdir}/systemd/systemd-
>>> machined \
>>> +                         ${rootlibexecdir}/systemd/systemd-
>>> portabled \
>>>                             ${rootlibexecdir}/systemd/systemd-pull \
>>> +                         ${exec_prefix}/lib/tmpfiles.d/portables.c
>>> onf \
>>>                             ${exec_prefix}/lib/tmpfiles.d/systemd-
>>> nspawn.conf \
>>>                             ${systemd_system_unitdir}/systemd-
>>> nspawn at .service \
>>>                             ${libdir}/libnss_mymachines.so.2 \
>>>                             ${datadir}/dbus-1/system-
>>> services/org.freedesktop.import1.service \
>>>                             ${datadir}/dbus-1/system-
>>> services/org.freedesktop.machine1.service \
>>> +                         ${datadir}/dbus-1/system-
>>> services/org.freedesktop.portable1.service \
>>>                             ${datadir}/dbus-
>>> 1/system.d/org.freedesktop.import1.conf \
>>>                             ${datadir}/dbus-
>>> 1/system.d/org.freedesktop.machine1.conf \
>>> +                         ${datadir}/dbus-
>>> 1/system.d/org.freedesktop.portable1.conf \
>>>                             ${datadir}/polkit-
>>> 1/actions/org.freedesktop.import1.policy \
>>>                             ${datadir}/polkit-
>>> 1/actions/org.freedesktop.machine1.policy \
>>> +                         ${datadir}/polkit-
>>> 1/actions/org.freedesktop.portable1.policy \
>>>                            "
>>>    
>>>    RRECOMMENDS_${PN}-container += "\
>>>
>>
>>

-- 
Kind regards,
Martin Hundebøll
Embedded Linux Consultant

+45 61 65 54 61
martin at geanix.com

Geanix ApS
https://geanix.com
DK39600706