diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-07-22 10:45:04 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:59:14 +0100 |
commit | dc6a9a94359280822205a04d5ad11c64423c75e1 (patch) | |
tree | 3c20a093788df4345ce39e9779d19ff5e756c041 | |
parent | 0270b0e1c599ea56c3ba1479d5231b9fbaf877ce (diff) | |
download | poky-dc6a9a94359280822205a04d5ad11c64423c75e1.tar.gz |
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 <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_213.bb | 5 |
1 files 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/ $ | |||
244 | 244 | ||
245 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" | 245 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" |
246 | 246 | ||
247 | RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \ | 247 | RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\ |
248 | util-linux-agetty \ | 248 | util-linux-agetty \ |
249 | util-linux-fsck e2fsprogs-e2fsck \ | 249 | util-linux-fsck e2fsprogs-e2fsck \ |
250 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ | 250 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ |
@@ -255,7 +255,8 @@ PACKAGES =+ "udev-dbg udev udev-hwdb" | |||
255 | FILES_udev-dbg += "/lib/udev/.debug" | 255 | FILES_udev-dbg += "/lib/udev/.debug" |
256 | 256 | ||
257 | RPROVIDES_udev = "hotplug" | 257 | RPROVIDES_udev = "hotplug" |
258 | RRECOMMENDS_udev += "udev-hwdb" | 258 | |
259 | RDEPENDS_udev-hwdb += "udev" | ||
259 | 260 | ||
260 | FILES_udev += "${base_sbindir}/udevd \ | 261 | FILES_udev += "${base_sbindir}/udevd \ |
261 | ${rootlibexecdir}/systemd/systemd-udevd \ | 262 | ${rootlibexecdir}/systemd/systemd-udevd \ |