From nobody Sun Feb 8 08:48:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594894689; cv=none; d=zohomail.com; s=zohoarc; b=isMRH0ZtccQu+8BdBzQBCWy6BVN5hQjhPjddeKaMBSvkCUrtx7ezsRUU6784EOUV/YaQmZnaErA3MWZPksHwRuWGtziPde7RFYnOpnLQn3VKfi4/jwwTtvfVFgvHjBvq635eRcXmjTlYkdrlQODnICRXFNd1ixw87KYe2RWF3OI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894689; 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=69Gbk4TwoynmuNeaifp5qSRYA+OIyZHwKmGChSL/GZs=; b=Scd9/3N6Q80uThDa+uDJwsV2RDBx7ustl6El96kc3QK+ZKEFYuYOUUoTJn26o67Vyqxe8RfiSLVLCbBDIREuB6Fhyb9mYiqOjytbSL6qohtwiIMdgnC5PSud2p/RnPUq2mfaednR7CtM0HHjlOYQ5lI+O2gStqZJZDuZJ+Tsetw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894689417963.7405071969097; Thu, 16 Jul 2020 03:18:09 -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-96-jiGGbkzDP7CZLfZrZ15QHw-1; Thu, 16 Jul 2020 06:08:08 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CF6F10059C4; Thu, 16 Jul 2020 10:08:03 +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 E237361982; Thu, 16 Jul 2020 10:08:02 +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 AFB7A1800FEE; Thu, 16 Jul 2020 10:08:02 +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 06GA48rZ017689 for ; Thu, 16 Jul 2020 06:04:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 946B52DE6B; Thu, 16 Jul 2020 10:04:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FBBE2B6DB for ; Thu, 16 Jul 2020 10:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894688; 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=69Gbk4TwoynmuNeaifp5qSRYA+OIyZHwKmGChSL/GZs=; b=cEgc2PJelxtKRfPagyNPaMtQMC+v+4fmwKgnYEpuvG0G55+OUEecBDBDUxyXf0N+3n4FvP h7hMy1tt3Ahy+zDp55J+MNJRVtqxhTEQMIIxmWE8+V0NytZ9wxam2DXe+kvQK8t/40ApJ/ Mv23q3tb3u3RYwwqzv5pBJeb3gzPN/g= X-MC-Unique: jiGGbkzDP7CZLfZrZ15QHw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 160/351] meson: src: build libvirt_driver_lxc_impl.a static library Date: Thu, 16 Jul 2020 11:56:36 +0200 Message-Id: <2cea77c35a379c4cc4eb4bbfbf05206f44ad85f4.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.79 on 10.5.11.12 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/lxc/Makefile.inc.am | 60 ------------------------------------ src/lxc/meson.build | 67 +++++++++++++++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 68 insertions(+), 60 deletions(-) create mode 100644 src/lxc/meson.build diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 031aed14203..b0a12fdda50 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -21,29 +21,6 @@ LXC_GENERATED =3D \ =20 LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x =20 -LXC_DRIVER_SOURCES =3D \ - lxc/lxc_conf.c \ - lxc/lxc_conf.h \ - lxc/lxc_container.c \ - lxc/lxc_container.h \ - lxc/lxc_cgroup.c \ - lxc/lxc_cgroup.h \ - lxc/lxc_domain.c \ - lxc/lxc_domain.h \ - lxc/lxc_hostdev.c \ - lxc/lxc_hostdev.h \ - lxc/lxc_monitor.c \ - lxc/lxc_monitor.h \ - lxc/lxc_process.c \ - lxc/lxc_process.h \ - lxc/lxc_fuse.c \ - lxc/lxc_fuse.h \ - lxc/lxc_native.c \ - lxc/lxc_native.h \ - lxc/lxc_driver.c \ - lxc/lxc_driver.h \ - $(NULL) - LXC_CONTROLLER_SOURCES =3D \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ @@ -70,7 +47,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_LXC =20 -noinst_LTLIBRARIES +=3D libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES =3D libvirt_driver_lxc_la_LIBADD =3D \ libvirt_driver_lxc_impl.la \ @@ -80,36 +56,6 @@ libvirt_driver_lxc_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_lxc.la libvirt_driver_lxc_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_lxc_impl_la_CFLAGS =3D \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(builddir)/lxc \ - -I$(builddir)/rpc \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_lxc_impl_la_LIBADD =3D \ - $(CAPNG_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBXML_LIBS) \ - $(FUSE_LIBS) \ - $(NULL) - -if WITH_BLKID -libvirt_driver_lxc_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_driver_lxc_impl_la_LIBADD +=3D $(BLKID_LIBS) -endif WITH_BLKID -libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) -libvirt_driver_lxc_impl_la_SOURCES =3D \ - $(LXC_DRIVER_SOURCES) -nodist_libvirt_driver_lxc_impl_la_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) - =20 sbin_PROGRAMS +=3D virtlxcd =20 @@ -258,12 +204,6 @@ uninstall-data-lxc: =20 endif WITH_LXC =20 -lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_MONITOR_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - lxc/lxc_monitor_dispatch.h - lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build new file mode 100644 index 00000000000..438cedd287c --- /dev/null +++ b/src/lxc/meson.build @@ -0,0 +1,67 @@ +lxc_driver_sources =3D [ + 'lxc_cgroup.c', + 'lxc_conf.c', + 'lxc_container.c', + 'lxc_domain.c', + 'lxc_driver.c', + 'lxc_fuse.c', + 'lxc_hostdev.c', + 'lxc_monitor.c', + 'lxc_native.c', + 'lxc_process.c', +] + +lxc_monitor_protocol =3D files('lxc_monitor_protocol.x') + +lxc_monitor_protocol_generated =3D [] + +lxc_monitor_protocol_generated +=3D custom_target( + 'lxc_monitor_protocol_h', + input: lxc_monitor_protocol, + output: 'lxc_monitor_protocol.h', + command: [ genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@' ] +) + +lxc_monitor_protocol_generated +=3D custom_target( + 'lxc_monitor_protocol_c', + input: lxc_monitor_protocol, + output: 'lxc_monitor_protocol.c', + command: [ genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@' ] +) + +lxc_monitor_generated =3D custom_target( + 'lxc_monitor_dispatch_h', + input: lxc_monitor_protocol, + output: 'lxc_monitor_dispatch.h', + command: [ + gendispatch_prog, '--mode=3Dclient', + 'virLXCMonitor', 'VIR_LXC_MONITOR', '@INPUT@' + ], + capture: true, +) + +if conf.has('WITH_LXC') + lxc_driver_impl_lib =3D static_library( + 'virt_driver_lxc_impl', + [ + lxc_driver_sources, + lxc_monitor_protocol_generated, + lxc_monitor_generated, + ], + dependencies: [ + access_dep, + blkid_dep, + capng_dep, + fuse_dep, + libnl_dep, + secdriver_dep, + src_dep, + rpc_dep, + xdr_dep, + ], + include_directories: [ + conf_inc_dir, + hypervisor_inc_dir, + ], + ) +endif diff --git a/src/meson.build b/src/meson.build index 44992fac02b..217ceb2d6ef 100644 --- a/src/meson.build +++ b/src/meson.build @@ -149,6 +149,7 @@ subdir('bhyve') subdir('esx') subdir('hyperv') subdir('libxl') +subdir('lxc') subdir('openvz') subdir('test') subdir('vmware') --=20 2.26.2