summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-02-18 03:10:09 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-22 13:16:47 +0100
commit62ee47f2c9dba7dcdf069cf5db2c7fc99e9359a7 (patch)
tree53aa62756d180b777db0340c1f1e1f41ebcc7dee /meta-oe/recipes-support
parent698d512877b9a4716bb2f08c86cedab26cbb524c (diff)
downloadmeta-openembedded-62ee47f2c9dba7dcdf069cf5db2c7fc99e9359a7.tar.gz
lvm2: Add a PACKAGECONFIG for dmeventd
This allows the support for dmeventd to be disabled. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 5d228ea96..2c0ad291a 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
18inherit autotools-brokensep pkgconfig systemd 18inherit autotools-brokensep pkgconfig systemd
19 19
20LVM2_PACKAGECONFIG = "" 20LVM2_PACKAGECONFIG = "dmeventd"
21LVM2_PACKAGECONFIG_append_class-target = " \ 21LVM2_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 \
@@ -32,6 +32,7 @@ PACKAGECONFIG ??= "${LVM2_PACKAGECONFIG}"
32# upstream... 32# upstream...
33PACKAGECONFIG_append = " odirect" 33PACKAGECONFIG_append = " odirect"
34 34
35PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd"
35PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" 36PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
36PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" 37PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
37PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" 38PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
@@ -45,7 +46,6 @@ EXTRA_OECONF = "--with-user= \
45 --enable-applib \ 46 --enable-applib \
46 --enable-cmdlib \ 47 --enable-cmdlib \
47 --enable-pkgconfig \ 48 --enable-pkgconfig \
48 --enable-dmeventd \
49 --enable-lvmetad \ 49 --enable-lvmetad \
50 --with-usrlibdir=${libdir} \ 50 --with-usrlibdir=${libdir} \
51 --with-systemdsystemunitdir=${systemd_system_unitdir} \ 51 --with-systemdsystemunitdir=${systemd_system_unitdir} \
@@ -74,8 +74,9 @@ do_install_append() {
74} 74}
75 75
76SYSTEMD_PACKAGES = "${PN}" 76SYSTEMD_PACKAGES = "${PN}"
77SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service lvm2-lvmetad.socket \ 77SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
78 lvm2-pvscan@.service blk-availability.service" 78 lvm2-lvmetad.socket lvm2-pvscan@.service \
79 blk-availability.service"
79SYSTEMD_AUTO_ENABLE = "disable" 80SYSTEMD_AUTO_ENABLE = "disable"
80 81
81TARGET_CC_ARCH += "${LDFLAGS}" 82TARGET_CC_ARCH += "${LDFLAGS}"