diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 09:41:49 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 10:54:22 +0200 |
| commit | 1378738a71d95d42e7b662daf0fda3460221e9f2 (patch) | |
| tree | 02751697b2e81de4a4b0accd3154475e73d8e4b9 /rules | |
| parent | e63ecc69e7ec211c830aea705aa429d66d923d80 (diff) | |
| download | ptxdist-1378738a71d95d42e7b662daf0fda3460221e9f2.tar.gz ptxdist-1378738a71d95d42e7b662daf0fda3460221e9f2.tar.xz | |
cryptsetup: version bump 2.0.6 -> 2.3.2
The old version fails to build with json-c 0.14:
lib/luks2/luks2_internal.h:62:10: error: conflicting types for 'json_object_get_uint64'
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/cryptsetup.make | 8 | ||||
| -rw-r--r-- | rules/host-cryptsetup.make | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make index 2169d900b..a997933f8 100644 --- a/rules/cryptsetup.make +++ b/rules/cryptsetup.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup # # Paths and names # -CRYPTSETUP_VERSION := 2.0.6 -CRYPTSETUP_MD5 := c01aa63a90acdb25600ed9126fa2b1a1 +CRYPTSETUP_VERSION := 2.3.2 +CRYPTSETUP_MD5 := ced7b4720a6cc2dadeeb46b8e52b080e 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) @@ -33,10 +33,10 @@ CRYPTSETUP_LICENSE := GPL-2.0-or-later CRYPTSETUP_CONF_TOOL := autoconf CRYPTSETUP_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --disable-rpath \ --enable-keyring \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-nls \ - --disable-rpath \ --disable-fips \ --disable-pwquality \ --disable-static-cryptsetup \ @@ -53,7 +53,7 @@ CRYPTSETUP_CONF_OPT := \ --disable-internal-sse-argon2 \ --enable-blkid \ --enable-dev-random \ - --disable-python \ + --enable-luks-adjust-xts-keysize \ --with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND) \ --with-luks2-lock-path=/run/cryptsetup diff --git a/rules/host-cryptsetup.make b/rules/host-cryptsetup.make index 749a0b88b..360d6bf3c 100644 --- a/rules/host-cryptsetup.make +++ b/rules/host-cryptsetup.make @@ -21,9 +21,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_CRYPTSETUP) += host-cryptsetup HOST_CRYPTSETUP_CONF_TOOL := autoconf HOST_CRYPTSETUP_CONF_OPT := \ $(HOST_AUTOCONF) \ + --disable-rpath \ --disable-keyring \ --disable-nls \ - --disable-rpath \ --disable-fips \ --disable-pwquality \ --disable-static-cryptsetup \ @@ -40,7 +40,7 @@ HOST_CRYPTSETUP_CONF_OPT := \ --disable-internal-sse-argon2 \ --enable-blkid \ --enable-dev-random \ - --disable-python \ + --enable-luks-adjust-xts-keysize \ --with-crypto_backend=openssl # vim: syntax=make |