[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7822/8267] systemd: change some RRECOMMENDS to RDEPENDS

[Emmanuele Bassi <ebassi src gnome org>]

commit 117946646ef51704af9ea5780e8f19f645fbbb12
Author: Chen Qi <Qi Chen windriver com>
Date:   Tue Sep 5 16:07:59 2017 +0800

    systemd: change some RRECOMMENDS to RDEPENDS
    
    Set NO_RECOMMENDATIONS to "1", build and start a systemd image, and we
    could not get serial getty spawned, thus causing the user not able to
    login via serial port.
    
    E.g.
    MACHINE=qemux86-64 bitbake core-image-minimal
    runqemu qemux86-64 nographic
    
    And we cannot login onto the system.
    
    Move util-linux-agetty and systemd-serialgetty (determined by PACKAGECONFIG)
    from RRECOMMENDS to RDEPENDS to fix the above problem.
    
    (From OE-Core rev: 39e78c7615cdaaa8ad61a67d5c5bf7ff877167df)
    
    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>

 meta/recipes-core/systemd/systemd_234.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 2736f38..2695e15 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -492,13 +492,13 @@ FILES_${PN} = " ${base_bindir}/* \
 
 FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ 
${sysconfdir}/rpm/macros.systemd"
 
-RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})"
+RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) util-linux-agetty"
+RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 
'systemd-serialgetty', d)}"
 RDEPENDS_${PN} += "volatile-binds update-rc.d"
 
-RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 
'systemd-serialgetty', d)} \
-                      systemd-extra-utils \
+RRECOMMENDS_${PN} += "systemd-extra-utils \
                       systemd-compat-units udev-hwdb \
-                      util-linux-agetty  util-linux-fsck e2fsprogs-e2fsck \
+                      util-linux-fsck e2fsprogs-e2fsck \
                       kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
                       os-release \
 "