diff mbox series

[v3,09/13] package/libblockdev: add support for part plugin

Message ID 20200725230618.3640682-10-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>
---
 package/libblockdev/Config.in      | 8 ++++++++
 package/libblockdev/libblockdev.mk | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

Comments

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

> From: Adam Duskett <Aduskett@gmail.com>
> 
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> ---
>  package/libblockdev/Config.in      | 8 ++++++++
>  package/libblockdev/libblockdev.mk | 8 +++++++-
>  2 files changed, 15 insertions(+), 1 deletion(-)

Applied to next, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in
index c51449b6ca..ffc92a89d1 100644
--- a/package/libblockdev/Config.in
+++ b/package/libblockdev/Config.in
@@ -49,6 +49,14 @@  config BR2_PACKAGE_LIBBLOCKDEV_MDRAID
 	bool "mdraid"
 	select BR2_PACKAGE_LIBBYTESIZE
 
+config BR2_PACKAGE_LIBBLOCKDEV_PART
+	bool "part"
+	depends on BR2_ENABLE_LOCALE # parted
+	select BR2_PACKAGE_PARTED
+
+comment "part 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 6bf3ad477a..41c64acc9c 100644
--- a/package/libblockdev/libblockdev.mk
+++ b/package/libblockdev/libblockdev.mk
@@ -23,7 +23,6 @@  LIBBLOCKDEV_CONF_OPTS = \
 	--without-lvm_dbus \
 	--without-mpath \
 	--without-nvdimm \
-	--without-parted \
 	--without-python2 \
 	--without-python3 \
 	--without-s390 \
@@ -65,4 +64,11 @@  else
 LIBBLOCKDEV_CONF_OPTS += --without-mdraid
 endif
 
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_PART),y)
+LIBBLOCKDEV_DEPENDENCIES += parted
+LIBBLOCKDEV_CONF_OPTS += --with-part
+else
+LIBBLOCKDEV_CONF_OPTS += --without-part
+endif
+
 $(eval $(autotools-package))