diff mbox series

[v3,05/13] package/libblockdev: add support for fs plugin

Message ID 20200725230618.3640682-6-aduskett@gmail.com
State Accepted
Headers show
Series package/udisks: bump version to 2.9.0 | expand

Commit Message

Adam Duskett July 25, 2020, 11:06 p.m. UTC 
From: Adam Duskett <Aduskett@gmail.com>

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v1 -> v2:
  - Change BR2_PACKAGE_UTIL_LINUX_LIBMOUNT to BR2_PACKAGE_PARTED which is the
    proper dependency on this plugin.

 package/libblockdev/Config.in      | 8 ++++++++
 package/libblockdev/libblockdev.mk | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni Aug. 29, 2020, 7:45 p.m. UTC | #1 
On Sat, 25 Jul 2020 16:06:10 -0700
aduskett@gmail.com wrote:

> +config BR2_PACKAGE_LIBBLOCKDEV_FS
> +	bool "filesystem"
> +	depends on BR2_ENABLE_LOCALE # parted
> +	select BR2_PACKAGE_PARTED

You had forgotten that parted had a dependency on !uclibc. However, we
had a patch sitting in patchwork to remove this dependency, so I
applied it, and then applied this patch to next.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in
index 50c84c0c4d..a514f01875 100644
--- a/package/libblockdev/Config.in
+++ b/package/libblockdev/Config.in
@@ -25,6 +25,14 @@  config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
 	select BR2_PACKAGE_CRYPTSETUP
 
+config BR2_PACKAGE_LIBBLOCKDEV_FS
+	bool "filesystem"
+	depends on BR2_ENABLE_LOCALE # parted
+	select BR2_PACKAGE_PARTED
+
+comment "filesystem plugin needs a toolchain w/ locale"
+	depends on !BR2_ENABLE_LOCALE
+
 endif
 
 comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library"
diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk
index bb6fbcdda1..7cb5ceb9bb 100644
--- a/package/libblockdev/libblockdev.mk
+++ b/package/libblockdev/libblockdev.mk
@@ -19,7 +19,6 @@  LIBBLOCKDEV_CONF_OPTS = \
 	--without-dm \
 	--without-dmraid \
 	--without-escrow \
-	--without-fs \
 	--without-kbd \
 	--without-loop \
 	--without-lvm \
@@ -42,4 +41,11 @@  else
 LIBBLOCKDEV_CONF_OPTS += --without-crypto
 endif
 
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_FS),y)
+LIBBLOCKDEV_DEPENDENCIES += parted
+LIBBLOCKDEV_CONF_OPTS += --with-fs
+else
+LIBBLOCKDEV_CONF_OPTS += --without-fs
+endif
+
 $(eval $(autotools-package))