[OE-core] [PATCH 1/1] systemd: split systemd-container

[Joshua G Lock]

On Thu, 2016-07-14 at 11:25 +0800, Chen Qi wrote:
> Split container/vm related units into a new package, systemd-
> container.
> 
> The split mainly references Fedora 24, with a few differences.
> Apart from the bash and zsh completion files, the differences include
> adding systemd-spawn at .service into the systemd-container package.
> 
> [YOCTO #9835]
> 
> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
> ---
>  meta/recipes-core/systemd/systemd_230.bb | 35
> +++++++++++++++++++++++++++++---
>  1 file changed, 32 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes-
> core/systemd/systemd_230.bb
> index 374a197..cf8aec1 100644
> --- a/meta/recipes-core/systemd/systemd_230.bb
> +++ b/meta/recipes-core/systemd/systemd_230.bb
> @@ -291,6 +291,7 @@ PACKAGES =+ "\
>      ${PN}-pam \
>      ${PN}-zsh-completion \
>      ${PN}-xorg-xinitrc \
> +    ${PN}-container \
>      ${PN}-extra-utils \
>  "
>  
> @@ -348,6 +349,37 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-
> binfmt-misc"
>  
>  RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-
> keymaps"

It would be nice to provide more information about systemd-container to
package managers with a SUMMARY_${PN}-container and DESCRIPTION_${PN}-
container

>  
> +FILES_${PN}-container = "${sysconfdir}/dbus-
> 1/system.d/org.freedesktop.import1.conf \
> +                         ${sysconfdir}/dbus-
> 1/system.d/org.freedesktop.machine1.conf \
> +                         ${base_bindir}/machinectl \
> +                         ${bindir}/systemd-nspawn \
> +                         ${exec_prefix}/lib/systemd/import-
> pubring.gpg \

any reason you didn't use ${libdir}/systemd/import-pubring.gpg or
${nonarch_libdir} if the files is always installed in /usr/lib
regardless of whether libdir is i.e. /usr/lib64

> +                         ${systemd_unitdir}/system/busnames.target.w
> ants/org.freedesktop.import1.busname \
> +                         ${systemd_unitdir}/system/busnames.target.w
> ants/org.freedesktop.machine1.busname \
> +                         ${systemd_unitdir}/system/local-
> fs.target.wants/var-lib-machines.mount \
> +                         ${systemd_unitdir}/system/machine.slice \
> +                         ${systemd_unitdir}/system/machines.target \
> +                         ${systemd_unitdir}/system/org.freedesktop.i
> mport1.busname \
> +                         ${systemd_unitdir}/system/org.freedesktop.m
> achine1.busname \
> +                         ${systemd_unitdir}/system/systemd-
> importd.service \
> +                         ${systemd_unitdir}/system/systemd-
> machined.service \
> +                         ${systemd_unitdir}/system/var-lib-
> machines.mount \

I realise these are probably copy/pasted, but you could replace all of
the ${systemd_unitdir}/system with ${systemd_system_unitdir}

Otherwise this change looks good, thanks!

Joshua

> +                         ${rootlibexecdir}/systemd/systemd-import \
> +                         ${rootlibexecdir}/systemd/systemd-importd \
> +                         ${rootlibexecdir}/systemd/systemd-journal-
> gatewayd \
> +                         ${rootlibexecdir}/systemd/systemd-journal-
> remote \
> +                         ${rootlibexecdir}/systemd/systemd-journal-
> upload \
> +                         ${rootlibexecdir}/systemd/systemd-machined
> \
> +                         ${rootlibexecdir}/systemd/systemd-pull
> \+                         ${exec_prefix}/lib/tmpfiles.d/systemd-
> nspawn.conf \
> +                         ${systemd_unitdir}/system/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}/polkit-
> 1/actions/org.freedesktop.import1.policy \
> +                         ${datadir}/polkit-
> 1/actions/org.freedesktop.machine1.policy \
> +                        "
> +



>  FILES_${PN}-extra-utils = "\
>                          ${base_bindir}/systemd-escape \
>                          ${base_bindir}/systemd-inhibit \
> @@ -371,9 +403,6 @@ FILES_${PN}-extra-utils = "\
>                          ${rootlibexecdir}/systemd/systemd-resolve-
> host \
>                          ${rootlibexecdir}/systemd/systemd-ac-power \
>                          ${rootlibexecdir}/systemd/systemd-activate \
> -                        ${bindir}/systemd-nspawn \
> -                        ${exec_prefix}/lib/tmpfiles.d/systemd-
> nspawn.conf \
> -                        ${systemd_unitdir}/system/systemd-
> nspawn at .service \
>                          ${rootlibexecdir}/systemd/systemd-bus-proxyd 
> \
>                          ${systemd_unitdir}/system/systemd-bus-
> proxyd.service \
>                          ${systemd_unitdir}/system/systemd-bus-
> proxyd.socket \
> -- 
> 1.9.1
>