aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/lvm2
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-02-18 03:10:06 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-22 13:16:46 +0100
commit02848f9707058ef96eaea06fd825892b9e16291f (patch)
tree85774452d5fdbcef358907557afce412540323cd /meta-oe/recipes-support/lvm2
parent247256f42ed9fa4e70d2a9ae47c400eb749b1aad (diff)
downloadmeta-openembedded-contrib-02848f9707058ef96eaea06fd825892b9e16291f.tar.gz
meta-openembedded-contrib-02848f9707058ef96eaea06fd825892b9e16291f.tar.bz2
meta-openembedded-contrib-02848f9707058ef96eaea06fd825892b9e16291f.zip
lvm2: Make sure odirect is always enabled
Make sure that even if PACKAGECONFIG is modified in a bbappend, odirect will still be enabled. 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/lvm2')
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 333223ad04..f69acdec38 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -19,21 +19,18 @@ inherit autotools-brokensep pkgconfig systemd
PACKAGECONFIG_class-target ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
thin-provisioning-tools \
- odirect \
"
-# odirect is enabled by default also for native compilation because
-# there's currently a bug in lib/device/dev-io.c which prevents
-# compiling without it. It is better to stick to configurations that
-# were actually tested by upstream...
-PACKAGECONFIG ??= " \
- odirect \
-"
+# odirect is always enabled because there currently is a bug in
+# lib/device/dev-io.c which prevents compiling without it. It is
+# better to stick to configurations that were actually tested by
+# upstream...
+PACKAGECONFIG_append = " odirect"
+PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools"
-PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
# Unset user/group to unbreak install.
EXTRA_OECONF = "--with-user= \