diff options
| author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2019-05-03 16:27:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-09 16:31:56 +0100 |
| commit | ef5a902cf085b47209bdde76d9e086f9a29da578 (patch) | |
| tree | 6e33502601885875dffe99a0c4c389ca79b7343c /meta/recipes-core/systemd | |
| parent | 310a958fb3e38e4f2b4a99648cbc9ffaf5628184 (diff) | |
| download | poky-ef5a902cf085b47209bdde76d9e086f9a29da578.tar.gz | |
systemd: move "machines" symlinks to systemd-container
Move symlinks to the machines.target and var-lib-machines.mount units to
the systemd-container package, where the pointed at units are located as
well.
This avoids an implicit dependency of the systemd package on
systemd-container, which prevented the use of systemd without installing
systemd-container.
(From OE-Core rev: ae3c8d938c261c92ecf06e2d09f7e32bc117ceb8)
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index c7ccd1f99b..73e03c7a77 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
| @@ -403,12 +403,15 @@ SYSTEMD_SERVICE_${PN}-remote = "systemd-journal-remote.socket" | |||
| 403 | 403 | ||
| 404 | FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ | 404 | FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ |
| 405 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ | 405 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ |
| 406 | ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ | ||
| 406 | ${base_bindir}/machinectl \ | 407 | ${base_bindir}/machinectl \ |
| 407 | ${bindir}/systemd-nspawn \ | 408 | ${bindir}/systemd-nspawn \ |
| 408 | ${nonarch_libdir}/systemd/import-pubring.gpg \ | 409 | ${nonarch_libdir}/systemd/import-pubring.gpg \ |
| 409 | ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \ | 410 | ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \ |
| 410 | ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \ | 411 | ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \ |
| 411 | ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \ | 412 | ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \ |
| 413 | ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \ | ||
| 414 | ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \ | ||
| 412 | ${systemd_system_unitdir}/machine.slice \ | 415 | ${systemd_system_unitdir}/machine.slice \ |
| 413 | ${systemd_system_unitdir}/machines.target \ | 416 | ${systemd_system_unitdir}/machines.target \ |
| 414 | ${systemd_system_unitdir}/org.freedesktop.import1.busname \ | 417 | ${systemd_system_unitdir}/org.freedesktop.import1.busname \ |