From 63962e7ad48335def7ffb88aecb67dd37c68e17a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 18 Sep 2018 10:26:07 +0200 Subject: libblockdev: make various features optional Signed-off-by: Max Kellermann Signed-off-by: Khem Raj --- meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb index bf33b968e2..021f641425 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb @@ -10,12 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools python3native gobject-introspection -DEPENDS += " \ - cryptsetup \ - libbytesize \ - btrfs-tools \ -" - SRCREV = "0debeb45562ac3d8f6f43f6f942b238abab55be9" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ @@ -25,7 +19,7 @@ S = "${WORKDIR}/git" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow" +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd lvm-dbus" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" @@ -39,6 +33,12 @@ PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm" PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo" PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" +PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" +PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" +PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus,--without-lvm_dbus" +PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" -- cgit 1.2.3-korg