From nobody Sun Feb 8 19:25:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893755; cv=none; d=zohomail.com; s=zohoarc; b=OZhkcaMiU0Rl5b0pdSkuq4Un+ws6nAiLJ3EakLa4GpOqm4cAvhqkNUkxFw5/2WWmkr59AxWx2zAT43Kl21LWLwR/Z4fN3T2Nvs3wIcO4Kf4p6lO0/SELu54DMbxahdU6t9rJU+l2G6ZMBq7XP1teUkcmPPnviqKfgLb3nO91rGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893755; h=Content-Type:Content-Transfer-Encoding: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=nMmNbvibAmwaHWbPqHZy7a78M6GAWEACKLfocJMoeKc=; b=DzknW7Q9XFhoxIqblCQkMwaLYmzNTmI6v70SPtooCCqElJgjZUvqEl8LHICO8oe8o8QQ+BjPKFxMe9wB8pukTXAeM4byOlgdfucEjeR9xXaa8guXi9bFh5vZIKnAHNkgYlt9QmMwP2JKqcvzfuvyhiBaAvSeZZZZGp1C5/7Dh8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 159489375587038.17771591393512; Thu, 16 Jul 2020 03:02:35 -0700 (PDT) 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-23-0vczmThPMEKKJ1IEH-Unhg-1; Thu, 16 Jul 2020 06:02:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65899100CCEC; Thu, 16 Jul 2020 10:02:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 197C372AE4; Thu, 16 Jul 2020 10:02:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D77F41806B0C; Thu, 16 Jul 2020 10:02:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA2D1n016235 for ; Thu, 16 Jul 2020 06:02:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F7C02DE69; Thu, 16 Jul 2020 10:02:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A5A2B6DB for ; Thu, 16 Jul 2020 10:02:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893754; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nMmNbvibAmwaHWbPqHZy7a78M6GAWEACKLfocJMoeKc=; b=aimbgfqDj/bU8tbB2ZKyA9IBAQpfIrk6BNnGStCXUCcjDYrTgfXzNR9MgOaIR9WDluebiG ZhTmDrv8kQ0TxAmxFNiMWsxYNNgvGs5Icuxz6SVc6HuCNu13fEAS3EefJV1l7yaCiZkIzI uBOPkmjzCyu2HAXGbchOZpQJ3c0ykFk= X-MC-Unique: 0vczmThPMEKKJ1IEH-Unhg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 059/351] meson: add libssh2 build dependency Date: Thu, 16 Jul 2020 11:54:55 +0200 Message-Id: <5760af0d4d0078f34532f8c2bcb1f0626e6041d9.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 4 ---- m4/virt-ssh2.m4 | 30 ------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 m4/virt-ssh2.m4 diff --git a/configure.ac b/configure.ac index 1709f56a8b5..c81db75ae33 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,6 @@ fi # RPC, we don't need several libraries. if test "$with_remote" =3D "no" ; then with_libvirtd=3Dno - with_ssh2=3Dno with_sasl=3Dno fi # Stateful drivers are useful only when building the daemon. @@ -121,7 +120,6 @@ LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX -LIBVIRT_ARG_SSH2 LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK @@ -140,7 +138,6 @@ LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX -LIBVIRT_CHECK_SSH2 LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK @@ -439,7 +436,6 @@ LIBVIRT_RESULT_RBD LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX -LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4 deleted file mode 100644 index f712f81fe2c..00000000000 --- a/m4/virt-ssh2.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libssh2.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SSH2],[ - LIBVIRT_ARG_WITH_FEATURE([SSH2], [libssh2], [check], [1.3]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SSH2],[ - LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3]) -]) - -AC_DEFUN([LIBVIRT_RESULT_SSH2],[ - LIBVIRT_RESULT_LIB([SSH2]) -]) diff --git a/meson.build b/meson.build index 2ab3aa87dea..6f37862611a 100644 --- a/meson.build +++ b/meson.build @@ -1132,6 +1132,16 @@ else libssh_dep =3D dependency('', required: false) endif =20 +libssh2_version =3D '1.3' +if get_option('driver_remote').enabled() + libssh2_dep =3D dependency('libssh2', version: '>=3D' + libssh2_version,= required: get_option('libssh2')) + if libssh2_dep.found() + conf.set('WITH_SSH2', 1) + endif +else + libssh2_dep =3D dependency('', required: false) +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1299,6 +1309,7 @@ libs_summary =3D { 'libnl': libnl_dep.found(), 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), + 'libssh2': libssh2_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 9588db5b835..a6e53ca36dc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,5 +26,6 @@ option('hal', type: 'feature', value: 'auto', description= : 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap su= pport') option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') +option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2