From nobody Sun Feb 8 12:42:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594894332; cv=none; d=zohomail.com; s=zohoarc; b=YKDkyHbKtdurKNbMDcYLI+VjTU8M0UW96IwcmmYXCz1U0fgn608jlSErrctmrk7QyuG0DfilxFaBoETR3AWvH7E38Y48k2HOZDyTnc1jGyb9fqKBBpONI0PRzZS2y19duT77YLOa4H/LbSqJPrEBkDFvTvNkNboB/rPQP1VDFhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894332; 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=K8cm85Z13R6j+6Ef+9ddW+J3Uep2gMsYAqpB57iYScU=; b=ULxx6XxRfayU399AXSCqDZ9zQ65/UDxRDDPwgCCKxm/6+8N8cwb2rkL4yLvYxV5/bR0YBOfbTzPvxveNmPU29lL3XR/iltKqHadfeAxtrElLwaahfo44LuOcJq9G7mAi9NDuRv9m09pk4r/XeIaaJmljnuQQBEiFNuM9TIzF9NU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894332501865.7202644838864; Thu, 16 Jul 2020 03:12:12 -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-273-yz2U7TJAMA-0TOk8r7zCSA-1; Thu, 16 Jul 2020 06:09:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCF03100AA2C; Thu, 16 Jul 2020 10:09:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB1721001B07; Thu, 16 Jul 2020 10:09:38 +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 8CE349A33D; Thu, 16 Jul 2020 10:09:38 +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 06GA5Z06018559 for ; Thu, 16 Jul 2020 06:05:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5ABDF2B6DC; Thu, 16 Jul 2020 10:05:35 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C988E2B6DB for ; Thu, 16 Jul 2020 10:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894331; 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=K8cm85Z13R6j+6Ef+9ddW+J3Uep2gMsYAqpB57iYScU=; b=FekGm53v1HHmzUOMDj8bkOY8Vlv70tj0zDOSuButNZSq2QoNdcQVygRZytjEDtN9/mGO0h sUJTjyr5/LuUpSwmkp22wHLVQmL8BMDaYMJauv8z3ZsapjEsSMVDPtzcZpHv2DD0scMjZt cOiUxNQJs5dARh3cLKenUwznlYvgvJ0= X-MC-Unique: yz2U7TJAMA-0TOk8r7zCSA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 219/351] meson: src: build virt-aa-helper binary Date: Thu, 16 Jul 2020 11:57:35 +0200 Message-Id: <8fe7ec944c13bedfedc4b71e78081ac73465d219.1594891445.git.phrdina@redhat.com> 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.84 on 10.5.11.22 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" Signed-off-by: Pavel Hrdina --- src/security/Makefile.inc.am | 31 ------------------------------- src/security/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 12afd7f8db0..50e2706be9f 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ - $(DATATYPES_SOURCES) \ - security/virt-aa-helper.c \ - $(NULL) - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN =3D \ security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ security/apparmor/usr.sbin.libvirtd.in \ @@ -23,32 +18,6 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in -e 's|[@]libexecdir[@]|@libexecdir@|' \ $< > $@ =20 -if WITH_SECDRIVER_APPARMOR -if WITH_LIBVIRTD -libexec_PROGRAMS +=3D virt-aa-helper - -virt_aa_helper_SOURCES =3D $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) - -virt_aa_helper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -virt_aa_helper_LDADD =3D \ - libvirt.la \ - libvirt_driver_storage_impl.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -virt_aa_helper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES -virt_aa_helper_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(top_srcdir)/src/hypervisor \ - -I$(srcdir)/security \ - $(AM_CFLAGS) \ - $(NULL) -endif WITH_LIBVIRTD -endif WITH_SECDRIVER_APPARMOR - if WITH_APPARMOR_PROFILES apparmordir =3D $(sysconfdir)/apparmor.d/ apparmor_DATA =3D \ diff --git a/src/security/meson.build b/src/security/meson.build index 1e85d8dcf5f..4014ddccc45 100644 --- a/src/security/meson.build +++ b/src/security/meson.build @@ -15,6 +15,10 @@ if conf.has('WITH_SECDRIVER_SELINUX') security_driver_sources +=3D 'security_selinux.c' endif =20 +apparmor_helper_sources =3D files( + 'virt-aa-helper.c', +) + security_driver_lib =3D static_library( 'virt_security_manager', [ @@ -31,3 +35,19 @@ security_driver_lib =3D static_library( ) =20 libvirt_libs +=3D security_driver_lib + +if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR') + virt_helpers +=3D { + 'name': 'virt-aa-helper', + 'sources': [ + apparmor_helper_sources, + datatypes_sources, + dtrace_gen_objects, + ], + 'include': [ + conf_inc_dir, + hypervisor_inc_dir, + include_directories('.'), + ], + } +endif --=20 2.26.2