From nobody Fri Mar 29 12:42:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683031230; cv=none; d=zohomail.com; s=zohoarc; b=En2+r3C9X0HF5M7DCRTSbjYGLT9IwUs6DFFXVAj1PvFrfcWKOLByQdycUmiMHt8oFdjP2rq2BONY3bbAZO3Z0LY9VR/ept4RTCyeOVP3i+aH4zuimfx8+KbcYswRy2nSZfxvdQlXpeZYA/tdPOeaB9OCcOuBqoR+MJOeZw79kvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683031230; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iIq7ZpHSte8g7V4mfp7E8JcCgSUWm0KyBSzMo6ePMiA=; b=LP9A/+9MCsK96hjaGo7U+JCW+wWrdw3dGBTKU8LVZ1DScIU7FRBcz/77StdwMXdaRZGbRlg5IA+R7pKibOIKjrh4v7XmP97tWTHvjS2GDjeXuOgzJJ4xUWV5W6YqSHZad347sx5r4+s7D2z4uXrFFgdt/R5eGwbeRmyP7stHbn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1683031230747773.0684559980217; Tue, 2 May 2023 05:40:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-483-7j1UgJfsOVyA7Yf20SJ-tQ-1; Tue, 02 May 2023 08:40:28 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 27BA61C0432E; Tue, 2 May 2023 12:40:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49D4A492B03; Tue, 2 May 2023 12:40:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 154FF1946595; Tue, 2 May 2023 12:40:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 17062194658C for ; Tue, 2 May 2023 12:40:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EE1F44020965; Tue, 2 May 2023 12:40:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E72874020962 for ; Tue, 2 May 2023 12:40:22 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8D8F2808E67 for ; Tue, 2 May 2023 12:40:22 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.163]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-401-0Tur6GCGPCKVbvXG1XIpLQ-1; Tue, 02 May 2023 08:40:21 -0400 Received: from sender by smtp.strato.de (RZmta 49.4.0 AUTH) with ESMTPSA id x6987cz42CbDcwT (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Tue, 2 May 2023 14:37:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683031229; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iIq7ZpHSte8g7V4mfp7E8JcCgSUWm0KyBSzMo6ePMiA=; b=ODrjSj5FaRn1n/6es9A0aLdVXNNe8IU1+IQfMjcWzipMvVKZDGe//YHW9YDFUcB7cF4HB4 kE5NXNKgEitRup/HRAw5xKOmi7FS04kM+8u2Z2dPgkgzBO0kKs1PdC2ZF1eUC2/nA3dRNu Ph36LFwRY/DhTHSZjJ3XcKJunBAUlCg= X-MC-Unique: 7j1UgJfsOVyA7Yf20SJ-tQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 0Tur6GCGPCKVbvXG1XIpLQ-1 X-RZG-CLASS-ID: mo00 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAg4wqVv7FZ8tH5EUSbMVU80kUr7f4QlYaI60OjHt/Q==" From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v1] use libexecdir as location for qemu-bridge-helper Date: Tue, 2 May 2023 14:37:03 +0200 Message-Id: <20230502123703.16276-1-olaf@aepfle.de> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: aepfle.de Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683031231552100001 Content-Type: text/plain; charset="utf-8" The current logic in meson.build assumes a fixed runtime path for qemu-bridge-helper in case this binary is not available during build. Since qemu-bridge-helper is not used during build it is not required to have it installed at build time. It is likely that both qemu and libvirt are built with the same --libexecdir option. So use this as the expected location for qemu-bridge-helper. Signed-off-by: Olaf Hering --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c2a2f306c1..6ca05e2f69 100644 --- a/meson.build +++ b/meson.build @@ -1653,7 +1653,7 @@ if not get_option('driver_qemu').disabled() if qemu_bridge_prog.found() qemu_bridge_path =3D qemu_bridge_prog.full_path() else - qemu_bridge_path =3D '/usr/libexec/qemu-bridge-helper' + qemu_bridge_path =3D libexecdir / 'qemu-bridge-helper' endif conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)