From 62ee47f2c9dba7dcdf069cf5db2c7fc99e9359a7 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 18 Feb 2017 03:10:09 +0100 Subject: lvm2: Add a PACKAGECONFIG for dmeventd This allows the support for dmeventd to be disabled. Signed-off-by: Peter Kjellerstedt Signed-off-by: Martin Jansa --- meta-oe/recipes-support/lvm2/lvm2.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 5d228ea966..2c0ad291a2 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}" inherit autotools-brokensep pkgconfig systemd -LVM2_PACKAGECONFIG = "" +LVM2_PACKAGECONFIG = "dmeventd" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ thin-provisioning-tools \ @@ -32,6 +32,7 @@ PACKAGECONFIG ??= "${LVM2_PACKAGECONFIG}" # upstream... PACKAGECONFIG_append = " odirect" +PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" @@ -45,7 +46,6 @@ EXTRA_OECONF = "--with-user= \ --enable-applib \ --enable-cmdlib \ --enable-pkgconfig \ - --enable-dmeventd \ --enable-lvmetad \ --with-usrlibdir=${libdir} \ --with-systemdsystemunitdir=${systemd_system_unitdir} \ @@ -74,8 +74,9 @@ do_install_append() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service lvm2-lvmetad.socket \ - lvm2-pvscan@.service blk-availability.service" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + lvm2-lvmetad.socket lvm2-pvscan@.service \ + blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" -- cgit v1.2.3-54-g00ecf