From: Matthias Schiffer Date: Fri, 3 May 2019 14:27:33 +0000 (+0200) Subject: systemd: move "machines" symlinks to systemd-container X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef5a902cf085b47209bdde76d9e086f9a29da578;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index c7ccd1f99be..73e03c7a776 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" 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 \