From nobody Sun May 19 13:54:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.124 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=1692103551; cv=none; d=zohomail.com; s=zohoarc; b=cEJEx3TWlsPAdN+c9/Z4iei5jytCxRDN8LAPGPvbiyAWGQNZiSLJj0bAA7XhBuCqfGzQKezNtKkzJc5M1MKdY9PI/wi491vlhjSbbSJorMHpkvIN2c+bwL/FhMgKL1BmmPsmK499nHxoVOtAS+s5TrzPgjceu9QdHygoeRA5sQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692103551; 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=V1hWKR9iSF7bKczAoNqA6Md3uEDsEP7VuG/8Jd5TTX0=; b=O2lgtYLxc17tE8AAlHE8RHJGrljR8pzNSXaW/1vqRT85SarBcpp/tojgnnf7SJdGTidZcaLziu1DOy79fiF5kTX9VWCtIj1Oi/foz4y7xmQP37ySb2TDljtI/rqv9KRiRBkkIy1XJDjHDWdtxzvPF0qjfRPA35KZsausDunH6Kc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 169210355144169.57423758884534; Tue, 15 Aug 2023 05:45:51 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-ZA3jOc-7PA-NjmE5RmFFLQ-1; Tue, 15 Aug 2023 08:45:47 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C969E185A7AF; Tue, 15 Aug 2023 12:45:43 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B307F40D2839; Tue, 15 Aug 2023 12:45:43 +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 B576219465B3; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0F2CD194658C for ; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E240F140E91B; Tue, 15 Aug 2023 12:45:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8918A140E917 for ; Tue, 15 Aug 2023 12:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692103550; 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=V1hWKR9iSF7bKczAoNqA6Md3uEDsEP7VuG/8Jd5TTX0=; b=bOek3ZIMgI+gAdVNU6ol4N/Be5rQ/+1Rl7oLuWaeCpqbRZB1EyRYSbvy2KNrE6AL8h/Bex W1PSsY9XtAN7MmtFH3w1lrcBipJEujb7sQ7oZuzWuJHfhGgGfyqk0d1Y1HXJ78cdmIxNGP lKEfr1Kq5aJ6kQPOvAkXXkyrRZ43bAQ= X-MC-Unique: ZA3jOc-7PA-NjmE5RmFFLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] scripts: Avoid spawning yet another process in meson-python.sh Date: Tue, 15 Aug 2023 14:45:35 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692103551727100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The aim of message-python.sh wrapper is to set some environment variables and then execute whatever it was called with (usually a python binary). Well, we can use 'exec' to replace the shell process with python instead of forking yet another process. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- scripts/meson-python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/meson-python.sh b/scripts/meson-python.sh index 9ba670fc1a..52b37be926 100755 --- a/scripts/meson-python.sh +++ b/scripts/meson-python.sh @@ -1,3 +1,3 @@ #!/bin/sh =20 -LC_ALL=3D LANG=3DC LC_CTYPE=3Den_US.UTF-8 "$@" +LC_ALL=3D LANG=3DC LC_CTYPE=3Den_US.UTF-8 exec "$@" --=20 2.41.0 From nobody Sun May 19 13:54:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692103552; cv=none; d=zohomail.com; s=zohoarc; b=doqWQWoT6XWcY1Qv7yML13vCmqvlNNzUhftmnz6T2TWeN+sXRUsdcNXuVdDgjJkih9iTmy68UOJd79L/McLzQOBFr+53500PlAMgh7ZbFdoQAo2MqcDESCZB1BRBfTL7ZJSUt4u4uqcGqNhkVayRDYxN5RcdHxVLR82jwVuTvAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692103552; 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=YUPMalnes1fSqqT6hUAhZyZ9I2tBgxkodAXafIrCUGk=; b=JXK8UFUHaAm/krQlVbLN9P6a3xs0NnrCMADq2pNqaMl6zvrdJw59MlowEeXQMzVdLQui6I3o4zE7V65etXrKOgqxezLq9cex4I2Hf4kpvM5R/liN6+pnleQhGWkL8HjE7N98fe35UYMB+ibTppJoH8/E6pNSqfUU7w2/0QCl+QE= 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; dmarc=pass header.from= (p=none dis=none) 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 1692103552905709.8781673516957; Tue, 15 Aug 2023 05:45:52 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-117-dBxo3H9KMSaDsSln07kDtQ-1; Tue, 15 Aug 2023 08:45:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 672763815F10; Tue, 15 Aug 2023 12:45:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53E0E40C207A; Tue, 15 Aug 2023 12:45:44 +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 F1651194658D; Tue, 15 Aug 2023 12:45:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 90DA01946594 for ; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7E71F140E917; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 259B1140E921 for ; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692103551; 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=YUPMalnes1fSqqT6hUAhZyZ9I2tBgxkodAXafIrCUGk=; b=bY5vkZXRPQPA4bt8ljHMy1iJIKhEfAKHypjxN8cF/7TTJcApSswoDO/09Ypu+7fw8EFNuX YtY9qIVOKJhFLoucLRUDSZN3qBHwBECMoVNVJtFwgPMSFJRigl3Yew6v5hCBHuvip+LhSz 7wIm4Bk5qfrdUdKjOdM3KSE6Ljppc+Q= X-MC-Unique: dBxo3H9KMSaDsSln07kDtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] scripts: Make standalone python scripts executable Date: Tue, 15 Aug 2023 14:45:36 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692103572042100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We keep a collection of python scripts under scripts/ directory. Some of them have executable bits set and some don't even though they have proper shebang. Add executable bits scripts from the latter set. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- scripts/check-drivername.py | 0 scripts/check-remote-protocol.py | 0 scripts/header-ifdef.py | 0 scripts/meson-install-dirs.py | 0 scripts/meson-install-symlink.py | 0 scripts/mock-noinline.py | 0 scripts/prohibit-duplicate-header.py | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 =3D> 100755 scripts/check-drivername.py mode change 100644 =3D> 100755 scripts/check-remote-protocol.py mode change 100644 =3D> 100755 scripts/header-ifdef.py mode change 100644 =3D> 100755 scripts/meson-install-dirs.py mode change 100644 =3D> 100755 scripts/meson-install-symlink.py mode change 100644 =3D> 100755 scripts/mock-noinline.py mode change 100644 =3D> 100755 scripts/prohibit-duplicate-header.py diff --git a/scripts/check-drivername.py b/scripts/check-drivername.py old mode 100644 new mode 100755 diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protoc= ol.py old mode 100644 new mode 100755 diff --git a/scripts/header-ifdef.py b/scripts/header-ifdef.py old mode 100644 new mode 100755 diff --git a/scripts/meson-install-dirs.py b/scripts/meson-install-dirs.py old mode 100644 new mode 100755 diff --git a/scripts/meson-install-symlink.py b/scripts/meson-install-symli= nk.py old mode 100644 new mode 100755 diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py old mode 100644 new mode 100755 diff --git a/scripts/prohibit-duplicate-header.py b/scripts/prohibit-duplic= ate-header.py old mode 100644 new mode 100755 --=20 2.41.0 From nobody Sun May 19 13:54:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1692103554; cv=none; d=zohomail.com; s=zohoarc; b=et/HKIOylsHDD1Nx1677JMcrc3dZPx9dox2DySzsc0G3dc2rbcdN00ZkWG9hFqol9vaGrKi36mDDENvFnIBSq3iuTUPXwvNk/oz6UgcGEEv5B/QwUJ1+KQu3K6E9JZ1MrUCozP3bPafAcWXL1vlzrD0a6h4tgh7PlcmLNHUZxbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692103554; 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=NWIOdV5f6C950OKUMMOqGMDVRc4f2elRM6BR/LTomDg=; b=ZfYfrozRF+3IOB3XWBSUU+QT7Y5+PVXFUAj8TSpwD6UDUKQwTXAUJZIy3Bha2xAWc4l1UIWRo+q3n0MuH13DgxtR6R79EpR3DGCo81TPPZRqkj3MYj8nBE6z0/wh1vyMFKQdVlqB5gDtOIkJq7t7A8XqJnORV/ntMmynv9uhPvE= 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; dmarc=pass header.from= (p=none dis=none) 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 1692103554984639.6984551731567; Tue, 15 Aug 2023 05:45:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-519--1XyP3obO8qmZXBZ9WLu6w-1; Tue, 15 Aug 2023 08:45:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87ACC80558D; Tue, 15 Aug 2023 12:45:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73B2564015; Tue, 15 Aug 2023 12:45:45 +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 BFA9B1946A4C; Tue, 15 Aug 2023 12:45:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 350BF194658D for ; Tue, 15 Aug 2023 12:45:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1A7E7140E91C; Tue, 15 Aug 2023 12:45:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5AC7140E917 for ; Tue, 15 Aug 2023 12:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692103554; 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=NWIOdV5f6C950OKUMMOqGMDVRc4f2elRM6BR/LTomDg=; b=Q+cMeggr5UR2wUKiIZA0B9u0LzS7oM8FqJ8aiCKjy5+ljQmJA9sIjkl6ns4a8DeqXzKsNG BJMOExp8bVVScz+OPGX1KQcbQOavoJNJxztBHZFRGKxDDLClui6DgYTl3QIONkWsC+QUuB NnJdn7H5uIjxljbpcAIY+nIluLlfOUQ= X-MC-Unique: -1XyP3obO8qmZXBZ9WLu6w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] meson: Drop python3_prog Date: Tue, 15 Aug 2023 14:45:37 +0200 Message-ID: <2561385a23fd6cbade84ad53a4a002c3a655be9a.1692103217.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692103556807100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- docs/meson.build | 7 +++---- meson.build | 4 ++-- src/access/meson.build | 6 +++--- src/meson.build | 43 +++++++++++++++++++---------------------- src/network/meson.build | 2 +- src/qemu/meson.build | 2 +- tests/meson.build | 2 +- 7 files changed, 31 insertions(+), 35 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index b20ef1c926..2231d2da04 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -126,7 +126,7 @@ aclperms_gen =3D custom_target( ) =20 docs_timestamp =3D run_command( - python3_prog, meson_timestamp_prog.full_path(), env: runutf8, check: tru= e, + meson_timestamp_prog, env: runutf8, check: true, ).stdout().strip() =20 site_xsl =3D files('site.xsl') @@ -345,7 +345,7 @@ endforeach run_target( 'install-web', command: [ - meson_python_prog, python3_prog.full_path(), meson_install_web_prog.fu= ll_path(), + meson_python_prog, meson_install_web_prog.full_path(), install_web_files, ], depends: install_web_deps, @@ -353,9 +353,8 @@ run_target( =20 test( 'check-html-references', - python3_prog, + check_html_references_prog, args: [ - check_html_references_prog.full_path(), '--webroot', meson.project_build_root() / 'docs' ], diff --git a/meson.build b/meson.build index 965ada483b..2c7e9908db 100644 --- a/meson.build +++ b/meson.build @@ -2097,7 +2097,7 @@ if git configuration: spec_conf, ) =20 - authors =3D run_command(python3_prog, meson_gen_authors_prog.full_path(), + authors =3D run_command(meson_gen_authors_prog, env: runutf8, check: true) authors_file =3D 'AUTHORS.rst.in' =20 @@ -2119,7 +2119,7 @@ if git =20 foreach file : dist_files meson.add_dist_script( - meson_python_prog.full_path(), python3_prog.full_path(), meson_dist_= prog.full_path(), + meson_python_prog.full_path(), meson_dist_prog.full_path(), meson.project_build_root(), file ) endforeach diff --git a/src/access/meson.build b/src/access/meson.build index e65f17c0a2..0ddfbd9d9e 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -70,7 +70,7 @@ if conf.has('WITH_POLKIT') 'org.libvirt.api.policy', input: access_perm_h, output: 'org.libvirt.api.policy', - command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@= ' ], + command: [ meson_python_prog, genpolkit_prog, '@INPUT@' ], capture: true, install: true, install_dir: datadir / 'polkit-1' / 'actions', @@ -107,8 +107,8 @@ generated_sym_files +=3D access_gen_sym =20 test( 'check-aclperms', - python3_prog, - args: [ check_aclperms_prog.full_path(), access_perm_h, files('viraccess= perm.c') ], + check_aclperms_prog, + args: [ access_perm_h, files('viraccessperm.c') ], env: runutf8, suite: 'script' ) diff --git a/src/meson.build b/src/meson.build index 28e4d0cc4e..606f238a95 100644 --- a/src/meson.build +++ b/src/meson.build @@ -75,7 +75,7 @@ if conf.has('WITH_DTRACE_PROBES') input: infile, output: out_stp, command: [ - meson_python_prog, python3_prog, dtrace2systemtap_prog, + meson_python_prog, dtrace2systemtap_prog, bindir, sbindir, libdir, '@INPUT@' ], capture: true, @@ -692,7 +692,7 @@ foreach data : virt_test_aug_files input: [ data['conf'], data['aug'] ], output: data['name'], command: [ - meson_python_prog, python3_prog, augeas_gentest_prog, + meson_python_prog, augeas_gentest_prog, '@INPUT@', ], capture: true, @@ -771,7 +771,7 @@ foreach data : virt_daemon_confs input: [ conf_out, test_aug_tmp ], output: test_aug_out, command: [ - meson_python_prog, python3_prog, augeas_gentest_prog, + meson_python_prog, augeas_gentest_prog, '@INPUT@', ], capture: true, @@ -890,7 +890,7 @@ if conf.has('WITH_DTRACE_PROBES') input: rpc_probe_files, output: 'libvirt_functions.stp', command: [ - meson_python_prog, python3_prog, gensystemtap_prog, + meson_python_prog, gensystemtap_prog, '@INPUT@', ], capture: true, @@ -910,7 +910,7 @@ virt_install_dirs +=3D [ ] =20 meson.add_install_script( - meson_python_prog.full_path(), python3_prog.full_path(), meson_install_d= irs_prog.full_path(), + meson_python_prog.full_path(), meson_install_dirs_prog.full_path(), virt_install_dirs, ) =20 @@ -920,8 +920,8 @@ meson.add_install_script( if host_machine.system() =3D=3D 'linux' test( 'check-symfile', - python3_prog, - args: [ check_symfile_prog.full_path(), libvirt_syms, libvirt_lib ], + check_symfile_prog, + args: [ libvirt_syms, libvirt_lib ], env: runutf8, suite: 'script' ) @@ -929,8 +929,8 @@ if host_machine.system() =3D=3D 'linux' if conf.has('WITH_REMOTE') test( 'check-admin-symfile', - python3_prog, - args: [ check_symfile_prog.full_path(), libvirt_admin_syms, libvirt_= admin_lib ], + check_symfile_prog, + args: [ libvirt_admin_syms, libvirt_admin_lib ], env: runutf8, suite: 'script' ) @@ -939,9 +939,8 @@ endif =20 test( 'check-symsorting', - python3_prog, + check_symsorting_prog, args: [ - check_symsorting_prog.full_path(), meson.current_source_dir(), files(sym_files, used_sym_files), ], @@ -951,9 +950,8 @@ test( =20 test( 'check-admin-symsorting', - python3_prog, + check_symsorting_prog, args: [ - check_symsorting_prog.full_path(), meson.current_source_dir(), libvirt_admin_private_syms, ], @@ -963,9 +961,9 @@ test( =20 test( 'check-drivername', - python3_prog, + check_drivername_prog, args: [ - check_drivername_prog.full_path(), files(driver_headers), + files(driver_headers), files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms, ], env: runutf8, @@ -974,9 +972,9 @@ test( =20 test( 'check-admin-drivername', - python3_prog, + check_drivername_prog, args: [ - check_drivername_prog.full_path(), libvirt_admin_public_syms, + libvirt_admin_public_syms, ], env: runutf8, suite: 'script' @@ -984,16 +982,16 @@ test( =20 test( 'check-driverimpls', - python3_prog, - args: [ check_driverimpls_prog.full_path(), driver_source_files ], + check_driverimpls_prog, + args: [ driver_source_files ], env: runutf8, suite: 'script' ) =20 test( 'check-aclrules', - python3_prog, - args: [ check_aclrules_prog.full_path(), files('remote/remote_protocol.x= '), stateful_driver_source_files ], + check_aclrules_prog, + args: [ files('remote/remote_protocol.x'), stateful_driver_source_files = ], env: runutf8, suite: 'script' ) @@ -1018,9 +1016,8 @@ if pdwtags_prog.found() and cc.get_id() !=3D 'clang' lib =3D proto['lib'] test( 'check-@0@'.format(proto['name']), - python3_prog, + check_remote_protocol_prog, args: [ - check_remote_protocol_prog.full_path(), proto['name'], lib.name(), lib.full_path(), diff --git a/src/network/meson.build b/src/network/meson.build index 0888d1beac..cea0d1dcd8 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -90,7 +90,7 @@ if conf.has('WITH_NETWORK') ) =20 meson.add_install_script( - meson_python_prog.full_path(), python3_prog.full_path(), meson_install= _symlink_prog.full_path(), + meson_python_prog.full_path(), meson_install_symlink_prog.full_path(), confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index c8806bbc36..271a0b4139 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -73,7 +73,7 @@ if conf.has('WITH_DTRACE_PROBES') input: infile, output: out_stp, command: [ - meson_python_prog, python3_prog, dtrace2systemtap_prog, + meson_python_prog, dtrace2systemtap_prog, bindir, sbindir, libdir, '@INPUT@', ], capture: true, diff --git a/tests/meson.build b/tests/meson.build index e6589ec555..0787b91513 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -711,7 +711,7 @@ testenv +=3D 'VIR_TEST_FILE_ACCESS=3D1' add_test_setup( 'access', env: testenv, - exe_wrapper: [ python3_prog, check_file_access_prog.full_path() ], + exe_wrapper: [ check_file_access_prog ], ) =20 add_test_setup( --=20 2.41.0