From nobody Wed Sep 10 00:00:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1735921645821758.6806723478246; Fri, 3 Jan 2025 08:27:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 7582294C; Fri, 3 Jan 2025 11:27:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3CEC999A; Fri, 3 Jan 2025 11:26:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A1845965; Fri, 3 Jan 2025 11:26:22 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 24DC2965 for ; Fri, 3 Jan 2025 11:26:22 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-EDWJPbyMMtGmRcU-lk7jVA-1; Fri, 03 Jan 2025 11:26:20 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5CBE71956096 for ; Fri, 3 Jan 2025 16:26:19 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.141]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 681F919560A2; Fri, 3 Jan 2025 16:26:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735921581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BnRmYd4dKFLI81s9e/ovq7N5g//SrSn3WI1i2dgUKk8=; b=WK5lNGpBlNHpPP1D3gwRphlytrXrMWtc8TzDsn5Hr+IUAnbIuXJDAUXEK/E2m2P6SVjOAr z+rU2lMeVT2Zh9qZ52GD90bj9D7mzAJHEnGLqL1IM7YJ0S75TGLk9PKefgVfhKoNLxxpGK i+/YJ2Vk2/fQPlysc8gcAqXcVd7Z58s= X-MC-Unique: EDWJPbyMMtGmRcU-lk7jVA-1 X-Mimecast-MFC-AGG-ID: EDWJPbyMMtGmRcU-lk7jVA From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/3] meson: remove duplication of polkit dirs construction Date: Fri, 3 Jan 2025 16:26:12 +0000 Message-ID: <20250103162613.152596-3-berrange@redhat.com> In-Reply-To: <20250103162613.152596-1-berrange@redhat.com> References: <20250103162613.152596-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Eh9PGNeu-bINKZg9E3q1la9dInsmujT2GwHQiKWcN0c_1735921579 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WOWLIAEBK5IU7WWJOWGSJXRBQBEG5ELG X-Message-ID-Hash: WOWLIAEBK5IU7WWJOWGSJXRBQBEG5ELG X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1735921647798116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 2 ++ src/access/meson.build | 2 +- src/remote/meson.build | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ca1b915737..409a44b69c 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,8 @@ localedir =3D prefix / get_option('localedir') mandir =3D prefix / get_option('mandir') sbindir =3D prefix / get_option('sbindir') sharedstatedir =3D prefix / get_option('sharedstatedir') +polkitactionsdir =3D datadir / 'polkit-1' / 'actions' +polkitrulesdir =3D datadir / 'polkit-1' / 'rules.d' =20 docdir =3D get_option('docdir') if docdir =3D=3D '' diff --git a/src/access/meson.build b/src/access/meson.build index fc5ba5b342..c006ca5934 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -73,7 +73,7 @@ if conf.has('WITH_POLKIT') command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@= ' ], capture: true, install: true, - install_dir: datadir / 'polkit-1' / 'actions', + install_dir: polkitactionsdir, ) endif endif diff --git a/src/remote/meson.build b/src/remote/meson.build index 831acaaa01..9a0288f928 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -294,15 +294,14 @@ if conf.has('WITH_REMOTE') endif =20 if conf.has('WITH_POLKIT') - polkitdir =3D datadir / 'polkit-1' install_data( 'libvirtd.policy', - install_dir: polkitdir / 'actions', + install_dir: polkitactionsdir, rename: [ 'org.libvirt.unix.policy' ], ) install_data( 'libvirtd.rules', - install_dir: polkitdir / 'rules.d', + install_dir: polkitrulesdir, rename: [ '50-libvirt.rules' ], ) endif --=20 2.47.1