diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-03-23 11:35:11 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-25 11:27:30 +0100 |
commit | 532ba623344d3233a88a50bd019719dfa783cf5d (patch) | |
tree | dec0849071de0f62ec3fcd5f63aaf353bde0a9b4 /meta-oe/recipes-support | |
parent | 99ec7272016df4c00717ce249a4315f94c21a599 (diff) | |
download | meta-openembedded-532ba623344d3233a88a50bd019719dfa783cf5d.tar.gz |
lvm2: make it more explicit that readline support is disabled by default
Any PACKAGECONFIG default assigned with ??= is lost by subsequent
assignments with +=, therefore lvm2 is currently building with the
readline PACKAGECONFIG disabled. Make that explicitly clear in the
recipe. Also minor formatting updates, to align with style guide.
Signed-off-by: Andre McCurdy <armccurdy@gmail.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.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index a891950d5..a8d44daea 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -5,7 +5,6 @@ LICENSE = "GPLv2 & LGPLv2" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
6 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" | 6 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" |
7 | 7 | ||
8 | S = "${WORKDIR}/LVM2.${PV}" | ||
9 | SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | 8 | SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ |
10 | file://lvm.conf \ | 9 | file://lvm.conf \ |
11 | file://0001-implement-libc-specific-_reopen_stream.patch \ | 10 | file://0001-implement-libc-specific-_reopen_stream.patch \ |
@@ -14,8 +13,14 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ | |||
14 | file://0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ | 13 | file://0004-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \ |
15 | " | 14 | " |
16 | 15 | ||
17 | PACKAGECONFIG ??= "readline" | 16 | S = "${WORKDIR}/LVM2.${PV}" |
17 | |||
18 | inherit autotools-brokensep pkgconfig systemd | ||
19 | |||
20 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | ||
21 | |||
18 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 22 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
23 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | ||
19 | 24 | ||
20 | # Unset user/group to unbreak install. | 25 | # Unset user/group to unbreak install. |
21 | EXTRA_OECONF = "--with-user= \ | 26 | EXTRA_OECONF = "--with-user= \ |
@@ -34,12 +39,6 @@ EXTRA_OECONF = "--with-user= \ | |||
34 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 39 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ |
35 | " | 40 | " |
36 | 41 | ||
37 | PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | ||
38 | |||
39 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," | ||
40 | |||
41 | inherit autotools-brokensep pkgconfig systemd | ||
42 | |||
43 | do_install_append() { | 42 | do_install_append() { |
44 | # Install machine specific configuration file | 43 | # Install machine specific configuration file |
45 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf | 44 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf |