summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
diff options
context:
space:
mode:
authorBryan Evenson <bevenson@melinkcorp.com>2015-04-20 10:53:47 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:19:03 +0100
commit3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac (patch)
tree00bdf801983ce9ebe9e0d2074d0b3bfc8e72d96a /meta/recipes-core/udev
parent090727384bed38c4317a25d2ecf4c7855a3ffaaa (diff)
downloadopenembedded-core-contrib-3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac.tar.gz
openembedded-core-contrib-3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac.tar.bz2
openembedded-core-contrib-3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac.zip
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. Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r--meta/recipes-core/udev/udev.inc5
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 ."
FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit ${nonarch_base_libdir}/udev ${bindir}/udevadm"
RRECOMMENDS_${PN} += "udev-cache"
+# udev-utils has been removed as a package. Note that udev conflicts with udev-utils so that
+# udev-utils is removed from systems on upgrade.
+RCONFLICTS_${PN} += "udev-utils"
+RREPLACES_${PN} += "udev-utils"
+
FILES_${PN}-dbg += "${libexecdir}/.debug"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"