From nobody Mon Feb 9 01:06:33 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=1594893769; cv=none; d=zohomail.com; s=zohoarc; b=KjGIYgrQjbWOlgRguOR6z1PJ+iUPXEVy0TMW7y9nwJ0WWZfYfTcqiUyXwmRWioVuuOt/glBl0Xkf+MbVoML6BNIKE0M5xxHFbF5zTbZYHk/fYCq7WdtcNiLpoWm57nbZNJoQtkicTZZZ5GFGsRNnUDtFBmL+66xUJoJWmUPc5gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893769; 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=bUaTLBYGC4sxz7UgtJ9Jcpp0zDYy+/Av+cSoCrHkqZE=; b=T/Jvrqc48o8sovoP5ni2G+9N5HCxHo8fm9v3bvCVXlVBv7OwjVOHuLAp0aNr2wQxycF8iLTX2S6DxotnrCnRrTI4M5XQYGNsdP6QAEgykie741mpACBchghfNnV9K1Eygr185zMiz6r3KLQqlj9zx7ZzrYe8XOWU8mN9lWLw57c= 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 1594893769879180.86817585668916; Thu, 16 Jul 2020 03:02:49 -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-81--Nyce9xPMH23o0xOJPC-rg-1; Thu, 16 Jul 2020 06:02:44 -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 DEBCF1888AD8; Thu, 16 Jul 2020 10:02:08 +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 BE2C072ADB; Thu, 16 Jul 2020 10:02:08 +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 8B1BE1809557; Thu, 16 Jul 2020 10:02:08 +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 06GA0rWh015568 for ; Thu, 16 Jul 2020 06:00:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 395FC2DE6F; Thu, 16 Jul 2020 10:00:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8D172DE6B for ; Thu, 16 Jul 2020 10:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893768; 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=bUaTLBYGC4sxz7UgtJ9Jcpp0zDYy+/Av+cSoCrHkqZE=; b=g6Jid9lzIhGSXF7P0gZ2dgr4bRBUwlZed3Lts4b5YEfs7NFsqSyGn6HwJaHYTRxBaLLeCi /tBT17jXV2RFGePQhkhBe9ldnzOJldGJ3lvNPMlCqWr0smqRJ7VKwtZWi3WspuCThIyJ/T gxK1iC24TS+LUlwVvN4ZCPkMTSzuk44= X-MC-Unique: -Nyce9xPMH23o0xOJPC-rg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 032/351] meson: add iscsiadm as optional program Date: Thu, 16 Jul 2020 11:54:28 +0200 Message-Id: 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" We compile src/util/viriscsi unconditionally where we require ISCSIADM to be defined. Signed-off-by: Pavel Hrdina --- m4/virt-storage-iscsi.m4 | 6 ------ meson.build | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4 index eb0b08671c3..0e04079a1cc 100644 --- a/m4/virt-storage-iscsi.m4 +++ b/m4/virt-storage-iscsi.m4 @@ -24,7 +24,6 @@ AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI], [ =20 AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ if test "$with_storage_iscsi" =3D "yes" || test "$with_storage_iscsi" = =3D "check"; then - AC_PATH_PROG([ISCSIADM], [iscsiadm], [], [$LIBVIRT_SBIN_PATH]) if test "$with_storage_iscsi" =3D "yes" ; then if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSC= SI storage driver]) ; fi else @@ -37,11 +36,6 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend f= or storage driver is enabled]) fi fi - if test -z "$ISCIADM" ; then - AC_DEFINE_UNQUOTED([ISCSIADM],["iscsiadm"],[Name of iscsiadm program]) - else - AC_DEFINE_UNQUOTED([ISCSIADM],["$ISCSIADM"],[Location of iscsiadm prog= ram]) - fi AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" =3D "ye= s"]) ]) =20 diff --git a/meson.build b/meson.build index 3f86f931de0..d4b3a9e910d 100644 --- a/meson.build +++ b/meson.build @@ -915,6 +915,7 @@ optional_programs =3D [ 'ip', 'ip6tables', 'iptables', + 'iscsiadm', 'mdevctl', 'mm-ctl', 'modprobe', --=20 2.26.2