[OE-core] [PATCH master thud] systemd: move "machines" symlinks to systemd-container

[Matthias Schiffer]

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, preventing the use of systemd without pulling in
container support.

Signed-off-by: Matthias Schiffer <matthias.schiffer at ew.tq-group.com>
---
 meta/recipes-core/systemd/systemd_239.bb | 3 +++
 1 file changed, 3 insertions(+)

The fix can also be cherry-picked to Sumo without conflicts (in fact, Rocko
is affected as well, but I think that's EOL?). Please let me know if you
want me to submit a separate patch for Sumo, or if fixing this in the older
releases is not desired.

diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 7af297245a..ef5020040c 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -421,12 +421,15 @@ 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}/systemd/system/multi-user.target.wants/machines.target \
                          ${base_bindir}/machinectl \
                          ${bindir}/systemd-nspawn \
                          ${nonarch_libdir}/systemd/import-pubring.gpg \
                          ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \
                          ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \
                          ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \
+                         ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \
+                         ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \
                          ${systemd_system_unitdir}/machine.slice \
                          ${systemd_system_unitdir}/machines.target \
                          ${systemd_system_unitdir}/org.freedesktop.import1.busname \
-- 
2.17.1