Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: aduskett at gmail.com <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 04/13] package/libblockdev: add support for crypto plugin
Date: Sat, 25 Jul 2020 16:06:09 -0700	[thread overview]
Message-ID: <20200725230618.3640682-5-aduskett@gmail.com> (raw)
In-Reply-To: <20200725230618.3640682-1-aduskett@gmail.com>

From: Adam Duskett <Aduskett@gmail.com>

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v1 -> v2:
  - Only depend on and select the cryptsetup package.
    The volume-key and libnss packages are only necessary if --with-escrow is
    passed as a conf opt.

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

diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in
index 4fd80f1f5c..50c84c0c4d 100644
--- a/package/libblockdev/Config.in
+++ b/package/libblockdev/Config.in
@@ -16,6 +16,17 @@ config BR2_PACKAGE_LIBBLOCKDEV
 
 	  https://github.com/storaged-project/libblockdev/
 
+if BR2_PACKAGE_LIBBLOCKDEV
+
+comment "plugins"
+
+config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO
+	bool "crypto"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
+	select BR2_PACKAGE_CRYPTSETUP
+
+endif
+
 comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_HAS_UDEV
diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk
index 3040a2a690..bb6fbcdda1 100644
--- a/package/libblockdev/libblockdev.mk
+++ b/package/libblockdev/libblockdev.mk
@@ -16,7 +16,6 @@ LIBBLOCKDEV_CONF_OPTS = \
 	--with-loop \
 	--without-bcache \
 	--without-btrfs \
-	--without-crypto \
 	--without-dm \
 	--without-dmraid \
 	--without-escrow \
@@ -36,4 +35,11 @@ LIBBLOCKDEV_CONF_OPTS = \
 	--without-tools \
 	--without-vdo
 
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_CRYPTO),y)
+LIBBLOCKDEV_DEPENDENCIES += cryptsetup
+LIBBLOCKDEV_CONF_OPTS += --with-crypto
+else
+LIBBLOCKDEV_CONF_OPTS += --without-crypto
+endif
+
 $(eval $(autotools-package))
-- 
2.26.2

  parent reply	other threads:[~2020-07-25 23:06 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-25 23:06 [Buildroot] [PATCH v3 00/13] package/udisks: bump version to 2.9.0 aduskett at gmail.com
2020-07-25 23:06 ` [Buildroot] [PATCH v3 01/13] package/gettext-gnu: add msgfmt wrapper aduskett at gmail.com
2020-08-29 21:55   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 02/13] package/libblockdev: new package aduskett at gmail.com
2020-08-29 14:35   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 03/13] package/libbytesize: " aduskett at gmail.com
2020-07-30 16:43   ` Adam Duskett
2020-08-29 19:19   ` Thomas Petazzoni
2020-07-25 23:06 ` aduskett at gmail.com [this message]
2020-08-29 19:42   ` [Buildroot] [PATCH v3 04/13] package/libblockdev: add support for crypto plugin Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 05/13] package/libblockdev: add support for fs plugin aduskett at gmail.com
2020-08-29 19:45   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 06/13] package/libblockdev: add support for loop plugin aduskett at gmail.com
2020-08-29 19:46   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 07/13] package/libblockdev: add support for lvm plugin aduskett at gmail.com
2020-08-29 19:46   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 08/13] package/libblockdev: add support for mdraid plugin aduskett at gmail.com
2020-08-29 19:46   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 09/13] package/libblockdev: add support for part plugin aduskett at gmail.com
2020-08-29 19:47   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 10/13] package/libblockdev: add support for swap plugin aduskett at gmail.com
2020-08-29 19:57   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 11/13] package/udisks/Config.in: alphabatize package selection aduskett at gmail.com
2020-08-29 21:20   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 12/13] package/udisks/udisks.mk: alphabatize dependencies aduskett at gmail.com
2020-08-29 21:21   ` Thomas Petazzoni
2020-07-25 23:06 ` [Buildroot] [PATCH v3 13/13] package/udisks: bump version to 2.9.0 aduskett at gmail.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200725230618.3640682-5-aduskett@gmail.com \
    --to=aduskett@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox