[OE-core] [oe-core][PATCH] eudev: Add RREPLACES/RCONFLICTS/PE for udev migration

Bryan Evenson bevenson at melinkcorp.com
Thu May 18 14:10:49 UTC 2017


Commit e5e540513665105b963262c2eaf33f197a0a36c replaced
udev with eudev on system's using sysvinit for init.
For clean upgrades, some extra variables are needed to
appropriately mark eudev as an update to udev.

 * Add RREPLACES/RCONFLICTS for udev so udev is removed on
   upgrade and the new files are replaced.
 * Commit ca2948a1d4e408bccdfcd43fc8833ea356a74bca added
   RREPLACES/RCONFLICTS for udev-utils when the udev-utils
   package was merged into udev.  Inherit this RREPLACES
   and RCONFLICTS so older systems with udev-utils will
   still upgrade cleanly.
 * The version numbering changed with eudev from a single
   version number to an x.y.z format with a lower version
   number.  The RREPLACES/RCONFLICTS takes care of upgrading
   udev to eudev, but both eudev and udev add the udev-cache
   package.  Since udev-cache can't replace/conflict with
   itself, the PE needs to be incremented for udev-cache
   to upgrade.

Signed-off-by: Bryan Evenson <bevenson at melinkcorp.com>
---
 meta/recipes-core/udev/eudev_3.2.1.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb b/meta/recipes-core/udev/eudev_3.2.1.bb
index bdfb544..539945e 100644
--- a/meta/recipes-core/udev/eudev_3.2.1.bb
+++ b/meta/recipes-core/udev/eudev_3.2.1.bb
@@ -8,6 +8,8 @@ DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux"
 
 PROVIDES = "udev"
 
+PE = "1"
+
 SRC_URI = "https://github.com/gentoo/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \
            file://0014-Revert-rules-remove-firmware-loading-rules.patch \
            file://Revert-udev-remove-userspace-firmware-loading-suppor.patch \
@@ -86,6 +88,10 @@ RRECOMMENDS_${PN} += "udev-cache"
 RPROVIDES_${PN} = "hotplug udev"
 RPROVIDES_eudev-hwdb += "udev-hwdb"
 
+RCONFLICTS_${PN} += "udev udev-utils"
+
+RREPLACES_${PN} += "udev udev-utils"
+
 python () {
     if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
         raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
-- 
1.9.1




More information about the Openembedded-core mailing list