From: Fredrik Hugosson <[email protected]> Add the specific udev rules needed for device mapper notifications to the libdevmapper package. This is needed to get notifications for device mapping to work with systemd.
Move the remaining udev rules files to the lvm2 package as there is no real reason to have them packaged separately. List all udev files explicitly in the FILES variables so that someone will have to make an active decision where to package any new udev files added in the future. Co-authored-by: Peter Kjellerstedt <[email protected]> Signed-off-by: Fredrik Hugosson <[email protected]> Signed-off-by: Peter Kjellerstedt <[email protected]> --- meta-oe/recipes-support/lvm2/lvm2.bb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb index f1a1aae2cd..f905a5ac9e 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.bb +++ b/meta-oe/recipes-support/lvm2/lvm2.bb @@ -57,13 +57,16 @@ LVM2_PACKAGECONFIG:append:class-target = " \ " PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev," PACKAGES =+ "libdevmapper" FILES:libdevmapper = " \ ${libdir}/libdevmapper.so.* \ ${sbindir}/dmsetup \ ${sbindir}/dmstats \ + ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \ + ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \ + ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \ " FILES:${PN} += " \ @@ -71,7 +74,13 @@ FILES:${PN} += " \ ${systemd_system_unitdir} \ ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ + ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \ + ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \ " +# Remove /lib/udev from FILES:${PN} so that any new rules files that are added +# upstream will have to be explicitly added to either FILES:${PN} or +# FILES:libdevmapper. +FILES:${PN}:remove = "${nonarch_base_libdir}/udev" FILES:${PN}-scripts = " \ ${sbindir}/blkdeactivate \ @@ -79,11 +88,8 @@ FILES:${PN}-scripts = " \ ${sbindir}/lvmconf \ ${sbindir}/lvmdump \ " -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" + RDEPENDS:${PN} = "bash" -RDEPENDS:${PN}-udevrules = "libdevmapper" RDEPENDS:${PN}:append:class-target = " libdevmapper" RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112710): https://lists.openembedded.org/g/openembedded-devel/message/112710 Mute This Topic: https://lists.openembedded.org/mt/108887244/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
