From dd1ddae07048f962c9c915ce631fdbd29e0a96fb Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 6 Sep 2016 05:15:15 -0400 Subject: lvm2: add PACKAGECONFIG for lvm thin provisioning The thin provisioning tools is runtime dependency, so disable build time detection. Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa --- meta-oe/recipes-support/lvm2/lvm2.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-support/lvm2/lvm2.inc') 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}" inherit autotools-brokensep pkgconfig systemd -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + thin-provisioning-tools \ +" 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" # Unset user/group to unbreak install. EXTRA_OECONF = "--with-user= \ @@ -38,6 +41,11 @@ EXTRA_OECONF = "--with-user= \ --with-udev-prefix= \ --with-usrlibdir=${libdir} \ --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --disable-thin_check_needs_check \ + --with-thin-check=${sbindir}/thin_check \ + --with-thin-dump=${sbindir}/thin_dump \ + --with-thin-repair=${sbindir}/thin_repair \ + --with-thin-restore=${sbindir}/thin_restore \ " CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" @@ -66,6 +74,6 @@ TARGET_CC_ARCH += "${LDFLAGS}" FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev" FILES_${PN}-dbg += "${libdir}/device-mapper/.debug" -RDEPENDS_${PN} = "bash thin-provisioning-tools" +RDEPENDS_${PN} = "bash" CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" -- cgit 1.2.3-korg