summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.bb16
1 files changed, 11 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index f1a1aae2c..f905a5ac9 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 = " \
57" 57"
58 58
59PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" 59PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
60PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" 60PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
61 61
62PACKAGES =+ "libdevmapper" 62PACKAGES =+ "libdevmapper"
63FILES:libdevmapper = " \ 63FILES:libdevmapper = " \
64 ${libdir}/libdevmapper.so.* \ 64 ${libdir}/libdevmapper.so.* \
65 ${sbindir}/dmsetup \ 65 ${sbindir}/dmsetup \
66 ${sbindir}/dmstats \ 66 ${sbindir}/dmstats \
67 ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
68 ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
69 ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
67" 70"
68 71
69FILES:${PN} += " \ 72FILES:${PN} += " \
@@ -71,7 +74,13 @@ FILES:${PN} += " \
71 ${systemd_system_unitdir} \ 74 ${systemd_system_unitdir} \
72 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ 75 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
73 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ 76 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
77 ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
78 ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
74" 79"
80# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
81# upstream will have to be explicitly added to either FILES:${PN} or
82# FILES:libdevmapper.
83FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
75 84
76FILES:${PN}-scripts = " \ 85FILES:${PN}-scripts = " \
77 ${sbindir}/blkdeactivate \ 86 ${sbindir}/blkdeactivate \
@@ -79,11 +88,8 @@ FILES:${PN}-scripts = " \
79 ${sbindir}/lvmconf \ 88 ${sbindir}/lvmconf \
80 ${sbindir}/lvmdump \ 89 ${sbindir}/lvmdump \
81" 90"
82# Specified explicitly for the udev rules, just in case that it does not get picked 91
83# up automatically:
84FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
85RDEPENDS:${PN} = "bash" 92RDEPENDS:${PN} = "bash"
86RDEPENDS:${PN}-udevrules = "libdevmapper"
87RDEPENDS:${PN}:append:class-target = " libdevmapper" 93RDEPENDS:${PN}:append:class-target = " libdevmapper"
88RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" 94RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
89 95