diff options
author | Bryan Evenson <bevenson@melinkcorp.com> | 2015-04-20 10:53:47 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-21 07:20:23 +0100 |
commit | ca2948a1d4e408bccdfcd43fc8833ea356a74bca (patch) | |
tree | d0ca2d8f73e46b3b05efb81f959315a7fcb54a4d /meta/recipes-core | |
parent | 705f14dcf807403941e3fec9fff37b808af8ba3c (diff) | |
download | poky-ca2948a1d4e408bccdfcd43fc8833ea356a74bca.tar.gz |
udev: Add RCONFLICTS/RREPLACES for udev-utils
As of commit 9bb5c7472958aeea46225e835f44d45bea7f7351, the
udev-utils package no longer exists with udev taking ownership
of udevadm. However, systems that had udev-utils installed have
a conflict with udev.
Add RCONFLICTS and RREPLACES variables for udev-utils so udev-utils
will be removed from systems that are upgrading udev. This change
would be applicable for master back through dizzy when the problem
was introduced.
(From OE-Core rev: 3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac)
Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/udev/udev.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc index 19e0e86506..a00dad5db2 100644 --- a/meta/recipes-core/udev/udev.inc +++ b/meta/recipes-core/udev/udev.inc | |||
@@ -61,6 +61,11 @@ INITSCRIPT_PARAMS_udev-cache = "start 36 S ." | |||
61 | FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm" | 61 | FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm" |
62 | RRECOMMENDS_${PN} += "udev-cache" | 62 | RRECOMMENDS_${PN} += "udev-cache" |
63 | 63 | ||
64 | # udev-utils has been removed as a package. Note that udev conflicts with udev-utils so that | ||
65 | # udev-utils is removed from systems on upgrade. | ||
66 | RCONFLICTS_${PN} += "udev-utils" | ||
67 | RREPLACES_${PN} += "udev-utils" | ||
68 | |||
64 | FILES_${PN}-dbg += "${libexecdir}/.debug" | 69 | FILES_${PN}-dbg += "${libexecdir}/.debug" |
65 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" | 70 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" |
66 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" | 71 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" |