diff options
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 2c0ad291a2..438ea7b606 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
| @@ -17,7 +17,7 @@ S = "${WORKDIR}/LVM2.${PV}" | |||
| 17 | 17 | ||
| 18 | inherit autotools-brokensep pkgconfig systemd | 18 | inherit autotools-brokensep pkgconfig systemd |
| 19 | 19 | ||
| 20 | LVM2_PACKAGECONFIG = "dmeventd" | 20 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" |
| 21 | LVM2_PACKAGECONFIG_append_class-target = " \ | 21 | LVM2_PACKAGECONFIG_append_class-target = " \ |
| 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
| 23 | thin-provisioning-tools \ | 23 | thin-provisioning-tools \ |
| @@ -33,6 +33,7 @@ PACKAGECONFIG ??= "${LVM2_PACKAGECONFIG}" | |||
| 33 | PACKAGECONFIG_append = " odirect" | 33 | PACKAGECONFIG_append = " odirect" |
| 34 | 34 | ||
| 35 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" | 35 | PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" |
| 36 | PACKAGECONFIG[lvmetad] = "--enable-lvmetad,--disable-lvmetad" | ||
| 36 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" | 37 | PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" |
| 37 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 38 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
| 38 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 39 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
| @@ -46,7 +47,6 @@ EXTRA_OECONF = "--with-user= \ | |||
| 46 | --enable-applib \ | 47 | --enable-applib \ |
| 47 | --enable-cmdlib \ | 48 | --enable-cmdlib \ |
| 48 | --enable-pkgconfig \ | 49 | --enable-pkgconfig \ |
| 49 | --enable-lvmetad \ | ||
| 50 | --with-usrlibdir=${libdir} \ | 50 | --with-usrlibdir=${libdir} \ |
| 51 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 51 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ |
| 52 | --disable-thin_check_needs_check \ | 52 | --disable-thin_check_needs_check \ |
| @@ -75,7 +75,7 @@ do_install_append() { | |||
| 75 | 75 | ||
| 76 | SYSTEMD_PACKAGES = "${PN}" | 76 | SYSTEMD_PACKAGES = "${PN}" |
| 77 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ | 77 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ |
| 78 | lvm2-lvmetad.socket lvm2-pvscan@.service \ | 78 | ${@bb.utils.contains('PACKAGECONFIG', 'lvmetad', 'lvm2-lvmetad.socket lvm2-pvscan@.service', '', d)} \ |
| 79 | blk-availability.service" | 79 | blk-availability.service" |
| 80 | SYSTEMD_AUTO_ENABLE = "disable" | 80 | SYSTEMD_AUTO_ENABLE = "disable" |
| 81 | 81 | ||
