diff mbox series

[06/12] package/libblockdev: add fs plugin support

Message ID 20200723010810.3237608-7-aduskett@gmail.com
State Changes Requested, archived
Headers show
Series package/udisks: bump version to 2.9.0 | expand

Commit Message

Adam Duskett July 23, 2020, 1:08 a.m. UTC 
From: Adam Duskett <Aduskett@gmail.com>

This plugin enables the fs plugin for the libblockdev library, which is
required for newer versions of the udisks package.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 package/libblockdev/Config.in      | 4 ++++
 package/libblockdev/libblockdev.mk | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in
index 6740b7ac6c..db67afd648 100644
--- a/package/libblockdev/Config.in
+++ b/package/libblockdev/Config.in
@@ -33,6 +33,10 @@  config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO
 	select BR2_PACKAGE_LIBNSS
 	select BR2_PACKAGE_VOLUME_KEY
 
+config BR2_PACKAGE_LIBBLOCKDEV_FS
+	bool "Filesystem plugin"
+	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+
 endif
 
 comment "libblockdev needs udev /dev management and a glibc or musl toolchain w/ locale, wchar, threads, dynamic library"
diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk
index 72163d8a94..2fd24e6103 100644
--- a/package/libblockdev/libblockdev.mk
+++ b/package/libblockdev/libblockdev.mk
@@ -24,7 +24,6 @@  LIBBLOCKDEV_CONF_OPTS = \
 	--enable-introspection=no \
 	--without-bcache \
 	--without-btrfs \
-	--without-fs \
 	--without-dm \
 	--without-dmraid \
 	--without-nvdimm \
@@ -45,4 +44,10 @@  else
 LIBBLOCKDEV_CONF_OPTS += --without-crypto --without-escrow
 endif
 
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_FS),y)
+LIBBLOCKDEV_CONF_OPTS += --with-fs
+else
+LIBBLOCKDEV_CONF_OPTS += --without-fs
+endif
+
 $(eval $(autotools-package))