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>

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 19e0e86506e49d714dfd220e4fb2142d19dd7c70..a00dad5db22f88338157bf91a8551dd11e383370 100644 (file)
--- 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/*"