Skip to contentSkip to conversation

package/cryptsetup: use libargon2 when available

PATCH New Pascal de Bruijn 2 participants 2 messages Dec 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cryptsetup: use libargon2 when available

cryptsetup has an internal copy of libargon2, which is used by default, but when libargon2 is available as a proper system library this is a duplication.

---
 package/cryptsetup/cryptsetup.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/cryptsetup/cryptsetup.mk +4 -0
index 7788bfb..2941328 100644
@@ -29,6 +29,10 @@ else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
+ifeq ($(BR2_PACKAGE_LIBARGON2),y)
+CRYPTSETUP_CONF_OPTS += --enable-libargon2
+endif
+
 HOST_CRYPTSETUP_DEPENDENCIES = \
 	host-pkgconf \
 	host-lvm2 \
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/cryptsetup: use libargon2 when available

Hello,

Quoted 14 lines · On Tue, 3 Dec 2019 10:27:15 +0100 Pascal de Bruijn <[email protected]>…

cryptsetup has an internal copy of libargon2, which is used by default, but when libargon2 is available as a proper system library this is a duplication.

---
 package/cryptsetup/cryptsetup.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/cryptsetup/cryptsetup.mk +0 -0
index 7788bfb..2941328 100644

package/cryptsetup/cryptsetup.mk else · line 34

Quoted 6 lines
package/cryptsetup/cryptsetup.mk +3 -0
@@ -29,6 +29,10 @@ else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
+ifeq ($(BR2_PACKAGE_LIBARGON2),y)
+CRYPTSETUP_CONF_OPTS += --enable-libargon2
+endif

Then we want to use --disable-libargon2 when the libargon2 package is not enabled. If libargon2 is mandatory for crypsetup, then we always want to use the separate package rather than the internal copy from cryptsetup.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com