cryptsetup strongly encourages to link against libblkid since 2.0.4.

There's no point in enabling an SSE implementation on embedded devices.

Signed-off-by: Bastian Krause <[email protected]>
---
 rules/cryptsetup.in   | 1 +
 rules/cryptsetup.make | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/cryptsetup.in b/rules/cryptsetup.in
index 67ce41beb..1a4f8f814 100644
--- a/rules/cryptsetup.in
+++ b/rules/cryptsetup.in
@@ -5,6 +5,7 @@ menuconfig CRYPTSETUP
        select LVM2
        select LIBUUID
        select LIBPOPT
+       select LIBBLKID
        select LIBGCRYPT        if CRYPTSETUP_CRYPT_BACKEND_GCRYPT
        select OPENSSL          if CRYPTSETUP_CRYPT_BACKEND_OPENSSL
        select NETTLE           if CRYPTSETUP_CRYPT_BACKEND_NETTLE
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index fbc30d868..ec82b4add 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION     := 2.0.3
-CRYPTSETUP_MD5         := 9161132f69e97018b39ab592d7831f61
+CRYPTSETUP_VERSION     := 2.0.6
+CRYPTSETUP_MD5         := c01aa63a90acdb25600ed9126fa2b1a1
 CRYPTSETUP             := cryptsetup-$(CRYPTSETUP_VERSION)
 CRYPTSETUP_SUFFIX      := tar.gz
 CRYPTSETUP_URL         := 
https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename 
$(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
@@ -52,6 +52,8 @@ CRYPTSETUP_CONF_OPT   := \
        --$(call ptx/endis, 
PTXCONF_CRYPTSETUP_CRYPT_BACKEND_GCRYPT)-gcrypt-pbkdf2 \
        --enable-internal-argon2 \
        --disable-libargon2 \
+       --disable-internal-sse-argon2 \
+       --enable-blkid \
        --enable-dev-random \
        --disable-python \
        --with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND) \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
[email protected]

Reply via email to