From dc6a9a94359280822205a04d5ad11c64423c75e1 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 22 Jul 2014 10:45:04 +0800 Subject: systemd: change dependency relationships When building out a systemd based image, the udev-hwdb postinstall script always fails at rootfs time. This is because that the 'udevadm' command used in udev-hwdb postinstall script is now in the udev package and udev recommends udev-hwdb. Instead of letting udev recommends udev-hwdb, we let systemd do it and make udev-hwdb rdepend on udev. (From OE-Core rev: f14ee284da19665f157453021e3fa0e3a0dbf75d) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_213.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_213.bb index 28cc4cb0d9..5de7cdc3b2 100644 --- a/meta/recipes-core/systemd/systemd_213.bb +++ b/meta/recipes-core/systemd/systemd_213.bb @@ -244,7 +244,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $ RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" -RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \ +RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\ util-linux-agetty \ util-linux-fsck e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ @@ -255,7 +255,8 @@ PACKAGES =+ "udev-dbg udev udev-hwdb" FILES_udev-dbg += "/lib/udev/.debug" RPROVIDES_udev = "hotplug" -RRECOMMENDS_udev += "udev-hwdb" + +RDEPENDS_udev-hwdb += "udev" FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/systemd/systemd-udevd \ -- cgit 1.2.3-korg