summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc15
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 a891950d5a..a8d44daea3 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -5,7 +5,6 @@ LICENSE = "GPLv2 & LGPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" 6 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
7 7
8S = "${WORKDIR}/LVM2.${PV}"
9SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ 8SRC_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
17PACKAGECONFIG ??= "readline" 16S = "${WORKDIR}/LVM2.${PV}"
17
18inherit autotools-brokensep pkgconfig systemd
19
20PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
21
18PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" 22PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
23PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
19 24
20# Unset user/group to unbreak install. 25# Unset user/group to unbreak install.
21EXTRA_OECONF = "--with-user= \ 26EXTRA_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
37PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
38
39PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
40
41inherit autotools-brokensep pkgconfig systemd
42
43do_install_append() { 42do_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