diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2016-09-06 05:15:15 -0400 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-11 09:11:24 +0200 |
| commit | dd1ddae07048f962c9c915ce631fdbd29e0a96fb (patch) | |
| tree | 567c5dc8d7d050163565a3dd7d0cc7124eb12b66 | |
| parent | 07c1512928f21fdb72a02691c6119f0e410f370f (diff) | |
| download | meta-openembedded-dd1ddae07048f962c9c915ce631fdbd29e0a96fb.tar.gz | |
lvm2: add PACKAGECONFIG for lvm thin provisioning
The thin provisioning tools is runtime dependency,
so disable build time detection.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index e2feeb3649..d66daf8c29 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
| @@ -18,10 +18,13 @@ S = "${WORKDIR}/LVM2.${PV}" | |||
| 18 | 18 | ||
| 19 | inherit autotools-brokensep pkgconfig systemd | 19 | inherit autotools-brokensep pkgconfig systemd |
| 20 | 20 | ||
| 21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
| 22 | thin-provisioning-tools \ | ||
| 23 | " | ||
| 22 | 24 | ||
| 23 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 25 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
| 24 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 26 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
| 27 | PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" | ||
| 25 | 28 | ||
| 26 | # Unset user/group to unbreak install. | 29 | # Unset user/group to unbreak install. |
| 27 | EXTRA_OECONF = "--with-user= \ | 30 | EXTRA_OECONF = "--with-user= \ |
| @@ -38,6 +41,11 @@ EXTRA_OECONF = "--with-user= \ | |||
| 38 | --with-udev-prefix= \ | 41 | --with-udev-prefix= \ |
| 39 | --with-usrlibdir=${libdir} \ | 42 | --with-usrlibdir=${libdir} \ |
| 40 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 43 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ |
| 44 | --disable-thin_check_needs_check \ | ||
| 45 | --with-thin-check=${sbindir}/thin_check \ | ||
| 46 | --with-thin-dump=${sbindir}/thin_dump \ | ||
| 47 | --with-thin-repair=${sbindir}/thin_repair \ | ||
| 48 | --with-thin-restore=${sbindir}/thin_restore \ | ||
| 41 | " | 49 | " |
| 42 | 50 | ||
| 43 | CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" | 51 | CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" |
| @@ -66,6 +74,6 @@ TARGET_CC_ARCH += "${LDFLAGS}" | |||
| 66 | FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev" | 74 | FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev" |
| 67 | FILES_${PN}-dbg += "${libdir}/device-mapper/.debug" | 75 | FILES_${PN}-dbg += "${libdir}/device-mapper/.debug" |
| 68 | 76 | ||
| 69 | RDEPENDS_${PN} = "bash thin-provisioning-tools" | 77 | RDEPENDS_${PN} = "bash" |
| 70 | 78 | ||
| 71 | CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" | 79 | CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" |
