From nobody Wed May 14 18:22:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519812903057578.4069319045694; Wed, 28 Feb 2018 02:15:03 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5CCA28211; Wed, 28 Feb 2018 10:14:58 +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 A90CE60C91; Wed, 28 Feb 2018 10:14:58 +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 5EEE44A47F; Wed, 28 Feb 2018 10:14:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1SAElE6005639 for ; Wed, 28 Feb 2018 05:14:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id EC26B202699A; Wed, 28 Feb 2018 10:14:46 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74A272026E04; Wed, 28 Feb 2018 10:14:46 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:28 +0000 Message-Id: <20180228101435.464-11-berrange@redhat.com> In-Reply-To: <20180228101435.464-1-berrange@redhat.com> References: <20180228101435.464-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/17] make: split security driver build rules into security/Makefile.inc.am 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 28 Feb 2018 10:14:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 65 +---------------------------------- src/security/Makefile.inc.am | 80 ++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 81 insertions(+), 64 deletions(-) create mode 100644 src/security/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8f628d2d38..7dd50dacec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,7 @@ man8_MANS =3D =20 include conf/Makefile.inc.am include cpu/Makefile.inc.am +include security/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -636,30 +637,12 @@ check-local: check-protocol check-symfile check-symso= rting \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 -SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ - $(DATATYPES_SOURCES) \ - security/virt-aa-helper.c - =20 =20 UTIL_IO_HELPER_SOURCES =3D \ util/iohelper.c =20 =20 -# Security framework and drivers for various models -SECURITY_DRIVER_SOURCES =3D \ - security/security_driver.h security/security_driver.c \ - security/security_nop.h security/security_nop.c \ - security/security_stack.h security/security_stack.c \ - security/security_dac.h security/security_dac.c \ - security/security_manager.h security/security_manager.c - -SECURITY_DRIVER_SELINUX_SOURCES =3D \ - security/security_selinux.h security/security_selinux.c - -SECURITY_DRIVER_APPARMOR_SOURCES =3D \ - security/security_apparmor.h security/security_apparmor.c - ACCESS_DRIVER_GENERATED =3D \ access/viraccessapicheck.h \ access/viraccessapicheck.c \ @@ -768,22 +751,6 @@ GENERATED_SYM_FILES +=3D \ =20 =20 =20 -libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) -noinst_LTLIBRARIES +=3D libvirt_security_manager.la -libvirt_la_BUILT_LIBADD +=3D libvirt_security_manager.la -libvirt_security_manager_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_security_manager_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_security_manager_la_LIBADD =3D $(SECDRIVER_LIBS) -if WITH_SECDRIVER_SELINUX -libvirt_security_manager_la_SOURCES +=3D $(SECURITY_DRIVER_SELINUX_SOURCES) -libvirt_security_manager_la_CFLAGS +=3D $(SELINUX_CFLAGS) -endif WITH_SECDRIVER_SELINUX -if WITH_SECDRIVER_APPARMOR -libvirt_security_manager_la_SOURCES +=3D $(SECURITY_DRIVER_APPARMOR_SOURCE= S) -libvirt_security_manager_la_CFLAGS +=3D $(APPARMOR_CFLAGS) -endif WITH_SECDRIVER_APPARMOR - libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) noinst_LTLIBRARIES +=3D libvirt_driver_access.la @@ -878,8 +845,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatc= h.pl \ =20 # Add all conditional sources just in case... EXTRA_DIST +=3D \ - $(SECURITY_DRIVER_SELINUX_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) =20 check-local: check-augeas @@ -1872,34 +1837,6 @@ libvirt_sanlock_helper_LDADD =3D libvirt.la endif WITH_SANLOCK =20 =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) \ - $(PIE_LDFLAGS) \ - $(NULL) -virt_aa_helper_LDADD =3D \ - libvirt.la \ - libvirt_conf.la \ - libvirt_util.la \ - libvirt_driver_storage_impl.la \ - ../gnulib/lib/libgnu.la -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$(srcdir)/security \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -endif WITH_LIBVIRTD -endif WITH_SECDRIVER_APPARMOR -EXTRA_DIST +=3D $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) =20 if WITH_NSS noinst_LTLIBRARIES +=3D libvirt-nss.la diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am new file mode 100644 index 0000000000..f88b82df7b --- /dev/null +++ b/src/security/Makefile.inc.am @@ -0,0 +1,80 @@ +SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ + $(DATATYPES_SOURCES) \ + security/virt-aa-helper.c \ + $(NULL) + +SECURITY_DRIVER_SOURCES =3D \ + security/security_driver.h \ + security/security_driver.c \ + security/security_nop.h \ + security/security_nop.c \ + security/security_stack.h \ + security/security_stack.c \ + security/security_dac.h \ + security/security_dac.c \ + security/security_manager.h \ + security/security_manager.c \ + $(NULL) + +SECURITY_DRIVER_SELINUX_SOURCES =3D \ + security/security_selinux.h \ + security/security_selinux.c \ + $(NULL) + +SECURITY_DRIVER_APPARMOR_SOURCES =3D \ + security/security_apparmor.h \ + security/security_apparmor.c \ + $(NULL) + +EXTRA_DIST +=3D \ + $(SECURITY_DRIVER_SELINUX_SOURCES) \ + $(SECURITY_DRIVER_APPARMOR_SOURCES) \ + $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ + $(NULL) + +libvirt_security_manager_la_SOURCES =3D $(SECURITY_DRIVER_SOURCES) +noinst_LTLIBRARIES +=3D libvirt_security_manager.la +libvirt_la_BUILT_LIBADD +=3D libvirt_security_manager.la +libvirt_security_manager_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_security_manager_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_security_manager_la_LIBADD =3D + +if WITH_SECDRIVER_SELINUX +libvirt_security_manager_la_SOURCES +=3D $(SECURITY_DRIVER_SELINUX_SOURCES) +libvirt_security_manager_la_CFLAGS +=3D $(SELINUX_CFLAGS) +endif WITH_SECDRIVER_SELINUX + +if WITH_SECDRIVER_APPARMOR +libvirt_security_manager_la_SOURCES +=3D $(SECURITY_DRIVER_APPARMOR_SOURCE= S) +libvirt_security_manager_la_CFLAGS +=3D $(APPARMOR_CFLAGS) + +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) \ + $(PIE_LDFLAGS) \ + $(NULL) +virt_aa_helper_LDADD =3D \ + libvirt.la \ + libvirt_conf.la \ + libvirt_util.la \ + libvirt_driver_storage_impl.la \ + ../gnulib/lib/libgnu.la \ + $(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$(srcdir)/security \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +endif WITH_LIBVIRTD +endif WITH_SECDRIVER_APPARMOR --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list