From c41ed7f332ea41984d26ad4a9ee242819c6a5a4c Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Fri, 27 Jul 2018 14:20:33 +0300 Subject: libblockdev: cleanup/fix PACKAGECONFIG/dependencies It only makes sense to rdepend on lvm2 if lvm is enabled by the configuration and the nss and volume-key dependencies are only needed if --with-escrow is configured. These dependencies are quite big so it's good to have a way to disable them. Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'meta-oe/recipes-extended/libblockdev') diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb index 4dbd04cd7b..a58871f0c9 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb @@ -12,8 +12,6 @@ inherit autotools python3native gobject-introspection DEPENDS += " \ cryptsetup \ - nss \ - volume-key \ libbytesize \ btrfs-tools \ " @@ -26,16 +24,12 @@ SRC_URI = " \ S = "${WORKDIR}/git" -RDEPENDS_${PN} += " \ - lvm2 \ -" - FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs" +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" -PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm" PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod" @@ -44,6 +38,7 @@ PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" 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" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" -- cgit 1.2.3-korg