summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-09-17 17:31:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commitb6eeccc881b2584be7b0d458f54626afc270883c (patch)
tree18bc919babbbcf0094ef48c68ac2136838ea562c /meta
parent8c0a33f326e99a84485634104fc29c1dde881c7d (diff)
downloadpoky-b6eeccc881b2584be7b0d458f54626afc270883c.tar.gz
systemd: Add util-linux-fsck to RDEPENDS
systemd-fsck expects util-linux-fsck passing a number of options that busybox fsck doesn't interpret. It then continues silently when run, so disks end up not having fsck run at all. Move util-linux-fsck from RRECOMMENDS to RDEPENDS to ensure we have the fsck which systemd expects. (From OE-Core rev: 409c3424250d55d1c5549841ddae22288aaa4859) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_239.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 55e3986935..194efb5b94 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -502,13 +502,13 @@ FILES_${PN} = " ${base_bindir}/* \
502 502
503FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" 503FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
504 504
505RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) util-linux-agetty" 505RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck"
506RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" 506RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
507RDEPENDS_${PN} += "volatile-binds update-rc.d" 507RDEPENDS_${PN} += "volatile-binds update-rc.d"
508 508
509RRECOMMENDS_${PN} += "systemd-extra-utils \ 509RRECOMMENDS_${PN} += "systemd-extra-utils \
510 systemd-compat-units udev-hwdb \ 510 systemd-compat-units udev-hwdb \
511 util-linux-fsck e2fsprogs-e2fsck \ 511 e2fsprogs-e2fsck \
512 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ 512 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
513 os-release \ 513 os-release \
514" 514"