[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7894/8267] systemd: move org.freedesktop.machine1.conf to systemd-container

[Emmanuele Bassi <ebassi src gnome org>]

commit 75bee4603dbabb4ed2cec3e2328cc24bf824a280
Author: Fathi Boudra <fathi boudra linaro org>
Date:   Sat Sep 23 13:37:30 2017 +0300

    systemd: move org.freedesktop.machine1.conf to systemd-container
    
    The file belongs to systemd-container package , not to systemd package.
    
    (From OE-Core rev: 9c1ec618860404bef0348bb17efcfb5c93cc360f)
    
    Signed-off-by: Fathi Boudra <fathi boudra linaro org>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/systemd/systemd_234.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 2695e15..881896b 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -388,6 +388,7 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c
                          ${libdir}/libnss_mymachines.so.2 \
                          ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \
                          ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \
+                         ${datadir}/dbus-1/system.d/org.freedesktop.machine1.conf \
                          ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \
                          ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \
                         "
@@ -485,7 +486,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${datadir}/dbus-1/system.d/org.freedesktop.network1.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf \
-                ${datadir}/dbus-1/system.d/org.freedesktop.machine1.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \
                "