From: Luca Boccassi <bluca@debian.org>
Date: Fri, 2 Jul 2021 18:11:58 +0000 (+0100)
Subject: meson: fix crypt_activate_by_signed_key detection
X-Git-Tag: v2.38-rc1~375^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a6e9adfdcbd02cc0ab30d3a820a034b11dfef75;p=thirdparty%2Futil-linux.git

meson: fix crypt_activate_by_signed_key detection

It should set HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY, rather than HAVE_CRYPTSETUP
which enables the verity features, as it needs to detect the availability of
the crypt_activate_by_signed_key API
---

diff --git a/meson.build b/meson.build
index 093a586a01..83e25a746f 100644
--- a/meson.build
+++ b/meson.build
@@ -323,7 +323,7 @@ conf.set('CRYPTSETUP_VIA_DLOPEN', lib_cryptsetup_dl.found() ? 1 : false)
 have = cc.has_function(
   'crypt_activate_by_signed_key',
   dependencies : lib_cryptsetup)
-conf.set('HAVE_CRYPTSETUP', have ? 1 : false)
+conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false)
 
 lib_cap_ng = dependency(
   'libcap-ng')