From nobody Fri Dec 19 21:47:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599220196; cv=none; d=zohomail.com; s=zohoarc; b=IxTnNitRrwdX/jXbpXveEMJbM2vFZXnwQmUUMp5rer0UZmMlIT69fB6SgKVJPZIIPtnehsT6AjIMcOAIEKyfNwlaMKJdpO2PzyxRXFxcRq2VYzfQA2dgyzy8F94+c2cPMHrys45huxt+xjFs1jUp3s3M5rE8L6wyoD6BKwtl3/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599220196; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z+9mjdHKOv9RFiWmt5m3sCgd5HvvbIhSDuxtGNSMGjM=; b=RjmMEZxYG+sOoFCopmBbSH++aL9u+MYPDTBk1aO97KlIGBk8lQiKnYfv7hLbY2Q6tSapSFD38jleAY3KMrr+S6JlWG6+1j0tBYaAveu1DErQijQCqmZcUNVQ64xQp/by+BBkZKm7eL/nJ++0z38bCrmwvURav03gDFFJD8X3U20= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599220196295887.716108057786; Fri, 4 Sep 2020 04:49:56 -0700 (PDT) Received: from localhost ([::1]:39132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEAE7-0006jT-E4 for importer@patchew.org; Fri, 04 Sep 2020 07:49:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEA6D-0008DZ-05 for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:47 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:24494 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kEA68-0005Dc-JR for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-289-mHLOstSyM_KPluuI6aLjdw-1; Fri, 04 Sep 2020 07:41:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21DA71DE13 for ; Fri, 4 Sep 2020 11:41:32 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D55689528; Fri, 4 Sep 2020 11:41:31 +0000 (UTC) X-MC-Unique: mHLOstSyM_KPluuI6aLjdw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/46] meson: declare keyutils dependency Date: Fri, 4 Sep 2020 07:40:51 -0400 Message-Id: <20200904114122.31307-16-pbonzini@redhat.com> In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com> References: <20200904114122.31307-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 03:57:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Marc-Andr=C3=A9 Lureau Rename the variable to be more explicit. A further clean-up patch will move the actual to dependency check to meson entirely. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- meson.build | 4 ++++ tests/Makefile.include | 2 +- tests/test-crypto-secret.c | 10 +++++----- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index e65662a3b3..35dedaf803 100755 --- a/configure +++ b/configure @@ -7511,7 +7511,7 @@ fi if test "$secret_keyring" =3D "yes" ; then echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak if test "$have_keyutils" =3D "yes" ; then - echo "CONFIG_TEST_SECRET_KEYRING=3Dy" >> $config_host_mak + echo "CONFIG_KEYUTILS=3Dy" >> $config_host_mak fi fi =20 diff --git a/meson.build b/meson.build index b2d1a909b6..fc46273491 100644 --- a/meson.build +++ b/meson.build @@ -410,6 +410,10 @@ if 'CONFIG_TASN1' in config_host tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), link_args: config_host['TASN1_LIBS'].split()) endif +keyutils =3D not_found +if 'CONFIG_KEYUTILS' in config_host + keyutils =3D declare_dependency(link_args: '-lkeyutils') +endif =20 # Create config-host.h =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index 21adf106c1..468d8b86c6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -246,7 +246,7 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark= -crypto-cipher.o $(test-c tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) =20 -ifeq ($(CONFIG_TEST_SECRET_KEYRING),y) +ifeq ($(CONFIG_KEYUTILS),y) tests/test-crypto-secret.o-libs :=3D -lkeyutils endif =20 diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c index 603a093f10..9d06176663 100644 --- a/tests/test-crypto-secret.c +++ b/tests/test-crypto-secret.c @@ -24,7 +24,7 @@ #include "crypto/secret.h" #include "qapi/error.h" #include "qemu/module.h" -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS #include "crypto/secret_keyring.h" #include #endif @@ -128,7 +128,7 @@ static void test_secret_indirect_emptyfile(void) g_free(fname); } =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS =20 #define DESCRIPTION "qemu_test_secret" #define PAYLOAD "Test Payload" @@ -268,7 +268,7 @@ static void test_secret_keyring_bad_key_access_right(vo= id) keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING); } =20 -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 static void test_secret_noconv_base64_good(void) { @@ -571,7 +571,7 @@ int main(int argc, char **argv) g_test_add_func("/crypto/secret/indirect/emptyfile", test_secret_indirect_emptyfile); =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS g_test_add_func("/crypto/secret/keyring/good", test_secret_keyring_good); g_test_add_func("/crypto/secret/keyring/revoked_key", @@ -582,7 +582,7 @@ int main(int argc, char **argv) test_secret_keyring_bad_serial_key); g_test_add_func("/crypto/secret/keyring/bad_key_access_right", test_secret_keyring_bad_key_access_right); -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 g_test_add_func("/crypto/secret/noconv/base64/good", test_secret_noconv_base64_good); --=20 2.26.2