summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-08-19 10:24:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-25 23:03:48 +0100
commit5bd1a35c8c6bd4759830dcecf3f71e5beef0abf7 (patch)
treedf3c0228e46ab0991cf73035542210d1575c70b6
parentd45a3449bc15de2334860c1964b81a20d876174c (diff)
downloadpoky-5bd1a35c8c6bd4759830dcecf3f71e5beef0abf7.tar.gz
systemd: split systemd-container
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@.service into the systemd-container package. [YOCTO #9835] (From OE-Core rev: 2a4bf6e4c96a8104733add315166210f04c02caf) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_230.bb38
1 files changed, 35 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes-core/systemd/systemd_230.bb
index 374a197673..4d367944c7 100644
--- a/meta/recipes-core/systemd/systemd_230.bb
+++ b/meta/recipes-core/systemd/systemd_230.bb
@@ -291,9 +291,13 @@ PACKAGES =+ "\
291 ${PN}-pam \ 291 ${PN}-pam \
292 ${PN}-zsh-completion \ 292 ${PN}-zsh-completion \
293 ${PN}-xorg-xinitrc \ 293 ${PN}-xorg-xinitrc \
294 ${PN}-container \
294 ${PN}-extra-utils \ 295 ${PN}-extra-utils \
295" 296"
296 297
298SUMMARY_${PN}-container = "Tools for containers and VMs"
299DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines."
300
297SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}" 301SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}"
298SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" 302SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
299 303
@@ -348,6 +352,37 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
348 352
349RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" 353RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
350 354
355FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \
356 ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \
357 ${base_bindir}/machinectl \
358 ${bindir}/systemd-nspawn \
359 ${nonarch_libdir}/systemd/import-pubring.gpg \
360 ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \
361 ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \
362 ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \
363 ${systemd_system_unitdir}/machine.slice \
364 ${systemd_system_unitdir}/machines.target \
365 ${systemd_system_unitdir}/org.freedesktop.import1.busname \
366 ${systemd_system_unitdir}/org.freedesktop.machine1.busname \
367 ${systemd_system_unitdir}/systemd-importd.service \
368 ${systemd_system_unitdir}/systemd-machined.service \
369 ${systemd_system_unitdir}/var-lib-machines.mount \
370 ${rootlibexecdir}/systemd/systemd-import \
371 ${rootlibexecdir}/systemd/systemd-importd \
372 ${rootlibexecdir}/systemd/systemd-journal-gatewayd \
373 ${rootlibexecdir}/systemd/systemd-journal-remote \
374 ${rootlibexecdir}/systemd/systemd-journal-upload \
375 ${rootlibexecdir}/systemd/systemd-machined \
376 ${rootlibexecdir}/systemd/systemd-pull \
377 ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \
378 ${systemd_system_unitdir}/systemd-nspawn@.service \
379 ${libdir}/libnss_mymachines.so.2 \
380 ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \
381 ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \
382 ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \
383 ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \
384 "
385
351FILES_${PN}-extra-utils = "\ 386FILES_${PN}-extra-utils = "\
352 ${base_bindir}/systemd-escape \ 387 ${base_bindir}/systemd-escape \
353 ${base_bindir}/systemd-inhibit \ 388 ${base_bindir}/systemd-inhibit \
@@ -371,9 +406,6 @@ FILES_${PN}-extra-utils = "\
371 ${rootlibexecdir}/systemd/systemd-resolve-host \ 406 ${rootlibexecdir}/systemd/systemd-resolve-host \
372 ${rootlibexecdir}/systemd/systemd-ac-power \ 407 ${rootlibexecdir}/systemd/systemd-ac-power \
373 ${rootlibexecdir}/systemd/systemd-activate \ 408 ${rootlibexecdir}/systemd/systemd-activate \
374 ${bindir}/systemd-nspawn \
375 ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \
376 ${systemd_unitdir}/system/systemd-nspawn@.service \
377 ${rootlibexecdir}/systemd/systemd-bus-proxyd \ 409 ${rootlibexecdir}/systemd/systemd-bus-proxyd \
378 ${systemd_unitdir}/system/systemd-bus-proxyd.service \ 410 ${systemd_unitdir}/system/systemd-bus-proxyd.service \
379 ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ 411 ${systemd_unitdir}/system/systemd-bus-proxyd.socket \