summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2019-02-08 10:12:15 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-13 08:47:57 +0100
commit36981993662bd66695ee4508c4f22b50b5d73db7 (patch)
tree14b23b8f1aa935e11c10aa2ba9a18179e2e7d560
parentb8176547c02d37e7a408ec36708591a7ea2eec3b (diff)
downloadptxdist-36981993662bd66695ee4508c4f22b50b5d73db7.tar.gz
ptxdist-36981993662bd66695ee4508c4f22b50b5d73db7.tar.xz
cryptsetup: version bump 2.0.3 -> 2.0.6
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 <bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/cryptsetup.in1
-rw-r--r--rules/cryptsetup.make6
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) \