From nobody Sun Feb 8 11:40:34 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=1594894635; cv=none; d=zohomail.com; s=zohoarc; b=H/xFiYxwOEi5mytcegEewSZ5pUv5YGdYtmZ4QLf8M0Cu671hFYhc8I0S0ugAw+yGRhJIUSxBtQNzcB4XjALiIJUzTuvFWLdvBgGtpIfKKJoV7dmrZj/PEi0ur6CNRbD2gP+v8a8tIrUyFGKb9CHhoBVKTHWvfk54nV6ycbuPH1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894635; 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=iyR5Q7gJUsYrcNeRYaBkoZxRYwPLwy/Xc/8mdU2dWKg=; b=KEfuvZfilXT9aFD7qQz6N8VhtEcn+N3cmWBTIwINP6uavpmfMZzEE5UEUkwKhkrhqlaiqz0sAvIROj08s12QM1TuiARvyuacxEOM1Y6lRWkUNeJnKaNhurw7CyzBHeEYoblRggX5FD+OuKlLZAOG4QosngkpJn/C7nSNqg1IWTM= 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894635670627.775756660974; Thu, 16 Jul 2020 03:17:15 -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-114-a98FPtuaMrqhwuiG89MwYw-1; Thu, 16 Jul 2020 06:07:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30BB8100AA40; Thu, 16 Jul 2020 10:07:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 110CC7B415; Thu, 16 Jul 2020 10:07:50 +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 D43391805317; Thu, 16 Jul 2020 10:07:49 +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 06GA3p9L017481 for ; Thu, 16 Jul 2020 06:03:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 29D752DE69; Thu, 16 Jul 2020 10:03:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98D972B6DB for ; Thu, 16 Jul 2020 10:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894634; 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=iyR5Q7gJUsYrcNeRYaBkoZxRYwPLwy/Xc/8mdU2dWKg=; b=f6Se/CQ6MSUCrLgLOasLcBJE9QHnmpdyYFkhwYBZ1GgOykswjSQios3olw0LlcgLI6ZTDC porxR3zb7xb4VA7ai0+tBCI4Fkrpc82Q211nJXqhExa+rAx+v0u+5i5tCbXqDZGfUDbbss NwHLh66Pa6JX/hn6inuml17hchtNQ/E= X-MC-Unique: a98FPtuaMrqhwuiG89MwYw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 146/351] meson: src: build libvirt_security_manager.a static library Date: Thu, 16 Jul 2020 11:56:22 +0200 Message-Id: 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.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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/meson.build | 1 + src/security/Makefile.inc.am | 43 ------------------------------------ src/security/meson.build | 31 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 43 deletions(-) create mode 100644 src/security/meson.build diff --git a/src/meson.build b/src/meson.build index 637f86b5ee4..d416531c12b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -91,6 +91,7 @@ subdir('remote') subdir('admin') subdir('locking') subdir('logging') +subdir('security') =20 subdir('esx') subdir('hyperv') diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index ec24931a80a..12afd7f8db0 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -5,31 +5,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ security/virt-aa-helper.c \ $(NULL) =20 -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/security_util.h \ - security/security_util.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) - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN =3D \ security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ security/apparmor/usr.sbin.libvirtd.in \ @@ -48,25 +23,7 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in -e 's|[@]libexecdir[@]|@libexecdir@|' \ $< > $@ =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) \ - $(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 =20 diff --git a/src/security/meson.build b/src/security/meson.build new file mode 100644 index 00000000000..3dc88c2c546 --- /dev/null +++ b/src/security/meson.build @@ -0,0 +1,31 @@ +security_driver_sources =3D [ + 'security_dac.c', + 'security_driver.c', + 'security_manager.c', + 'security_nop.c', + 'security_stack.c', + 'security_util.c', +] + +if conf.has('WITH_SECDRIVER_APPARMOR') + security_driver_sources +=3D 'security_apparmor.c' +endif + +if conf.has('WITH_SECDRIVER_SELINUX') + security_driver_sources +=3D 'security_selinux.c' +endif + +security_driver_lib =3D static_library( + 'virt_security_manager', + [ + security_driver_sources, + ], + dependencies: [ + apparmor_dep, + selinux_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) --=20 2.26.2