]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
systemd: fix runtime dependency ChenQi/systemd-rdepends
authorChen Qi <Qi.Chen@windriver.com>
Thu, 16 Oct 2014 09:07:55 +0000 (17:07 +0800)
committerChen Qi <Qi.Chen@windriver.com>
Thu, 16 Oct 2014 09:17:49 +0000 (17:17 +0800)
Previously, if we set 'NO_RECOMMENDATIONS' to "1", we cannot reach login
in systemd systems. The problem is that several runtime dependencies are
coded as 'recommended' in our project.

This patch makes the following changes.
1. Add util-linux-agetty as a runtime dependency.
   Otherwise, getty services in systemd cannot start correctly.
2. Add systemd-serialgetty as a runtime dependency.
   Otherwise, serialgetty services cannot start correctly in systemd and
   we would have problem when using `runqemu qemux86 nographic'.
3. Remove 'systemd' from RDEPENDS of systemd-serialgetty.
   systemd-serialgetty justs ships systemd unit files, even if the init
   manager is 'sysvinit', these files do no harm.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
meta/recipes-core/systemd/systemd-serialgetty.bb
meta/recipes-core/systemd/systemd_216.bb

index 1c34d5c747cd3db802bcf5d51b03f74d45534f79..f3acaada2d5ded8d08b50ba41735190c04e83d1e 100644 (file)
@@ -36,8 +36,6 @@ do_install() {
        fi
 }
 
-RDEPENDS_${PN} = "systemd"
-
 # This is a machine specific file
 FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
index ebf939574d8d8364c6f076a7bbb786654c19dbd4..62fe5c7a216c8092823b684e4b4a8444f5f0a88f 100644 (file)
@@ -267,11 +267,10 @@ FILES_${PN} = " ${base_bindir}/* \
 FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
 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 systemd-serialgetty util-linux-mount util-linux-agetty udev (= ${EXTENDPKGV})"
 RDEPENDS_${PN} += "volatile-binds"
 
-RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\
-                      util-linux-agetty \
+RRECOMMENDS_${PN} += "systemd-compat-units udev-hwdb\
                       util-linux-fsck e2fsprogs-e2fsck \
                       kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 os-release \
 "