From nobody Mon Feb 9 14:14:15 2026 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=1688044516; cv=none; d=zohomail.com; s=zohoarc; b=FzOCJQkQhR57K5sCErT9uYXn6Cu0SWzSrDwXpI1D5cb3t6UznuCfThnlQ9erWkI0R9Wj/wP2dBomA18JjeqM/pe0ik7dDx+9QMeWw66eZEk1/c6qOEHlzKj2B3kZea0C+uz7MJFNKBQC0mvPEd44ViEnkkT8bMDMG81ijDLqfK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688044516; 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=giKsf7pwUYW6ORonDXx1v4JpF8lZzfrJ68CY5pq7mJ0=; b=d59v1vYyCEQVYiYIm3IHmkcnnx74O5QDorr8enHd8K8Tn/18hhSLH7b7kDMyBWpmqRxVKD3JnpGF0AyXkOARccC0a1r/PO/S6LDocClzqKZrXQk0AOZNsQlEspRCTQsVlGBFspHuOV8S0GSqdEQh97ggSDVQoJ9YG4O0W8R/sH0= 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 1688044516890547.4238668331845; Thu, 29 Jun 2023 06:15:16 -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-138-3mo_rbPyOuS-wJBhT-MAzw-1; Thu, 29 Jun 2023 09:15:10 -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 3B7F81064BF2; Thu, 29 Jun 2023 13:15:03 +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 295D840C6CD1; Thu, 29 Jun 2023 13:15:03 +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 133E01946A41; Thu, 29 Jun 2023 13:15:03 +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 1D2501946A7C for ; Thu, 29 Jun 2023 13:15:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0B289402491A; Thu, 29 Jun 2023 13:15:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9315F40C6CCD for ; Thu, 29 Jun 2023 13:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688044516; 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=giKsf7pwUYW6ORonDXx1v4JpF8lZzfrJ68CY5pq7mJ0=; b=OVqhSQ22V54V4v1C/rYMvDeNoUHLZhokVrIijQVUulqOpEAtCh4NBzOednuIeawtaybT/S eQHfPFdnYU4dV8e7Rz5ralAU1B7GYd129aiKmv8RWYlbNWkYM/ka1m6UuRTfq5Nd1Rwdr9 6zeeKye+MGo3QN9iBZWZzXTzshA5/Fo= X-MC-Unique: 3mo_rbPyOuS-wJBhT-MAzw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/8] apparmor: Allow version-specific bits in abstractions too Date: Thu, 29 Jun 2023 15:14:52 +0200 Message-ID: <20230629131457.248503-4-abologna@redhat.com> In-Reply-To: <20230629131457.248503-1-abologna@redhat.com> References: <20230629131457.248503-1-abologna@redhat.com> MIME-Version: 1.0 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.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: 1688044518365100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Compared to profiles, we only need a single preprocessing step here, as there is no variable substitution happening. Signed-off-by: Andrea Bolognani --- .../apparmor/{libvirt-lxc =3D> libvirt-lxc.in} | 0 .../{libvirt-qemu =3D> libvirt-qemu.in} | 0 src/security/apparmor/meson.build | 19 +++++++++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) rename src/security/apparmor/{libvirt-lxc =3D> libvirt-lxc.in} (100%) rename src/security/apparmor/{libvirt-qemu =3D> libvirt-qemu.in} (100%) diff --git a/src/security/apparmor/libvirt-lxc b/src/security/apparmor/libv= irt-lxc.in similarity index 100% rename from src/security/apparmor/libvirt-lxc rename to src/security/apparmor/libvirt-lxc.in diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/lib= virt-qemu.in similarity index 100% rename from src/security/apparmor/libvirt-qemu rename to src/security/apparmor/libvirt-qemu.in diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index c4745acdb9..8bc2405f88 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -5,6 +5,11 @@ apparmor_gen_profiles =3D [ 'usr.sbin.virtxend', ] =20 +apparmor_gen_abstractions =3D [ + 'libvirt-qemu', + 'libvirt-lxc', +] + apparmor_gen_profiles_conf =3D configuration_data({ 'sysconfdir': sysconfdir, 'sbindir': sbindir, @@ -56,10 +61,16 @@ foreach name : apparmor_gen_profiles ) endforeach =20 -install_data( - [ 'libvirt-qemu', 'libvirt-lxc' ], - install_dir: apparmor_dir / 'abstractions', -) +foreach name : apparmor_gen_abstractions + configure_file( + input: '@0@.in'.format(name), + output: name, + command: apparmor_gen_cmd, + capture: true, + install: true, + install_dir: apparmor_dir / 'abstractions', + ) +endforeach =20 install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], --=20 2.41.0