From 3a457cd2c5c9abf1b3aa622edbcc689d88b1c4ac Mon Sep 17 00:00:00 2001 From: Bryan Evenson Date: Mon, 20 Apr 2015 10:53:47 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/udev/udev.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/recipes-core/udev') 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/*" -- cgit 1.2.3-korg