From nobody Thu May 2 00:12:15 2024 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=1594893608; cv=none; d=zohomail.com; s=zohoarc; b=PSvX+hWWqn4qH+4KAI76f2prqBtuzRuQH8GhD46FMkXgxDO4LnV0oKOtOqgAQApp7TBX/uIUb2TT1lrE+0S+6t2LJeQZBReCW7FK8bliJl2MWY7ZrM/b8qSQgjlyTRI2Z310lbrdycxdPA9z8oFyOINSggRN0knQ0cD6rerWWFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893608; 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=ZZz1NhEmNNkjCRB+H/18q00kt7jplm8E5Xn6fwtF6EE=; b=d5zHsUZNQyNravOEFE3j16TMpMzsHUB4Xa3AYA3khAT0tgdRX05hwzwTB7hPa6rOrl2dJaNbGoKeMeggIIL9U8jyY/54E4VeffPCDhgEtxsWKGs1qh8NBNM594lgSA2PMirBZpIE+Sgas0fgocPZqwdc61/ZS3a9CoXBr3j3Ntw= 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 159489360830272.36264981919953; Thu, 16 Jul 2020 03:00:08 -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-319-f43YKIWuM9ijzGKlJJIK9Q-1; Thu, 16 Jul 2020 06:00:03 -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 4D2218015F7; Thu, 16 Jul 2020 09:59:56 +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 DCCC779D1F; Thu, 16 Jul 2020 09:59:55 +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 A0BCB96236; Thu, 16 Jul 2020 09:59:55 +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 06G9xraY015019 for ; Thu, 16 Jul 2020 05:59:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id D07B52B6DC; Thu, 16 Jul 2020 09:59:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6ED2B6DB for ; Thu, 16 Jul 2020 09:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893606; 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=ZZz1NhEmNNkjCRB+H/18q00kt7jplm8E5Xn6fwtF6EE=; b=LK5QfaeQtyTHy+RZ3J9RiUupprp8sZBjlID1I3jmjHCCrgpGPk3Xd23MSdgg35nxkHqpYN l/2fBPgUKKLlHQET5xacL7ZAYwQPaWWx8PQ3M+BHJw00+zMz839AiPkDH8FTy6cJ5zCQOw TOrcjMsycevLHg0dOjzI6pK9MdmqLfk= X-MC-Unique: f43YKIWuM9ijzGKlJJIK9Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 001/351] meson: ci: increase git clone depth to 1000 Date: Thu, 16 Jul 2020 11:53:57 +0200 Message-Id: <8051bc7ac864045a13d10b18dbdea160e637c52f.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.13 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" Having limit set to 100 is in most cases perfect but sometimes there can be a larger series that will have more than 100 patches and it will make the check-dco job fail. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- .gitlab-ci.yml | 2 +- ci/cirrus/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 702198ec8e4..c997dc6df25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - GIT_DEPTH: 100 + GIT_DEPTH: 1000 =20 stages: - sanity_checks diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 893e13d7241..49e90b6d67b 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -14,7 +14,7 @@ build_task: install_script: - @INSTALL_COMMAND@ @PKGS@ clone_script: - - git clone --depth 100 "$CI_REPOSITORY_URL" . + - git clone --depth 1000 "$CI_REPOSITORY_URL" . - git fetch origin "$CI_COMMIT_REF_NAME" - git reset --hard "$CI_COMMIT_SHA" build_script: --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893643; cv=none; d=zohomail.com; s=zohoarc; b=cYy+tyqR+YRyGvnY+4hW+6sF69KGYHVA7O2XZOGpRgQcBzYedJlsrHEiTcXVznBaG/FAOtOY9SPZuBEq4N0SJaRUHEjUvD5QvrleXtKM0b/3ZsC8gDU2g3Nz2vU4i8lMsAqdjIWp1Nb2T7G9QVN/KYh/x1z70qGp1LA59zGmowk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893643; 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=kdQsdEKWHpfnNWkWJix0SnjrOdRUB+7jFXpcK9fo2FY=; b=jZqlYVSss+jwTDr8YOrhEJy8x6R1QOAx7yZ1oXaD8ENYdgplR4y6Tu60DNpEXyq00GFLeRTb1UI8kKjsrJ+7M9dcfa+OMpcZWnMBbceAcfB4+hEdzcvfCdL78rmJ5kvErBSTRUJap2Rsfgq4aUNTrkY7+eeLQB7Qhtjll4f2Wrw= 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 1594893643562729.881034715438; Thu, 16 Jul 2020 03:00:43 -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-163-2mnJVIx_PM-VzIle1tRLyA-1; Thu, 16 Jul 2020 06:00:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AAB708015F7; Thu, 16 Jul 2020 10:00:05 +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 70E8572AE7; Thu, 16 Jul 2020 10:00:05 +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 303F5180BACF; Thu, 16 Jul 2020 10:00:05 +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 06G9xv91015046 for ; Thu, 16 Jul 2020 05:59:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id ABBCC2B6DB; Thu, 16 Jul 2020 09:59:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECD7C2B6DC for ; Thu, 16 Jul 2020 09:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893641; 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=kdQsdEKWHpfnNWkWJix0SnjrOdRUB+7jFXpcK9fo2FY=; b=JOaLRfdr4SAQAxzEJK9chBvZsCpKIQFyc9gIk1/DqAV8rNa/po7PGNAGQlkEA6g0232rMu FHpmOw6K5dYELlCJP9leD37EeZJmSf+wuyyUtItXmrPacMQlXDhmX8Sn0LSJ932OC1pkF6 6biv9q2QcE6zA9PvcPb3Z4sUn9mQJtE= X-MC-Unique: 2mnJVIx_PM-VzIle1tRLyA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 002/351] meson: remove automake specific directives Date: Thu, 16 Jul 2020 11:53:58 +0200 Message-Id: <4f0e4545b71d24e15f3538a1103a2327f5d025e8.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.15 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" EXTRA_DIST is not relevant because meson makes a git copy when creating dist archive so everything tracked by git is part of dist tarball. BUILD_SOURCES is not relevant as all dependencies should be explicitly tracked. The remaining ones are not converted to meson files as they are automatically tracked by meson. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- Makefile.am | 62 +---------- docs/Makefile.am | 51 --------- examples/Makefile.am | 8 -- include/libvirt/Makefile.am | 2 - po/Makefile.am | 7 -- src/Makefile.am | 55 ---------- src/access/Makefile.inc.am | 18 --- src/admin/Makefile.inc.am | 12 -- src/bhyve/Makefile.inc.am | 9 -- src/cpu_map/Makefile.inc.am | 2 - src/esx/Makefile.inc.am | 14 --- src/hyperv/Makefile.inc.am | 13 --- src/interface/Makefile.inc.am | 7 -- src/libxl/Makefile.inc.am | 10 -- src/locking/Makefile.inc.am | 26 ----- src/logging/Makefile.inc.am | 16 --- src/lxc/Makefile.inc.am | 15 --- src/network/Makefile.inc.am | 9 -- src/node_device/Makefile.inc.am | 7 -- src/nwfilter/Makefile.inc.am | 5 - src/openvz/Makefile.inc.am | 2 - src/qemu/Makefile.inc.am | 20 ---- src/remote/Makefile.inc.am | 31 ------ src/rpc/Makefile.inc.am | 25 ----- src/secret/Makefile.inc.am | 5 - src/security/Makefile.inc.am | 14 --- src/storage/Makefile.inc.am | 20 ---- src/test/Makefile.inc.am | 5 - src/util/Makefile.inc.am | 8 -- src/vbox/Makefile.inc.am | 11 -- src/vmware/Makefile.inc.am | 2 - src/vmx/Makefile.inc.am | 2 - src/vz/Makefile.inc.am | 2 - tests/Makefile.am | 187 -------------------------------- tools/Makefile.am | 47 -------- 35 files changed, 1 insertion(+), 728 deletions(-) diff --git a/Makefile.am b/Makefile.am index ad1edee76f4..310a9d90276 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,54 +31,6 @@ export XZ_OPT =20 ACLOCAL_AMFLAGS =3D -I m4 =20 -EXTRA_DIST =3D \ - config-post.h \ - libvirt.spec libvirt.spec.in \ - mingw-libvirt.spec.in \ - libvirt.pc.in \ - libvirt-qemu.pc.in \ - libvirt-lxc.pc.in \ - libvirt-admin.pc.in \ - Makefile.nonreentrant \ - autogen.sh \ - GNUmakefile \ - run.in \ - README.rst \ - AUTHORS.in \ - CONTRIBUTING.rst \ - NEWS.rst \ - scripts/apibuild.py \ - scripts/augeas-gentest.py \ - build-aux/check-spacing.pl \ - scripts/check-aclperms.py \ - scripts/check-aclrules.py \ - scripts/check-drivername.py \ - scripts/check-driverimpls.py \ - scripts/check-file-access.py \ - scripts/check-remote-protocol.py \ - scripts/check-symfile.py \ - scripts/check-symsorting.py \ - scripts/dtrace2systemtap.py \ - scripts/esx_vi_generator.py \ - scripts/genaclperms.py \ - scripts/genpolkit.py \ - scripts/gensystemtap.py \ - scripts/group-qemu-caps.py \ - scripts/header-ifdef.py \ - scripts/hvsupport.py \ - scripts/hyperv_wmi_generator.py \ - scripts/mock-noinline.py \ - scripts/prohibit-duplicate-header.py \ - scripts/test-wrap-argv.py \ - build-aux/syntax-check.mk \ - build-aux/useless-if-before-free \ - build-aux/vc-list-files \ - ci/Makefile \ - ci/build.sh \ - ci/list-images.sh \ - ci/prepare.sh \ - $(NULL) - pkgconfigdir =3D $(libdir)/pkgconfig pkgconfig_DATA =3D libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin= .pc =20 @@ -93,7 +45,7 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) =20 -cov: clean-cov +cov: $(MKDIR_P) $(top_builddir)/coverage $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ -d $(top_builddir)/src \ @@ -104,18 +56,6 @@ cov: clean-cov $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ --legend $(top_builddir)/coverage/libvirt.info =20 -clean-cov: - rm -rf $(top_builddir)/coverage - -MAINTAINERCLEANFILES =3D .git-module-status - -BUILT_SOURCES =3D configmake.h -CLEANFILES =3D configmake.h - -distclean-local: clean-GNUmakefile -clean-GNUmakefile: - test '$(srcdir)' =3D . || rm -f $(top_builddir)/GNUmakefile - dist-hook: gen-AUTHORS =20 .PHONY: gen-AUTHORS diff --git a/docs/Makefile.am b/docs/Makefile.am index a480123e33f..6d4fcdc831a 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -53,16 +53,6 @@ vpathhack: test -e $$file || ln -s $(srcdir)/$$file $$file ; \ done =20 -clean-local: - for dir in fonts js logos; \ - do \ - rm -f $$dir ; \ - done - for file in $(assets); \ - do \ - rm -f $$file ; \ - done - apihtml =3D \ html/index.html \ $(apihtml_generated) @@ -343,53 +333,15 @@ api_DATA =3D \ libvirt-lxc-api.xml \ libvirt-admin-api.xml =20 -svg =3D \ - libvirt-daemon-arch.svg \ - libvirt-driver-arch.svg \ - libvirt-object-model.svg \ - migration-managed-direct.svg \ - migration-managed-p2p.svg \ - migration-native.svg \ - migration-tunnel.svg \ - migration-unmanaged-direct.svg - schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 -EXTRA_DIST=3D \ - site.xsl subsite.xsl newapi.xsl page.xsl \ - $(dot_html_in) $(dot_rst) $(apipng) \ - $(svg) $(assets) \ - $(javascript) $(logofiles) \ - $(internals_html_in) $(internals_rst) $(fonts) \ - $(kbase_html_in) $(kbase_rst) \ - $(manpages_rst) \ - aclperms.htmlinc \ - $(schema_DATA) - acl_generated =3D aclperms.htmlinc =20 aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(top_srcdir)/scripts/genaclperms.py Makefile.am $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/genaclperms.py $< >= $@ =20 -CLEANFILES =3D \ - $(dot_html) \ - $(apihtml) \ - $(apiadminhtml) \ - $(apiqemuhtml) \ - $(apilxchtml) \ - $(internals_html) \ - $(kbase_html) \ - $(manpages_html) \ - $(man1_MANS) \ - $(man7_MANS) \ - $(manpages7_rst) \ - $(man8_MANS) \ - $(api_DATA) \ - $(dot_html_generated_in) \ - aclperms.htmlinc - timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ then \ date -u --date=3D"@$$SOURCE_DATE_EPOCH"; \ @@ -417,8 +369,6 @@ news.html.in: $(top_srcdir)/NEWS.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } =20 -CLEANFILES +=3D news.html.in - %.html.in: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } @@ -476,7 +426,6 @@ python_generated_files =3D $(api_DATA) =20 APIBUILD=3D$(top_srcdir)/scripts/apibuild.py APIBUILD_STAMP=3Dapibuild.py.stamp -CLEANFILES +=3D $(APIBUILD_STAMP) =20 $(python_generated_files): $(APIBUILD_STAMP) =20 diff --git a/examples/Makefile.am b/examples/Makefile.am index ad635bdcc05..15ff897cf1f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -48,14 +48,6 @@ TEST_XML_EXAMPLES =3D \ $(wildcard $(srcdir)/xml/test/*.xml) \ $(NULL) =20 -EXTRA_DIST =3D \ - $(POLKIT_EXAMPLES) \ - $(SH_EXAMPLES) \ - $(STORAGE_XML_EXAMPLES) \ - $(SYSTEMTAP_EXAMPLES) \ - $(TEST_XML_EXAMPLES) \ - $(NULL) - AM_CPPFLAGS =3D \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index d7114c34622..e447a5d37da 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -22,7 +22,5 @@ allheaders =3D $(wildcard $(srcdir)/*.h) virinc_HEADERS =3D $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) nodist_virinc_HEADERS =3D libvirt-common.h =20 -EXTRA_DIST =3D libvirt-common.h.in - install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/po/Makefile.am b/po/Makefile.am index f0698b455ba..ff73ead6f72 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -14,13 +14,6 @@ POTFILE :=3D $(DOMAIN).pot POFILES :=3D $(LANGS:%=3D%.po) GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -CLEANFILES =3D $(GMOFILES) POTFILES - -EXTRA_DIST =3D \ - LINGUAS \ - $(POTFILES_IN) \ - $(POFILES) - if HAVE_GNU_GETTEXT_TOOLS =20 XGETTEXT_ARGS =3D \ diff --git a/src/Makefile.am b/src/Makefile.am index 834e356b68b..c2bb7d0083b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,12 +48,6 @@ AM_LDFLAGS_MOD =3D \ $(AM_LDFLAGS) AM_LDFLAGS_MOD_NOUNDEF =3D $(AM_LDFLAGS_MOD) $(NO_UNDEFINED_LDFLAGS) =20 -EXTRA_DIST =3D $(conf_DATA) - -BUILT_SOURCES =3D -CLEANFILES =3D -DISTCLEANFILES =3D -MAINTAINERCLEANFILES =3D nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D @@ -145,15 +139,10 @@ moddir =3D $(libdir)/libvirt/connection-driver confdir =3D $(sysconfdir)/libvirt conf_DATA +=3D libvirt.conf =20 -CLEANFILES +=3D $(nodist_conf_DATA) -BUILT_SOURCES +=3D $(nodist_conf_DATA) - augeasdir =3D $(datadir)/augeas/lenses =20 augeastestdir =3D $(datadir)/augeas/lenses/tests =20 -CLEANFILES +=3D $(augeastest_DATA) - # Internal generic driver infrastructure DATATYPES_SOURCES =3D datatypes.h datatypes.c DRIVER_SOURCES +=3D \ @@ -252,7 +241,6 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif !WITH_REMOTE -EXTRA_DIST +=3D $(PROTOCOL_STRUCTS) =20 DRIVERS =3D \ $(srcdir)/driver-hypervisor.h \ @@ -392,15 +380,6 @@ else ! WITH_LIBSSH SYM_FILES +=3D $(srcdir)/libvirt_libssh.syms endif ! WITH_LIBSSH =20 -EXTRA_DIST +=3D \ - libvirt_public.syms \ - libvirt_lxc.syms \ - libvirt_qemu.syms \ - $(SYM_FILES) \ - $(NULL) - -BUILT_SOURCES +=3D $(GENERATED_SYM_FILES) - libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ $(ACCESS_DRIVER_SYM_FILES) \ $(top_builddir)/config.status @@ -450,9 +429,6 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_probes.lo libvirt_la_DEPENDENCIES +=3D libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES =3D libvirt_probes.h =20 -BUILT_SOURCES +=3D libvirt_probes.h libvirt_probes.stp libvirt_functions.s= tp - - tapsetdir =3D $(datadir)/systemtap/tapset tapset_DATA +=3D libvirt_probes.stp libvirt_functions.stp =20 @@ -489,12 +465,8 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/dtrace2systemtap.py= \ $(bindir) $(sbindir) $(libdir) $< > $@ =20 -CLEANFILES +=3D libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ - libvirt_functions.stp libvirt_probes.stp endif WITH_DTRACE_PROBES =20 -EXTRA_DIST +=3D libvirt_probes.d - libvirt_qemu_la_SOURCES =3D libvirt-qemu.c libvirt_qemu_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ @@ -515,10 +487,6 @@ libvirt_lxc_la_LDFLAGS =3D \ libvirt_lxc_la_CFLAGS =3D $(AM_CFLAGS) libvirt_lxc_la_LIBADD =3D libvirt.la =20 -EXTRA_DIST +=3D \ - $(SYSCONF_FILES) \ - $(OPENRC_CONF_FILES) - install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig for f in $(SYSCONF_FILES:%.sysconf=3D%) ; \ @@ -557,11 +525,6 @@ uninstall-openrc-conf: =20 LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) =20 -EXTRA_DIST +=3D $(LOGROTATE_FILES_IN) - -BUILT_SOURCES +=3D $(LOGROTATE_FILES) -CLEANFILES +=3D $(LOGROTATE_FILES) - %.logrotate: remote/%.logrotate.in $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -587,20 +550,11 @@ UNINSTALL_LOCAL +=3D uninstall-logrotate endif WITH_LIBVIRTD =20 =20 -EXTRA_DIST +=3D \ - $(SYSTEMD_UNIT_FILES_IN) \ - $(OPENRC_INIT_FILES_IN) \ - $(NULL) - - if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD =20 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 -BUILT_SOURCES +=3D $(SYSTEMD_UNIT_FILES) -DISTCLEANFILES +=3D $(SYSTEMD_UNIT_FILES) - install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) for f in $(SYSTEMD_UNIT_FILES); \ @@ -620,9 +574,6 @@ if LIBVIRT_INIT_SCRIPT_OPENRC =20 OPENRC_INIT_DIR =3D $(sysconfdir)/init.d =20 -BUILT_SOURCES +=3D $(OPENRC_INIT_FILES) -DISTCLEANFILES +=3D $(OPENRC_INIT_FILES) - install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf $(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR) for f in $(OPENRC_INIT_FILES:%.init=3D%) ; \ @@ -671,9 +622,6 @@ libvirt_iohelper_CFLAGS =3D \ endif WITH_LIBVIRTD =20 =20 -generated-sources: $(BUILT_SOURCES) - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" @@ -688,6 +636,3 @@ uninstall-local: $(UNINSTALL_LOCAL) \ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: - -CLEANFILES +=3D *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s -DISTCLEANFILES +=3D $(GENERATED_SYM_FILES) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 11f87c6aa74..d58d5166bef 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -42,10 +42,6 @@ ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.p= olicy =20 GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 -EXTRA_DIST +=3D \ - $(NULL) - - libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_SOURCES) \ $(NULL) @@ -76,23 +72,9 @@ polkitactiondir =3D $(datadir)/polkit-1/actions if WITH_LIBVIRTD polkitaction_DATA =3D $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD - -CLEANFILES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) -BUILT_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_POLICY) -else ! WITH_POLKIT -EXTRA_DIST +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) endif ! WITH_POLKIT =20 =20 -BUILT_SOURCES +=3D \ - $(ACCESS_DRIVER_GENERATED) \ - $(ACCESS_DRIVER_API_FILES) \ - $(NULL) -CLEANFILES +=3D \ - $(ACCESS_DRIVER_GENERATED) \ - $(ACCESS_DRIVER_API_FILES) \ - $(NULL) - libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 8556a3b8523..2d94ead73e1 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,10 +9,6 @@ ADMIN_PROTOCOL_GENERATED =3D \ admin/admin_server_dispatch_stubs.h \ $(NULL) =20 -EXTRA_DIST +=3D $(ADMIN_PROTOCOL) -BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) -CLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) - admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h =20 noinst_LTLIBRARIES +=3D libvirt_driver_admin.la @@ -44,14 +40,6 @@ GENERATED_SYM_FILES +=3D admin/libvirt_admin.syms admin/= libvirt_admin.def =20 ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms =20 -# admin/admin_remote.c is being included in admin/libvirt-admin.c, so we -# need to include it in the dist -EXTRA_DIST +=3D \ - admin/admin_remote.c \ - admin/libvirt_admin_public.syms \ - $(ADMIN_SYM_FILES) \ - $(NULL) - conf_DATA +=3D admin/libvirt-admin.conf =20 lib_LTLIBRARIES +=3D libvirt-admin.la diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 2536d12ab35..f75194fd3c8 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -25,8 +25,6 @@ BHYVE_DRIVER_SOURCES =3D \ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) =20 -EXTRA_DIST +=3D $(BHYVE_DRIVER_SOURCES) - =20 if WITH_BHYVE noinst_LTLIBRARIES +=3D libvirt_driver_bhyve_impl.la @@ -54,7 +52,6 @@ sbin_PROGRAMS +=3D virtbhyved nodist_conf_DATA +=3D bhyve/virtbhyved.conf augeas_DATA +=3D bhyve/virtbhyved.aug augeastest_DATA +=3D bhyve/test_virtbhyved.aug -CLEANFILES +=3D bhyve/virtbhyved.aug =20 virtbhyved_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtbhyved_SOURCES =3D $(REMOTE_DAEMON_GENERATED) @@ -98,9 +95,3 @@ bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.= aug.in \ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@ =20 endif WITH_BHYVE - -EXTRA_DIST +=3D \ - bhyve/bhyve.conf \ - bhyve/libvirtd_bhyve.aug \ - bhyve/test_libvirtd_bhyve.aug.in \ - $(NULL) diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 62403d2ed01..d3ccb880733 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -76,5 +76,3 @@ cpumap_DATA =3D \ cpu_map/x86_Westmere.xml \ cpu_map/x86_Westmere-IBRS.xml \ $(NULL) - -EXTRA_DIST +=3D $(cpumap_DATA) diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index d53cef15150..89e7b18d344 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -40,22 +40,10 @@ ESX_DRIVER_GENERATED =3D \ esx/esx_vi.generated.h \ $(NULL) =20 -ESX_DRIVER_EXTRA_DIST =3D \ - esx/README \ - esx/esx_vi_generator.input \ - $(NULL) - ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(ESX_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(ESX_DRIVER_SOURCES) \ - $(ESX_DRIVER_EXTRA_DIST) \ - $(NULL) - -BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) - $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) =20 $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ @@ -64,8 +52,6 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.in= put \ $(top_srcdir)/scripts/esx_vi_generator.py \ $(srcdir) $(builddir) && touch $@ =20 -CLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) - if WITH_ESX USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms else ! WITH_ESX diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 672b42763ae..6e15f0682d9 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -21,19 +21,8 @@ HYPERV_DRIVER_GENERATED =3D \ =20 HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp =20 -HYPERV_DRIVER_EXTRA_DIST =3D \ - hyperv/hyperv_wmi_generator.input \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(HYPERV_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(HYPERV_DRIVER_SOURCES) \ - $(HYPERV_DRIVER_EXTRA_DIST) \ - $(NULL) - -BUILT_SOURCES +=3D $(HYPERV_DRIVER_GENERATED) - $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) =20 $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ @@ -42,8 +31,6 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_ge= nerator.input \ $(top_srcdir)/scripts/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 -CLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) - if WITH_HYPERV noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 46a43e61db1..deff49fa65d 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -12,12 +12,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(INTERF= ACE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(INTERFACE_DRIVER_SOURCES) \ - $(INTERFACE_DRIVER_NETCF_SOURCES) \ - $(INTERFACE_DRIVER_UDEV_SOURCES) \ - $(NULL) - if WITH_INTERFACE mod_LTLIBRARIES +=3D libvirt_driver_interface.la libvirt_driver_interface_la_CFLAGS =3D \ @@ -49,7 +43,6 @@ sbin_PROGRAMS +=3D virtinterfaced nodist_conf_DATA +=3D interface/virtinterfaced.conf augeas_DATA +=3D interface/virtinterfaced.aug augeastest_DATA +=3D interface/test_virtinterfaced.aug -CLEANFILES +=3D interface/virtinterfaced.aug =20 virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 9037ba61ef3..db1f51e3ef8 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -24,9 +24,6 @@ LIBXL_DRIVER_SOURCES =3D \ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) -EXTRA_DIST +=3D \ - $(LIBXL_DRIVER_SOURCES) \ - $(NULL) =20 if WITH_LIBXL noinst_LTLIBRARIES +=3D libvirt_driver_libxl_impl.la @@ -60,7 +57,6 @@ sbin_PROGRAMS +=3D virtxend nodist_conf_DATA +=3D libxl/virtxend.conf augeas_DATA +=3D libxl/virtxend.aug augeastest_DATA +=3D libxl/test_virtxend.aug -CLEANFILES +=3D libxl/virtxend.aug =20 virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtxend_SOURCES =3D $(REMOTE_DAEMON_GENERATED) @@ -155,9 +151,3 @@ uninstall-data-libxl: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: =20 endif WITH_LIBXL - -EXTRA_DIST +=3D \ - libxl/libxl.conf \ - libxl/libvirtd_libxl.aug \ - libxl/test_libvirtd_libxl.aug.in \ - $(NULL) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ab01d8e0482..ab0822dda35 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -41,32 +41,6 @@ LOCK_DAEMON_SOURCES =3D \ locking/lock_daemon_dispatch.h \ $(NULL) =20 -EXTRA_DIST +=3D \ - $(LOCK_PROTOCOL) \ - $(LOCK_DAEMON_SOURCES) \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(LOCK_DRIVER_SOURCES) \ - locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug.in \ - locking/lockd.conf \ - locking/libvirt_lockd.aug \ - locking/test_libvirt_lockd.aug.in \ - locking/virtlockd.aug \ - locking/virtlockd.conf \ - locking/test_virtlockd.aug.in \ - $(NULL) - -BUILT_SOURCES +=3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) - -CLEANFILES +=3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) - RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 873e6029dd5..74987c63845 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -27,22 +27,6 @@ LOG_DAEMON_SOURCES =3D \ =20 LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x =20 -EXTRA_DIST +=3D \ - $(LOG_PROTOCOL) \ - $(LOG_DAEMON_SOURCES) \ - logging/virtlogd.aug \ - logging/virtlogd.conf \ - logging/test_virtlogd.aug.in \ - $(NULL) -BUILT_SOURCES +=3D \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES +=3D \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) - SYSCONF_FILES +=3D logging/virtlogd.sysconf =20 VIRTLOGD_UNIT_FILES_IN =3D \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index b8c2e1eb3db..c9201110071 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -66,14 +66,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) -EXTRA_DIST +=3D \ - $(LXC_DRIVER_SOURCES) \ - $(LXC_MONITOR_PROTOCOL) \ - $(LXC_CONTROLLER_SOURCES) \ - $(NULL) - -BUILT_SOURCES +=3D $(LXC_GENERATED) -CLEANFILES +=3D $(LXC_GENERATED) =20 =20 if WITH_LXC @@ -124,7 +116,6 @@ sbin_PROGRAMS +=3D virtlxcd nodist_conf_DATA +=3D lxc/virtlxcd.conf augeas_DATA +=3D lxc/virtlxcd.aug augeastest_DATA +=3D lxc/test_virtlxcd.aug -CLEANFILES +=3D lxc/virtlxcd.aug =20 virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtlxcd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) @@ -285,9 +276,3 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatc= h.pl \ install-data-lxc \ uninstall-data-lxc \ $(NULL) - -EXTRA_DIST +=3D \ - lxc/lxc.conf \ - lxc/libvirtd_lxc.aug \ - lxc/test_libvirtd_lxc.aug.in \ - $(NULL) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 196a30e16cd..9a1a3717073 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -20,12 +20,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWOR= K_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(NETWORK_DRIVER_SOURCES) \ - $(NETWORK_DRIVER_PLATFORM_INC) \ - $(NETWORK_LEASES_HELPER_SOURCES) \ - $(NULL) - =20 if WITH_NETWORK =20 @@ -57,7 +51,6 @@ sbin_PROGRAMS +=3D virtnetworkd nodist_conf_DATA +=3D network/virtnetworkd.conf augeas_DATA +=3D network/virtnetworkd.aug augeastest_DATA +=3D network/test_virtnetworkd.aug -CLEANFILES +=3D network/virtnetworkd.aug =20 virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) @@ -189,8 +182,6 @@ endif WITH_FIREWALLD_ZONE =20 endif WITH_NETWORK =20 -EXTRA_DIST +=3D network/default.xml network/libvirt.zone - .PHONY: \ install-data-network \ uninstall-data-network \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index f0f419317f9..8a8bbea01e9 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -25,12 +25,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) =20 -EXTRA_DIST +=3D \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NULL) - =20 if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals @@ -75,7 +69,6 @@ sbin_PROGRAMS +=3D virtnodedevd nodist_conf_DATA +=3D node_device/virtnodedevd.conf augeas_DATA +=3D node_device/virtnodedevd.aug augeastest_DATA +=3D node_device/test_virtnodedevd.aug -CLEANFILES +=3D node_device/virtnodedevd.aug =20 virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 20db8090e06..758370e1a74 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -2,8 +2,6 @@ =20 NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) =20 -EXTRA_DIST +=3D $(NWFILTER_XML_FILES) - NWFILTER_DRIVER_SOURCES =3D \ nwfilter/nwfilter_driver.h \ nwfilter/nwfilter_driver.c \ @@ -22,8 +20,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTE= R_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D $(NWFILTER_DRIVER_SOURCES) - if WITH_NWFILTER =20 nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter @@ -58,7 +54,6 @@ sbin_PROGRAMS +=3D virtnwfilterd nodist_conf_DATA +=3D nwfilter/virtnwfilterd.conf augeas_DATA +=3D nwfilter/virtnwfilterd.aug augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug -CLEANFILES +=3D nwfilter/virtnwfilterd.aug =20 virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am index 7ceb4e6095e..65b750b35af 100644 --- a/src/openvz/Makefile.inc.am +++ b/src/openvz/Makefile.inc.am @@ -11,8 +11,6 @@ OPENVZ_DRIVER_SOURCES =3D \ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D $(OPENVZ_DRIVER_SOURCES) - if WITH_OPENVZ noinst_LTLIBRARIES +=3D libvirt_driver_openvz.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_openvz.la diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 9e1d6192f5e..5aee568ed90 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -82,7 +82,6 @@ QEMU_DRIVER_SOURCES =3D \ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) -EXTRA_DIST +=3D $(QEMU_DRIVER_SOURCES) =20 if WITH_QEMU noinst_LTLIBRARIES +=3D libvirt_driver_qemu_impl.la @@ -119,17 +118,9 @@ libvirt_driver_qemu_impl_la_SOURCES =3D $(QEMU_DRIVER_= SOURCES) if WITH_DTRACE_PROBES libvirt_driver_qemu_la_LIBADD +=3D libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES =3D libvirt_qemu_probes.h -BUILT_SOURCES +=3D libvirt_qemu_probes.h =20 tapset_DATA +=3D libvirt_qemu_probes.stp =20 -CLEANFILES +=3D \ - libvirt_qemu_probes.h \ - libvirt_qemu_probes.o \ - libvirt_qemu_probes.lo \ - libvirt_qemu_probes.stp \ - $(NULL) - endif WITH_DTRACE_PROBES =20 sbin_PROGRAMS +=3D virtqemud @@ -137,7 +128,6 @@ sbin_PROGRAMS +=3D virtqemud nodist_conf_DATA +=3D qemu/virtqemud.conf augeas_DATA +=3D qemu/virtqemud.aug augeastest_DATA +=3D qemu/test_virtqemud.aug -CLEANFILES +=3D qemu/virtqemud.aug =20 virtqemud_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtqemud_SOURCES =3D $(REMOTE_DAEMON_GENERATED) @@ -243,18 +233,8 @@ endif WITH_QEMU uninstall-data-qemu \ $(NULL) =20 -EXTRA_DIST +=3D \ - qemu/qemu.conf \ - qemu/libvirtd_qemu.aug \ - qemu/test_libvirtd_qemu.aug.in \ - qemu/THREADS.txt \ - libvirt_qemu_probes.d \ - $(NULL) - QEMU_SHIM_SOURCES =3D qemu/qemu_shim.c =20 -EXTRA_DIST +=3D $(QEMU_SHIM_SOURCES) - if WITH_QEMU bin_PROGRAMS +=3D virt-qemu-run =20 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 80f4aad7828..165a7cced60 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -150,32 +150,6 @@ DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(addprefix $(srcdir)/,$(REMOTE_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(REMOTE_DRIVER_PROTOCOL) \ - $(REMOTE_DRIVER_SOURCES) \ - $(REMOTE_DAEMON_SOURCES) \ - remote/test_libvirtd.aug.in \ - remote/libvirtd.aug.in \ - remote/libvirtd.conf.in \ - remote/libvirtd.policy \ - remote/libvirtd.rules \ - remote/libvirtd.sasl \ - remote/libvirtd.sysctl \ - $(NULL) - -# Needed to build libvirt.pot, so must be listed outside -# the WITH_REMOTE/WITH_LIBVIRTD conditionals -BUILT_SOURCES +=3D \ - $(REMOTE_DRIVER_GENERATED) \ - $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES +=3D \ - $(REMOTE_DRIVER_GENERATED) \ - $(REMOTE_DAEMON_GENERATED) \ - remote/libvirtd.conf \ - remote/virtproxyd.conf \ - $(NULL) - if WITH_REMOTE noinst_LTLIBRARIES +=3D libvirt_driver_remote.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_remote.la @@ -230,11 +204,6 @@ nodist_conf_DATA +=3D \ remote/virtproxyd.conf \ $(NULL) =20 -CLEANFILES +=3D \ - remote/libvirtd.aug \ - remote/virtproxyd.aug \ - $(NULL) - libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) =20 nodist_libvirtd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 0e154d9c69d..fe23b17a62b 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -1,12 +1,5 @@ # vim: filetype=3Dautomake =20 -EXTRA_DIST +=3D \ - rpc/gendispatch.pl \ - rpc/genprotocol.pl \ - rpc/virnetprotocol.x \ - rpc/virkeepaliveprotocol.x \ - $(NULL) - VIR_NET_RPC_GENERATED =3D \ rpc/virnetprotocol.h \ rpc/virnetprotocol.c \ @@ -14,9 +7,6 @@ VIR_NET_RPC_GENERATED =3D \ rpc/virkeepaliveprotocol.c \ $(NULL) =20 -BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) -CLEANFILES +=3D $(VIR_NET_RPC_GENERATED) - noinst_LTLIBRARIES +=3D \ libvirt-net-rpc.la \ libvirt-net-rpc-server.la \ @@ -49,11 +39,6 @@ libvirt_net_rpc_la_SOURCES +=3D \ rpc/virnetsshsession.h \ rpc/virnetsshsession.c \ $(NULL) -else ! WITH_SSH2 -EXTRA_DIST +=3D \ - rpc/virnetsshsession.h \ - rpc/virnetsshsession.c \ - $(NULL) endif ! WITH_SSH2 =20 if WITH_SASL @@ -61,11 +46,6 @@ libvirt_net_rpc_la_SOURCES +=3D \ rpc/virnetsaslcontext.h \ rpc/virnetsaslcontext.c \ $(NULL) -else ! WITH_SASL -EXTRA_DIST +=3D \ - rpc/virnetsaslcontext.h \ - rpc/virnetsaslcontext.c \ - $(NULL) endif ! WITH_SASL =20 if WITH_LIBSSH @@ -73,11 +53,6 @@ libvirt_net_rpc_la_SOURCES +=3D \ rpc/virnetlibsshsession.h \ rpc/virnetlibsshsession.c \ $(NULL) -else ! WITH_LIBSSH -EXTRA_DIST +=3D \ - rpc/virnetlibsshsession.h \ - rpc/virnetlibsshsession.c \ - $(NULL) endif ! WITH_LIBSSH =20 libvirt_net_rpc_la_CFLAGS =3D \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index a8390f82652..586e6e372fd 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -10,10 +10,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(SECRET= _DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(SECRET_DRIVER_SOURCES) \ - $(NULL) - =20 if WITH_SECRETS mod_LTLIBRARIES +=3D libvirt_driver_secret.la @@ -35,7 +31,6 @@ sbin_PROGRAMS +=3D virtsecretd nodist_conf_DATA +=3D secret/virtsecretd.conf augeas_DATA +=3D secret/virtsecretd.aug augeastest_DATA +=3D secret/test_virtsecretd.aug -CLEANFILES +=3D secret/virtsecretd.aug =20 virtsecretd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtsecretd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 5f2f4c8e2de..871245a035f 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -48,20 +48,6 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in -e 's|[@]libexecdir[@]|@libexecdir@|' \ $< > $@ =20 -BUILT_SOURCES +=3D $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) -CLEANFILES +=3D $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - -EXTRA_DIST +=3D \ - $(SECURITY_DRIVER_SELINUX_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN) \ - security/apparmor/TEMPLATE.qemu \ - security/apparmor/TEMPLATE.lxc \ - security/apparmor/libvirt-qemu \ - security/apparmor/libvirt-lxc \ - $(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 diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 5e98a7ef5c5..43010ee9664 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -92,25 +92,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAG= E_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(STORAGE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_FS_SOURCES) \ - $(STORAGE_FILE_FS_SOURCES) \ - $(STORAGE_DRIVER_LVM_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) \ - $(STORAGE_DRIVER_SCSI_SOURCES) \ - $(STORAGE_DRIVER_MPATH_SOURCES) \ - $(STORAGE_DRIVER_DISK_SOURCES) \ - $(STORAGE_DRIVER_RBD_SOURCES) \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) \ - $(STORAGE_FILE_GLUSTER_SOURCES) \ - $(STORAGE_DRIVER_ZFS_SOURCES) \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ - $(STORAGE_HELPER_DISK_SOURCES) \ - $(NULL) - storagebackenddir =3D $(libdir)/libvirt/storage-backend storagebackend_LTLIBRARIES =3D =20 @@ -149,7 +130,6 @@ sbin_PROGRAMS +=3D virtstoraged nodist_conf_DATA +=3D storage/virtstoraged.conf augeas_DATA +=3D storage/virtstoraged.aug augeastest_DATA +=3D storage/test_virtstoraged.aug -CLEANFILES +=3D storage/virtstoraged.aug =20 virtstoraged_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtstoraged_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am index b84ab520bb6..c209414745e 100644 --- a/src/test/Makefile.inc.am +++ b/src/test/Makefile.inc.am @@ -8,11 +8,6 @@ TEST_DRIVER_ASSETS =3D test/test-screenshot.png =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D \ - $(TEST_DRIVER_SOURCES) \ - $(TEST_DRIVER_ASSETS) \ - $(NULL) - if WITH_TEST =20 driver_test_asset_DATA =3D $(TEST_DRIVER_ASSETS) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index eca7e7e0a1e..ca25f983090 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -239,11 +239,6 @@ UTIL_SOURCES =3D \ $(NULL) =20 =20 -EXTRA_DIST +=3D \ - $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen \ - $(NULL) - # Sync with docs/ KEYCODES =3D linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES =3D linux osx win32 @@ -253,9 +248,6 @@ KEYTABLES =3D \ $(KEYNAMES:%=3Dutil/virkeynametable_%.h) \ $(NULL) =20 -BUILT_SOURCES +=3D $(KEYTABLES) -CLEANFILES +=3D $(KEYTABLES) - UTIL_IO_HELPER_SOURCES =3D util/iohelper.c =20 noinst_LTLIBRARIES +=3D libvirt_util.la diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index c5c6d538e71..8acbdc84609 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -21,21 +21,11 @@ VBOX_DRIVER_SOURCES =3D \ vbox/vbox_XPCOMCGlue.h \ $(NULL) =20 -VBOX_DRIVER_EXTRA_DIST =3D \ - vbox/vbox_tmpl.c \ - vbox/README \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ $(NULL) =20 -EXTRA_DIST +=3D \ - $(VBOX_DRIVER_SOURCES) \ - $(VBOX_DRIVER_EXTRA_DIST) \ - $(NULL) - if WITH_VBOX noinst_LTLIBRARIES +=3D libvirt_driver_vbox_impl.la libvirt_driver_vbox_la_SOURCES =3D @@ -65,7 +55,6 @@ sbin_PROGRAMS +=3D virtvboxd nodist_conf_DATA +=3D vbox/virtvboxd.conf augeas_DATA +=3D vbox/virtvboxd.aug augeastest_DATA +=3D vbox/test_virtvboxd.aug -CLEANFILES +=3D vbox/virtvboxd.aug =20 virtvboxd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtvboxd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 10057343a6f..3caa6340daf 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -9,8 +9,6 @@ VMWARE_DRIVER_SOURCES =3D \ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES)) =20 -EXTRA_DIST +=3D $(VMWARE_DRIVER_SOURCES) - if WITH_VMWARE noinst_LTLIBRARIES +=3D libvirt_driver_vmware.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_vmware.la diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am index 429bdfe51ef..88df423fed5 100644 --- a/src/vmx/Makefile.inc.am +++ b/src/vmx/Makefile.inc.am @@ -5,8 +5,6 @@ VMX_SOURCES =3D \ vmx/vmx.h \ $(NULL) =20 -EXTRA_DIST +=3D $(VMX_SOURCES) - if WITH_VMX noinst_LTLIBRARIES +=3D libvirt_vmx.la libvirt_la_BUILT_LIBADD +=3D libvirt_vmx.la diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index f60f73bf06f..7782fd89d75 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -12,7 +12,6 @@ VZ_DRIVER_SOURCES =3D \ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) -EXTRA_DIST +=3D $(VZ_DRIVER_SOURCES) =20 =20 if WITH_VZ @@ -44,7 +43,6 @@ sbin_PROGRAMS +=3D virtvzd nodist_conf_DATA +=3D vz/virtvzd.conf augeas_DATA +=3D vz/virtvzd.aug augeastest_DATA +=3D vz/test_virtvzd.aug -CLEANFILES +=3D vz/virtvzd.aug =20 virtvzd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtvzd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) diff --git a/tests/Makefile.am b/tests/Makefile.am index c87b12d28c3..1b384f3d0c2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -74,102 +74,6 @@ LDADDS =3D \ MOCKLIBS_LIBS =3D \ ../src/libvirt.la =20 -EXTRA_DIST =3D \ - .valgrind.supp \ - bhyvexml2argvdata \ - bhyveargv2xmldata \ - bhyvexml2xmloutdata \ - capabilityschemadata \ - commanddata \ - cputestdata \ - domaincapsdata \ - domainbackupxml2xmlin \ - domainbackupxml2xmlout \ - domainconfdata \ - domainschemadata \ - fchostdata \ - genericxml2xmlindata \ - genericxml2xmloutdata \ - interfaceschemadata \ - libxlxml2domconfigdata \ - lxcconf2xmldata \ - lxcxml2xmldata \ - lxcxml2xmloutdata \ - networkxml2confdata \ - networkxml2firewalldata \ - networkxml2xmlin \ - networkxml2xmlout \ - networkxml2xmlupdatein \ - networkxml2xmlupdateout \ - nodedevschemadata \ - nodedevmdevctldata \ - virhostcpudata \ - nssdata \ - nwfilterxml2firewalldata \ - nwfilterxml2xmlin \ - nwfilterxml2xmlout \ - qemuagentdata \ - qemublocktestdata \ - qemucapabilitiesdata \ - qemucaps2xmloutdata \ - qemudomaincheckpointxml2xmlin \ - qemudomaincheckpointxml2xmlout \ - qemudomainsnapshotxml2xmlin \ - qemudomainsnapshotxml2xmlout \ - qemuhotplugtestcpus \ - qemuhotplugtestdevices \ - qemuhotplugtestdomains \ - qemumigparamsdata \ - qemumonitorjsondata \ - qemuxml2argvdata \ - qemuxml2xmloutdata \ - qemustatusxml2xmldata \ - qemumemlockdata \ - qemufirmwaredata \ - qemuvhostuserdata \ - secretxml2xmlin \ - securityselinuxhelperdata \ - securityselinuxlabeldata \ - storagepoolcapsschemadata \ - storagepoolschemadata \ - storagepoolxml2xmlin \ - storagepoolxml2xmlout \ - storagepoolxml2argvdata \ - storagevolschemadata \ - storagevolxml2argvdata \ - storagevolxml2xmlin \ - storagevolxml2xmlout \ - sysinfodata \ - test-lib.sh \ - vboxsnapshotxmldata \ - vircaps2xmldata \ - vircgroupdata \ - virconfdata \ - virfiledata \ - virjsondata \ - virmacmaptestdata \ - virmock.h \ - virmockstathelpers.c \ - virnetdaemondata \ - virnetdevtestdata \ - virnetdevopenvswitchdata \ - virnetworkportxml2xmldata \ - virnwfilterbindingxml2xmldata \ - virpcitestdata \ - virscsidata \ - virsh-uriprecedence \ - virusbtestdata \ - vmwareverdata \ - vmx2xmldata \ - xlconfigdata \ - xmconfigdata \ - xml2vmxdata \ - virsh-auth.xml \ - virstorageutildata \ - virfilecachedata \ - virresctrldata \ - $(NULL) - test_helpers =3D commandhelper ssh test_programs =3D virshtest sockettest \ virhostcputest virbuftest \ @@ -437,8 +341,6 @@ test_programs +=3D \ eventtest \ virdrivermoduletest \ virdriverconnvalidatetest -else ! WITH_LIBVIRTD -EXTRA_DIST +=3D $(libvirtd_test_scripts) endif ! WITH_LIBVIRTD =20 test_programs +=3D objecteventtest @@ -448,9 +350,6 @@ if WITH_LIBVIRTD test_scripts +=3D virt-aa-helper-test endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR -EXTRA_DIST +=3D virt-aa-helper-test - -EXTRA_DIST +=3D $(test_scripts) =20 if WITH_LINUX check-access: file-access-clean @@ -463,9 +362,6 @@ file-access-clean: > test_file_access.txt endif WITH_LINUX =20 -EXTRA_DIST +=3D \ - permitted_file_access.txt - if WITH_TESTS noinst_PROGRAMS =3D $(test_programs) $(test_helpers) noinst_LTLIBRARIES =3D $(test_libraries) @@ -533,10 +429,6 @@ libxlmock_la_SOURCES =3D \ libxlmock_la_CFLAGS =3D $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) $(GLIB_CFLAGS) libxlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) libxlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -else ! WITH_LIBXL -EXTRA_DIST +=3D xlconfigtest.c \ - xmconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL =20 QEMUMONITORTESTUTILS_SOURCES =3D \ @@ -707,24 +599,6 @@ qemuvhostusertest_SOURCES =3D \ virfilewrapper.c virfilewrapper.h \ $(NULL) qemuvhostusertest_LDADD =3D $(qemu_LDADDS) - -else ! WITH_QEMU -EXTRA_DIST +=3D qemuxml2argvtest.c qemuxml2xmltest.c \ - qemudomaincheckpointxml2xmltest.c qemudomainsnapshotxml2xmltest.c \ - testutilsqemu.c testutilsqemu.h \ - testutilsqemuschema.c testutilsqemuschema.h \ - qemumonitorjsontest.c qemuhotplugtest.c \ - qemuagenttest.c qemucapabilitiestest.c \ - qemucaps2xmltest.c qemucommandutiltest.c \ - qemumemlocktest.c qemucpumock.c testutilshostcpus.h \ - qemublocktest.c \ - qemumigparamstest.c \ - qemusecuritytest.c qemusecuritytest.h \ - qemusecuritymock.c \ - qemufirmwaretest.c \ - qemuvhostusertest.c \ - qemuhotplugmock.c \ - $(QEMUMONITORTESTUTILS_SOURCES) endif ! WITH_QEMU =20 if WITH_LXC @@ -743,8 +617,6 @@ lxcconf2xmltest_SOURCES =3D \ lxcconf2xmltest.c testutilslxc.c testutilslxc.h \ testutils.c testutils.h lxcconf2xmltest_LDADD =3D $(lxc_LDADDS) -else ! WITH_LXC -EXTRA_DIST +=3D lxcxml2xmltest.c testutilslxc.c testutilslxc.h endif ! WITH_LXC =20 if WITH_OPENVZ @@ -753,10 +625,7 @@ openvzutilstest_SOURCES =3D \ testutils.c testutils.h openvzutilstest_LDADD =3D $(LDADDS) \ ../src/libvirt_driver_openvz.la -else ! WITH_OPENVZ -EXTRA_DIST +=3D openvzutilstest.c endif ! WITH_OPENVZ -EXTRA_DIST +=3D openvzutilstest.conf =20 if WITH_ESX esxutilstest_SOURCES =3D \ @@ -766,8 +635,6 @@ esxutilstest_LDADD =3D $(LDADDS) esxutilstest_CFLAGS =3D \ -I$(top_builddir)/src/esx \ $(AM_CFLAGS) -else ! WITH_ESX -EXTRA_DIST +=3D esxutilstest.c endif ! WITH_ESX =20 if WITH_VBOX @@ -776,8 +643,6 @@ vboxsnapshotxmltest_SOURCES =3D \ testutils.c testutils.h vbox_LDADDS =3D ../src/libvirt_driver_vbox_impl.la vboxsnapshotxmltest_LDADD =3D $(LDADDS) $(vbox_LDADDS) -else ! WITH_VBOX -EXTRA_DIST +=3D vboxsnapshotxmltest.c endif ! WITH_VBOX =20 if WITH_VMX @@ -790,8 +655,6 @@ xml2vmxtest_SOURCES =3D \ xml2vmxtest.c \ testutils.c testutils.h xml2vmxtest_LDADD =3D $(LDADDS) -else ! WITH_VMX -EXTRA_DIST +=3D vmx2xmltest.c xml2vmxtest.c endif ! WITH_VMX =20 if WITH_VMWARE @@ -799,8 +662,6 @@ vmwarevertest_SOURCES =3D \ vmwarevertest.c \ testutils.c testutils.h vmwarevertest_LDADD =3D $(LDADDS) -else ! WITH_VMWARE -EXTRA_DIST +=3D vmwarevertest.c endif ! WITH_VMWARE =20 if WITH_BHYVE @@ -832,13 +693,6 @@ bhyveargv2xmltest_SOURCES =3D \ bhyveargv2xmltest.c \ testutils.c testutils.h bhyveargv2xmltest_LDADD =3D $(bhyve_LDADDS) -else ! WITH_BHYVE -EXTRA_DIST +=3D \ - bhyvexml2argvtest.c \ - bhyveargv2xmltest.c \ - bhyvexml2xmltest.c \ - bhyvexml2argvmock.c \ - bhyveargv2xmlmock.c endif ! WITH_BHYVE =20 networkxml2xmlupdatetest_SOURCES =3D \ @@ -866,9 +720,6 @@ networkxml2firewalltest_SOURCES =3D \ networkxml2firewalltest.c \ testutils.c testutils.h networkxml2firewalltest_LDADD =3D ../src/libvirt_driver_network_impl.la $(= LDADDS) - -else ! WITH_NETWORK -EXTRA_DIST +=3D networkxml2xmltest.c networkxml2conftest.c endif ! WITH_NETWORK =20 if WITH_STORAGE_SHEEPDOG @@ -879,8 +730,6 @@ storagebackendsheepdogtest_LDADD =3D \ ../src/libvirt_storage_backend_sheepdog_priv.la \ ../src/libvirt_driver_storage_impl.la \ $(LDADDS) -else ! WITH_STORAGE_SHEEPDOG -EXTRA_DIST +=3D storagebackendsheepdogtest.c endif ! WITH_STORAGE_SHEEPDOG =20 nwfilterxml2xmltest_SOURCES =3D \ @@ -955,13 +804,6 @@ storagepoolxml2xmltest_LDADD =3D $(LDADDS) \ storagepoolcapstest_SOURCES =3D \ storagepoolcapstest.c testutils.h testutils.c storagepoolcapstest_LDADD =3D $(LDADDS) - -else ! WITH_STORAGE -EXTRA_DIST +=3D storagevolxml2argvtest.c -EXTRA_DIST +=3D virstorageutiltest.c -EXTRA_DIST +=3D storagepoolxml2argvtest.c -EXTRA_DIST +=3D storagepoolxml2xmltest.c -EXTRA_DIST +=3D storagepoolcapstest.c endif ! WITH_STORAGE =20 storagevolxml2xmltest_SOURCES =3D \ @@ -1137,8 +979,6 @@ virnettlscontexttest_SOURCES +=3D pkix_asn1_tab.c virnettlscontexttest_LDADD +=3D -ltasn1 virnettlssessiontest_SOURCES +=3D pkix_asn1_tab.c virnettlssessiontest_LDADD +=3D -ltasn1 -else ! HAVE_LIBTASN1 -EXTRA_DIST +=3D pkix_asn1_tab.c endif ! HAVE_LIBTASN1 =20 virtimetest_SOURCES =3D \ @@ -1265,9 +1105,6 @@ libvirfilemock_la_SOURCES =3D \ virfilemock.c libvirfilemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) libvirfilemock_la_LIBADD =3D $(MOCKLIBS_LIBS) -else ! WITH_LINUX -EXTRA_DIST +=3D vircaps2xmltest.c virnumamock.c virfilewrapper.c \ - virfilewrapper.h virresctrltest.c virfilemock.c endif ! WITH_LINUX =20 if WITH_NSS @@ -1311,8 +1148,6 @@ nssguestlinktest_CFLAGS =3D \ -I$(top_srcdir)/tools/nss nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDFLAGS =3D $(NULL) -else ! WITH_NSS -EXTRA_DIST +=3D nsstest.c nssmock.c nsslinktest.c endif ! WITH_NSS =20 libvirdeterministichashmock_la_SOURCES =3D \ @@ -1334,10 +1169,6 @@ virnetdevopenvswitchtest_LDADD =3D $(LDADDS) test_programs +=3D \ virmacmaptest \ virnetdevopenvswitchtest -else ! WITH_YAJL -EXTRA_DIST +=3D \ - virmacmaptest.c \ - virnetdevopenvswitchtest.c endif ! WITH_YAJL =20 virnetdevtest_SOURCES =3D \ @@ -1382,10 +1213,6 @@ libvirtestmock_la_LIBADD =3D \ $(MOCKLIBS_LIBS) \ $(PROBES_O) \ ../src/libvirt_util.la -else ! WITH_LINUX - EXTRA_DIST +=3D virusbtest.c virusbmock.c \ - virnetdevbandwidthtest.c virnetdevbandwidthmock.c \ - virtestmock.c endif ! WITH_LINUX =20 if WITH_DBUS @@ -1409,9 +1236,6 @@ virsystemdtest_SOURCES =3D \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD =3D $(LDADDS) $(DBUS_LIBS) - -else ! WITH_DBUS -EXTRA_DIST +=3D virdbustest.c virdbusmock.c virsystemdtest.c endif ! WITH_DBUS =20 viruritest_SOURCES =3D \ @@ -1458,8 +1282,6 @@ securityselinuxlabeltest_DEPENDENCIES =3D libsecurity= selinuxhelper.la \ endif WITH_QEMU endif WITH_ATTR endif WITH_SECDRIVER_SELINUX -EXTRA_DIST +=3D securityselinuxtest.c securityselinuxlabeltest.c \ - securityselinuxhelper.c =20 virbuftest_SOURCES =3D \ virbuftest.c testutils.h testutils.c @@ -1553,19 +1375,10 @@ fchosttest_LDADD =3D $(LDADDS) scsihosttest_SOURCES =3D \ scsihosttest.c testutils.h testutils.c scsihosttest_LDADD =3D $(LDADDS) - -else ! WITH_LINUX -EXTRA_DIST +=3D fchosttest.c -EXTRA_DIST +=3D scsihosttest.c endif ! WITH_LINUX =20 if WITH_LINUX virscsitest_SOURCES =3D \ virscsitest.c testutils.h testutils.c virscsitest_LDADD =3D $(LDADDS) - -else ! WITH_LINUX -EXTRA_DIST +=3D virscsitest.c endif ! WITH_LINUX - -CLEANFILES =3D *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/tools/Makefile.am b/tools/Makefile.am index eb8f269b486..0530e439a8b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -49,24 +49,6 @@ ICON_FILES =3D \ libvirt_win_icon_64x64.ico \ virsh_win_icon.rc =20 -EXTRA_DIST =3D \ - $(ICON_FILES) \ - $(conf_DATA) \ - virt-xml-validate.in \ - virt-pki-validate.in \ - virt-sanlock-cleanup.in \ - libvirt-guests.sysconf \ - virt-login-shell.conf \ - virsh-edit.c \ - bash-completion/vsh \ - libvirt_recover_xattrs.sh \ - $(NULL) - - -CLEANFILES =3D -DISTCLEANFILES =3D -MAINTAINERCLEANFILES =3D - confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 @@ -76,7 +58,6 @@ libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK sbin_SCRIPTS =3D virt-sanlock-cleanup -DISTCLEANFILES +=3D virt-sanlock-cleanup endif WITH_SANLOCK =20 if WITH_LOGIN_SHELL @@ -139,20 +120,14 @@ VIRT_HOST_VALIDATE_BHYVE =3D \ virt-host-validate-bhyve.h if WITH_QEMU virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_QEMU) -else ! WITH_QEMU -EXTRA_DIST +=3D $(VIRT_HOST_VALIDATE_QEMU) endif ! WITH_QEMU =20 if WITH_LXC virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_LXC) -else ! WITH_LXC -EXTRA_DIST +=3D $(VIRT_HOST_VALIDATE_LXC) endif ! WITH_LXC =20 if WITH_BHYVE virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_BHYVE) -else ! WITH_BHYVE -EXTRA_DIST +=3D $(VIRT_HOST_VALIDATE_BHYVE) endif ! WITH_BHYVE =20 virt_host_validate_LDFLAGS =3D \ @@ -260,7 +235,6 @@ virt_admin_LDADD =3D \ virt_admin_CFLAGS =3D \ $(AM_CFLAGS) \ $(READLINE_CFLAGS) -BUILT_SOURCES =3D =20 if WITH_WIN_ICON virsh_LDADD +=3D virsh_win_icon.$(OBJEXT) @@ -303,8 +277,6 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: =20 -EXTRA_DIST +=3D libvirt-guests.sh.in - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ @@ -316,9 +288,7 @@ libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)= /config.status < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ -BUILT_SOURCES +=3D libvirt-guests.sh =20 -EXTRA_DIST +=3D libvirt-guests.service.in SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -331,8 +301,6 @@ uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: =20 -BUILT_SOURCES +=3D libvirt-guests.service - else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: uninstall-systemd: @@ -372,8 +340,6 @@ uninstall-bash-completion: endif ! WITH_BASH_COMPLETION =20 =20 -EXTRA_DIST +=3D wireshark/util/genxdrstub.pl - if WITH_WIRESHARK_DISSECTOR =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la @@ -514,16 +480,3 @@ lib_LTLIBRARIES =3D \ nss/libnss_libvirt_guest.la =20 endif WITH_NSS - -EXTRA_DIST +=3D $(LIBVIRT_NSS_SOURCES) \ - $(srcdir)/nss/libvirt_nss.syms \ - $(srcdir)/nss/libvirt_nss_bsd.syms \ - $(srcdir)/nss/libvirt_guest_nss.syms - -clean-local: - -rm -rf wireshark/src/libvirt - -CLEANFILES +=3D $(bin_SCRIPTS) -CLEANFILES +=3D *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s - -DISTCLEANFILES +=3D $(BUILT_SOURCES) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893643; cv=none; d=zohomail.com; s=zohoarc; b=C6Q3D8K+N873nsgJhQDDHdyjLIl9U3zF2cIXKes1W6ZVZUcM+7QPUiNW28RsNhg/RmrdAUub035gkBeiTJuaMumE24umRVxWFBgrJbwTFzRTq/TmjnZ/yMWb9/Whg8hzWP7+TI4eSDRNbYT8QvGTFiMgswObUTQv3IHeCXHZdr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893643; 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=CYNiXj51TJDeOfuR9w26iHJ85XkJfRUuDiNJ7EDrWs8=; b=KV76njkjggiLyYdHtDh/l3g3XEjIdfH9baMF+4djroChmL6nRHa8N1qVV+Ud0r1WrRz9v987+rqlRQ2VEcmhKAXW0U0s5b9Y/umIMS77V2XwijMCL0fyyIu0i7rv7X78sY5+0tnyg3693xjbk3PSUc0JbHb6vgOvNLjuDZZQhL8= 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 1594893643679234.81411758454317; Thu, 16 Jul 2020 03:00:43 -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-1-_0MG5tGKMbuueHYxZv6LIA-1; Thu, 16 Jul 2020 06:00:14 -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 DBB3D1005260; Thu, 16 Jul 2020 10:00:08 +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 B5D401001B07; Thu, 16 Jul 2020 10:00:08 +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 834539623B; Thu, 16 Jul 2020 10:00:08 +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 06G9xwon015053 for ; Thu, 16 Jul 2020 05:59:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93DB52B6DC; Thu, 16 Jul 2020 09:59:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F94F2B6DB for ; Thu, 16 Jul 2020 09:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893642; 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=CYNiXj51TJDeOfuR9w26iHJ85XkJfRUuDiNJ7EDrWs8=; b=foCeZqAoQ/g6QiUdjttvPiTzuFODepwufd0ZIl8cRk5K5u1kS0+cPH83UT7WhMNlOQSUOJ cWy8x4PMnivck8m6tT462k/UXs6p1UmVLZwHNyWX2a6G4MKO+Uiugh9oYh/SO4naa0OfYR toIoqARSBwTedOnjFesjJ4slbU3UyL0= X-MC-Unique: _0MG5tGKMbuueHYxZv6LIA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 003/351] meson: drop driver_module configure argument Date: Thu, 16 Jul 2020 11:53:59 +0200 Message-Id: <81d07e3e6cc2afb958addb1c800e2f39af845e8d.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 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" Building without driver_module is not supported anymore so drop the option before switching to meson as we will not introduce it there. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- configure.ac | 1 - m4/virt-driver-modules.m4 | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 0ab9bf9721d..97dbfe9ec2b 100644 --- a/configure.ac +++ b/configure.ac @@ -796,7 +796,6 @@ LIBVIRT_WIN_CHECK_WINDRES =20 =20 dnl Driver-Modules library support -LIBVIRT_ARG_DRIVER_MODULES LIBVIRT_CHECK_DRIVER_MODULES =20 =20 diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 index 54b75e09739..f7902283884 100644 --- a/m4/virt-driver-modules.m4 +++ b/m4/virt-driver-modules.m4 @@ -17,25 +17,10 @@ dnl License along with this library. If not, see dnl . dnl =20 -AC_DEFUN([LIBVIRT_ARG_DRIVER_MODULES], [ - LIBVIRT_ARG_WITH([DRIVER_MODULES], [build drivers as loadable modules], - [yes]) -]) - AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [ AC_REQUIRE([LIBVIRT_CHECK_DLOPEN]) =20 - if test "$with_libvirtd" =3D "no" ; then - with_driver_modules=3Dno - else - if test "$with_driver_modules" =3D "no"; then - AC_MSG_ERROR([Building without driver modules is not supported anymo= re]) - fi - - if test "$with_driver_modules" =3D "check"; then - with_driver_modules=3Dyes - fi - fi + with_driver_modules=3D$with_libvirtd =20 DRIVER_MODULES_CFLAGS=3D if test "$with_driver_modules" =3D "yes"; then --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893666; cv=none; d=zohomail.com; s=zohoarc; b=O9BImY29cvK8mG1lIPzA/hLWg5ZysoqYdHsfJHhlMg3QrT2iRdFmE9Y0PHKAnSp3USb+REMWeRi9fNEghv3slAb6An56oNml8vQSN+1JrQMYv5QWZq5vA0MAW0yjGSn4VMltCMjQSQouSXEhey1uWE/3yDK7e2bP3tGyF6Bg25M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893666; 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=Bc8XLxT/s3tbpzXKVu/kfJmAQS5S87HezSdK2nQkpsE=; b=j8WxMPLjioa2OOEWViRfQBq0koa39xbqIAK94LjrlKV3j31/qS1BexXpCyd0QYMLvjlD5j94ci8gVSQkKBWYf/JizRW33BrJKbEnpRgU01RRdYF0DFw48gPE80gl/yZSaLODKkHbxusRUnJfZ1nRTOqwTZxtGY+uMMBVtlcAWYk= 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 1594893666333719.044781328231; Thu, 16 Jul 2020 03:01:06 -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-374-5wu4AkCdP1SOhRf8IrYenQ-1; Thu, 16 Jul 2020 06:00: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 A387210059BB; Thu, 16 Jul 2020 10:00:02 +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 7FB436FEFB; Thu, 16 Jul 2020 10:00: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 3D0371800CAF; Thu, 16 Jul 2020 10:00: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 06G9xxuJ015065 for ; Thu, 16 Jul 2020 05:59:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B9512B6DC; Thu, 16 Jul 2020 09:59:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB0202B6DB for ; Thu, 16 Jul 2020 09:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893665; 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=Bc8XLxT/s3tbpzXKVu/kfJmAQS5S87HezSdK2nQkpsE=; b=Y1dNWpEkR8AaHRQYg6iLRFAH8sy9Bdo9KEAXaGMcJKsVdavvp0wsF0QS4swgbLvWhlt1Qg OtCdxSgE3x4Dt4spa5zJ/7PT3URpnPeF/PtFk5pDBfFyk034Fgmt7pQ4v4jrBNCdPj1FbX Qf31ZXiWgZOwTea6I5xIhOdaiQI2pg0= X-MC-Unique: 5wu4AkCdP1SOhRf8IrYenQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 004/351] meson: drop loader_nvram build option Date: Thu, 16 Jul 2020 11:54:00 +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.12 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" With the switch to meson it should be safe to drop this build option. We don't have any deprecation policy so let's take the opportunity when everything will break current users. Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-loader-nvram.m4 | 49 ----------------------------------------- 2 files changed, 52 deletions(-) delete mode 100644 m4/virt-loader-nvram.m4 diff --git a/configure.ac b/configure.ac index 97dbfe9ec2b..23074d3badd 100644 --- a/configure.ac +++ b/configure.ac @@ -515,7 +515,6 @@ LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_CHRDEV_LOCK_FILES LIBVIRT_ARG_DEFAULT_EDITOR -LIBVIRT_ARG_LOADER_NVRAM LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY @@ -528,7 +527,6 @@ LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_CHRDEV_LOCK_FILES LIBVIRT_CHECK_DEFAULT_EDITOR -LIBVIRT_CHECK_LOADER_NVRAM LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY @@ -1047,7 +1045,6 @@ LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_DEFAULT_EDITOR -LIBVIRT_RESULT_LOADER_NVRAM LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4 deleted file mode 100644 index ed2ae0cf27b..00000000000 --- a/m4/virt-loader-nvram.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl The loader:nvram list check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_LOADER_NVRAM], [ - LIBVIRT_ARG_WITH([LOADER_NVRAM], - [Pass list of pairs of : paths. - Both pairs and list items are separated by a colon.], - ['']) -]) - -AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ - if test "x$with_loader_nvram" !=3D "xno" && \ - test "x$with_loader_nvram" !=3D "x" ; then - l=3D$(echo $with_loader_nvram | tr ':' '\n' | wc -l) - if test $(expr $l % 2) -ne 0 ; then - AC_MSG_ERROR([Malformed --with-loader-nvram argument]) - elif test $l -gt 0 ; then - AC_MSG_WARN([Note that --with-loader-nvram is obsolete and will be r= emoved soon]) - fi - AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$with_loader_nvram"], - [List of loader:nvram pairs]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_LOADER_NVRAM], [ - if test "x$with_loader_nvram" !=3D "xno" && \ - test "x$with_loader_nvram" !=3D "x" ; then - LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram], - [!!! Using this configure option is strongly discourage= d !!!]) - else - LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram]) - fi -]) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893748; cv=none; d=zohomail.com; s=zohoarc; b=G9Lk2IBdbk7ySjkSBOwc5yYTDR4gTGdG97jdp7beXXj8lY5HSw6D1ZU6+yVcOx1mtczyZ9PulLtKswqCgQkqGZMmlWzRl/FbB7syVV1nqxFLikYUqRvFbL+yVYKpNuU06INkedUTb6ug2aMvCb8o1ZegpMEuR5ZxbpnL97j7354= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893748; 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=8b834s2SGatvaXHP9zHU+ZYrtqCKQtoPCMSttNOZLac=; b=NLCxb9TC1uhebAzm0GYZHDMmX0H13tLQHvJJ3+Q/u8vpRJ/PSumx4zZq7YxbHql0CygLfgD2g8en6bCnQFzhnOiP98DHxSnhDlixiQPWqrEfnswBVOQhOLPX/jdaRtLdhr9ok5kR/gNi5IxsitNhSr0WL1P5D00OlDgdO/grSiU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893748296303.8748105535932; Thu, 16 Jul 2020 03:02:28 -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-210-iNe0z6SuNuW_M3wNclQ0XQ-1; Thu, 16 Jul 2020 06:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7B47809DB2; Thu, 16 Jul 2020 10:01:59 +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 C685A79504; Thu, 16 Jul 2020 10:01:59 +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 0AAC396222; Thu, 16 Jul 2020 10:01:57 +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 06GA00iO015073 for ; Thu, 16 Jul 2020 06:00:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 652DE2B6E2; Thu, 16 Jul 2020 10:00:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D28C62B6DC for ; Thu, 16 Jul 2020 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893747; 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=8b834s2SGatvaXHP9zHU+ZYrtqCKQtoPCMSttNOZLac=; b=IupSa2xKiwkVjQpfeZOHl4Y0jgjmUPCddnwEQdHYe126sser5g9jR8MLgexMCSGyHuTVyk y30/HjCSOoDufX17heKKZN9Oa/1rAAZz2KAYurUbW+zeg7K9jdRTPz583UBfQ/VluE6eQ8 ptAh+9znTbtPwYnrohN3FJ4amprQ9l8= X-MC-Unique: iNe0z6SuNuW_M3wNclQ0XQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 005/351] meson: Makefile: drop cov target Date: Thu, 16 Jul 2020 11:54:01 +0200 Message-Id: <350638e911ecf77e04bdb20294992a940187edfb.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.14 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" Coverage functionality is provided directly by meson so there is no need to convert it into meson. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- Makefile.am | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 310a9d90276..fbb3cb09ff1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,9 +16,6 @@ ## License along with this library. If not, see ## . =20 -LCOV =3D lcov -GENHTML =3D genhtml - # when building from tarball -Werror isn't auto enabled # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror @@ -45,17 +42,6 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) =20 -cov: - $(MKDIR_P) $(top_builddir)/coverage - $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ - -d $(top_builddir)/src \ - -d $(top_builddir)/tests - $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ - -o $(top_builddir)/coverage/libvirt.info - rm $(top_builddir)/coverage/libvirt.info.tmp - $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ - --legend $(top_builddir)/coverage/libvirt.info - dist-hook: gen-AUTHORS =20 .PHONY: gen-AUTHORS --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893641; cv=none; d=zohomail.com; s=zohoarc; b=KblVRH0avHFVQzG+knELDEWm8uEirBYJHEVlJUVzytrvZssHPonHxTFJBJTItlpAYQa3NFc7U94BErgDa+g+T6ATM+vjPARkinyhiRqR0KSLrzxl+VKZmbvMNt48+J/uvC3/sOt16gl6+FMw006Fs63LGs8tEipvXvRXqMuyodU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893641; 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=CO2iiWEgMCFMleHY8fx63/wZo54HRvFb6w/ItllRjf4=; b=PJQnW4ZhAWeChIefyYiKZwFyUry1v2P4/4TPV4krWGDgkiTo42KdkrHDkyFIBFqwstHQmir8tRCytJw4atTLCWBGGmiRBSYrGvdR+AxGxukcKNbI4Ej4k5riq8TgqG7lOeAhS97KW8eekYrhBRoLU84JSovI+p2afIRmFeKvNug= 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 1594893641237581.6564295817274; Thu, 16 Jul 2020 03:00:41 -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-399-ODreIoozPsmr-Jfl8c7irA-1; Thu, 16 Jul 2020 06:00:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 249CE100526A; Thu, 16 Jul 2020 10:00:05 +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 028E578525; Thu, 16 Jul 2020 10:00:05 +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 C1E6C1800FDE; Thu, 16 Jul 2020 10:00:04 +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 06GA012B015083 for ; Thu, 16 Jul 2020 06:00:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E1082B6E2; Thu, 16 Jul 2020 10:00:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBDDD2B6DC for ; Thu, 16 Jul 2020 10:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893640; 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=CO2iiWEgMCFMleHY8fx63/wZo54HRvFb6w/ItllRjf4=; b=c1TbJFKhxY0s4qn0tFEkIM9fp41yRRKJE2YIy10OBLH1yT6QY68ctLbBJJhYcnFsSJba6S UzARaziLN9J+laT1dO6P9jsOAsqaAv9UrSG2c8bV2tYQbC0xZE3gxZYqF3J37+5rDCGdBx fQyBFr12Zo9aKN8/6/svrz9AyD5u2K0= X-MC-Unique: ODreIoozPsmr-Jfl8c7irA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 006/351] meson: syntax-check: drop Makefile and m4 related checks Date: Thu, 16 Jul 2020 11:54:02 +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.11 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" Rewrite to meson will eliminate most of the Makefile and all of m4 files so there is no need to check them. We still need to ignore mk files otherwise syntax-check.mk would be considered as well. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- build-aux/syntax-check.mk | 58 ++------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index bf229c42a74..3d7b644f01f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -785,14 +785,6 @@ sc_spec_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi =20 -# Nested conditionals are easier to understand if we enforce that endifs -# can be paired back to the if -sc_makefile_conditionals: - @prohibit=3D'(else|endif)($$| *#)' \ - in_vc_files=3D'Makefile\.am' \ - halt=3D'match "if FOO" with "endif FOO" in Makefiles' \ - $(_sc_search_regexp) - # Long lines can be harder to diff; too long, and git send-email chokes. # For now, only enforce line length on files where we have intentionally # fixed things and don't want to regress. @@ -801,10 +793,6 @@ sc_prohibit_long_lines: in_vc_files=3D'\.arg[sv]' \ halt=3D'Wrap long lines in expected output files' \ $(_sc_search_regexp) - @prohibit=3D'.{80}' \ - in_vc_files=3D'Makefile(\.inc)?\.am' \ - halt=3D'Wrap long lines in Makefiles' \ - $(_sc_search_regexp) =20 sc_copyright_format: @require=3D'Copyright .*Red 'Hat', Inc\.' \ @@ -1793,40 +1781,6 @@ sc_const_long_option: halt=3D'add "const" to the above declarations' \ $(_sc_search_regexp) =20 -# Ensure that we use only the standard $(VAR) notation, -# not @...@ in Makefile.am, now that we can rely on automake -# to emit a definition for each substituted variable. -# However, there is still one case in which @VAR@ use is not just -# legitimate, but actually required: when augmenting an automake-defined -# variable with a prefix. For example, gettext uses this: -# MAKEINFO =3D env LANG=3D LC_MESSAGES=3D LC_ALL=3D LANGUAGE=3D @MAKEINFO@ -# otherwise, makeinfo would put German or French (current locale) -# navigation hints in the otherwise-English documentation. -# -# Allow the package to add exceptions via a hook in syntax-check.mk; -# for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by -# setting this to ' && !/PRAGMA_SYSTEM_HEADER/'. -_makefile_at_at_check_exceptions ?=3D -sc_makefile_at_at_check: - @perl -ne '/\@\w+\@/' \ - -e ' && !/(\w+)\s+=3D.*\@\1\@$$/' \ - -e ''$(_makefile_at_at_check_exceptions) \ - -e 'and (print "$$ARGV:$$.: $$_"), $$m=3D1; END {exit !$$m}' \ - $$($(VC_LIST_EXCEPT) | $(GREP) -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \ - && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || : - -sc_makefile_TAB_only_indentation: - @prohibit=3D'^ [ ]{8}' \ - in_vc_files=3D'akefile|\.mk$$' \ - halt=3D'found TAB-8-space indentation' \ - $(_sc_search_regexp) - -sc_m4_quote_check: - @prohibit=3D'(AC_DEFINE(_UNQUOTED)?|AC_DEFUN)\([^[]' \ - in_vc_files=3D'(^configure\.ac|\.m4)$$' \ - halt=3D'quote the first arg to AC_DEF*' \ - $(_sc_search_regexp) - gen_source_files: $(MAKE) -C src generated-sources =20 @@ -1839,8 +1793,8 @@ perl_translatable_files_list_ =3D \ -e 'foreach $$file (@ARGV) {' \ -e ' \# Consider only file extensions with one or two letters' \ -e ' $$file =3D~ /\...?$$/ or next;' \ - -e ' \# Ignore m4 and mk files' \ - -e ' $$file =3D~ /\.m[4k]$$/ and next;' \ + -e ' \# Ignore mk files' \ + -e ' $$file =3D~ /\.mk$$/ and next;' \ -e ' \# Ignore a .c or .h file with a corresponding .l or .y file' \ -e ' $$file =3D~ /(.+)\.[ch]$$/ && (-e "$${1}.l" || -e "$${1}.y")' \ -e ' and next;' \ @@ -1993,12 +1947,6 @@ exclude_file_name_regexp--sc_po_check =3D ^(docs/|sr= c/rpc/gendispatch\.pl$$|tests/ exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY =3D \ ^(build-aux/syntax-check\.mk|include/libvirt/virterror\.h|src/remote/rem= ote_daemon_dispatch\.c|src/util/virerror\.c|docs/internals/oomtesting\.html= \.in)$$ =20 -exclude_file_name_regexp--sc_makefile_TAB_only_indentation =3D \ - ^build-aux/syntax-check\.mk$$ - -exclude_file_name_regexp--sc_makefile_at_at_check =3D \ - ^build-aux/syntax-check\.mk$$ - exclude_file_name_regexp--sc_prohibit_PATH_MAX =3D \ ^build-aux/syntax-check\.mk$$ =20 @@ -2076,8 +2024,6 @@ exclude_file_name_regexp--sc_size_of_brackets =3D bui= ld-aux/syntax-check\.mk exclude_file_name_regexp--sc_correct_id_types =3D \ (^src/locking/lock_protocol.x$$) =20 -exclude_file_name_regexp--sc_m4_quote_check =3D m4/virt-lib.m4 - exclude_file_name_regexp--sc_prohibit_include_public_headers_quote =3D \ ^(src/internal\.h$$|tools/wireshark/src/packet-libvirt.c$$) =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893751; cv=none; d=zohomail.com; s=zohoarc; b=E3YuylCWn3aelGxbAh+6UHgMvIGL8oNx6qEzq6DmUHOuzHnux5LORqLTkBQzwU3+nyP9JGkWYSBW6QGttv4C30n9ANcMVVQi8diOEWdp4MHeIm0QuQWEvbVzKVMcCQGilc4Gal6Ste28YSHfit/OWEb/W2yffXtd4B2Wxgm00Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893751; 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=trLa5vCDgYB+BA/XPzbOK/R/6/RXW80cydX6o+Jte6Q=; b=ihs/ntkXqw7aQ16CZ5ZqlgfUfe3fvXgXIiEtygss527+ehCfu4/r7pQbCgu+rEUzXax2czkJ0c0MGqYYHhH1ETRHgcmGQs2iF5RNKsuy0shCkr9aC0cFUVhGx0jLwu03etbr/DlyW3Wl9PQgrRY4e7xy8u1wd/QD7T2PjoZ0KDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893751887687.4815183710223; Thu, 16 Jul 2020 03:02:31 -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-120-VuQm4MdOORW569izaFv6eQ-1; Thu, 16 Jul 2020 06:02:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35AB58B8D2C; Thu, 16 Jul 2020 10:02:01 +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 1356476164; Thu, 16 Jul 2020 10:02:01 +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 D1E4296222; Thu, 16 Jul 2020 10:02:00 +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 06GA0Rhj015240 for ; Thu, 16 Jul 2020 06:00:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 224DA2B6DC; Thu, 16 Jul 2020 10:00:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EFD62DE79 for ; Thu, 16 Jul 2020 10:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893750; 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=trLa5vCDgYB+BA/XPzbOK/R/6/RXW80cydX6o+Jte6Q=; b=bE6z3ydJ0bvNfkZWwasZNVezGWbLExwp4zX9q/BqFmISASaNVtCS+Qtv4hyezQhowIDXTD CaVJh6bxIgASRKR2uEeUcGUitUydSmGSqLrbzg799eWw3h/3gGzRXtW4AK5nE6NDGBW4jt F14+PtncpixrZWXk9pJZwulyaqcvmPw= X-MC-Unique: VuQm4MdOORW569izaFv6eQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 007/351] meson: m4: drop not relevant m4 files Date: Thu, 16 Jul 2020 11:54:03 +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.11 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" These will not be ported to meson since the function provided by them is available by meson directly. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- m4/virt-arg.m4 | 154 ------------------ m4/virt-lib.m4 | 386 ---------------------------------------------- m4/virt-result.m4 | 42 ----- 3 files changed, 582 deletions(-) delete mode 100644 m4/virt-arg.m4 delete mode 100644 m4/virt-lib.m4 delete mode 100644 m4/virt-result.m4 diff --git a/m4/virt-arg.m4 b/m4/virt-arg.m4 deleted file mode 100644 index d626d72a6c1..00000000000 --- a/m4/virt-arg.m4 +++ /dev/null @@ -1,154 +0,0 @@ -dnl -dnl virt-arg.m4: Helper macros for adding configure arguments -dnl -dnl Copyright (C) 2012-2014 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - - -dnl -dnl To be used instead of AC_ARG_WITH -dnl -dnl See LIBVIRT_ARG_WITH_FEATURE if the argument you're adding is going to -dnl be used for switching a feature on and off. -dnl -dnl LIBVIRT_ARG_WITH([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_DESC: Description that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl -dnl LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) -dnl LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory], [$(datadir= )/doc]) -dnl -AC_DEFUN([LIBVIRT_ARG_WITH], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_desc], [[$2]]) - m4_pushdef([default_action], [$3]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [with-]check_name_dash) - m4_pushdef([with_var], [with_]check_name_lc) - - m4_divert_text([DEFAULTS], [with_var][[=3D]][default_action]) - AC_ARG_WITH([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - ]m4_dquote(help_desc)[[ @<:@default=3D]]m4_d= quote(default_action)[[@:>@])]) - - m4_popdef([with_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([default_action]) - m4_popdef([help_desc]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used instead of AC_ARG_WITH -dnl -dnl The difference between LIBVIRT_ARG_WITH and this macro is that the for= mer -dnl is mostly an enhanced drop-in replacement for AC_ARG_WITH, whereas the -dnl latter is tailored for adding an argument that is going to be used to -dnl switch a feature on and off: as a consequence, it optionally supports -dnl specifying the minimum version for libraries the feature depends on and -dnl automatically builds a suitable description from the feature name. -dnl -dnl LIBVIRT_ARG_WITH_FEATURE([CHECK_NAME], [HELP_NAME], [DEFAULT_ACTION], = [MIN_VERSION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_NAME: Name that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl MIN_VERSION: Specify minimal version that will be added to -dnl configure --help (optional) -dnl -dnl LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SeLinux], [check]) -dnl LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1]) -dnl -AC_DEFUN([LIBVIRT_ARG_WITH_FEATURE], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_name], [[$2]]) - m4_pushdef([default_action], [$3]) - m4_pushdef([min_version], [$4]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [with-]check_name_dash) - m4_pushdef([with_var], [with_]check_name_lc) - - m4_pushdef([version_text], m4_ifnblank(min_version, [[ (>=3D ]]min_versi= on[[)]])) - - m4_divert_text([DEFAULTS], [with_var][[=3D]][default_action]) - AC_ARG_WITH([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - [with ]]m4_dquote(help_name)m4_dquote(versio= n_text)[[ support @<:@default=3D]]m4_dquote(default_action)[[@:>@])]) - - m4_popdef([version_text]) - - m4_popdef([with_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([min_version]) - m4_popdef([default_action]) - m4_popdef([help_name]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used instead of AC_ARG_ENABLE -dnl -dnl LIBVIRT_ARG_ENABLE([CHECK_NAME], [HELP_DESC], [DEFAULT_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables/flags, in uppercase. -dnl HELP_DESC: Description that will appear in configure --help -dnl DEFAULT_ACTION: Default configure action -dnl -dnl LIBVIRT_ARG_ENABLE([DEBUG], [enable debugging output], [yes]) -dnl -AC_DEFUN([LIBVIRT_ARG_ENABLE], [ - m4_pushdef([check_name], [$1]) - m4_pushdef([help_desc], [[$2]]) - m4_pushdef([default_action], [$3]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - m4_pushdef([check_name_dash], m4_translit(check_name_lc, [_], [-])) - - m4_pushdef([arg_var], [enable-]check_name_dash) - m4_pushdef([enable_var], [enable_]check_name_lc) - - m4_divert_text([DEFAULTS], [enable_var][[=3D]][default_action]) - AC_ARG_ENABLE([check_name_lc], - [AS_HELP_STRING([[--]arg_var], - ]m4_dquote(help_desc)[[ @<:@default=3D]]m4= _dquote(default_action)[[@:>@])]) - - m4_popdef([enable_var]) - m4_popdef([arg_var]) - - m4_popdef([check_name_dash]) - m4_popdef([check_name_lc]) - - m4_popdef([default_action]) - m4_popdef([help_desc]) - m4_popdef([check_name]) -]) diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4 deleted file mode 100644 index daa9f801231..00000000000 --- a/m4/virt-lib.m4 +++ /dev/null @@ -1,386 +0,0 @@ -dnl -dnl virt-lib.m4: Helper macros for checking for libraries -dnl -dnl Copyright (C) 2012-2014 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - - -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_LIB([CHECK_NAME], [LIBRARY_NAME], -dnl [FUNCTION_NAME], [HEADER_NAME], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl -dnl LIBRARY_NAME: base name of library to check for eg libXXX.so -dnl FUNCTION_NAME: function to check for in libXXX.so -dnl HEADER_NAME: header file to check for -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl -dnl e.g. -dnl -dnl LIBVIRT_CHECK_LIB([SELINUX], [selinux], -dnl [getfilecon], [selinux/selinux.h]) -dnl LIBVIRT_CHECK_LIB([SANLOCK], [sanlock_client], -dnl [sanlock_init], [sanlock.h]) -dnl LIBVIRT_CHECK_LIB([LIBATTR], [attr], -dnl [getxattr], [attr/attr.h]) -dnl -AC_DEFUN([LIBVIRT_CHECK_LIB],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([library_name], [$2]) - m4_pushdef([function_name], [$3]) - m4_pushdef([header_name], [$4]) - m4_pushdef([fail_action], [$5]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - old_LIBS=3D$LIBS - old_CFLAGS=3D$CFLAGS - cflags_var=3D - libs_var=3D - - fail=3D0 - if test "x$with_var" !=3D "xno" ; then - if test "x$with_var" !=3D "xyes" && test "x$with_var" !=3D "xcheck" ; = then - cflags_var=3D"-I$with_var/include" - libs_var=3D"-L$with_var/lib" - fi - CFLAGS=3D"$CFLAGS $cflags_var" - LIBS=3D"$LIBS $libs_var" - AC_CHECK_LIB(library_name, function_name, [],[ - if test "x$with_var" !=3D "xcheck"; then - fail=3D1 - fi - with_var=3Dno - ]) - if test "$fail" =3D "0" && test "x$with_var" !=3D "xno" ; then - AC_CHECK_HEADER(header_name, [ - with_var=3Dyes - ],[ - if test "x$with_var" !=3D "xcheck"; then - fail=3D1 - fi - with_var=3Dno - ]) - fi - fi - - LIBS=3D$old_LIBS - CFLAGS=3D$old_CFLAGS - - if test $fail =3D 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the lib]library_name[ library & head= ers to compile libvirt])]) - else - if test "x$with_var" =3D "xyes" ; then - if test "x$libs_var" =3D 'x' ; then - libs_var=3D"-l[]library_name" - else - libs_var=3D"$libs_var -l[]library_name" - fi - AC_DEFINE_UNQUOTED(config_var, 1, [whether lib]library_name[ is avai= lable]) - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" =3D "xyes"]) - - AC_SUBST(cflags_var) - AC_SUBST(libs_var) - fi - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([header_name]) - m4_popdef([function_name]) - m4_popdef([library_name]) - m4_popdef([check_name]) -]) - -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_LIB_ALT([CHECK_NAME], [LIBRARY_NAME], -dnl [FUNCTION_NAME], [HEADER_NAME], -dnl [CHECK_NAME_ALT, [LIBRARY_NAME_ALT], -dnl [FUNCTION_NAME_ALT], [HEADER_NAME_ALT], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl -dnl LIBRARY_NAME: base name of library to check for eg libXXX.so -dnl FUNCTION_NAME: function to check for in libXXX.so -dnl HEADER_NAME: header file to check for -dnl -dnl CHECK_NAME_ALT: Suffix/prefix used to set additional -dnl variables if alternative check succeeds -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl NB all vars for CHECK_NAME are also set -dnl LIBRARY_NAME_ALT: alternative library name to check for -dnl FUNCTION_NAME_ALT: alternative function name to check for -dnl HEADER_NAME_ALT: alternative header file to check for -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl e.g. -dnl -dnl LIBVIRT_CHECK_LIB([YAJL], [yajl], -dnl [yajl_parse_complete], [yajl/yajl_common.h], -dnl [YAJL2], [yajl], -dnl [yajl_tree_parse], [yajl/yajl_common.h]) -dnl -AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([library_name], [$2]) - m4_pushdef([function_name], [$3]) - m4_pushdef([header_name], [$4]) - m4_pushdef([check_name_alt], [$5]) - m4_pushdef([library_name_alt], [$6]) - m4_pushdef([function_name_alt], [$7]) - m4_pushdef([header_name_alt], [$8]) - m4_pushdef([fail_action], [$9]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - m4_pushdef([config_var_alt], [WITH_]check_name_alt) - m4_pushdef([make_var_alt], [WITH_]check_name_alt) - - old_LIBS=3D$LIBS - old_CFLAGS=3D$CFLAGS - cflags_var=3D - libs_var=3D - - fail=3D0 - alt=3D0 - if test "x$with_var" !=3D "xno" ; then - if test "x$with_var" !=3D "xyes" && test "x$with_var" !=3D "xcheck" ; = then - cflags_var=3D"-I$with_var/include" - libs_var=3D"-L$with_var/lib" - fi - CFLAGS=3D"$CFLAGS $cflags_var" - LIBS=3D"$LIBS $libs_var" - AC_CHECK_LIB(library_name, function_name, [],[ - AC_CHECK_LIB(library_name_alt, function_name_alt, [ - alt=3D1 - ],[ - if test "x$with_var" !=3D "xcheck"; then - fail=3D1 - fi - with_var=3Dno - ]) - ]) - if test "$fail" =3D "0" && test "x$with_var" !=3D "xno" ; then - AC_CHECK_HEADER(header_name, [ - with_var=3Dyes - ],[ - AC_CHECK_HEADER(header_name_alt, [ - with_var=3Dyes - ],[ - if test "x$with_var" !=3D "xcheck"; then - fail=3D1 - fi - with_var=3Dno - ]) - ]) - fi - fi - - LIBS=3D$old_LIBS - CFLAGS=3D$old_CFLAGS - - if test $fail =3D 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the lib]library_name[ library & head= ers to compile libvirt])]) - else - if test "x$with_var" =3D "xyes" ; then - if test "x$libs_var" =3D 'x' ; then - libs_var=3D"-l[]library_name" - else - libs_var=3D"$libs_var -l[]library_name" - fi - - AC_DEFINE_UNQUOTED(config_var, 1, [whether lib]library_name[ is avai= lable]) - if test "$alt" =3D "1" ; then - AC_DEFINE_UNQUOTED(config_var_alt, 1, [whether lib]library_name[ i= s available]) - fi - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" =3D "xyes"]) - AM_CONDITIONAL(make_var_alt, [test "x$with_var" =3D "xyes" && test "$a= lt" =3D "1"]) - - AC_SUBST(cflags_var) - AC_SUBST(libs_var) - fi - - m4_popdef([make_var_alt]) - m4_popdef([config_var_alt]) - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([header_name_alt]) - m4_popdef([function_name_alt]) - m4_popdef([library_name_alt]) - m4_popdef([header_name]) - m4_popdef([function_name]) - m4_popdef([library_name]) - m4_popdef([check_name]) -]) - -dnl -dnl Probe for existence of libXXXX and set WITH_XXX -dnl config header var, WITH_XXXX make conditional and -dnl with_XXX configure shell var. -dnl -dnl LIBVIRT_CHECK_PKG([CHECK_NAME], [PC_NAME], [PC_VERSION], -dnl [FAIL_ACTION]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl Used to set -dnl config.h: WITH_XXX macro -dnl Makefile: WITH_XXX conditional -dnl Makefile: XXX_CFLAGS, XXX_LIBS variables -dnl configure: --with-xxx argument -dnl configure: with_xxx variable -dnl PC_NAME: Name of the pkg-config module -dnl PC_VERSION: Version of the pkg-config module -dnl FAIL_ACTION: overrides the default fail action -dnl -dnl eg -dnl -dnl LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.4]) -dnl -AC_DEFUN([LIBVIRT_CHECK_PKG],[ - m4_pushdef([check_name], [$1]) - m4_pushdef([pc_name], [$2]) - m4_pushdef([pc_version], [$3]) - m4_pushdef([fail_action], [$4]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([config_var], [WITH_]check_name) - m4_pushdef([make_var], [WITH_]check_name) - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - fail=3D0 - if test "x$with_var" !=3D "xno" ; then - PKG_CHECK_MODULES(check_name, pc_name[ >=3D ]pc_version, [ - with_var=3Dyes - ],[ - if test "x$with_var" !=3D "xcheck"; then - fail=3D1 - fi - with_var=3Dno - ]) - fi - - if test $fail =3D 1; then - m4_default(fail_action, - [AC_MSG_ERROR([You must install the ]pc_name[ >=3D ]pc_version[ pkg-= config module to compile libvirt])]) - fi - - if test "x$with_var" =3D "xyes" ; then - AC_DEFINE_UNQUOTED(config_var, 1, [whether ]pc_name[ >=3D ]pc_version[= is available]) - fi - - AM_CONDITIONAL(make_var, [test "x$with_var" =3D "xyes"]) - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - m4_popdef([make_var]) - m4_popdef([config_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([fail_action]) - m4_popdef([pc_version]) - m4_popdef([pc_name]) - m4_popdef([check_name]) -]) - -dnl -dnl To be used after a call to LIBVIRT_CHECK_LIB, -dnl LIBVIRT_CHECK_LIB_ALT or LIBVIRT_CHECK_PKG -dnl to print the result status -dnl -dnl LIBVIRT_RESULT_LIB([CHECK_NAME]) -dnl -dnl CHECK_NAME: Suffix/prefix used for variables / flags, in uppercase. -dnl -dnl LIBVIRT_RESULT_LIB([SELINUX]) -dnl -AC_DEFUN([LIBVIRT_RESULT_LIB],[ - m4_pushdef([check_name], [$1]) - - m4_pushdef([check_name_lc], m4_tolower(check_name)) - - m4_pushdef([cflags_var], check_name[_CFLAGS]) - m4_pushdef([libs_var], check_name[_LIBS]) - m4_pushdef([with_var], [with_]check_name_lc) - - LIBVIRT_RESULT(check_name_lc, [$with_var], [CFLAGS=3D'$cflags_var' LIBS= =3D'$libs_var']) - - m4_popdef([with_var]) - m4_popdef([libs_var]) - m4_popdef([cflags_var]) - - m4_popdef([check_name_lc]) - - m4_popdef([check_name]) -]) diff --git a/m4/virt-result.m4 b/m4/virt-result.m4 deleted file mode 100644 index 36973ba0b54..00000000000 --- a/m4/virt-result.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl -dnl virt-result.m4: Helper macros for checking for libraries -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -dnl -dnl To be used to print the results of a conditional test -dnl -dnl LIBVIRT_RESULT(CHECK_NAME, STATUS, DETAILS) -dnl -dnl CHECK_NAME: Name of the item being checked -dnl STATUS: 'yes' or 'no' result of check -dnl DETAILS: Details of result eg compiler flags -dnl -dnl eg -dnl -dnl LIBVIRT_RESULT([yajl], [yes], [-I/opt/yajl/include -lyajl]) -dnl -AC_DEFUN([LIBVIRT_RESULT], [ - if test "$2" =3D "no" || test -z "$3" ; then - STR=3D`printf "%20s: %s" "$1" "$2"` - else - STR=3D`printf "%20s: %s (%s)" "$1" "$2" "$3"` - fi - - AC_MSG_NOTICE([$STR]) -]) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893639; cv=none; d=zohomail.com; s=zohoarc; b=c9GpnLtQGZlDBywA9YF2Bkg9BL4A9T30rI+6RCJz9AamN/tk96lRC8UxF8mOaoLR+N0cXjBRykwzeXWe/S02LW1/BtJSq9wRRXgQpmwAavDYSK1sxvM3Ve+gc3cG6L180x9mCo/VQW+wKAdYosrQORNaDJfBM00cgbk3MJAfhjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893639; 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=X1MifAO7+Kwzqf1rrYM99tSqQavqkPgxxGz2/NvxiLU=; b=MJRq9bVAWoKXXIeI0mihGw+KBOxHaXQ1NGa0VKZm32ysbaVv7hpcnG9CjUBROuqrvMcdqucL+WjLtxuNoUJ/bF3UQ6NGSGBelN9GpaOR2Ukd+c+4he1sKgdXI6L8t5uIRVHstw6fLVjVrdLm2qU/sPNzHEPa0+taivyOJAlJpn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893639983758.0405141179812; Thu, 16 Jul 2020 03:00:39 -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-438-zlaimd3hO-GB2q4EQ7VWHA-1; Thu, 16 Jul 2020 06:00:36 -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 331C58015F4; Thu, 16 Jul 2020 10:00:31 +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 0EE9674F64; Thu, 16 Jul 2020 10:00:31 +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 CB7B41800FEE; Thu, 16 Jul 2020 10:00:30 +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 06GA0Srs015248 for ; Thu, 16 Jul 2020 06:00:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D4672B6DC; Thu, 16 Jul 2020 10:00:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B3452DE72 for ; Thu, 16 Jul 2020 10:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893638; 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=X1MifAO7+Kwzqf1rrYM99tSqQavqkPgxxGz2/NvxiLU=; b=HU0nX40g98GGyxt1nXDBwJdkdbcBV3ilf0IghPkQInyILN31zSUquTl+UuxqjCU7Lec1I8 6obplMQ6ATEn9OEoCiWWTVVAhTmr1Yav07O+lZgq158Vw0PZ5oYY6F3ZCRO4/Giujw4p2r Lks9sjtXrywhm8HkR7HrzRb9m0pDwQs= X-MC-Unique: zlaimd3hO-GB2q4EQ7VWHA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 008/351] meson: src/util/virfile: rewrite virFileActivateDirOverrideForProg Date: Thu, 16 Jul 2020 11:54:04 +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 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" With meson we no longer have .libs directory with the actual binary so we have to take a different approach to detect if running from build directory. This is not as robust as for autotools because if you select --prefix in the build directory it will incorrectly enable the override as well but nobody should do that. We have to modify some of the tests to not add current build path into PATH variable and use the full path for virsh instead. Otherwise it would be impossible to figure out that we are running virsh from build directory. Signed-off-by: Pavel Hrdina --- src/util/virfile.c | 34 ++++++++++++++++++------- tests/virsh-optparse | 58 +++++++++++++++++++------------------------ tests/virsh-schedinfo | 12 +++------ 3 files changed, 54 insertions(+), 50 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 213acdbcaa2..4542a38278e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1781,21 +1781,37 @@ virFileFindResource(const char *filename, * virFileActivateDirOverrideForProg: * @argv0: argv[0] of the calling program * - * Look at @argv0 and try to detect if running from - * a build directory, by looking for a 'lt-' prefix - * on the binary name, or '/.libs/' in the path + * Combine $PWD and @argv0, canonicalize it and check if abs_top_builddir + * matches as prefix in the path. */ void virFileActivateDirOverrideForProg(const char *argv0) { - char *file =3D strrchr(argv0, '/'); - if (!file || file[1] =3D=3D '\0') + const char *pwd =3D g_getenv("PWD"); + g_autofree char *fullPath =3D NULL; + g_autofree char *canonPath =3D NULL; + const char *path =3D NULL; + + if (!pwd) return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { + + if (argv0[0] !=3D '/') { + fullPath =3D g_strdup_printf("%s/%s", pwd, argv0); + canonPath =3D virFileCanonicalizePath(fullPath); + + if (!canonPath) { + VIR_DEBUG("Failed to get canonicalized path errno=3D%d", errno= ); + return; + } + + path =3D canonPath; + } else { + path =3D argv0; + } + + if (STRPREFIX(path, abs_top_builddir)) { useDirOverride =3D true; - VIR_DEBUG("Activating build dir override for %s", argv0); + VIR_DEBUG("Activating build dir override for %s", path); } } =20 diff --git a/tests/virsh-optparse b/tests/virsh-optparse index d9c8f3c731b..fed71a8509e 100755 --- a/tests/virsh-optparse +++ b/tests/virsh-optparse @@ -21,17 +21,11 @@ =20 test_expensive =20 -# If $abs_top_builddir/tools is not early in $PATH, put it there, -# so that we can safely invoke "virsh" simply with its name. -case $PATH in - $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;; - $abs_top_builddir/tools:*) ;; - *) PATH=3D$abs_top_builddir/tools:$PATH; export PATH ;; -esac +VIRSH=3D$abs_top_builddir/tools/virsh =20 if test "$VERBOSE" =3D yes; then set -x - virsh --version + $VIRSH --version fi =20 cat <<\EOF > exp-out || framework_failure @@ -63,7 +57,7 @@ for args in \ '--count 2 test' \ '--count=3D2 test' \ ; do - virsh -k0 -d0 -c $test_url setvcpus $args >out 2>>err || fail=3D1 + $VIRSH -k0 -d0 -c $test_url setvcpus $args >out 2>>err || fail=3D1 LC_ALL=3DC sort out | compare exp-out - || fail=3D1 done =20 @@ -81,7 +75,7 @@ cat <<\EOF > exp-out || framework_failure =20 EOF -virsh -q -c $test_url snapshot-create-as --print-xml test \ +$VIRSH -q -c $test_url snapshot-create-as --print-xml test \ --diskspec 'vda,file=3Da&b,,c,snapshot=3Dexternal' --description '1<2' \ --diskspec vdb --memspec file=3Dd,,e >out 2>>err || fail=3D1 compare exp-out out || fail=3D1 @@ -96,7 +90,7 @@ cat <<\EOF > exp-out || framework_failure =20 EOF -virsh -q -c $test_url snapshot-create-as --print-xml test name vda vdb \ +$VIRSH -q -c $test_url snapshot-create-as --print-xml test name vda vdb \ >out 2>>err || fail=3D1 compare exp-out out || fail=3D1 =20 @@ -120,7 +114,7 @@ for args in \ '--description desc --name name --domain test vda vdb' \ '--description desc --diskspec vda --name name --domain test vdb' \ ; do - virsh -q -c $test_url snapshot-create-as --print-xml $args \ + $VIRSH -q -c $test_url snapshot-create-as --print-xml $args \ >out 2>>err || fail=3D1 compare exp-out out || fail=3D1 done @@ -131,7 +125,7 @@ test -s err && fail=3D1 cat <<\EOF > exp-err || framework_failure error: this function is not supported by the connection driver: virDomainQ= emuMonitorCommand EOF -virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=3D1 +$VIRSH -q -c $test_url qemu-monitor-command test a >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -141,7 +135,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value 'abc' for option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start abc >out 2>err && fail=3D1 +$VIRSH -q -c $test_url cpu-stats test --start abc >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -149,7 +143,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42WB' for option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start 42WB >out 2>err && fail=3D1 +$VIRSH -q -c $test_url cpu-stats test --start 42WB >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -158,7 +152,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42MB' for option is malformed or out of range EOF -virsh -q -c $test_url cpu-stats test --start 42MB >out 2>err && fail=3D1 +$VIRSH -q -c $test_url cpu-stats test --start 42MB >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -166,7 +160,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '2147483648' for option is malformed or out o= f range EOF -virsh -q -c $test_url cpu-stats test --start 2147483648 >out 2>err && fail= =3D1 +$VIRSH -q -c $test_url cpu-stats test --start 2147483648 >out 2>err && fai= l=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -175,7 +169,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Invalid value for start CPU EOF -virsh -q -c $test_url cpu-stats test --start -1 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url cpu-stats test --start -1 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -185,7 +179,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Scaled numeric value 'abc' for option is malformed or out of= range EOF -virsh -q -c $test_url setmaxmem test abc >out 2>err && fail=3D1 +$VIRSH -q -c $test_url setmaxmem test abc >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -194,18 +188,18 @@ cat <<\EOF > exp-err || framework_failure error: Scaled numeric value '42WB' for option is malformed or out o= f range error: invalid argument: unknown suffix 'WB' EOF -virsh -q -c $test_url setmaxmem test 42WB >out 2>err && fail=3D1 +$VIRSH -q -c $test_url setmaxmem test 42WB >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 # Numeric value with valid suffix -virsh -q -c $test_url setmaxmem test 42MB --config >out 2>err || fail=3D1 +$VIRSH -q -c $test_url setmaxmem test 42MB --config >out 2>err || fail=3D1 test -s out && fail=3D1 test -s err && fail=3D1 =20 # Numeric value bigger than INT_MAX. No failure here because # scaled numeric values are unsigned long long -virsh -q -c $test_url setmaxmem test 2147483648 --config >out 2>err || fai= l=3D1 +$VIRSH -q -c $test_url setmaxmem test 2147483648 --config >out 2>err || fa= il=3D1 test -s out && fail=3D1 test -s err && fail=3D1 =20 @@ -213,7 +207,7 @@ test -s err && fail=3D1 cat <<\EOF > exp-err || framework_failure error: Scaled numeric value '-1' for option is malformed or out of = range EOF -virsh -q -c $test_url setmaxmem test -1 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url setmaxmem test -1 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -223,12 +217,12 @@ cat <<\EOF > exp-err || framework_failure error: Unable to change MaxMemorySize error: memory in virDomainSetMaxMemory must not be zero EOF -virsh -q -c $test_url setmaxmem test 0 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url setmaxmem test 0 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 # Numeric value -virsh -q -c $test_url setmaxmem test 42 --config >out 2>err || fail=3D1 +$VIRSH -q -c $test_url setmaxmem test 42 --config >out 2>err || fail=3D1 test -s out && fail=3D1 test -s err && fail=3D1 =20 @@ -238,7 +232,7 @@ test -s err && fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value 'abc' for option is malformed or out of ran= ge EOF -virsh -q -c $test_url event --all --timeout abc >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout abc >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -247,7 +241,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '2147484' for option is malformed or out of= range EOF -virsh -q -c $test_url event --all --timeout 2147484 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout 2147484 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -255,7 +249,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42WB' for option is malformed or out of ra= nge EOF -virsh -q -c $test_url event --all --timeout 42WB >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout 42WB >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -264,7 +258,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '42MB' for option is malformed or out of ra= nge EOF -virsh -q -c $test_url event --all --timeout 42MB >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout 42MB >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -272,7 +266,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '-1' for option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout -1 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout -1 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -281,7 +275,7 @@ compare exp-err err || fail=3D1 cat <<\EOF > exp-err || framework_failure error: Numeric value '0' for option is malformed or out of range EOF -virsh -q -c $test_url event --all --timeout 0 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout 0 >out 2>err && fail=3D1 test -s out && fail=3D1 compare exp-err err || fail=3D1 =20 @@ -291,7 +285,7 @@ cat <<\EOF > exp-out || framework_failure event loop timed out events received: 0 EOF -virsh -q -c $test_url event --all --timeout 1 >out 2>err && fail=3D1 +$VIRSH -q -c $test_url event --all --timeout 1 >out 2>err && fail=3D1 test -s err && fail=3D1 compare exp-out out || fail=3D1 =20 diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo index d6d9ac2d59e..e4e2509f762 100755 --- a/tests/virsh-schedinfo +++ b/tests/virsh-schedinfo @@ -19,17 +19,11 @@ =20 . "$(dirname $0)/test-lib.sh" =20 -# If $abs_top_builddir/tools is not early in $PATH, put it there, -# so that we can safely invoke "virsh" simply with its name. -case $PATH in - $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;; - $abs_top_builddir/tools:*) ;; - *) PATH=3D$abs_top_builddir/tools:$PATH; export PATH ;; -esac +VIRSH=3D$abs_top_builddir/tools/virsh =20 if test "$VERBOSE" =3D yes; then set -x - virsh --version + $VIRSH --version fi =20 printf 'Scheduler : fair\n\n' > exp-out || framework_failure @@ -39,7 +33,7 @@ fail=3D0 =20 test_url=3Dtest:///default =20 -virsh -c $test_url schedinfo 1 --set j=3Dk >out 2>err && fail=3D1 +$VIRSH -c $test_url schedinfo 1 --set j=3Dk >out 2>err && fail=3D1 compare exp-out out || fail=3D1 compare exp-err err || fail=3D1 =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893643; cv=none; d=zohomail.com; s=zohoarc; b=KRRecye2w/cMFosx2+hiZ63RL5ARuo9NIatFd/hGHY9cTLjvjzLiXdeecDhKyhCE+q0p3nCRxCwFzoggh3TVVAbiW09qjG2QSYWE3LaxOrWx2zUnoFzC1k4U0estUcKic2UjeXHlWBLy1rasg4Y9FU3E6pZ+kpbzqsfTxg5LMY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893643; 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=w7uyfGy2uD+e6Lop/hI2gDDTyiHijYnOlA7Blx7RMdc=; b=KQRx9zi08RZA2yjYYVrPA8YgN3CpygbFnl3SAeJKNEwRmiwktTVmcH9OWHdk6zTkJxZtVjjqSuROMNRmhC5vefqnY3erePVIGkwWMVI7jpNWeZZroN2CNh4rVqPMzPU3QhhVLnMqSya+k/60kTqlHnzSMTtZFAxhYNwfbfZk6GI= 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 1594893643767651.1915394192366; Thu, 16 Jul 2020 03:00:43 -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-119-uxhJ3CUqMWy2lbKUvpmihA-1; Thu, 16 Jul 2020 06:00:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF661108C; Thu, 16 Jul 2020 10:00:33 +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 8E90972ADA; Thu, 16 Jul 2020 10:00:33 +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 5A45F9623B; Thu, 16 Jul 2020 10:00:33 +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 06GA0SND015259 for ; Thu, 16 Jul 2020 06:00:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id ED6D42B6E2; Thu, 16 Jul 2020 10:00:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66C8E2B6DC for ; Thu, 16 Jul 2020 10:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893642; 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=w7uyfGy2uD+e6Lop/hI2gDDTyiHijYnOlA7Blx7RMdc=; b=FQWJNCAwhH1onmJhNIZIt6dVudZufUwRPNbd44ckq9y1E4PghnRKKk1Q/AMgzPtDwwWnAS eXM0YPHVQz7NFNkJC952aV4JBm2JNQ2D3yZqya5ya8T1HPjXxrPYOv6WihTZGRQh3HWZB1 EEDLhBLftdygxMX0Mked2MV34QA+zw4= X-MC-Unique: uxhJ3CUqMWy2lbKUvpmihA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 009/351] meson: tests: remove '.libs' from all relevant paths Date: Thu, 16 Jul 2020 11:54:05 +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.15 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" Meson doesn't use .libs directory, everything is placed directly into directories where meson.build file is used. In order to have working tests we need to fix all the paths pointing '.libs' directory. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- docs/logging.html.in | 2 +- examples/systemtap/lock-debug.stp | 2 +- run.in | 2 +- src/driver.c | 2 +- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 2 +- src/locking/lock_manager.c | 2 +- src/storage/storage_backend.c | 2 +- src/util/virstoragefilebackend.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/shunloadtest.c | 4 ++-- tests/testutils.h | 2 +- tests/viridentitytest.c | 2 +- tests/virt-aa-helper-test | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/logging.html.in b/docs/logging.html.in index 3ff0dd3eb67..b4e7d0c3864 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -209,7 +209,7 @@ $ journalctl MESSAGE_ID=3D8ae2f3fb-2dbe-498e-8fbd-012d4= 0afa361 --output=3Djson "LIBVIRT_QEMU_BINARY" : "/bin/qemu-system-xtensa", "MESSAGE" : "Failed to probe capabilities for /bin/qemu-system-xtensa:" \ "internal error: Child process (LC_ALL=3DC LD_LIBRARY_PATH= =3D/home/berrange" \ - "/src/virt/libvirt/src/.libs PATH=3D/usr/lib64/ccache:/usr/l= ocal/sbin:" \ + "/src/virt/libvirt/src PATH=3D/usr/lib64/ccache:/usr/local/s= bin:" \ "/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin HOME= =3D/root " \ "USER=3Droot LOGNAME=3Droot /bin/qemu-system-xtensa -help) u= nexpected " \ "exit status 127: /bin/qemu-system-xtensa: error while loadi= ng shared " \ diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-de= bug.stp index 0c9cc386924..a68a3855695 100644 --- a/examples/systemtap/lock-debug.stp +++ b/examples/systemtap/lock-debug.stp @@ -12,7 +12,7 @@ # source git directory, it should be only slight modification to the follo= wing: # # ./run stap --ldd -c src/libvirtd -d src/libvirtd -# examples/systemtap/lock-debug.stp src/.libs/libvirt.so +# examples/systemtap/lock-debug.stp src/libvirt.so # # Debug RWLock mechanisms as well. # diff --git a/run.in b/run.in index d508e648020..1a0dee4d9ee 100644 --- a/run.in +++ b/run.in @@ -50,7 +50,7 @@ prepend() # Find this script. b=3D@abs_builddir@ =20 -prepend LD_LIBRARY_PATH "$b/src/.libs" +prepend LD_LIBRARY_PATH "$b/src" export LD_LIBRARY_PATH =20 prepend PKG_CONFIG_PATH "$b/src" diff --git a/src/driver.c b/src/driver.c index e7452106ed9..37bf9de3921 100644 --- a/src/driver.c +++ b/src/driver.c @@ -56,7 +56,7 @@ virDriverLoadModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_driver_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", DEFAULT_DRIVER_DIR, "LIBVIRT_DRIVER_DIR"))) return -1; diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 9243bcf9034..f6d4dd71e7e 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -4,7 +4,7 @@ =20 prefix=3D@abs_top_builddir@ exec_prefix=3D@abs_top_builddir@ -libdir=3D@abs_top_builddir@/src/.libs +libdir=3D@abs_top_builddir@/src includedir=3D@abs_top_builddir@/include source_includedir=3D@abs_top_srcdir@/include datarootdir=3D@abs_top_builddir@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index a4f9e65c03e..b224679d7e3 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -4,7 +4,7 @@ =20 prefix=3D@abs_top_builddir@ exec_prefix=3D@abs_top_builddir@ -libdir=3D@abs_top_builddir@/src/.libs +libdir=3D@abs_top_builddir@/src includedir=3D@abs_top_builddir@/include source_includedir=3D@abs_top_srcdir@/include datarootdir=3D@abs_top_builddir@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index a16e4552105..93a42a457b4 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -4,7 +4,7 @@ =20 prefix=3D@abs_top_builddir@ exec_prefix=3D@abs_top_builddir@ -libdir=3D@abs_top_builddir@/src/.libs +libdir=3D@abs_top_builddir@/src includedir=3D@abs_top_builddir@/include source_includedir=3D@abs_top_srcdir@/include datarootdir=3D@abs_top_builddir@ diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 07318fb53f0..39e482f11cd 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const c= har *name, if (!(modfile =3D virFileFindResourceFull(name, NULL, ".so", - abs_top_builddir "/src/.li= bs", + abs_top_builddir "/src", LIBDIR "/libvirt/lock-driv= er", "LIBVIRT_LOCK_MANAGER_PLUG= IN_DIR"))) goto cleanup; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e9f6663e6d1..1f83236f2fc 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_storage_backend_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_BACKEND_MODULE_DIR, "LIBVIRT_STORAGE_BACKEND_DIR")= )) return -1; diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefileback= end.c index f362436d9ba..bf452a1dc5d 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name, if (!(modfile =3D virFileFindResourceFull(name, "libvirt_storage_file_", ".so", - abs_top_builddir "/src/.libs", + abs_top_builddir "/src", STORAGE_FILE_MODULE_DIR, "LIBVIRT_STORAGE_FILE_DIR"))) return -1; diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index 50b447c1637..2989a668b75 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -374,4 +374,4 @@ mymain(void) =20 VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("domaincaps"), - abs_builddir "/.libs/libsecurityselinuxhelper.so") + abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 3f069c2d6be..ae4b08b9d8a 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -339,4 +339,4 @@ mymain(void) return (ret =3D=3D 0) ? EXIT_SUCCESS : EXIT_FAILURE; } =20 -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelpe= r.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index b377c07294f..d4ab3cd5acf 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv) fprintf(stderr, " .%*s 1 ", 39, ""); signal(SIGSEGV, sigHandler); =20 - if (!(lib =3D dlopen("./.libs/libshunload.so", RTLD_LAZY))) { - fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror= ()); + if (!(lib =3D dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) { + fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror()); return 1; } if (!(startup =3D dlsym(lib, "shunloadStart"))) { diff --git a/tests/testutils.h b/tests/testutils.h index 3f32aa72002..ff5c98a0785 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -140,7 +140,7 @@ int virTestMain(int argc, return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } =20 -#define VIR_TEST_MOCK(mock) (abs_builddir "/.libs/lib" mock "mock" MOCK_EX= T) +#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock" MOCK_EXT) =20 virCapsPtr virTestGenericCapsInit(void); virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq); diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 9a8c8914d36..fd01eeaa80b 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -158,7 +158,7 @@ mymain(void) } =20 #if WITH_SELINUX -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelpe= r.so") +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") #else VIR_TEST_MAIN(mymain) #endif diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index 6a6703ecf5c..8dbe82a6b98 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -15,7 +15,7 @@ fi =20 output=3D"/dev/null" use_valgrind=3D"" -ld_library_path=3D"../src/.libs/" +ld_library_path=3D"../src/" if [ ! -z "$1" ] && [ "$1" =3D "-d" ]; then output=3D"/dev/stdout" shift --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893704; cv=none; d=zohomail.com; s=zohoarc; b=IPjhZSbmW6/2xh7ztEeirP7Aw85qfvGoDuWUQU/o+nf/kBZBjIGqcnigK+xvgrmGHTisvRUQHJobE72a3Rw6XCKOHpGkJS7lvMn/p4w447WDtMS2KR2VYqrQfexWL4QDVxs5zFpxwM4s3xZIipUadMZMvXkbxyOyhl8hvkTudhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893704; 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=V2ed4jGgBsNj7y79WZSJad8/fzTGLUB0a8E1dfyKT6U=; b=AYhJZPkDPz+60XA/9k6ZM997wZb0e8UMmXzCkhhE0gWG8wnlyJR6N23lvOszEjZp9dvQhAKLQib10YsCFsPUmG/mM64mBQBS6X3oma4/vVH6Jm1rd46vu6ZBuGSjKtDEkLoubzzeqEiyF09t1U0adl8Z3DAgG7KvDUgIdk3DWwM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893704001790.1190550370101; Thu, 16 Jul 2020 03:01:44 -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-15-aPPV1AF7OVipTu1r-QpbvQ-1; Thu, 16 Jul 2020 06:00:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2ABB8027F1; Thu, 16 Jul 2020 10:00:33 +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 A32CE78A5C; Thu, 16 Jul 2020 10:00:33 +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 70A4B1800FF0; Thu, 16 Jul 2020 10:00:33 +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 06GA0Ta7015266 for ; Thu, 16 Jul 2020 06:00:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id D91C32B6E2; Thu, 16 Jul 2020 10:00:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5406C2B6DC for ; Thu, 16 Jul 2020 10:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893701; 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=V2ed4jGgBsNj7y79WZSJad8/fzTGLUB0a8E1dfyKT6U=; b=URmbrELcj0qTvEEbfiOpUqnxaeVM3Fl9EYf/eOmaCxJ5xpMS0m4Heamvr4TDuomOBtiJZF 3mZkXzBbgZ9pDZEJzXyd7kwnOYoVz243cQcFmashN8fcaVD75FqXCmlaOyf5o8I56ebl9U EHFlQXPPMivJWBpF1StQmK6pApUB1aE= X-MC-Unique: aPPV1AF7OVipTu1r-QpbvQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 010/351] meson: introduce meson build files Date: Thu, 16 Jul 2020 11:54:06 +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.14 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" The PACKAGE* variables are defined by AC_INIT so we have to define explicitly with meson. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- autogen.sh | 53 ------------------ config.h | 1 + configure.ac | 96 --------------------------------- meson.build | 134 ++++++++++++++++++++++++++++++++++++++++++++++ meson_options.txt | 3 ++ 5 files changed, 138 insertions(+), 149 deletions(-) delete mode 100755 autogen.sh create mode 100644 config.h create mode 100644 meson.build create mode 100644 meson_options.txt diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 389f07ef4d2..00000000000 --- a/autogen.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# -# THe following options must come first. All other or subsequent -# arguments are passed to configure: -# --no-git skip `git submodule update --init` - -test -n "$srcdir" || srcdir=3D$(dirname "$0") -test -n "$srcdir" || srcdir=3D. - -olddir=3D$(pwd) - -cd "$srcdir" - -(test -f src/libvirt.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level libvirt directory" - exit 1 -} - -if [ "x$1" =3D x--no-git ]; then - shift -else - git submodule update --init || exit 1 -fi - -autoreconf --verbose --force --install || exit 1 - -if test "x$1" =3D "x--system"; then - shift - prefix=3D/usr - libdir=3D$prefix/lib - sysconfdir=3D/etc - localstatedir=3D/var - if [ -d /usr/lib64 ]; then - libdir=3D$prefix/lib64 - fi - EXTRA_ARGS=3D"--prefix=3D$prefix --sysconfdir=3D$sysconfdir --localsta= tedir=3D$localstatedir --libdir=3D$libdir" -fi - -cd "$olddir" - -if [ "$NOCONFIGURE" =3D "" ]; then - $srcdir/configure $EXTRA_ARGS "$@" || exit 1 - - if [ "$1" =3D "--help" ]; then - exit 0 - else - echo "Now type 'make' to compile libvirt" || exit 1 - fi -else - echo "Skipping configure process." -fi diff --git a/config.h b/config.h new file mode 100644 index 00000000000..05cd1507f45 --- /dev/null +++ b/config.h @@ -0,0 +1 @@ +#include diff --git a/configure.ac b/configure.ac index 23074d3badd..a91ed590edd 100644 --- a/configure.ac +++ b/configure.ac @@ -16,16 +16,7 @@ dnl You should have received a copy of the GNU Lesser Ge= neral Public dnl License along with this library. If not, see dnl . =20 -AC_INIT([libvirt], [6.6.0], [libvir-list@redhat.com], [], [https://libvirt= .org]) - -if test $srcdir =3D "." -then - AC_MSG_ERROR([Build directory must be different from source directory]) -fi - -AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([config.h]) AH_BOTTOM([#include ]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms @@ -50,61 +41,6 @@ m4_ifndef([AM_SILENT_RULES], =20 AC_CANONICAL_HOST =20 -AC_USE_SYSTEM_EXTENSIONS - -# First extract pieces from the version number string -LIBVIRT_MAJOR_VERSION=3D`echo $VERSION | awk -F. '{print $1}'` -LIBVIRT_MINOR_VERSION=3D`echo $VERSION | awk -F. '{print $2}'` -LIBVIRT_MICRO_VERSION=3D`echo $VERSION | awk -F. '{print $3}'` -LIBVIRT_VERSION=3D$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_M= ICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX -LIBVIRT_VERSION_NUMBER=3D`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIR= T_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` - -# In libtool terminology we need to figure out: -# -# CURRENT -# The most recent interface number that this library implements. -# -# REVISION -# The implementation number of the CURRENT interface. -# -# AGE -# The difference between the newest and oldest interfaces that this -# library implements. -# -# In other words, the library implements all the interface numbers -# in the range from number `CURRENT - AGE' to `CURRENT'. -# -# Libtool assigns the soname version from `CURRENT - AGE', and we -# don't want that to ever change in libvirt. ie it must always be -# zero, to produce libvirt.so.0. -# -# We would, however, like the libvirt version number reflected -# in the so version'd symlinks, and this is based on AGE.REVISION -# eg libvirt.so.0.AGE.REVISION -# -# Assuming we do ever want to break soname version, this can -# toggled. But seriously, don't ever touch this. -LIBVIRT_SONUM=3D0 - -# The following examples show what libtool will do -# -# Input: 0.9.14 -> libvirt.so.0.9.14 -# Input: 1.0.0 -> libvirt.so.0.1000.0 -# Input: 2.5.8 -> libvirt.so.0.2005.8 -# -AGE=3D`expr $LIBVIRT_MAJOR_VERSION '*' 1000 + $LIBVIRT_MINOR_VERSION` -REVISION=3D$LIBVIRT_MICRO_VERSION -CURRENT=3D`expr $LIBVIRT_SONUM + $AGE` -LIBVIRT_VERSION_INFO=3D$CURRENT:$REVISION:$AGE - -AC_SUBST([LIBVIRT_MAJOR_VERSION]) -AC_SUBST([LIBVIRT_MINOR_VERSION]) -AC_SUBST([LIBVIRT_MICRO_VERSION]) -AC_SUBST([LIBVIRT_SONUM]) -AC_SUBST([LIBVIRT_VERSION]) -AC_SUBST([LIBVIRT_VERSION_INFO]) -AC_SUBST([LIBVIRT_VERSION_NUMBER]) - LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no]) if test "x$with_packager" !=3D "xno" @@ -126,27 +62,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP =20 -dnl autoconf 2.70 adds a --runstatedir option so that downstreams -dnl can point to /run instead of the historic /var/run, but -dnl autoconf hasn't had a release since 2012. -if test "x$runstatedir" =3D x; then - AC_SUBST([runstatedir], ['${localstatedir}/run']) -fi - -dnl we introduce --with-runstatedir and then overwrite the -dnl value of $runstatedir so configmake.h is more useful -AC_ARG_WITH( - [runstatedir], - [AS_HELP_STRING( - [--with-runstatedir], - [State directory for temporary sockets, pid files, etc])]) - -if test -n "$with_runstatedir" -then - runstatedir=3D$with_runstatedir -fi - - dnl get 64-int interfaces on 32-bit platforms AC_SYS_LARGEFILE =20 @@ -450,17 +365,6 @@ dnl =20 LIBVIRT_CHECK_EXTERNAL_PROGRAMS =20 -dnl if --prefix is /usr, don't use /usr/var for localstatedir -dnl or /usr/etc for sysconfdir -dnl as this makes a lot of things break in testing situations - -if test "$prefix" =3D "/usr" && test "$localstatedir" =3D '${prefix}/var' = ; then - localstatedir=3D'/var' -fi -if test "$prefix" =3D "/usr" && test "$sysconfdir" =3D '${prefix}/etc' ; t= hen - sysconfdir=3D'/etc' -fi - dnl dnl Virtualization drivers check dnl diff --git a/meson.build b/meson.build new file mode 100644 index 00000000000..12a6a14ee58 --- /dev/null +++ b/meson.build @@ -0,0 +1,134 @@ +project( + 'libvirt', 'c', + version: '6.6.0', + license: 'LGPLv2+', + meson_version: '>=3D 0.54.0', + default_options: [ + 'buildtype=3Ddebugoptimized', + 'c_std=3Dgnu99', + ], +) + + +# figure out if we are building from git + +git =3D run_command('test', '-d', '.git').returncode() =3D=3D 0 + +if git and not get_option('no-git') + run_command('git', 'submodule', 'update', '--init') +endif + + +# prepare build configuration data + +conf =3D configuration_data() + +conf.set('_GNU_SOURCE', 1) +conf.set_quoted('abs_top_builddir', meson.build_root()) +conf.set_quoted('abs_top_srcdir', meson.source_root()) +conf.set_quoted('PACKAGE', meson.project_name()) +conf.set_quoted('PACKAGE_NAME', meson.project_name()) +conf.set_quoted('PACKAGE_VERSION', meson.project_version()) +conf.set_quoted('VERSION', meson.project_version()) + + +# set various paths + +if get_option('system') + prefix =3D '/usr' + libdir =3D prefix / 'lib64' + if run_command('test', '-d', libdir).returncode() !=3D 0 + libdir =3D prefix / 'lib' + endif + localstatedir =3D '/var' + sysconfdir =3D '/etc' +else + prefix =3D get_option('prefix') + libdir =3D prefix / get_option('libdir') + localstatedir =3D prefix / get_option('localstatedir') + sysconfdir =3D prefix / get_option('sysconfdir') +endif + +# if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for +# sysconfdir as this makes a lot of things break in testing situations +if prefix =3D=3D '/usr' + if localstatedir =3D=3D '/usr/var' + localstatedir =3D '/var' + endif + if sysconfdir =3D=3D '/usr/etc' + sysconfdir =3D '/etc' + endif +endif + +runstatedir =3D get_option('runstatedir') +if runstatedir =3D=3D '' + runstatedir =3D localstatedir / 'run' +endif + +bindir =3D prefix / get_option('bindir') +datadir =3D prefix / get_option('datadir') +includedir =3D prefix / get_option('includedir') +infodir =3D prefix / get_option('infodir') +libexecdir =3D prefix / get_option('libexecdir') +localedir =3D prefix / get_option('localedir') +mandir =3D prefix / get_option('mandir') +sbindir =3D prefix / get_option('sbindir') +sharedstatedir =3D prefix / get_option('sharedstatedir') + +confdir =3D sysconfdir / meson.project_name() +docdir =3D datadir / 'doc' / meson.project_name() +pkgdatadir =3D datadir / meson.project_name() + + +# figure out libvirt version strings + +arr_version =3D meson.project_version().split('.') +libvirt_version_number =3D 1000000 * arr_version[0].to_int() + 1000 * arr_= version[1].to_int() + arr_version[2].to_int() + +conf.set('LIBVIRT_VERSION_NUMBER', libvirt_version_number) + +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt.so.0.AGE.REVISION +# +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt.so.0.9.14 +# Input: 1.0.0 -> libvirt.so.0.1000.0 +# Input: 2.5.8 -> libvirt.so.0.2005.8 +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't ever touch this. + +libvirt_so_version =3D 0 +libvirt_age =3D 1000 * arr_version[0].to_int() + arr_version[1].to_int() +libvirt_revision =3D arr_version[2].to_int() +libvirt_lib_version =3D '@0@.@1@.@2@'.format(libvirt_so_version, libvirt_a= ge, libvirt_revision) + + +# define top include directory + +top_inc_dir =3D include_directories('.') + + +# generate meson-config.h file +configure_file(output: 'meson-config.h', configuration: conf) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000000..5338ee89b9a --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,3 @@ +option('no-git', type: 'boolean', value: false, description: 'Disable git = submodule update') +option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') +option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893647; cv=none; d=zohomail.com; s=zohoarc; b=ByX80vKMibllK8D2hCtHmIhBxNOB1ITE7kXinilrKbSMtmSE33LNb9IUrtD+xb6LalcSOoQ4aHSjqN2Ix2r6c+PcgpexW3V6TkJ5XubEi19IDYAuSbE1DM6d1toVHOKnhlYbFVAuAfu2I/Ll+q75PrH1De9tVSHBiimohgvNzxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893647; 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=BTjTze7btX5s6NzWMDDShw8X7tGueouCmcRt56RDbjI=; b=gTi9cUA1D3/jIeVKHtTo+Uzuf7DlBSRiatzmZyykxTtgvGwjI6vV4wG/YFSwkX1bVhj9Ua86ybIbNxWWIHAb2x5dHVygkp9uAbDtMPU6S5XnJrNN7ICwWDEztzLFyUn5Xgc+jQ6Zy95LJF9rRBJRKdoYrV2ONgnyzVf77mTmqnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893647194616.2490069658797; Thu, 16 Jul 2020 03:00:47 -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-484-yxB4xhdJNx2AE1tVrRpuyw-1; Thu, 16 Jul 2020 06:00:42 -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 4305C1005261; Thu, 16 Jul 2020 10:00:36 +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 218B279D16; Thu, 16 Jul 2020 10:00:36 +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 DD2AC1800FF5; Thu, 16 Jul 2020 10:00:35 +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 06GA0Ual015275 for ; Thu, 16 Jul 2020 06:00:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id C315D2B6DC; Thu, 16 Jul 2020 10:00:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D6482DE69 for ; Thu, 16 Jul 2020 10:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893646; 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=BTjTze7btX5s6NzWMDDShw8X7tGueouCmcRt56RDbjI=; b=dV/+802C1LQblOiYXBGV6R6PrxL3o4REvMo0iNKQ7IABEE0q/02v2JWXuregN39vRG5TRw QWh9NWmKtFI3HJyJrQyFT6y+KAqj3F2+HqhYZFAqPujT3+o1cSDylqyEzw8hJUy3CWF30v 6SBFG6u40g+DHGqLrrKS6C3bwYmdoaI= X-MC-Unique: yxB4xhdJNx2AE1tVrRpuyw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 011/351] meson: build everything with PIE Date: Thu, 16 Jul 2020 11:54:07 +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 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 1 - m4/virt-compile-pie.m4 | 35 ----------------------------------- meson.build | 1 + src/Makefile.am | 2 -- src/locking/Makefile.inc.am | 4 ---- src/logging/Makefile.inc.am | 2 -- src/lxc/Makefile.inc.am | 2 -- src/network/Makefile.inc.am | 2 -- src/remote/Makefile.inc.am | 2 -- src/security/Makefile.inc.am | 2 -- src/storage/Makefile.inc.am | 2 -- tools/Makefile.am | 6 ------ 12 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 m4/virt-compile-pie.m4 diff --git a/configure.ac b/configure.ac index a91ed590edd..84e63063e43 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,6 @@ fi # Check for compiler and library settings. =20 LIBVIRT_COMPILE_WARNINGS -LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_LINKER_NO_UNDEFINED diff --git a/m4/virt-compile-pie.m4 b/m4/virt-compile-pie.m4 deleted file mode 100644 index da5cdf57b75..00000000000 --- a/m4/virt-compile-pie.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl -dnl Check for support for position independent executables -dnl -dnl Copyright (C) 2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_COMPILE_PIE],[ - PIE_CFLAGS=3D - PIE_LDFLAGS=3D - case "$host" in - *-*-mingw* ) - ;; dnl All code is position independent on Win32 target - *) - gl_COMPILER_OPTION_IF([-fPIE -DPIE -pie], [ - PIE_CFLAGS=3D"-fPIE -DPIE" - PIE_LDFLAGS=3D"-pie" - ]) - esac - AC_SUBST([PIE_CFLAGS]) - AC_SUBST([PIE_LDFLAGS]) -]) diff --git a/meson.build b/meson.build index 12a6a14ee58..88a163e2ee6 100644 --- a/meson.build +++ b/meson.build @@ -5,6 +5,7 @@ project( meson_version: '>=3D 0.54.0', default_options: [ 'buildtype=3Ddebugoptimized', + 'b_pie=3Dtrue', 'c_std=3Dgnu99', ], ) diff --git a/src/Makefile.am b/src/Makefile.am index c2bb7d0083b..6cf23bb0bdf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -603,7 +603,6 @@ libexec_PROGRAMS +=3D libvirt_iohelper libvirt_iohelper_SOURCES =3D $(UTIL_IO_HELPER_SOURCES) libvirt_iohelper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_iohelper_LDADD =3D \ libvirt.la \ @@ -615,7 +614,6 @@ endif WITH_DTRACE_PROBES =20 libvirt_iohelper_CFLAGS =3D \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) =20 =20 diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ab0822dda35..b75588f9fce 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -130,12 +130,10 @@ virtlockd_CFLAGS =3D \ -I$(builddir)/locking \ -I$(builddir)/rpc \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) virtlockd_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) @@ -182,11 +180,9 @@ libvirt_sanlock_helper_SOURCES =3D $(LOCK_DRIVER_SANLO= CK_HELPER_SOURCES) libvirt_sanlock_helper_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) libvirt_sanlock_helper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_sanlock_helper_LDADD =3D \ libvirt.la \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 74987c63845..9aa634b126b 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -76,12 +76,10 @@ virtlogd_CFLAGS =3D \ -I$(builddir)/logging \ -I$(builddir)/rpc \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) virtlogd_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(XDR_LIBS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index c9201110071..031aed14203 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -197,7 +197,6 @@ nodist_libvirt_lxc_SOURCES =3D \ $(NULL) libvirt_lxc_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(CAPNG_LIBS) \ $(LIBXML_LIBS) \ $(GLIB_LIBS) \ @@ -217,7 +216,6 @@ libvirt_lxc_CFLAGS =3D \ -I$(builddir)/rpc \ -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(CAPNG_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 9a1a3717073..5a5d1630a08 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -126,7 +126,6 @@ libexec_PROGRAMS +=3D libvirt_leaseshelper libvirt_leaseshelper_SOURCES =3D $(NETWORK_LEASES_HELPER_SOURCES) libvirt_leaseshelper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_leaseshelper_LDADD =3D \ libvirt.la \ @@ -138,7 +137,6 @@ endif WITH_DTRACE_PROBES =20 libvirt_leaseshelper_CFLAGS =3D \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) =20 INSTALL_DATA_DIRS +=3D network diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 165a7cced60..341f429b773 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -41,7 +41,6 @@ REMOTE_DAEMON_CFLAGS =3D \ $(XDR_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBNL_CFLAGS) \ - $(PIE_CFLAGS) \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ @@ -52,7 +51,6 @@ REMOTE_DAEMON_CFLAGS =3D \ =20 REMOTE_DAEMON_LD_FLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) =20 diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 871245a035f..ec24931a80a 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -74,7 +74,6 @@ virt_aa_helper_SOURCES =3D $(SECURITY_DRIVER_APPARMOR_HEL= PER_SOURCES) =20 virt_aa_helper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) virt_aa_helper_LDADD =3D \ libvirt.la \ @@ -89,7 +88,6 @@ virt_aa_helper_CFLAGS =3D \ -I$(top_srcdir)/src/hypervisor \ -I$(srcdir)/security \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 43010ee9664..e201b9938d9 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -437,7 +437,6 @@ libexec_PROGRAMS +=3D libvirt_parthelper libvirt_parthelper_SOURCES =3D $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(NULL) libvirt_parthelper_LDADD =3D \ $(LIBPARTED_LIBS) \ @@ -451,6 +450,5 @@ endif WITH_DTRACE_PROBES libvirt_parthelper_CFLAGS =3D \ $(LIBPARTED_CFLAGS) \ $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ $(NULL) endif WITH_STORAGE_DISK diff --git a/tools/Makefile.am b/tools/Makefile.am index 0530e439a8b..19c3b88777c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,7 +31,6 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) AM_CFLAGS =3D \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(PIE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(NULL) @@ -92,7 +91,6 @@ libvirt_shell_la_CFLAGS =3D \ $(NULL) libvirt_shell_la_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) libvirt_shell_la_LIBADD =3D \ @@ -132,7 +130,6 @@ endif ! WITH_BHYVE =20 virt_host_validate_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) =20 @@ -158,7 +155,6 @@ virt_login_shell_helper_SOURCES =3D \ =20 virt_login_shell_helper_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) virt_login_shell_helper_LDADD =3D \ @@ -204,7 +200,6 @@ virsh_SOURCES =3D \ =20 virsh_LDFLAGS =3D \ $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NULL) virsh_LDADD =3D \ @@ -225,7 +220,6 @@ virt_admin_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(STATIC_BINARIES) \ - $(PIE_LDFLAGS) \ $(NULL) virt_admin_LDADD =3D \ ../src/libvirt-admin.la \ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893762; cv=none; d=zohomail.com; s=zohoarc; b=ncrG/NIwjBF+t493vZXxFCjEg31Vu4cWTx6NIMZeRs5Y8fq/rCN0jp5kiQyBDTHwG1kq46oaE+qpJ6IYufApBtCuPOKYdP5wZjonRVQTuv4Yk83XpIqDnW3rwLemCefWTBfAF3bClQzqBmWGTKLItGsmNayx0mO9QGor9OniXcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893762; 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=MB9fSRDDIlMBHqERX0G+DfNPBxFbPrvcLmNxGixRZ3I=; b=lND4EPahc8Ie0QQEXv6DPqb0vkQH+yommdufv5l3q+b4K3fAXhe3Hxk+0qs47O3d5W+Y8Pa/6+KUJ9AxdvJVt57jXFsvT4nCmSpunvru+pF9InHYOozjk3J7t8fTtxmu4eCJO88Xh5zJmQ70tO+QW4xrkuqnDyml8Nv3bxtA1JQ= 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 1594893762581761.8939407530194; Thu, 16 Jul 2020 03:02:42 -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-435-ID7MweZAN7uWpccXSy9MSw-1; Thu, 16 Jul 2020 06:00:48 -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 CAC0618A1DED; Thu, 16 Jul 2020 10:00:38 +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 A871C74F64; Thu, 16 Jul 2020 10:00: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 75BD9180530A; Thu, 16 Jul 2020 10:00: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 06GA0V2q015290 for ; Thu, 16 Jul 2020 06:00:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC49E2B6E2; Thu, 16 Jul 2020 10:00:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 274072B6DC for ; Thu, 16 Jul 2020 10:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893761; 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=MB9fSRDDIlMBHqERX0G+DfNPBxFbPrvcLmNxGixRZ3I=; b=ZQ+YmVLtSaIxxoV6O66erA2gPUrSdIKuet/m4tkTvmIsv6sNmL3LmEWL2MtZ3iIIHFc11Z B3/6fy7WBV82Gyx5WuWuy45dIkuAhCBUK4OfliwHvFYeTH8/JiCJAZK8UBCM61JfXacr63 wPA9r9kKvZVXcLTUhgxhsO6eXAh3Be0= X-MC-Unique: ID7MweZAN7uWpccXSy9MSw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 012/351] meson: move content from config-post.h to config.h Date: Thu, 16 Jul 2020 11:54:08 +0200 Message-Id: <16c82c14ab628cfa34c72b16f30f97bd01389bfd.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.13 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" With meson we generate meson-config.h into the build directory and include it in config.h so there is no need to have separate config-post.h file. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- config-post.h | 58 --------------------------------------------------- config.h | 41 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 - 3 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 config-post.h diff --git a/config-post.h b/config-post.h deleted file mode 100644 index 4a49cd4194d..00000000000 --- a/config-post.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#ifndef __GNUC__ -# error "Libvirt requires GCC >=3D 4.8, or CLang" -#endif - -/* - * Define __GNUC_PREREQ to a sane default if it isn't yet defined. - * This is done here so that it's included as early as possible; - */ -#ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >=3D ((maj) << 16) + (min)) -#endif - -#if defined(__clang_major__) && defined(__clang_minor__) -# ifdef __apple_build_version__ -# if __clang_major__ < 5 || (__clang_major__ =3D=3D 5 && __clang_minor__ = < 1) -# error You need at least XCode Clang v5.1 to compile QEMU -# endif -# else -# if __clang_major__ < 3 || (__clang_major__ =3D=3D 3 && __clang_minor__ = < 4) -# error You need at least Clang v3.4 to compile QEMU -# endif -# endif -#elif defined(__GNUC__) && defined(__GNUC_MINOR__) -# if __GNUC__ < 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ < 8) -# error You need at least GCC v4.8 to compile QEMU -# endif -#else -# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 t= o compile libvirt -#endif - -/* Ask for warnings for anything that was marked deprecated in - * the defined version, or before. It is a candidate for rewrite. - */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 - -/* Ask for warnings if code tries to use function that did not - * exist in the defined version. These risk breaking builds - */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/config.h b/config.h index 05cd1507f45..9c433ad4c0f 100644 --- a/config.h +++ b/config.h @@ -1 +1,42 @@ #include + +#ifndef __GNUC__ +# error "Libvirt requires GCC >=3D 4.8, or CLang" +#endif + +/* + * Define __GNUC_PREREQ to a sane default if it isn't yet defined. + * This is done here so that it's included as early as possible; + */ +#ifndef __GNUC_PREREQ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >=3D ((maj) << 16) + (min)) +#endif + +#if defined(__clang_major__) && defined(__clang_minor__) +# ifdef __apple_build_version__ +# if __clang_major__ < 5 || (__clang_major__ =3D=3D 5 && __clang_minor__ = < 1) +# error You need at least XCode Clang v5.1 to compile QEMU +# endif +# else +# if __clang_major__ < 3 || (__clang_major__ =3D=3D 3 && __clang_minor__ = < 4) +# error You need at least Clang v3.4 to compile QEMU +# endif +# endif +#elif defined(__GNUC__) && defined(__GNUC_MINOR__) +# if __GNUC__ < 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ < 8) +# error You need at least GCC v4.8 to compile QEMU +# endif +#else +# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 t= o compile libvirt +#endif + +/* Ask for warnings for anything that was marked deprecated in + * the defined version, or before. It is a candidate for rewrite. + */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 + +/* Ask for warnings if code tries to use function that did not + * exist in the defined version. These risk breaking builds + */ +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/configure.ac b/configure.ac index 84e63063e43..7294b61bc46 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,6 @@ dnl License along with this library. If not, see dnl . =20 AC_CONFIG_AUX_DIR([build-aux]) -AH_BOTTOM([#include ]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893972; cv=none; d=zohomail.com; s=zohoarc; b=n2phYxjI/MPbMK9fXNnyaB7xOqqzmL6RDPMi1hVepbU3o7Uokw3D89r/HKVDI+N6FaEu5f/CidQDZu4wimbG6DBI4DW9FtxNZByB42SLppuFsvWb3Czbx1GZO5JyvZ8VZLx/X/+KyJYayVQZrPkeS+TP71Nhe4T0HPJ3cLnq640= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893972; 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=C6zjvPyn3GRjo3sDuQJRYdf0QfaQUBzMeAvdDjpx+aA=; b=D3BdDTDzw2FQvwb7jznFJNC5S5eJLUG2rWwynWwrMA1dDv6nPZ08buO7vh1VixSUoCqbXHn1+ex+BapIeqYJuU/osqXDGFDCBlFWc+JI+Aao4QKi2ImczUagUw/u82ub5jKy2Zgnc8UykNpVx9ncdXGnpTFmgl8rypCUiqjqGHo= 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 1594893972953314.8799756722127; Thu, 16 Jul 2020 03:06: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-416-sgBLh_ztNTK_94uDrvRu7A-1; Thu, 16 Jul 2020 06:00:41 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 124CB8027F3; Thu, 16 Jul 2020 10:00:36 +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 E1AEC2DE6D; Thu, 16 Jul 2020 10:00:35 +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 B1B2B9623F; Thu, 16 Jul 2020 10:00:35 +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 06GA0WC0015300 for ; Thu, 16 Jul 2020 06:00:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 96AB72B6E2; Thu, 16 Jul 2020 10:00:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 100DE2B6DC for ; Thu, 16 Jul 2020 10:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893971; 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=C6zjvPyn3GRjo3sDuQJRYdf0QfaQUBzMeAvdDjpx+aA=; b=fV6sSLNitOdF8K29/TRgxYnXWObA17k2G4s8I4LEbGNhcSlhgfkGV3YJ4hD7Y4NlFYlhzz VMCC3LdcrMBoU+4FUIlJ6tlMGF+4xeRDLqmfRprlmVgJOveuR1ABYvLdFHFCvwBsopG459 0rC7YQ417W65CeNOwmQ9HOhst7w+5Dw= X-MC-Unique: sgBLh_ztNTK_94uDrvRu7A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 013/351] meson: set windows variables for AI_ADDRCONFIG Date: Thu, 16 Jul 2020 11:54:09 +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.84 on 10.5.11.23 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 4 ---- meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7294b61bc46..445a44f2e79 100644 --- a/configure.ac +++ b/configure.ac @@ -154,10 +154,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "= yes"]) if test "$with_win" =3D "yes" ; then # We don't support the daemon yet with_libvirtd=3Dno - - # For AI_ADDRCONFIG - AC_DEFINE([_WIN32_WINNT], [0x0600], [Win Vista / Server 2008]) - AC_DEFINE([WINVER], [0x0600], [Win Vista / Server 2008]) fi =20 # The daemon requires remote support. Likewise, if we are not using diff --git a/meson.build b/meson.build index 88a163e2ee6..3b149e829d3 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,12 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', meson.project_version()) conf.set_quoted('VERSION', meson.project_version()) =20 +if host_machine.system() =3D=3D 'windows' + # For AI_ADDRCONFIG + conf.set('_WIN32_WINNT', '0x0600') # Win Vista / Server 2008 + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 +endif + =20 # set various paths =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893653; cv=none; d=zohomail.com; s=zohoarc; b=n+TNy59FTfrg0IldN7G14lWQjxJy9cducK2Sn4tX0FPUyNlUAbdA6+6+cYd9lQdkDgpZBzVvHqovGLlCN8A9GZ5l4fiF0XgeGgGYT1ah2mLidY452FWJGwGd5bhhXCcN2yePZItiO5T5upc7mGe3cHp7HjKj6ef1gATlJfEbFjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893653; 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=MTbcA2mwlgGWm1zwtwc1cUR2K/wuri7OeXunUbAbZno=; b=FCwmXvkoCBBWruDGfotmYYK5Pt+5aspxbq8EyybjW74RX7Ufl66Tss4IbqActV7xx8jL3rKBpQNhlYn0t4x9hOas3Qpp1nw76SSTc+fCiz7H7EEZmJTw3vaKSE2JQ3XQ+X/mDzbvPta7W4aGBpd8XKgzYmKGXjmypbiMi81g73s= 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 1594893653787171.34800383243692; Thu, 16 Jul 2020 03:00:53 -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-235-8L205f1qP-2TX6yuDBaFRA-1; Thu, 16 Jul 2020 06:00:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 460828015F7; Thu, 16 Jul 2020 10:00:41 +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 24ED972ADE; Thu, 16 Jul 2020 10:00:41 +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 E312A96240; Thu, 16 Jul 2020 10:00:40 +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 06GA0XmB015309 for ; Thu, 16 Jul 2020 06:00:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F01B2B6DC; Thu, 16 Jul 2020 10:00:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDB762DE69 for ; Thu, 16 Jul 2020 10:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893650; 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=MTbcA2mwlgGWm1zwtwc1cUR2K/wuri7OeXunUbAbZno=; b=WJQofMqcYiDMBHpkFqz1+jl2Vs1rxWRUFNBmeqnCcAHpZRgL+BmzhCEbHOqVghg6oiBN2X f4d3hOA7jcc0mFFmfNGvSVADirTF+epEfq8oZ1C9I8mjdHyW6PDfiqvdGHJ07ALXGG/ulb 1ZfWAvtoJhiQsxKbOQCOc2tmyqcSyus= X-MC-Unique: 8L205f1qP-2TX6yuDBaFRA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 014/351] meson: generate configmake.h Date: Thu, 16 Jul 2020 11:54:10 +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.15 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" We don't use all of the defines so copy only the ones actually used. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- Makefile.am | 41 ----------------------------------------- configmake.h.in | 16 ++++++++++++++++ meson.build | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 41 deletions(-) create mode 100644 configmake.h.in diff --git a/Makefile.am b/Makefile.am index fbb3cb09ff1..82ccbac6f91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,44 +63,3 @@ gen-AUTHORS: =20 ci-%: $(MAKE) -C $(srcdir)/ci/ $@ - -# Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+ or 2.70. -# The Automake-defined pkg* macros are appended, in the order -# listed in the Automake 1.10a+ documentation. -configmake.h: Makefile - $(AM_V_GEN)rm -f $@-t && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#if WIN32'; \ - echo '# include /* avoid mingw pollution on DATADIR */'; \ - echo '#endif'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ - } | sed '/""/d' > $@-t && \ - mv -f $@-t $@ diff --git a/configmake.h.in b/configmake.h.in new file mode 100644 index 00000000000..c9930b60493 --- /dev/null +++ b/configmake.h.in @@ -0,0 +1,16 @@ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +#if WIN32 +# include /* avoid mingw pollution on DATADIR */ +#endif +#mesondefine BINDIR +#mesondefine DATADIR +#mesondefine LIBDIR +#mesondefine LIBEXECDIR +#mesondefine LOCALEDIR +#mesondefine LOCALSTATEDIR +#mesondefine MANDIR +#mesondefine PKGDATADIR +#mesondefine PREFIX +#mesondefine RUNSTATEDIR +#mesondefine SBINDIR +#mesondefine SYSCONFDIR diff --git a/meson.build b/meson.build index 3b149e829d3..07dacf92009 100644 --- a/meson.build +++ b/meson.build @@ -87,6 +87,29 @@ docdir =3D datadir / 'doc' / meson.project_name() pkgdatadir =3D datadir / meson.project_name() =20 =20 +# generate configmake.h header + +configmake_conf =3D configuration_data() +configmake_conf.set_quoted('BINDIR', bindir) +configmake_conf.set_quoted('DATADIR', datadir) +configmake_conf.set_quoted('LIBDIR', libdir) +configmake_conf.set_quoted('LIBEXECDIR', libexecdir) +configmake_conf.set_quoted('LOCALEDIR', localedir) +configmake_conf.set_quoted('LOCALSTATEDIR', localstatedir) +configmake_conf.set_quoted('MANDIR', mandir) +configmake_conf.set_quoted('PKGDATADIR', pkgdatadir) +configmake_conf.set_quoted('PREFIX', prefix) +configmake_conf.set_quoted('RUNSTATEDIR', runstatedir) +configmake_conf.set_quoted('SBINDIR', sbindir) +configmake_conf.set_quoted('SYSCONFDIR', sysconfdir) + +configure_file( + input: 'configmake.h.in', + output: 'configmake.h', + configuration: configmake_conf, +) + + # figure out libvirt version strings =20 arr_version =3D meson.project_version().split('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893649; cv=none; d=zohomail.com; s=zohoarc; b=QSE1bfSZRhfpGULIH9BPZ0JcpeL4h25RNDQMWyN4mJbM+5eKqd9Y4NZi4F6KameoBQFpm5sqpsc0UHEb0ZfDKEpO2ftufjTY88RXtNiv0CqPWa7bMlZ7hn4l6XN8teHoomUbdz20IdeUXH5BI6zymYc/MXOKgTA86wjlH3vJZxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893649; 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=XSIlINS9o8jtBFjnu+oGIRgQdSow8csKdL6UwDW86VU=; b=RfposuS8h648KZxwwNgmGwNtAW+WVVyYoxv3p8vz7ADEKQQUYSpiYP76Mp2kZeOT3MTo9BD3No8DfwluLrPRc41xGNEnNCu51ipEjiLOfup06ZxWnGqjXZSY4Ljgcz5GAeXGxud3kGKP0JkWlXvU4jRER9+xWdBfVY28Tw1eP2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893649238515.64350432092; Thu, 16 Jul 2020 03:00:49 -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-312-c0iZkT2RNeqeL8rd_IubRg-1; Thu, 16 Jul 2020 06:00: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 8880A1090; Thu, 16 Jul 2020 10:00:38 +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 5D73B10098AE; Thu, 16 Jul 2020 10:00: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 265A8180CB39; Thu, 16 Jul 2020 10:00: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 06GA0Yri015321 for ; Thu, 16 Jul 2020 06:00:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 674C62B6E2; Thu, 16 Jul 2020 10:00:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D64522B6DC for ; Thu, 16 Jul 2020 10:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893647; 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=XSIlINS9o8jtBFjnu+oGIRgQdSow8csKdL6UwDW86VU=; b=WNkJbcw6Jq8OTdf3yCK3tlZtrMhqL/wPyFIyVceJaj/VWIwA739DVNKQIwEOEVcYqYD+gW wIhyQIMlOTdsnp/lr5bvCDUIq/+argV7dP3QZUtyX6PkLKe2f/f5NtUB6Wp9Nnz4acoug5 MpnenpExKRi7GwLY5Wi58ooXpvGjUuo= X-MC-Unique: c0iZkT2RNeqeL8rd_IubRg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 015/351] meson: add packager build options Date: Thu, 16 Jul 2020 11:54:11 +0200 Message-Id: <7a27c05bde3ba0806f3a6af302bd0aa22707a808.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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 13 ------------- meson.build | 14 ++++++++++++++ meson_options.txt | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 445a44f2e79..66fc88bd014 100644 --- a/configure.ac +++ b/configure.ac @@ -40,19 +40,6 @@ m4_ifndef([AM_SILENT_RULES], =20 AC_CANONICAL_HOST =20 -LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) -LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no]) -if test "x$with_packager" !=3D "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"], - [Extra package name]) -fi -if test "x$with_packager_version" !=3D "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"], - [Extra package version]) -fi - dnl Where we look for daemons and admin binaries during configure LIBVIRT_SBIN_PATH=3D"$PATH:/sbin:/usr/sbin:/usr/local/sbin" =20 diff --git a/meson.build b/meson.build index 07dacf92009..633db2df51a 100644 --- a/meson.build +++ b/meson.build @@ -110,6 +110,20 @@ configure_file( ) =20 =20 +# packager options + +packager =3D get_option('packager') +packager_version =3D get_option('packager_version') + +if packager !=3D '' + conf.set_quoted('PACKAGER', packager) +endif + +if packager_version !=3D '' + conf.set_quoted('PACKAGER_VERSION', packager_version) +endif + + # figure out libvirt version strings =20 arr_version =3D meson.project_version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 5338ee89b9a..2281faec429 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ option('no-git', type: 'boolean', value: false, description: 'Disable git = submodule update') +option('packager', type: 'string', value: '', description: 'Extra packager= name') +option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893656; cv=none; d=zohomail.com; s=zohoarc; b=nKYDmqs1L3ualbiB88GolJ6e0NtwsslVo/Ihycwmlf1jRlNa7dPK6knYd6Gw2dwd3w8TgAGQT4PfOHlOJkzSdOOzJNH5lQg4SWeUmGCTuQoS8LQ5ocyw1uHb5pV+IXatzqwwsghEftfIruMcSl8QWeHm7C1NY+CkPg/3ocM2cdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893656; 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=rDnwlOzGkuPLISJgkeT96svxygilXr0AvXRZ3J+0ZLQ=; b=YFVdGA8i1pH9KOayYHWE/QYkjZMw5PE3Ns4LnugTLzLNmlWbh39bEHL+EqpqdeeC86IjRt0/O4HeLnF+r32I2nUIjGP0V9I80++wU5bbBRbMlZkQN5MpT0TIRSkfdf/Gxdwwid036olPPfkgVVbyUhECQ6wgXJ5HJ3uiFwexzcg= 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 1594893656871657.9258777080341; Thu, 16 Jul 2020 03:00:56 -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-319-juVEv4bNPiupYG98wBsWXQ-1; Thu, 16 Jul 2020 06:00:51 -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 C743C18A1E05; Thu, 16 Jul 2020 10:00:43 +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 A992574F64; Thu, 16 Jul 2020 10:00:43 +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 71C46180530E; Thu, 16 Jul 2020 10:00:43 +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 06GA0ZmY015336 for ; Thu, 16 Jul 2020 06:00:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 513312B6DC; Thu, 16 Jul 2020 10:00:35 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C00C02DE69 for ; Thu, 16 Jul 2020 10:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893654; 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=rDnwlOzGkuPLISJgkeT96svxygilXr0AvXRZ3J+0ZLQ=; b=eS2FZmnxl+gjdeSX+Ws7su9jVlDVYTa6awYQDuEJFnheiC2UA0iGfkkYrx6J02jXaRv5EU UUxx80evW7NHUlAQss3wac0yA320lBcFVjtOOtUZw3NzArCmkMgkhH6wT+UjwZVCitktxQ eG6o3gCbmBHLdMuz63jqtHPVZBgcZzo= X-MC-Unique: juVEv4bNPiupYG98wBsWXQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 016/351] meson: add test_suite build option Date: Thu, 16 Jul 2020 11:54:12 +0200 Message-Id: <464eecb4a4c71244f2c498dd1a31fe99a8ec147e.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.13 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" With autoconf this option controlled if the test suite is compiled by default or not with the fact that it will be compiled later when running `make check`. With meson it is not possible to compile it later when running `ninja test` as it will be always compiled if referenced by `test()` function in meson.build files. Because of that enable the test suite be default. Enabling it only when compiling from git makes the test suite disabled for `ninja dist` command which builds the code from non-git location. Since that command is closest equivalent of `make distcheck` which runs the test suite. The only drawback from the autoconf state is that users compiling libvirt from tarball will compile the test suite as well even though they will not run it in most cases. Signed-off-by: Pavel Hrdina --- configure.ac | 17 ----------------- meson.build | 5 +++++ meson_options.txt | 1 + 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 66fc88bd014..71766f2fe61 100644 --- a/configure.ac +++ b/configure.ac @@ -616,23 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi =20 -LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check]) -case "$with_test_suite" in - yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; -esac - -AC_MSG_CHECKING([Whether to build test suite by default]) -if test "$with_test_suite" =3D "check" ; then - if test -d $srcdir/.git ; then - with_test_suite=3Dyes - else - with_test_suite=3Dno - fi -fi -AC_MSG_RESULT([$with_test_suite]) -AM_CONDITIONAL([WITH_TESTS], [test "$with_test_suite" =3D "yes"]) - LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], [set the default for enabling expensive tests ] [(long timeouts), use VIR_TEST_EXPENSIVE to ] diff --git a/meson.build b/meson.build index 633db2df51a..fee75204d27 100644 --- a/meson.build +++ b/meson.build @@ -124,6 +124,11 @@ if packager_version !=3D '' endif =20 =20 +# test options + +use_test_suite =3D get_option('test_suite') + + # figure out libvirt version strings =20 arr_version =3D meson.project_version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 2281faec429..6973b9f6587 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,3 +3,4 @@ option('packager', type: 'string', value: '', description: = 'Extra packager name' option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') +option('test_suite', type: 'boolean', value: true, description: 'Whether t= o enable and build test suite by default') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894084; cv=none; d=zohomail.com; s=zohoarc; b=Liym1lBztgXZJw7gE6KWAJjb9odAgUQInu6ON1pXOYXK9LaIY4GjXXDwqBMSqQox6hRZsW8ahlIa1TctU5VT8Z6niFTIojofaBNo04VTdqqPU9f+InL2mYUXqjcYyeYEjPSVv6asGJ4+hDkdJD6ZD6hjd7/cRKnQ+mJq3d6xuuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894084; 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=wqEYZaKqtwGsPS7sIvMjEShRCFQzAZ0i24GTTQTIsGQ=; b=j1WmJ47bp6CYZZgKV53KYsod6/2vo7ZJFhsBuS9/o6Eh8QNNI63go8AwpFWpSU5FWmRp2UHKKpmynuKbUmorQkBgeD/ChsdrolV0K5Oh6Hu5sfBjDJ7O6q8hZRIvVyMtFOKugSIrnvTrhYGuO5j1mNVayXy4YCyI8qfBdpgw7Bw= 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 1594894084111732.0888302757313; Thu, 16 Jul 2020 03:08:04 -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-339-hGb7at8QO_aN9BieeRbU8A-1; Thu, 16 Jul 2020 06:00:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 53E3B80BCAB; Thu, 16 Jul 2020 10:00:46 +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 31D625C1D2; Thu, 16 Jul 2020 10:00:46 +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 F04F51805315; Thu, 16 Jul 2020 10:00:45 +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 06GA0aUW015350 for ; Thu, 16 Jul 2020 06:00:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3962B2B6DC; Thu, 16 Jul 2020 10:00:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A869A2DE69 for ; Thu, 16 Jul 2020 10:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894083; 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=wqEYZaKqtwGsPS7sIvMjEShRCFQzAZ0i24GTTQTIsGQ=; b=NZbHoRXmOIZX7s6Gga5GpkYEH9mmToZNY+NosOmAY3rpOyGertSlU2sEtCxAYGXlw17Uxm xk3WCIkemBxo+N9GhqX2XpEXg6U+i+s8zRBz6M2lsvEXEzPR1ubm2k4HFrkeo9YYTRBAg7 Dgj5Y3YH2PGRB+z9ujkv4oV8lVnReeo= X-MC-Unique: hGb7at8QO_aN9BieeRbU8A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 017/351] meson: add expensive_tests build option Date: Thu, 16 Jul 2020 11:54:13 +0200 Message-Id: <1acaca2ca978e9a52583afc2718782908b4f5366.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.16 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 21 --------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 71766f2fe61..7b370f4f1be 100644 --- a/configure.ac +++ b/configure.ac @@ -616,27 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi =20 -LIBVIRT_ARG_ENABLE([EXPENSIVE_TESTS], - [set the default for enabling expensive tests ] - [(long timeouts), use VIR_TEST_EXPENSIVE to ] - [override during make], - [check]) -case "$enable_expensive_tests" in - 0|no) VIR_TEST_EXPENSIVE_DEFAULT=3D0 ;; - 1|yes) VIR_TEST_EXPENSIVE_DEFAULT=3D1 ;; - check) ;; - *) AC_MSG_ERROR([bad value ${enable_expensive_tests} for enable-expensiv= e-tests option]) ;; -esac -if test "$enable_expensive_tests" =3D check; then - if test -d $srcdir/.git ; then - VIR_TEST_EXPENSIVE_DEFAULT=3D0 - else - VIR_TEST_EXPENSIVE_DEFAULT=3D1 - fi -fi -AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT]) -AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = =3D 1]) - LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation= ], [no]) case "$enable_test_coverage" in yes|no) ;; diff --git a/meson.build b/meson.build index fee75204d27..e48525d9d22 100644 --- a/meson.build +++ b/meson.build @@ -128,6 +128,12 @@ endif =20 use_test_suite =3D get_option('test_suite') =20 +if get_option('expensive_tests').auto() + use_expensive_tests =3D not git +else + use_expensive_tests =3D get_option('expensive_tests').enabled() +endif + =20 # figure out libvirt version strings =20 diff --git a/meson_options.txt b/meson_options.txt index 6973b9f6587..f0c4f93ad16 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,3 +4,4 @@ option('packager_version', type: 'string', value: '', descr= iption: 'Extra packag option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') option('test_suite', type: 'boolean', value: true, description: 'Whether t= o enable and build test suite by default') +option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts), use VIR_TEST_EX= PENSIVE to override') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893649; cv=none; d=zohomail.com; s=zohoarc; b=CXa9iiZQ8FtR4qf9BejfJb64dqjMHEam54+Z3KIAfRXlA8mDuzZdWHcswIR6scNV0ZjQM6EwIA/hD6yRDSUIQupGQi4zmemxnSghAJqbXZ6esvoFRw3nlvtaEw4nhJdiqpTXhv5ugzVE5zyxfQVbO9zwyaT4J4/ilNSHn/DImys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893649; 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=YR/J5+pl9YqbwfrYJjgNgfZfhKW2MhDqYXJRubxnILo=; b=GmNJfSHNi4cJxGH8QcpSzP0vK3FWq0lrP3GOtRMbAdn1HXZn8oP5xfKQv37ogiFmwpvbIGhKAntb25DTi4AYS+nt+2KneKokkfGqTJR247DfS1Ed8WGsEJj6Ay2L57H68alWPOd7jpiidlzDlMlb09QJn3L+F5nmcfnGOvD1uv0= 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 15948936499321006.7187420406162; Thu, 16 Jul 2020 03:00:49 -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-83-lk5NJ9UqNs6eoi89TyzVxA-1; Thu, 16 Jul 2020 06:00:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3D5F109A; Thu, 16 Jul 2020 10:00:40 +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 B50465C5B7; Thu, 16 Jul 2020 10:00:40 +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 8282A9623B; Thu, 16 Jul 2020 10:00:40 +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 06GA0b2j015358 for ; Thu, 16 Jul 2020 06:00:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 218EF2B6E2; Thu, 16 Jul 2020 10:00:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9058D2B6DC for ; Thu, 16 Jul 2020 10:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893648; 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=YR/J5+pl9YqbwfrYJjgNgfZfhKW2MhDqYXJRubxnILo=; b=CbuVZdvw9tI+Xc85Mzuf9nm6brpX6I8XbVZWRaGntbp2V6sASCwn1G0iuEEoFj/YtIsY5k kUS8Jp/GUnOuqcB9j3v1B+PajYbhR7FgPkFF23nwVqQzZG2I+nZp4j13T0XKQpUBsC2LuP 1ww9UPxodUoeFN/CK+AqMqnKS6UceW8= X-MC-Unique: lk5NJ9UqNs6eoi89TyzVxA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 018/351] meson: add test_coverage build option Date: Thu, 16 Jul 2020 11:54:14 +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.16 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 21 --------------------- meson.build | 16 ++++++++++++++++ meson_options.txt | 1 + 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 7b370f4f1be..d76c2d22fc2 100644 --- a/configure.ac +++ b/configure.ac @@ -616,23 +616,6 @@ if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi =20 -LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation= ], [no]) -case "$enable_test_coverage" in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enable_test_coverga} for test-coverage opti= on]) ;; -esac - -if test "$enable_test_coverage" =3D yes; then - save_WARN_CFLAGS=3D$WARN_CFLAGS - WARN_CFLAGS=3D - gl_WARN_ADD([-fprofile-arcs]) - gl_WARN_ADD([-ftest-coverage]) - COVERAGE_FLAGS=3D$WARN_CFLAGS - AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS]) - AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS]) - WARN_CFLAGS=3D$save_WARN_CFLAGS -fi - dnl MinGW checks LIBVIRT_WIN_CHECK_COMMON LIBVIRT_WIN_CHECK_MINGW @@ -878,10 +861,6 @@ AC_MSG_NOTICE([]) LIBVIRT_WIN_RESULT_COMMON LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Test suite]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT([Coverage], [$enable_test_coverage]) -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG diff --git a/meson.build b/meson.build index e48525d9d22..e91d664a77a 100644 --- a/meson.build +++ b/meson.build @@ -134,6 +134,14 @@ else use_expensive_tests =3D get_option('expensive_tests').enabled() endif =20 +coverage_flags =3D [] +if get_option('test_coverage') + coverage_flags =3D [ + '-fprofile-arcs', + '-ftest-coverage', + ] +endif + =20 # figure out libvirt version strings =20 @@ -187,3 +195,11 @@ top_inc_dir =3D include_directories('.') =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) + + +# print configuration summary + +test_summary =3D { + 'Coverage': coverage_flags.length() > 0, +} +summary(test_summary, section: 'Test suite', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f0c4f93ad16..0f79f8aea03 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,3 +5,4 @@ option('system', type: 'boolean', value: false, description= : 'Set install paths option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') option('test_suite', type: 'boolean', value: true, description: 'Whether t= o enable and build test suite by default') option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts), use VIR_TEST_EX= PENSIVE to override') +option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893660; cv=none; d=zohomail.com; s=zohoarc; b=ZXV+pOcO7s9bcmv3sk+9mhwNZfqrUzYELRQmGNLVnuVnjPmrsP7fsdhtmYubArwnrMSwGS8uI9ELywkvwUkGDziZJxyEr5iodMax3VG099UbBAiiYn+27vXpFWRK3umVa+lAlg2wnyKBCKx5fqJ7nhLtbu/GMeGKBvr752hc4Es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893660; 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=7qt9RIWZ+rSaqE+o1kSQ6frt5wpOCZMl7xE4SJnOESc=; b=OQnJ8mqvlrzeInCbRRney5CRSLoV/xhGQLFz1baPYbfJPPxqBv8BBv4S8xiG+p+6PRB/kQRt0gUZwmxRPh6WJrmkkm1YNj6TJDknvl+hwtHaLO7e182t4LVbIC10wK+od+1YOQ8E941zqHjX910Zo2jndeiBgIO0HW86bUPCk0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893660568935.8798997677479; Thu, 16 Jul 2020 03:01:00 -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-168-OWV8RQ8XOtqLRCfYaxR9HA-1; Thu, 16 Jul 2020 06:00:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF3D41005260; Thu, 16 Jul 2020 10:00:48 +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 9EC39710D7; Thu, 16 Jul 2020 10:00:48 +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 6B3F41805319; Thu, 16 Jul 2020 10:00:48 +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 06GA0cPF015373 for ; Thu, 16 Jul 2020 06:00:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AF2D2B6E6; Thu, 16 Jul 2020 10:00:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 794E22B6E2 for ; Thu, 16 Jul 2020 10:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893659; 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=7qt9RIWZ+rSaqE+o1kSQ6frt5wpOCZMl7xE4SJnOESc=; b=XDF5kBQVWgdkY7lMzGoDo4wu88Qqu25lkiMv3LSVAUEdTgL7YJlMLsbyrWvDMF/nlriMAF ik7AX95GjgaXzSrqYmQmVP4PSPniOE3u/l7H5orC/79y9vD3jrHQh0UeZlTuV0o5MtkN4B E8I5iPwPTcyKBC1jlaTNUreb8omlxis= X-MC-Unique: OWV8RQ8XOtqLRCfYaxR9HA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 019/351] meson: add static analysis detection Date: Thu, 16 Jul 2020 11:54:15 +0200 Message-Id: <61f69916effc9f68992d4d0def092b4ec4c0273d.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.15 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 15 --------------- meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index d76c2d22fc2..8f16b364de6 100644 --- a/configure.ac +++ b/configure.ac @@ -722,21 +722,6 @@ if test "$want_ifconfig" =3D "yes"; then AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconf= ig binary]) fi =20 -# Detect when running under the clang static analyzer's scan-build driver -# or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. -AC_CACHE_CHECK([whether this build is done by a static analysis tool], - [lv_cv_static_analysis], [ - lv_cv_static_analysis=3Dno - if test -n "${CCC_ANALYZER_ANALYSIS+set}" || \ - test -n "$COVERITY_BUILD_COMMAND$COVERITY_LD_PRELOAD"; then - lv_cv_static_analysis=3Dyes - fi - ]) -t=3D0 -test "x$lv_cv_static_analysis" =3D xyes && t=3D1 -AC_DEFINE_UNQUOTED([STATIC_ANALYSIS], [$t], - [Define to 1 when performing static analysis.]) - GNUmakefile=3DGNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/meson.build b/meson.build index e91d664a77a..be5e64fc6d2 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,19 @@ if get_option('test_coverage') endif =20 =20 +# Detect when running under the + +rc =3D run_command( + 'sh', '-c', + 'test -n "${CCC_ANALYZER_HTML}"' + + ' -o -n "${CCC_ANALYZER_ANALYSIS+set}"' + + ' -o -n "$COVERITY_BUILD_COMMAND$COVERITY_LD_PRELOAD"', +) +if rc.returncode() =3D=3D 0 + conf.set('STATIC_ANALYSIS', 1) +endif + + # figure out libvirt version strings =20 arr_version =3D meson.project_version().split('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895009; cv=none; d=zohomail.com; s=zohoarc; b=Pc81LtwPAespWbWpsCK2kL1nsUtjR5x+ft/GcGkmGlkNXlDZFO6v5pkUTO4ikB6DcYPNYY1i9YtKM7zkW5FlhLqqNO+NEpnwqAvlBST1hJwFrqRumJnS51eERcIoooeoTKtajoZH8blvFxNAk7jbIrMvk2WvLJ55BVA34nWqxTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895009; 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=gTeZz008/cIigulKBfORQo44Nm8LXQLWGexa/bEtCjQ=; b=neUxvIvnDpJgkxyUQKO6m+V2LZshM9+GLnuJw5XiY3IJjDw0uYdAeXQb5TDXFHUPCsmBhAVzILw23+z3JYnQXog4CKsiTmKFSvY2dHR43vz+/N/HNjWQXYsX/SgepVMb9t8Md9rOBf6G0b6/lU3y+8FTKi3yqYNFWzRg0QmytCQ= 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 1594895009846743.443607916146; Thu, 16 Jul 2020 03:23:29 -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-474-v9Q9QuT3M4egSE2atMsd7Q-1; Thu, 16 Jul 2020 06:00:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 649E08027EE; Thu, 16 Jul 2020 10:00:43 +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 443B678471; Thu, 16 Jul 2020 10:00:43 +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 0813A96244; Thu, 16 Jul 2020 10:00:43 +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 06GA0cCh015384 for ; Thu, 16 Jul 2020 06:00:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id E86572B6E2; Thu, 16 Jul 2020 10:00:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 635592DE6F for ; Thu, 16 Jul 2020 10:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895006; 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=gTeZz008/cIigulKBfORQo44Nm8LXQLWGexa/bEtCjQ=; b=UnbrvtgoaYzSaxgVa2I7c+iRxmW3MP2fOYV4asaQxQW+Woirmsl+EYMd5m+n1h/MvFHwSC widmTeQJ/EuSJPzY9Vq4O2I9iExrdjLUFrI9g8DV/Th0+iTSJIP8815/0FwzF2Qq/upovu ApqOS0AJouLPrAI/dqQ0EmPcDy1igwc= X-MC-Unique: v9Q9QuT3M4egSE2atMsd7Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 020/351] meson: add manywarnings Date: Thu, 16 Jul 2020 11:54:16 +0200 Message-Id: <790cf23592b47ff552374a8a68622957a7c46f5d.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.11 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 --- m4/virt-manywarnings.m4 | 339 ---------------------------------------- meson.build | 192 +++++++++++++++++++++++ 2 files changed, 192 insertions(+), 339 deletions(-) delete mode 100644 m4/virt-manywarnings.m4 diff --git a/m4/virt-manywarnings.m4 b/m4/virt-manywarnings.m4 deleted file mode 100644 index 783620da3ad..00000000000 --- a/m4/virt-manywarnings.m4 +++ /dev/null @@ -1,339 +0,0 @@ -# manywarnings.m4 serial 18 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# gl_MANYWARN_COMPLEMENT(OUTVAR, LISTVAR, REMOVEVAR) -# -------------------------------------------------- -# Copy LISTVAR to OUTVAR except for the entries in REMOVEVAR. -# Elements separated by whitespace. In set logic terms, the function -# does OUTVAR =3D LISTVAR \ REMOVEVAR. -AC_DEFUN([gl_MANYWARN_COMPLEMENT], -[ - gl_warn_set=3D - set x $2; shift - for gl_warn_item - do - case " $3 " in - *" $gl_warn_item "*) - ;; - *) - gl_warn_set=3D"$gl_warn_set $gl_warn_item" - ;; - esac - done - $1=3D$gl_warn_set -]) - -# gl_MANYWARN_ALL_GCC(VARIABLE) -# ----------------------------- -# Add all documented GCC warning parameters to variable VARIABLE. -# Note that you need to test them using gl_WARN_ADD if you want to -# make sure your gcc understands it. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_MANYWARN_ALL_GCC], -[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) - -# Specialization for _AC_LANG =3D C. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.= 63b. -m4_defun([gl_MANYWARN_ALL_GCC(C)], -[ - AC_LANG_PUSH([C]) - - dnl First, check for some issues that only occur when combining multiple - dnl gcc warning categories. - AC_REQUIRE([AC_PROG_CC]) - if test -n "$GCC"; then - - dnl Check if -W -Werror -Wno-missing-field-initializers is supported - dnl with the current $CC $CFLAGS $CPPFLAGS. - AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported], - [gl_cv_cc_nomfi_supported], - [gl_save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"$CFLAGS -W -Werror -Wno-missing-field-initializers" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_nomfi_supported=3Dyes], - [gl_cv_cc_nomfi_supported=3Dno]) - CFLAGS=3D"$gl_save_CFLAGS" - ]) - - if test "$gl_cv_cc_nomfi_supported" =3D yes; then - dnl Now check whether -Wno-missing-field-initializers is needed - dnl for the { 0, } construct. - AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], - [gl_cv_cc_nomfi_needed], - [gl_save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"$CFLAGS -W -Werror" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[int f (void) - { - typedef struct { int a; int b; } s_t; - s_t s1 =3D { 0, }; - return s1.b; - } - ]], - [[]])], - [gl_cv_cc_nomfi_needed=3Dno], - [gl_cv_cc_nomfi_needed=3Dyes]) - CFLAGS=3D"$gl_save_CFLAGS" - ]) - fi - - dnl Next, check if -Werror -Wuninitialized is useful with the - dnl user's choice of $CFLAGS; some versions of gcc warn that it - dnl has no effect if -O is not also used - AC_CACHE_CHECK([whether -Wuninitialized is supported], - [gl_cv_cc_uninitialized_supported], - [gl_save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"$CFLAGS -Werror -Wuninitialized" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_uninitialized_supported=3Dyes], - [gl_cv_cc_uninitialized_supported=3Dno]) - CFLAGS=3D"$gl_save_CFLAGS" - ]) - - fi - - # List all gcc warning categories. - # To compare this list to your installed GCC's, run this Bash command: - # - # comm -3 \ - # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ - # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \ - # <(LC_ALL=3DC gcc --help=3Dwarnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p'= | sort) - - gl_manywarn_set=3D - for gl_manywarn_item in -fno-common \ - -W \ - -Wabsolute-value \ - -Waddress \ - -Waddress-of-packed-member \ - -Waggressive-loop-optimizations \ - -Wall \ - -Wattribute-warning \ - -Wattributes \ - -Wbad-function-cast \ - -Wbool-compare \ - -Wbool-operation \ - -Wbuiltin-declaration-mismatch \ - -Wbuiltin-macro-redefined \ - -Wcannot-profile \ - -Wcast-align \ - -Wcast-align=3Dstrict \ - -Wcast-function-type \ - -Wchar-subscripts \ - -Wclobbered \ - -Wcomment \ - -Wcomments \ - -Wcoverage-mismatch \ - -Wcpp \ - -Wdangling-else \ - -Wdate-time \ - -Wdeprecated \ - -Wdeprecated-declarations \ - -Wdesignated-init \ - -Wdisabled-optimization \ - -Wdiscarded-array-qualifiers \ - -Wdiscarded-qualifiers \ - -Wdiv-by-zero \ - -Wdouble-promotion \ - -Wduplicated-branches \ - -Wduplicated-cond \ - -Wduplicate-decl-specifier \ - -Wempty-body \ - -Wendif-labels \ - -Wenum-compare \ - -Wexpansion-to-defined \ - -Wextra \ - -Wformat-contains-nul \ - -Wformat-extra-args \ - -Wformat-nonliteral \ - -Wformat-security \ - -Wformat-signedness \ - -Wformat-y2k \ - -Wformat-zero-length \ - -Wframe-address \ - -Wfree-nonheap-object \ - -Whsa \ - -Wif-not-aligned \ - -Wignored-attributes \ - -Wignored-qualifiers \ - -Wimplicit \ - -Wimplicit-function-declaration \ - -Wimplicit-int \ - -Wincompatible-pointer-types \ - -Winit-self \ - -Winline \ - -Wint-conversion \ - -Wint-in-bool-context \ - -Wint-to-pointer-cast \ - -Winvalid-memory-model \ - -Winvalid-pch \ - -Wlogical-not-parentheses \ - -Wlogical-op \ - -Wmain \ - -Wmaybe-uninitialized \ - -Wmemset-elt-size \ - -Wmemset-transposed-args \ - -Wmisleading-indentation \ - -Wmissing-attributes \ - -Wmissing-braces \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-include-dirs \ - -Wmissing-parameter-type \ - -Wmissing-profile \ - -Wmissing-prototypes \ - -Wmultichar \ - -Wmultistatement-macros \ - -Wnarrowing \ - -Wnested-externs \ - -Wnonnull \ - -Wnonnull-compare \ - -Wnull-dereference \ - -Wodr \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wopenmp-simd \ - -Woverflow \ - -Woverlength-strings \ - -Woverride-init \ - -Wpacked \ - -Wpacked-bitfield-compat \ - -Wpacked-not-aligned \ - -Wparentheses \ - -Wpointer-arith \ - -Wpointer-compare \ - -Wpointer-sign \ - -Wpointer-to-int-cast \ - -Wpragmas \ - -Wpsabi \ - -Wrestrict \ - -Wreturn-local-addr \ - -Wreturn-type \ - -Wscalar-storage-order \ - -Wsequence-point \ - -Wshadow \ - -Wshift-count-negative \ - -Wshift-count-overflow \ - -Wshift-negative-value \ - -Wsizeof-array-argument \ - -Wsizeof-pointer-div \ - -Wsizeof-pointer-memaccess \ - -Wstack-protector \ - -Wstrict-aliasing \ - -Wstrict-overflow \ - -Wstrict-prototypes \ - -Wstringop-truncation \ - -Wsuggest-attribute=3Dcold \ - -Wsuggest-attribute=3Dconst \ - -Wsuggest-attribute=3Dformat \ - -Wsuggest-attribute=3Dmalloc \ - -Wsuggest-attribute=3Dnoreturn \ - -Wsuggest-attribute=3Dpure \ - -Wsuggest-final-methods \ - -Wsuggest-final-types \ - -Wswitch \ - -Wswitch-bool \ - -Wswitch-unreachable \ - -Wsync-nand \ - -Wsystem-headers \ - -Wtautological-compare \ - -Wtrampolines \ - -Wtrigraphs \ - -Wtype-limits \ - -Wuninitialized \ - -Wunknown-pragmas \ - -Wunsafe-loop-optimizations \ - -Wunused \ - -Wunused-but-set-parameter \ - -Wunused-but-set-variable \ - -Wunused-function \ - -Wunused-label \ - -Wunused-local-typedefs \ - -Wunused-macros \ - -Wunused-parameter \ - -Wunused-result \ - -Wunused-value \ - -Wunused-variable \ - -Wvarargs \ - -Wvariadic-macros \ - -Wvector-operation-performance \ - -Wvla \ - -Wvolatile-register-var \ - -Wwrite-strings \ - \ - ; do - gl_manywarn_set=3D"$gl_manywarn_set $gl_manywarn_item" - done - - # gcc --help=3Dwarnings outputs an unusual form for these options; list - # them here so that the above 'comm' command doesn't report a false matc= h. - # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal. - # Also, AC_COMPUTE_INT requires it to fit in a long; it is 2**63 on - # the only platforms where it does not fit in a long, so make that - # a special case. - AC_MSG_CHECKING([max safe object size]) - AC_COMPUTE_INT([gl_alloc_max], - [LONG_MAX < (PTRDIFF_MAX < (size_t) -1 ? PTRDIFF_MAX : (size_t) -1) - ? -1 - : PTRDIFF_MAX < (size_t) -1 ? (long) PTRDIFF_MAX : (long) (size_t) -1= ], - [[#include - #include - #include - ]], - [gl_alloc_max=3D2147483647]) - case $gl_alloc_max in - -1) gl_alloc_max=3D9223372036854775807;; - esac - AC_MSG_RESULT([$gl_alloc_max]) - gl_manywarn_set=3D"$gl_manywarn_set -Walloc-size-larger-than=3D$gl_alloc= _max" - gl_manywarn_set=3D"$gl_manywarn_set -Warray-bounds=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wattribute-alias=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wformat-overflow=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wformat-truncation=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wimplicit-fallthrough=3D5" - gl_manywarn_set=3D"$gl_manywarn_set -Wnormalized=3Dnfc" - gl_manywarn_set=3D"$gl_manywarn_set -Wshift-overflow=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wstringop-overflow=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wunused-const-variable=3D2" - gl_manywarn_set=3D"$gl_manywarn_set -Wvla-larger-than=3D4031" - - # These are needed for older GCC versions. - if test -n "$GCC"; then - case `($CC --version) 2>/dev/null` in - 'gcc (GCC) '[[0-3]].* | \ - 'gcc (GCC) '4.[[0-7]].*) - gl_manywarn_set=3D"$gl_manywarn_set -fdiagnostics-show-option" - gl_manywarn_set=3D"$gl_manywarn_set -funit-at-a-time" - ;; - esac - fi - - # Disable specific options as needed. - if test "$gl_cv_cc_nomfi_needed" =3D yes; then - gl_manywarn_set=3D"$gl_manywarn_set -Wno-missing-field-initializers" - fi - - if test "$gl_cv_cc_uninitialized_supported" =3D no; then - gl_manywarn_set=3D"$gl_manywarn_set -Wno-uninitialized" - fi - - $1=3D$gl_manywarn_set - - AC_LANG_POP([C]) -]) - -# Specialization for _AC_LANG =3D C++. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.= 63b. -m4_defun([gl_MANYWARN_ALL_GCC(C++)], -[ - gl_MANYWARN_ALL_GCC_CXX_IMPL([$1]) -]) diff --git a/meson.build b/meson.build index be5e64fc6d2..d9a95e049c0 100644 --- a/meson.build +++ b/meson.build @@ -201,6 +201,198 @@ libvirt_revision =3D arr_version[2].to_int() libvirt_lib_version =3D '@0@.@1@.@2@'.format(libvirt_so_version, libvirt_a= ge, libvirt_revision) =20 =20 +# check compile flags + +cc =3D meson.get_compiler('c') + +cc_flags =3D [ + '-fno-common', + '-W', + '-Wabsolute-value', + '-Waddress', + '-Waddress-of-packed-member', + '-Waggressive-loop-optimizations', + '-Wall', + '-Wattribute-warning', + '-Wattributes', + '-Wbad-function-cast', + '-Wbool-compare', + '-Wbool-operation', + '-Wbuiltin-declaration-mismatch', + '-Wbuiltin-macro-redefined', + '-Wcannot-profile', + '-Wcast-align', + '-Wcast-align=3Dstrict', + '-Wcast-function-type', + '-Wchar-subscripts', + '-Wclobbered', + '-Wcomment', + '-Wcomments', + '-Wcoverage-mismatch', + '-Wcpp', + '-Wdangling-else', + '-Wdate-time', + '-Wdeprecated', + '-Wdeprecated-declarations', + '-Wdesignated-init', + '-Wdisabled-optimization', + '-Wdiscarded-array-qualifiers', + '-Wdiscarded-qualifiers', + '-Wdiv-by-zero', + '-Wdouble-promotion', + '-Wduplicated-branches', + '-Wduplicated-cond', + '-Wduplicate-decl-specifier', + '-Wempty-body', + '-Wendif-labels', + '-Wenum-compare', + '-Wexpansion-to-defined', + '-Wextra', + '-Wformat-contains-nul', + '-Wformat-extra-args', + '-Wformat-nonliteral', + '-Wformat-security', + '-Wformat-signedness', + '-Wformat-y2k', + '-Wformat-zero-length', + '-Wframe-address', + '-Wfree-nonheap-object', + '-Whsa', + '-Wif-not-aligned', + '-Wignored-attributes', + '-Wignored-qualifiers', + '-Wimplicit', + '-Wimplicit-function-declaration', + '-Wimplicit-int', + '-Wincompatible-pointer-types', + '-Winit-self', + '-Winline', + '-Wint-conversion', + '-Wint-in-bool-context', + '-Wint-to-pointer-cast', + '-Winvalid-memory-model', + '-Winvalid-pch', + '-Wlogical-not-parentheses', + '-Wlogical-op', + '-Wmain', + '-Wmaybe-uninitialized', + '-Wmemset-elt-size', + '-Wmemset-transposed-args', + '-Wmisleading-indentation', + '-Wmissing-attributes', + '-Wmissing-braces', + '-Wmissing-declarations', + '-Wmissing-field-initializers', + '-Wmissing-include-dirs', + '-Wmissing-parameter-type', + '-Wmissing-profile', + '-Wmissing-prototypes', + '-Wmultichar', + '-Wmultistatement-macros', + '-Wnarrowing', + '-Wnested-externs', + '-Wnonnull', + '-Wnonnull-compare', + '-Wnull-dereference', + '-Wodr', + '-Wold-style-declaration', + '-Wold-style-definition', + '-Wopenmp-simd', + '-Woverflow', + '-Woverlength-strings', + '-Woverride-init', + '-Wpacked', + '-Wpacked-bitfield-compat', + '-Wpacked-not-aligned', + '-Wparentheses', + '-Wpointer-arith', + '-Wpointer-compare', + '-Wpointer-sign', + '-Wpointer-to-int-cast', + '-Wpragmas', + '-Wpsabi', + '-Wrestrict', + '-Wreturn-local-addr', + '-Wreturn-type', + '-Wscalar-storage-order', + '-Wsequence-point', + '-Wshadow', + '-Wshift-count-negative', + '-Wshift-count-overflow', + '-Wshift-negative-value', + '-Wsizeof-array-argument', + '-Wsizeof-pointer-div', + '-Wsizeof-pointer-memaccess', + '-Wstack-protector', + '-Wstrict-aliasing', + '-Wstrict-overflow', + '-Wstrict-prototypes', + '-Wstringop-truncation', + '-Wsuggest-attribute=3Dcold', + '-Wsuggest-attribute=3Dconst', + '-Wsuggest-attribute=3Dformat', + '-Wsuggest-attribute=3Dmalloc', + '-Wsuggest-attribute=3Dnoreturn', + '-Wsuggest-attribute=3Dpure', + '-Wsuggest-final-methods', + '-Wsuggest-final-types', + '-Wswitch', + '-Wswitch-bool', + '-Wswitch-unreachable', + '-Wsync-nand', + '-Wsystem-headers', + '-Wtautological-compare', + '-Wtrampolines', + '-Wtrigraphs', + '-Wtype-limits', + '-Wuninitialized', + '-Wunknown-pragmas', + '-Wunsafe-loop-optimizations', + '-Wunused', + '-Wunused-but-set-parameter', + '-Wunused-but-set-variable', + '-Wunused-function', + '-Wunused-label', + '-Wunused-local-typedefs', + '-Wunused-macros', + '-Wunused-parameter', + '-Wunused-result', + '-Wunused-value', + '-Wunused-variable', + '-Wvarargs', + '-Wvariadic-macros', + '-Wvector-operation-performance', + '-Wvla', + '-Wvolatile-register-var', + '-Wwrite-strings', +] + +# gcc --help=3Dwarnings outputs +ptrdiff_max =3D cc.sizeof('ptrdiff_t', prefix: '#include ') +size_max =3D cc.sizeof('size_t', prefix: '#include ') +# Compute max safe object size by checking ptrdiff_t and size_t sizes. +# Ideally we would get PTRDIFF_MAX and SIZE_MAX values but it would +# give us (2147483647L) and we would have to remove the () and the suffix +# in order to convert it to numbers to be able to pick the smaller one. +alloc_max =3D run_command( + 'python3', '-c', + 'print(min(2**@0@ - 1, 2**@1@ - 1))'.format(ptrdiff_max * 8 - 1, size_ma= x * 8), +) +cc_flags +=3D [ + '-Walloc-size-larger-than=3D@0@'.format(alloc_max.stdout().strip()), + '-Warray-bounds=3D2', + '-Wattribute-alias=3D2', + '-Wformat-overflow=3D2', + '-Wformat-truncation=3D2', + '-Wimplicit-fallthrough=3D5', + '-Wnormalized=3Dnfc', + '-Wshift-overflow=3D2', + '-Wstringop-overflow=3D2', + '-Wunused-const-variable=3D2', + '-Wvla-larger-then=3D4031', +] + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893683; cv=none; d=zohomail.com; s=zohoarc; b=PQDFbbA/+FlYzSvWipF8PvacaSTFyNvrn+Uv2hEG8/bfhNqyxT81k4i4l5oYelMsAp8rrnCaTQlH+bjGqKgt8fWCCnL8jE4kySgzxpjGsM71XRWWNYmjQ1fcFcebDm/Aydm9NrpwYszFkjrNPgKh6HNPWlUfjh9qshdjO5US9Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893683; 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=PX7DycCg+p9iqWKp1Vxai4WfDHjnGeBT4ZjUUam+k3I=; b=AzfpuzeQa3UacB3B/AEWywuKD8jRINGdWTJxvMceBgglTrol76wR/zQrmK9SkOjqZXxgbZQtisof4s8FrE8O9AaZhiCmFtlVUwfaWJaVXhXn4QVjDJ9iStWVeQdqdnBCryMBeD9TvviGJODHsEPdmcH3AD8FdsQUVj2bsibeJUs= 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 1594893683604328.5640546790868; Thu, 16 Jul 2020 03:01:23 -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-199-DgX6YKAtOKGliZ0vNK9W_g-1; Thu, 16 Jul 2020 06:00:51 -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 BC51F100526A; Thu, 16 Jul 2020 10:00:45 +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 9669610023A7; Thu, 16 Jul 2020 10:00:45 +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 6573B1805311; Thu, 16 Jul 2020 10:00:45 +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 06GA0dX1015397 for ; Thu, 16 Jul 2020 06:00:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id D2B622B6E6; Thu, 16 Jul 2020 10:00:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D0A92B6E2 for ; Thu, 16 Jul 2020 10:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893682; 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=PX7DycCg+p9iqWKp1Vxai4WfDHjnGeBT4ZjUUam+k3I=; b=PUrHIzJTBKvxATb22Igby2APTlpTU6r5RLjwvEQ7mt8YMICTRtKyDOjbOxI4wEAYxv6zQI Ugrc5cd0kfIWRhUflaTRfiqwL5lPbuem6FiCHxL9RXeR5OW6On2kKJzleU+U47eFXdP9ug IbMHuFGunKlfmJwgc6G+MURoGaR9Xkk= X-MC-Unique: DgX6YKAtOKGliZ0vNK9W_g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 021/351] meson: add compiler warnings Date: Thu, 16 Jul 2020 11:54:17 +0200 Message-Id: <10c752ca91c0e6101034a1a9622825ccb77c9cb9.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 --- config.h | 7 + configure.ac | 3 - m4/virt-compile-warnings.m4 | 255 ------------------------------------ m4/virt-warnings.m4 | 115 ---------------- meson.build | 221 ++++++++++++++++++++++++++++--- 5 files changed, 211 insertions(+), 390 deletions(-) delete mode 100644 m4/virt-compile-warnings.m4 delete mode 100644 m4/virt-warnings.m4 diff --git a/config.h b/config.h index 9c433ad4c0f..368688f3d01 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,12 @@ #include =20 +/* Enable compile-time and run-time bounds-checking, and some warnings, + * without upsetting newer glibc. */ + +#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ +# define _FORTIFY_SOURCE 2 +#endif + #ifndef __GNUC__ # error "Libvirt requires GCC >=3D 4.8, or CLang" #endif diff --git a/configure.ac b/configure.ac index 8f16b364de6..56a471fc3ab 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_COMPILE_WARNINGS LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_LINKER_NO_UNDEFINED @@ -849,8 +848,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG -LIBVIRT_RESULT([Use -Werror], [$enable_werror]) -LIBVIRT_RESULT([Warning Flags], [$WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 deleted file mode 100644 index d3538d59f82..00000000000 --- a/m4/virt-compile-warnings.m4 +++ /dev/null @@ -1,255 +0,0 @@ -dnl -dnl Enable all known GCC compiler warnings, except for those -dnl we can't yet cope with -dnl -AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - LIBVIRT_ARG_ENABLE([WERROR], [Use -Werror (if supported)], [check]) - if test "$enable_werror" =3D "check"; then - if test -d $srcdir/.git; then - is_git_version=3Dtrue - enable_werror=3Dyes - else - enable_werror=3Dno - fi - fi - - # List of warnings that are not relevant / wanted - - # Don't care about C++ compiler compat - dontwarn=3D"$dontwarn -Wc++-compat" - dontwarn=3D"$dontwarn -Wabi" - dontwarn=3D"$dontwarn -Wdeprecated" - # Don't care about ancient C standard compat - dontwarn=3D"$dontwarn -Wtraditional" - # Don't care about ancient C standard compat - dontwarn=3D"$dontwarn -Wtraditional-conversion" - # Ignore warnings in /usr/include - dontwarn=3D"$dontwarn -Wsystem-headers" - # Happy for compiler to add struct padding - dontwarn=3D"$dontwarn -Wpadded" - # GCC very confused with -O2 - dontwarn=3D"$dontwarn -Wunreachable-code" - # Too many to deal with - dontwarn=3D"$dontwarn -Wconversion" - # Too many to deal with - dontwarn=3D"$dontwarn -Wsign-conversion" - # Need to allow bad cast for execve() - dontwarn=3D"$dontwarn -Wcast-qual" - # We need to use long long in many places - dontwarn=3D"$dontwarn -Wlong-long" - # We allow manual list of all enum cases without default: - dontwarn=3D"$dontwarn -Wswitch-default" - # Not a problem since we don't use -fstrict-overflow - dontwarn=3D"$dontwarn -Wstrict-overflow" - # Not a problem since we don't use -funsafe-loop-optimizations - dontwarn=3D"$dontwarn -Wunsafe-loop-optimizations" - # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -W= all - dontwarn=3D"$dontwarn -Wenum-compare" - # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime ti= me - dontwarn=3D"$dontwarn -Wformat-signedness" - # Several conditionals expand the same on both branches - # depending on the particular platform/architecture - dontwarn=3D"$dontwarn -Wduplicated-branches" - # > This warning does not generally indicate that there is anything wr= ong - # > with your code; it merely indicates that GCC's optimizers are unab= le - # > to handle the code effectively. - # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html - dontwarn=3D"$dontwarn -Wdisabled-optimization" - # Various valid glib APIs/macros trigger this warning - dontwarn=3D"$dontwarn -Wbad-function-cast" - - # Broken in 6.0 and later - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D69602 - AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op], - [lv_cv_gcc_wlogical_op_equal_expr_broken], [ - save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"-O2 -Wlogical-op -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define TEST1 1 - #define TEST2 TEST1 - ]], [[ - int test =3D 0; - return test =3D=3D TEST1 || test =3D=3D TEST2;]])], - [lv_cv_gcc_wlogical_op_equal_expr_broken=3Dno], - [lv_cv_gcc_wlogical_op_equal_expr_broken=3Dyes]) - CFLAGS=3D"$save_CFLAGS"]) - - AC_CACHE_CHECK([whether clang gives bogus warnings for -Wdouble-promot= ion], - [lv_cv_clang_double_promotion_broken], [ - save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"-O2 -Wdouble-promotion -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - ]], [[ - float f =3D 0.0; - return isnan(f);]])], - [lv_cv_clang_double_promotion_broken=3Dno], - [lv_cv_clang_double_promotion_broken=3Dyes]) - CFLAGS=3D"$save_CFLAGS"]) - - if test "$lv_cv_clang_double_promotion_broken" =3D "yes"; - then - dontwarn=3D"$dontwarn -Wdouble-promotion" - fi - - # Clang complains about unused static inline functions - # which are common with G_DEFINE_AUTOPTR_CLEANUP_FUNC - AC_CACHE_CHECK([whether clang gives bogus warnings for -Wunused-functi= on], - [lv_cv_clang_unused_function_broken], [ - save_CFLAGS=3D"$CFLAGS" - CFLAGS=3D"-Wunused-function -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - static inline void foo(void) {} - ]], [[ - return 0]])], - [lv_cv_clang_unused_function_broken=3Dno], - [lv_cv_clang_unused_function_broken=3Dyes]) - CFLAGS=3D"$save_CFLAGS"]) - - # We might fundamentally need some of these disabled forever, but - # ideally we'd turn many of them on - dontwarn=3D"$dontwarn -Wfloat-equal" - dontwarn=3D"$dontwarn -Wdeclaration-after-statement" - dontwarn=3D"$dontwarn -Wpacked" - dontwarn=3D"$dontwarn -Wunused-macros" - dontwarn=3D"$dontwarn -Woverlength-strings" - dontwarn=3D"$dontwarn -Wstack-protector" - dontwarn=3D"$dontwarn -Wsuggest-attribute=3Dmalloc" - - # Get all possible GCC warnings - gl_MANYWARN_ALL_GCC([maybewarn]) - - # Remove the ones we don't want, blacklisted earlier - gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn]) - - # -Wunused-functin is implied by -Wall we must turn it - # off explicitly. - if test "$lv_cv_clang_unused_function_broken" =3D "yes"; - then - wantwarn=3D"$wantwarn -Wno-unused-function" - fi - - # manywarnings uses '-W' (aka -Wextra) which includes a bunch of stuff. - # Unfortunately, this means you can't simply use '-Wsign-compare' - # with gl_MANYWARN_COMPLEMENT - # So we have -W enabled, and then have to explicitly turn off... - wantwarn=3D"$wantwarn -Wno-sign-compare" - # We do "bad" function casts all the time for event callbacks - wantwarn=3D"$wantwarn -Wno-cast-function-type" - - # CLang incorrectly complains about dup typedefs win gnu99 mode - # so use this CLang-specific arg to keep it quiet - wantwarn=3D"$wantwarn -Wno-typedef-redefinition" - - # manywarnings expects this to be part of -Wc++-compat, but we turn - # that one off, so we need to manually enable this again - wantwarn=3D"$wantwarn -Wjump-misses-init" - - # manywarnings explicitly filters it out, preferring -Wswitch - # but that doesn't report missing enums if a default: - # is present. - wantwarn=3D"$wantwarn -Wswitch-enum" - - # manywarnings turns on -Wformat=3D2 which implies -Wformat-nonliteral, - # so we need to manually re-exclude it. - wantwarn=3D"$wantwarn -Wno-format-nonliteral" - - # -Wformat enables this by default, and we should keep it, - # but need to rewrite various areas of code first - wantwarn=3D"$wantwarn -Wno-format-truncation" - - # This should be < 256 really. Currently we're down to 4096, - # but using 1024 bytes sized buffers (mostly for virStrerror) - # stops us from going down further - wantwarn=3D"$wantwarn -Wframe-larger-than=3D4096" - gl_WARN_ADD([-Wframe-larger-than=3D262144], [RELAXED_FRAME_LIMIT_CFLAG= S]) - - # Extra special flags - dnl -fstack-protector stuff passes gl_WARN_ADD with gcc - dnl on Mingw32, but fails when actually used - case $host in - aarch64-*-*) - dnl "error: -fstack-protector not supported for this target [-Werro= r]" - ;; - *-*-linux*) - dnl Prefer -fstack-protector-strong if it's available. - dnl There doesn't seem to be great overhead in adding - dnl -fstack-protector-all instead of -fstack-protector. - dnl - dnl We also don't need ssp-buffer-size with -all or -strong, - dnl since functions are protected regardless of buffer size. - dnl wantwarn=3D"$wantwarn --param=3Dssp-buffer-size=3D4" - wantwarn=3D"$wantwarn -fstack-protector-strong" - ;; - *-*-freebsd*) - dnl FreeBSD ships old gcc 4.2.1 which doesn't handle - dnl -fstack-protector-all well - wantwarn=3D"$wantwarn -fstack-protector" - - wantwarn=3D"$wantwarn -Wno-unused-command-line-argument" - ;; - esac - wantwarn=3D"$wantwarn -fexceptions" - wantwarn=3D"$wantwarn -fasynchronous-unwind-tables" - - # Need -fipa-pure-const in order to make -Wsuggest-attribute=3Dpure - # fire even without -O. - wantwarn=3D"$wantwarn -fipa-pure-const" - # We should eventually enable this, but right now there are at - # least 75 functions triggering warnings. - wantwarn=3D"$wantwarn -Wno-suggest-attribute=3Dpure" - wantwarn=3D"$wantwarn -Wno-suggest-attribute=3Dconst" - - if test "$enable_werror" =3D "yes" - then - wantwarn=3D"$wantwarn -Werror" - fi - - # Request the gnu99 standard which is the best choice with - # gcc 4.8.0. Not a warning flag, but the probing mechanism - # is convenient - wantwarn=3D"$wantwarn -std=3Dgnu99" - - # Check for $CC support of each warning - for w in $wantwarn; do - gl_WARN_ADD([$w]) - done - - case $host in - *-*-linux*) - dnl Fall back to -fstack-protector-all if -strong is not available - case $WARN_CFLAGS in - *-fstack-protector-strong*) - ;; - *) - gl_WARN_ADD([-fstack-protector-all]) - ;; - esac - ;; - esac - - case $WARN_CFLAGS in - *-Wsuggest-attribute=3Dformat*) - AC_DEFINE([HAVE_SUGGEST_ATTRIBUTE_FORMAT], [1], [Whether -Wsugg= est-attribute=3Dformat works]) - ;; - esac - - # Use security checked glibc headers - AH_VERBATIM([FORTIFY_SOURCE], - [/* Enable compile-time and run-time bounds-checking, and some warning= s, - without upsetting newer glibc. */ - #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ - # define _FORTIFY_SOURCE 2 - #endif - ]) - - if test "$gl_cv_warn_c__Wlogical_op" =3D yes && - test "$lv_cv_gcc_wlogical_op_equal_expr_broken" =3D yes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1, - [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal= expr]) - fi -]) diff --git a/m4/virt-warnings.m4 b/m4/virt-warnings.m4 deleted file mode 100644 index d272365f0a1..00000000000 --- a/m4/virt-warnings.m4 +++ /dev/null @@ -1,115 +0,0 @@ -# warnings.m4 serial 14 -dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# gl_AS_VAR_APPEND(VAR, VALUE) -# ---------------------------- -# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it. -m4_ifdef([AS_VAR_APPEND], -[m4_copy([AS_VAR_APPEND], [gl_AS_VAR_APPEND])], -[m4_define([gl_AS_VAR_APPEND], -[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])]) - - -# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED], -# [PROGRAM =3D AC_LANG_PROGRAM()]) -# ----------------------------------------------------------------- -# Check if the compiler supports OPTION when compiling PROGRAM. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_COMPILER_OPTION_IF], -[ -dnl FIXME: gl_Warn must be used unquoted until we can assume Autoconf -dnl 2.64 or newer. -AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl -AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl -AS_LITERAL_IF([$1], - [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], - [gl_positive=3D"$1" -case $gl_positive in - -Wno-*) gl_positive=3D-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; -esac -m4_pushdef([gl_Positive], [$gl_positive])])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]),= [ - gl_save_compiler_FLAGS=3D"$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), - [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) - AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) - gl_Flags=3D"$gl_save_compiler_FLAGS" -]) -AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) -m4_popdef([gl_Positive])dnl -AS_VAR_POPDEF([gl_Flags])dnl -AS_VAR_POPDEF([gl_Warn])dnl -]) - -# gl_UNKNOWN_WARNINGS_ARE_ERRORS -# ------------------------------ -# Clang doesn't complain about unknown warning options unless one also -# specifies -Wunknown-warning-option -Werror. Detect this. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], -[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) - -# Specialization for _AC_LANG =3D C. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.= 63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], -[ - AC_LANG_PUSH([C]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([C]) -]) - -# Specialization for _AC_LANG =3D C++. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.= 63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], -[ - AC_LANG_PUSH([C++]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([C++]) -]) - -# Specialization for _AC_LANG =3D Objective C. This macro can be AC_REQUIR= Ed. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.= 63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)], -[ - AC_LANG_PUSH([Objective C]) - gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL - AC_LANG_POP([Objective C]) -]) - -AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL], -[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], - [gl_unknown_warnings_are_errors=3D'-Wunknown-warning-option -Werror'], - [gl_unknown_warnings_are_errors=3D])]) - -# gl_WARN_ADD(OPTION, [VARIABLE =3D WARN_CFLAGS/WARN_CXXFLAGS], -# [PROGRAM =3D AC_LANG_PROGRAM()]) -# ----------------------------------------------------------- -# Adds parameter to WARN_CFLAGS/WARN_CXXFLAGS if the compiler supports it -# when compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]). -# -# If VARIABLE is a variable name, AC_SUBST it. -# -# The effects of this macro depend on the current language (_AC_LANG). -AC_DEFUN([gl_WARN_ADD], -[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS(]_AC_LANG[)]) -gl_COMPILER_OPTION_IF([$1], - [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_]_AC_LANG_PREFIX[FLAGS]], [[$2]= ]), [" $1"])], - [], - [$3]) -m4_ifval([$2], - [AS_LITERAL_IF([$2], [AC_SUBST([$2])])], - [AC_SUBST([WARN_]_AC_LANG_PREFIX[FLAGS])])dnl -]) - -# Local Variables: -# mode: autoconf -# End: diff --git a/meson.build b/meson.build index d9a95e049c0..2450a8bdd79 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,7 @@ project( 'buildtype=3Ddebugoptimized', 'b_pie=3Dtrue', 'c_std=3Dgnu99', + 'warning_level=3D2', ], ) =20 @@ -212,10 +213,8 @@ cc_flags =3D [ '-Waddress', '-Waddress-of-packed-member', '-Waggressive-loop-optimizations', - '-Wall', '-Wattribute-warning', '-Wattributes', - '-Wbad-function-cast', '-Wbool-compare', '-Wbool-operation', '-Wbuiltin-declaration-mismatch', @@ -232,27 +231,20 @@ cc_flags =3D [ '-Wcpp', '-Wdangling-else', '-Wdate-time', - '-Wdeprecated', '-Wdeprecated-declarations', '-Wdesignated-init', - '-Wdisabled-optimization', '-Wdiscarded-array-qualifiers', '-Wdiscarded-qualifiers', '-Wdiv-by-zero', - '-Wdouble-promotion', - '-Wduplicated-branches', '-Wduplicated-cond', '-Wduplicate-decl-specifier', '-Wempty-body', '-Wendif-labels', - '-Wenum-compare', '-Wexpansion-to-defined', - '-Wextra', '-Wformat-contains-nul', '-Wformat-extra-args', '-Wformat-nonliteral', '-Wformat-security', - '-Wformat-signedness', '-Wformat-y2k', '-Wformat-zero-length', '-Wframe-address', @@ -299,9 +291,7 @@ cc_flags =3D [ '-Wold-style-definition', '-Wopenmp-simd', '-Woverflow', - '-Woverlength-strings', '-Woverride-init', - '-Wpacked', '-Wpacked-bitfield-compat', '-Wpacked-not-aligned', '-Wparentheses', @@ -323,15 +313,12 @@ cc_flags =3D [ '-Wsizeof-array-argument', '-Wsizeof-pointer-div', '-Wsizeof-pointer-memaccess', - '-Wstack-protector', '-Wstrict-aliasing', - '-Wstrict-overflow', '-Wstrict-prototypes', '-Wstringop-truncation', '-Wsuggest-attribute=3Dcold', '-Wsuggest-attribute=3Dconst', '-Wsuggest-attribute=3Dformat', - '-Wsuggest-attribute=3Dmalloc', '-Wsuggest-attribute=3Dnoreturn', '-Wsuggest-attribute=3Dpure', '-Wsuggest-final-methods', @@ -340,21 +327,18 @@ cc_flags =3D [ '-Wswitch-bool', '-Wswitch-unreachable', '-Wsync-nand', - '-Wsystem-headers', '-Wtautological-compare', '-Wtrampolines', '-Wtrigraphs', '-Wtype-limits', '-Wuninitialized', '-Wunknown-pragmas', - '-Wunsafe-loop-optimizations', '-Wunused', '-Wunused-but-set-parameter', '-Wunused-but-set-variable', '-Wunused-function', '-Wunused-label', '-Wunused-local-typedefs', - '-Wunused-macros', '-Wunused-parameter', '-Wunused-result', '-Wunused-value', @@ -392,6 +376,203 @@ cc_flags +=3D [ '-Wvla-larger-then=3D4031', ] =20 +cc_flags +=3D [ + # So we have -W enabled, and then have to explicitly turn off... + '-Wno-sign-compare', + + # We do "bad" function casts all the time for event callbacks + '-Wno-cast-function-type', + + # CLang incorrectly complains about dup typedefs win gnu99 mode + # so use this CLang-specific arg to keep it quiet + '-Wno-typedef-redefinition', + + # We don't use -Wc++-compat so we have to enable it explicitly + '-Wjump-misses-init', + + # TODO comment + '-Wswitch-enum', + + # -Wformat=3D2 implies -Wformat-nonliteral so we need to manually exclud= e it + '-Wno-format-nonliteral', + + # -Wformat enables this by default, and we should keep it, + # but need to rewrite various areas of code first + '-Wno-format-truncation', + + # This should be < 256 really. Currently we're down to 4096, + # but using 1024 bytes sized buffers (mostly for virStrerror) + # stops us from going down further + '-Wframe-larger-than=3D4096', + + # extra special flags + '-fexceptions', + '-fasynchronous-unwind-tables', + + # Need -fipa-pure-const in order to make -Wsuggest-attribute=3Dpure + # fire even without -O. + '-fipa-pure-const', + + # We should eventually enable this, but right now there are at + # least 75 functions triggering warnings. + '-Wno-suggest-attribute=3Dpure', + '-Wno-suggest-attribute=3Dconst', +] + +if git + cc_flags +=3D [ '-Werror' ] +endif + +# on aarch64 error: -fstack-protector not supported for this target +# on mingw32 it is supported but fails when actually used +if host_machine.cpu_family() !=3D 'aarch64' + if host_machine.system() in [ 'linux', 'freebsd' ] + # we prefer -fstack-protector-strong but fallback to -fstack-protector= -all + cc_flags +=3D cc.first_supported_argument([ + '-fstack-protector-strong', + '-fstack-protector-all', + ]) + endif +endif + +if cc.has_argument('-Wlogical-op') + # Broken in 6.0 and later + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D69602 + w_logical_op_args =3D ['-O2', '-Wlogical-op', '-Werror'] + w_logical_op_code =3D ''' + #define TEST1 1 + #define TEST2 TEST1 + + int main(void) { + int test =3D 0; + return test =3D=3D TEST1 || test =3D=3D TEST2; + } + ''' + if not cc.compiles(w_logical_op_code, args: w_logical_op_args) + conf.set('BROKEN_GCC_WLOGICALOP_EQUAL_EXPR', 1) + endif +endif + +# Check whether clang gives bogus warning for -Wdouble-promotion. +w_double_promotion_args =3D ['-O2', '-Wdouble-promotion', '-Werror'] +w_double_promotion_code =3D ''' + #include + + int main(void) { + float f =3D 0.0; + return isnan(f); + } +''' +if cc.compiles(w_double_promotion_code, args: w_double_promotion_args, nam= e: '-Wdouble-promotion') + cc_flags +=3D ['-Wdouble-promotion'] +endif + +# Clang complains about unused static inline functions which are common +# with G_DEFINE_AUTOPTR_CLEANUP_FUNC. +w_unused_function_args =3D ['-Wunused-function', '-Werror'] +w_unused_function_code =3D ''' + static inline void foo(void) {} + + int main(void) { return 0; } +''' +# -Wunused-function is implied by -Wall, we must turn it off explicitly. +if not cc.compiles(w_unused_function_code, args: w_unused_function_args) + cc_flags +=3D ['-Wno-unused-function'] +endif + +cc_flags_disabled =3D [ + # In meson this is specified using 'c_std=3Dgnu99' in project() function. + '-std=3Dgnu99', + + # In meson this is specified using 'warning_level=3D2' in project() func= tion. + '-Wall', + '-Wextra', + + # don't care about C++ compiler compat + '-Wc++-compat', + '-Wabi', + '-Wdeprecated', + + # Don't care about ancient C standard compat + '-Wtraditional', + '-Wtraditional-conversion', + + # Ignore warnings in /usr/include + '-Wsystem-headers', + + # Happy for compiler to add struct padding + '-Wpadded', + + # GCC very confused with -O2 + '-Wunreachable-code', + + # Too many to deal with + '-Wconversion', + '-Wsign-conversion', + + # Need to allow bad cast for execve() + '-Wcast-qual', + + # We need to use long long in many places + '-Wlong-long', + + # We allow manual list of all enum cases without default + '-Wswitch-default', + + # Not a problem since we don't use -fstrict-overflow + '-Wstrict-overflow', + + # Not a problem since we don't use -funsafe-loop-optimizations + '-Wunsafe-loop-optimizations', + + # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall + '-Wenum-compare', + + # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time + '-Wformat-signedness', + + # Several conditionals expand the same on both branches depending on the + # particular platform/architecture + '-Wduplicated-branches', + + # > This warning does not generally indicate that there is anything wrong + # > with your code; it merely indicates that GCC's optimizers are unable + # > to handle the code effectively. + # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html + '-Wdisabled-optimization', + + # Various valid glib APIs/macros trigger this warning + '-Wbad-function-cast', + + # We might fundamentally need some of these disabled forever, but + # ideally we'd turn many of them on + '-Wfloat-equal', + '-Wdeclaration-after-statement', + '-Wpacked', + '-Wunused-macros', + '-Woverlength-strings', + '-Wstack-protector', + '-Wsuggest-attribute=3Dmalloc', +] + +foreach flag : cc_flags_disabled + if cc_flags.contains(flag) + error('@0@ is disabled but listed in cc_flags'.format(flag)) + endif +endforeach + +supported_cc_flags =3D cc.get_supported_arguments(cc_flags) +add_project_arguments(supported_cc_flags, language: 'c') + +if cc.has_argument('-Wsuggest-attribute=3Dformat') + conf.set('HAVE_SUGGEST_ATTRIBUTE_FORMAT', 1) +endif + +# used in tests +cc_flags_relaxed_frame_limit =3D [ + '-Wframe-larger-than=3D262144', +] + =20 # define top include directory =20 @@ -408,3 +589,9 @@ test_summary =3D { 'Coverage': coverage_flags.length() > 0, } summary(test_summary, section: 'Test suite', bool_yn: true) + +misc_summary =3D { + 'Use -Werror': cc_flags.contains('-Werror'), + 'Warning Flags': supported_cc_flags, +} +summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893735; cv=none; d=zohomail.com; s=zohoarc; b=mHE8Xf86fcRtqcio3KYxixF8Lfw8OjWRv2QyTtHQvtQZtfSHNygmNjf8U3lwZaGSBDIBTSUwohl+wb1RH+frbHiO2NXn8ZvxOKKZHQjkTOWouCNPXTGUyjLT8BU8El9MVdRg9fGXAwbuJRmU82jOIIU8KBC16LC6YaMDjkpUUBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893735; 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=CLhrvt/iXWa1p7cN9NTPYnD1ZnHofNalHP1D0y6diQY=; b=S1HLWyu9nIV8Glqigc8eUanYwc6Ru3ahbikn3JYQSbjUKx2CQUds+7PUYYYfZdpwoPefi9nEuea06UfrRf4a6lemGhNo4+/GI6aKzDbEZffGSXnc9zRW0Qp6A5zT999UuMoBSEsPPUJSoNWUSIQC3AchaOlcJ247vgOgiKw0UEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893735006579.0582727079404; Thu, 16 Jul 2020 03:02: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-183-WxzEtopzMgCeLHd0__8SbQ-1; Thu, 16 Jul 2020 06:00:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9417910059C2; Thu, 16 Jul 2020 10:00:51 +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 707C078490; Thu, 16 Jul 2020 10:00:51 +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 39554180531D; Thu, 16 Jul 2020 10:00:51 +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 06GA0eRQ015407 for ; Thu, 16 Jul 2020 06:00:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id BDA942DE69; Thu, 16 Jul 2020 10:00:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36CB92B6E2 for ; Thu, 16 Jul 2020 10:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893733; 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=CLhrvt/iXWa1p7cN9NTPYnD1ZnHofNalHP1D0y6diQY=; b=BUKraOHoAYdNhTxNbFeqmWkR8PLrr2Zqyjm+BzMlRs3wyBFJaJocIQ85BDTQUlCC+eWLfo +GDovKI7gvfT4BIWnvoYc/A7OWsDHJBfyvSS58HXOsHZ74kTQQ8sfPCTLRnuN2uaUjHGYu aFNOYJNxubn1RObIdkDoTP0SMHDq3Ss= X-MC-Unique: WxzEtopzMgCeLHd0__8SbQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 022/351] meson: add linker checks Date: Thu, 16 Jul 2020 11:54:18 +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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Pavel Hrdina --- configure.ac | 41 -------------------------------- m4/virt-linker-no-indirect.m4 | 32 ------------------------- m4/virt-linker-no-undefined.m4 | 32 ------------------------- m4/virt-linker-relro.m4 | 35 --------------------------- meson.build | 43 ++++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 140 deletions(-) delete mode 100644 m4/virt-linker-no-indirect.m4 delete mode 100644 m4/virt-linker-no-undefined.m4 delete mode 100644 m4/virt-linker-relro.m4 diff --git a/configure.ac b/configure.ac index 56a471fc3ab..cb1aed73828 100644 --- a/configure.ac +++ b/configure.ac @@ -64,43 +64,6 @@ m4_ifndef([LT_INIT], [ AM_PROG_CC_C_O AM_PROG_LD =20 -AC_MSG_CHECKING([for how to mark DSO non-deletable at runtime]) -LIBVIRT_NODELETE=3D -`$LD --help 2>&1 | grep -- "-z nodelete" >/dev/null` && \ - LIBVIRT_NODELETE=3D"-Wl,-z -Wl,nodelete" -AC_MSG_RESULT([$LIBVIRT_NODELETE]) -AC_SUBST([LIBVIRT_NODELETE]) - -AC_MSG_CHECKING([for how to set DSO symbol versions]) -case "$host" in - *-*-mingw* | *-*-msvc* ) - # mingw's ld has the --version-script parameter, but it requires a .de= f file - # instead to work properly, therefore clear --version-script here and = use - # -Wl, to pass the .def file to the linker - VERSION_SCRIPT_FLAGS=3D"-Wl," - ;; - * ) - VERSION_SCRIPT_FLAGS=3D-Wl,--version-script=3D - `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ - VERSION_SCRIPT_FLAGS=3D"-Wl,-M -Wl," - ;; -esac -AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) -AC_SUBST([VERSION_SCRIPT_FLAGS]) - -dnl macOS has two-level namespaces by default. -dnl Override it to allow symbol replacement with DYLD_INSERT_LIBRARIES -case "$host" in - *-*-darwin*) - FLAT_NAMESPACE_FLAGS=3D-Wl,-flat_namespace - ;; - * ) - FLAT_NAMESPACE_FLAGS=3D"" - ;; -esac -AC_MSG_RESULT([$FLAT_NAMESPACE_FLAGS]) -AC_SUBST([FLAT_NAMESPACE_FLAGS]) - dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case dnl we're working on BSD) want_ifconfig=3Dno @@ -161,10 +124,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_LINKER_RELRO -LIBVIRT_LINKER_NO_INDIRECT -LIBVIRT_LINKER_NO_UNDEFINED - LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT diff --git a/m4/virt-linker-no-indirect.m4 b/m4/virt-linker-no-indirect.m4 deleted file mode 100644 index b344f708539..00000000000 --- a/m4/virt-linker-no-indirect.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl -dnl Check for --no-copy-dt-needed-entries -dnl -dnl Copyright (C) 2013 Guido G=C3=BCnther -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_LINKER_NO_INDIRECT],[ - AC_MSG_CHECKING([for how to avoid indirect lib deps]) - - NO_INDIRECT_LDFLAGS=3D - case `$LD --help 2>&1` in - *"--no-copy-dt-needed-entries"*) - NO_INDIRECT_LDFLAGS=3D"-Wl,--no-copy-dt-needed-entries" ;; - esac - AC_SUBST([NO_INDIRECT_LDFLAGS]) - - AC_MSG_RESULT([$NO_INDIRECT_LDFLAGS]) -]) diff --git a/m4/virt-linker-no-undefined.m4 b/m4/virt-linker-no-undefined.m4 deleted file mode 100644 index 532b0de212c..00000000000 --- a/m4/virt-linker-no-undefined.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl -dnl Check for -z defs linker flag -dnl -dnl Copyright (C) 2013-2018 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_LINKER_NO_UNDEFINED],[ - AC_MSG_CHECKING([for how to stop undefined symbols at link time]) - - NO_UNDEFINED_LDFLAGS=3D - ld_help=3D`$LD --help 2>&1` - case $ld_help in - *"-z defs"*) NO_UNDEFINED_LDFLAGS=3D"-Wl,-z -Wl,defs" ;; - esac - AC_SUBST([NO_UNDEFINED_LDFLAGS]) - - AC_MSG_RESULT([$NO_UNDEFINED_LDFLAGS]) -]) diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4 deleted file mode 100644 index 079a095feed..00000000000 --- a/m4/virt-linker-relro.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl -dnl Check for -z now and -z relro linker flags -dnl -dnl Copyright (C) 2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_LINKER_RELRO],[ - AC_MSG_CHECKING([for how to force completely read-only GOT table]) - - RELRO_LDFLAGS=3D - ld_help=3D`$LD --help 2>&1` - case $ld_help in - *"-z relro"*) RELRO_LDFLAGS=3D"-Wl,-z -Wl,relro" ;; - esac - case $ld_help in - *"-z now"*) RELRO_LDFLAGS=3D"$RELRO_LDFLAGS -Wl,-z -Wl,now" ;; - esac - AC_SUBST([RELRO_LDFLAGS]) - - AC_MSG_RESULT([$RELRO_LDFLAGS]) -]) diff --git a/meson.build b/meson.build index 2450a8bdd79..d1237c10875 100644 --- a/meson.build +++ b/meson.build @@ -574,6 +574,49 @@ cc_flags_relaxed_frame_limit =3D [ ] =20 =20 +# various linker checks + +libvirt_relro =3D cc.get_supported_link_arguments([ + '-Wl,-z,relro', + '-Wl,-z,now', +]) + +libvirt_nodelete =3D cc.get_supported_link_arguments([ + '-Wl,-z,nodelete', +]) + +libvirt_no_undefined =3D cc.get_supported_link_arguments([ + '-Wl,-z,defs', +]) + +libvirt_no_indirect =3D cc.get_supported_link_arguments([ + '-Wl,--no-copy-dt-needed-entries', +]) + +if host_machine.system() =3D=3D 'windows' + version_script_flags =3D '-Wl,' +else + test_file =3D '@0@/src/libvirt_qemu.syms'.format(meson.source_root()) + if cc.has_link_argument('-Wl,--version-script=3D@0@'.format(test_file)) + version_script_flags =3D '-Wl,--version-script=3D' + elif cc.has_link_argument('-Wl,-M,') + version_script_flags =3D '-Wl,-M,' + else + error('No supported version script link argument found.') + endif +endif + +libvirt_flat_namespace =3D [] +if host_machine.system() =3D=3D 'darwin' + libvirt_flat_namespace =3D '-Wl,-flat_namespace' +endif + +libvirt_export_dynamic =3D cc.first_supported_link_argument([ + '-Wl,-export-dynamic', + '-Wl,-export_dynamic', +]) + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893913; cv=none; d=zohomail.com; s=zohoarc; b=fbsJw7xZHdOgtI8iMXsvOMoqNI86h9ZQLh5DK7DfVoPMXxo5nYqS93uqBzxUAcjpuFxPbajcQhpYi9ezank6bJh70EG2gZg4vkbqU5uM+/qnfEBY/hbBEQhva1R0eViXMNTIa3G93ehNNGrbPNg8jJhqKzVp8lxe65BolkBtNyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893913; 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=QyJ6KtHs30q1HVtfui9Xn61IucVMEQDgm53pTu/ZgRc=; b=TAaarCRH+hM/bO4wIy6T9vO0PFhRIfDjImC6Ztv/xUakuPS1/5YeqcQTnmndYQ7mVe4DvtYbn+fKRhMjIEvqgu1LovDd9DbdSmnx2QVhGV613Niukb3godcoqmzHTd0GnBqR2G9n9+BFqHmg5UYenn2qdUHn+P9RC5LGzsY5HYM= 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 1594893913229337.39647301637376; Thu, 16 Jul 2020 03:05:13 -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-237-88wU37QtPiOEkxpc0SFVIQ-1; Thu, 16 Jul 2020 06:02:35 -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 12460101A9BC; Thu, 16 Jul 2020 10:02:04 +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 E28671001B07; Thu, 16 Jul 2020 10:02:03 +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 AF8F496236; Thu, 16 Jul 2020 10:02:03 +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 06GA0f2N015422 for ; Thu, 16 Jul 2020 06:00:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id A55F72B6E6; Thu, 16 Jul 2020 10:00:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F5B52B6E2 for ; Thu, 16 Jul 2020 10:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893912; 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=QyJ6KtHs30q1HVtfui9Xn61IucVMEQDgm53pTu/ZgRc=; b=GCxddrh8syvJ2vGOxWWLHmOb2CtMQgpaJ7XDinTHgjeIiTyJ0eRmPcBLtfFpxiwzTUgejf DPPkV5kx8jVAyWyA5HhuwKDBGSHXbvmjPsxLU96fQWWCBI3K83FyD8+ttxpaIGMt8rfKyG QCE1k0xDcOdRTa32ntN6pgPp26Z64T8= X-MC-Unique: 88wU37QtPiOEkxpc0SFVIQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 023/351] meson: add scripts directory Date: Thu, 16 Jul 2020 11:54:19 +0200 Message-Id: <3dbda740d0bcaf9a90d2ce6e9eb8679c73eebe36.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 --- meson.build | 5 +++++ scripts/meson.build | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 scripts/meson.build diff --git a/meson.build b/meson.build index d1237c10875..8c6db66a07f 100644 --- a/meson.build +++ b/meson.build @@ -622,6 +622,11 @@ libvirt_export_dynamic =3D cc.first_supported_link_arg= ument([ top_inc_dir =3D include_directories('.') =20 =20 +# include remaining subdirs + +subdir('scripts') + + # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) =20 diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 00000000000..941e40a0917 --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,29 @@ +scripts =3D [ + 'apibuild.py', + 'augeas-gentest.py', + 'check-aclperms.py', + 'check-aclrules.py', + 'check-driverimpls.py', + 'check-drivername.py', + 'check-file-access.py', + 'check-remote-protocol.py', + 'check-symfile.py', + 'check-symsorting.py', + 'dtrace2systemtap.py', + 'esx_vi_generator.py', + 'genaclperms.py', + 'genpolkit.py', + 'gensystemtap.py', + 'group-qemu-caps.py', + 'header-ifdef.py', + 'hvsupport.py', + 'hyperv_wmi_generator.py', + 'mock-noinline.py', + 'prohibit-duplicate-header.py', + 'test-wrap-argv.py', +] + +foreach name : scripts + sname =3D name.split('.')[0].underscorify() + set_variable('@0@_prog'.format(sname), find_program(name)) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893834; cv=none; d=zohomail.com; s=zohoarc; b=DO72He6EzNPhZhhwywArzuSIpVaaK2LX171uJFe1BWlX7qxJx3jgbwCt9QBwHV8WdjBjPECmeVIww4k0ZrH/0VSw51SWoT7yn4RGgRFBDFbpbOUqMYcMu/6ZsbG5Uuyfyz4PJWiPIqNngznBw/XMqnUvvsoWiah3jY3ddnI55t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893834; 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=Nk9o7M8MZkXYjYN86TgSYfRY4WeT2bDDSCpbJ40AjtQ=; b=RCBxjECmwjD4jvU3DzOpz8RevBJC9wH0UfSgkeStmbdWEj8IXiDk5K9bMJ8E5lC4/4gC595rACa2Mm3UcSQchOf18++d7GhDBOI9A4segPQ5w7t15zALZUGtMuMUFwaZqUephqBQy35KGQbS/a6WWM6REJIQgMyezI9jOfZyerI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893834760325.74226447046874; Thu, 16 Jul 2020 03:03:54 -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-453-yq5tH46fPlq0GY1bu9Y8aw-1; Thu, 16 Jul 2020 06:00:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A017918A1DEE; Thu, 16 Jul 2020 10:00:48 +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 808C878485; Thu, 16 Jul 2020 10:00:48 +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 4FCBD9623A; Thu, 16 Jul 2020 10:00:48 +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 06GA0jVv015460 for ; Thu, 16 Jul 2020 06:00:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0B822DE72; Thu, 16 Jul 2020 10:00:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BFA72DE6F for ; Thu, 16 Jul 2020 10:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893833; 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=Nk9o7M8MZkXYjYN86TgSYfRY4WeT2bDDSCpbJ40AjtQ=; b=KBSfgym0DOVKKp5BS08zTM+p0jjup4j5VVsWJ63AeKvIiWKKAjE8O3UgLrFIWygevMwXW4 nx5SGStbmKSChH3GTmBg64sJowfLWaoEIB1vZHLOBsoNSnbLHyPigSZwvEnmfdmrzeTqmu oKrpxjzvmoqMTbytsfOSl5CC9Jwx4T8= X-MC-Unique: yq5tH46fPlq0GY1bu9Y8aw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 024/351] meson: add include directory Date: Thu, 16 Jul 2020 11:54:20 +0200 Message-Id: <45bbfd0e02efce538eea96a88a7867bbd7d1ad2e.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.11 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 --- Makefile.am | 2 +- configure.ac | 3 +-- include/libvirt/Makefile.am | 26 -------------------------- include/libvirt/meson.build | 36 ++++++++++++++++++++++++++++++++++++ include/meson.build | 3 +++ meson.build | 2 ++ 6 files changed, 43 insertions(+), 29 deletions(-) delete mode 100644 include/libvirt/Makefile.am create mode 100644 include/libvirt/meson.build create mode 100644 include/meson.build diff --git a/Makefile.am b/Makefile.am index 82ccbac6f91..6df2176364a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . include/libvirt src tools docs \ +SUBDIRS =3D . src tools docs \ tests po examples =20 XZ_OPT ?=3D -v -T0 diff --git a/configure.ac b/configure.ac index cb1aed73828..07b86d8b944 100644 --- a/configure.ac +++ b/configure.ac @@ -689,7 +689,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ + Makefile src/Makefile docs/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ @@ -701,7 +701,6 @@ AC_CONFIG_FILES([\ src/libvirt-lxc.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile \ - include/libvirt/libvirt-common.h \ examples/Makefile \ tests/Makefile \ tools/Makefile]) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am deleted file mode 100644 index e447a5d37da..00000000000 --- a/include/libvirt/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2011, 2013-2016 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -virincdir =3D $(includedir)/libvirt - -allheaders =3D $(wildcard $(srcdir)/*.h) -virinc_HEADERS =3D $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) -nodist_virinc_HEADERS =3D libvirt-common.h - -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/include/libvirt/meson.build b/include/libvirt/meson.build new file mode 100644 index 00000000000..4b77a222f03 --- /dev/null +++ b/include/libvirt/meson.build @@ -0,0 +1,36 @@ +libvirt_common_h_in =3D files('libvirt-common.h.in') + +libvirt_include =3D files( + 'libvirt-admin.h', + 'libvirt-domain-checkpoint.h', + 'libvirt-domain.h', + 'libvirt-domain-snapshot.h', + 'libvirt-event.h', + 'libvirt.h', + 'libvirt-host.h', + 'libvirt-interface.h', + 'libvirt-lxc.h', + 'libvirt-network.h', + 'libvirt-nodedev.h', + 'libvirt-nwfilter.h', + 'libvirt-qemu.h', + 'libvirt-secret.h', + 'libvirt-storage.h', + 'libvirt-stream.h', + 'virterror.h', +) + +include_conf =3D configuration_data() +include_conf.merge_from(conf) + +libvirt_common_h =3D configure_file( + input: libvirt_common_h_in, + output: 'libvirt-common.h', + configuration: include_conf, +) + +install_headers( + libvirt_include, + libvirt_common_h, + install_dir: includedir / 'libvirt', +) diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 00000000000..06658ede6a7 --- /dev/null +++ b/include/meson.build @@ -0,0 +1,3 @@ +libvirt_inc =3D include_directories('.') + +subdir('libvirt') diff --git a/meson.build b/meson.build index 8c6db66a07f..b5430012a79 100644 --- a/meson.build +++ b/meson.build @@ -626,6 +626,8 @@ top_inc_dir =3D include_directories('.') =20 subdir('scripts') =20 +subdir('include') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893727; cv=none; d=zohomail.com; s=zohoarc; b=fK1n1BpdP/Ms54efcRgSerGhyJgeYljQqcX9z6XVL+ZR0mJJNl8PxwwNlqnbwRWHzXNna1FnrzCNRJPy3qhSVIcWsfrSbgkk6lMNvt2EGctiyq7WlsdN83hvrQiQB+6aDzyoQr474etDsG8pgVVphUZ572IRMgqLIa7oXBvU1Yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893727; 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=IS289babXgsxisPQacK6kxHf5mhhvmDS05ZwKN2F6Fs=; b=W80Ffr0oJeR1wHxcLIxebCtiotTu4HLI3w744uO7pWd5kKehy6k72ldFsDc4ns/i3GgmPDPcAAJoquE0MCcKzIMqVGvVeab3S9JJceeMPsjzNNBL4fB7pjqskohcBApkymCvuo2XSPMajUXf5jwZzS7VnaGkj9OqiRzN73+DpT4= 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 1594893727250637.0896075827394; Thu, 16 Jul 2020 03:02:07 -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-105-jepYv8f6PMuscotlNExRXA-1; Thu, 16 Jul 2020 06:01:00 -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 0551B10059C4; Thu, 16 Jul 2020 10:00:54 +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 D551361983; Thu, 16 Jul 2020 10:00:53 +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 A4B2D96240; Thu, 16 Jul 2020 10:00:53 +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 06GA0kxx015472 for ; Thu, 16 Jul 2020 06:00:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id DADF82DE71; Thu, 16 Jul 2020 10:00:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 538522DE6F for ; Thu, 16 Jul 2020 10:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893726; 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=IS289babXgsxisPQacK6kxHf5mhhvmDS05ZwKN2F6Fs=; b=PoJ4BbfMDn9/fc0kdYFvBa+DEGXh44Qq5CHTpneySNJfztCCAxruzggHMnX0fDBsX1HY5H 3YeCytj7l0n7E82ML8tr83GBEh7kW3iP8R6Ym15/A5X08gjAxVWAqTAKgHNOJd+RlVcoGq Cn97FISFJ5kxN8KZyx2lMekiOHF+sjU= X-MC-Unique: jepYv8f6PMuscotlNExRXA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 025/351] meson: add functions check Date: Thu, 16 Jul 2020 11:54:21 +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.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 --- configure.ac | 33 --------------------------------- meson.build | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index 07b86d8b944..904c2a0fdcf 100644 --- a/configure.ac +++ b/configure.ac @@ -207,38 +207,6 @@ LIBVIRT_CHECK_YAJL =20 AC_CHECK_SIZEOF([long]) =20 -dnl Availability of various common functions (non-fatal if missing), -dnl and various less common threadsafe functions -AC_CHECK_FUNCS_ONCE([\ - elf_aux_info \ - fallocate \ - getauxval \ - getegid \ - geteuid \ - getgid \ - getifaddrs \ - getmntent_r \ - getpwuid_r \ - getrlimit \ - getuid \ - getutxid \ - if_indextoname \ - mmap \ - newlocale \ - posix_fallocate \ - posix_memalign \ - pipe2 \ - prlimit \ - sched_getaffinity \ - sched_setscheduler \ - setgroups \ - setns \ - setrlimit \ - symlink \ - sysctlbyname \ - unshare \ - ]) - dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([\ asm/hwcap.h \ @@ -263,7 +231,6 @@ AC_CHECK_HEADERS([\ ]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include ]]) -AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxs= tat64]) =20 AC_CHECK_TYPE([struct ifreq], [AC_DEFINE([HAVE_STRUCT_IFREQ],[1], diff --git a/meson.build b/meson.build index b5430012a79..eb71a66cdf2 100644 --- a/meson.build +++ b/meson.build @@ -617,6 +617,53 @@ libvirt_export_dynamic =3D cc.first_supported_link_arg= ument([ ]) =20 =20 +# check availability of various common functions (non-fatal i missing) + +functions =3D [ + '__lxstat', + '__lxstat64', + '__xstat', + '__xstat64', + 'elf_aux_info', + 'fallocate', + 'getauxval', + 'getegid', + 'geteuid', + 'getgid', + 'getifaddrs', + 'getmntent_r', + 'getpwuid_r', + 'getrlimit', + 'getuid', + 'getutxid', + 'if_indextoname', + 'lstat', + 'lstat64', + 'mmap', + 'newlocale', + 'pipe2', + 'posix_fallocate', + 'posix_memalign', + 'prlimit', + 'sched_getaffinity', + 'sched_setscheduler', + 'setgroups', + 'setns', + 'setrlimit', + 'stat', + 'stat64', + 'symlink', + 'sysctlbyname', + 'unshare', +] + +foreach function : functions + if cc.has_function(function) + conf.set('HAVE_@0@'.format(function.to_upper()), 1) + endif +endforeach + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893751; cv=none; d=zohomail.com; s=zohoarc; b=QO5yytbithbqrzM/Iwgd0eX/sF2q68B4iTaxxcxg3gxiHNwN9tbAd9IV4S+tckYq85iXgDM0v+296pKJ64UsB4o3zkvrG4CammvxHcI/D7e0hWMFl3/2NEGeKBGp/j9BG5fG3Pjx6VoyXF47PUCipgJvAkMRI5hPOdBDglA68sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893751; 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=u6Tk1pdjYbP2KEVenZenULLqQ7ux5nb+9vZKuJ/6eMM=; b=IkimEpA+QHk13fL3Fd/WCBelXRgdRrhyxumyZ7CYZ1BlO/JqY3qBwbmmg/4MGXMF2LUSPUHX8aerDxaWixe3w/bYXyJ/0WjWs5yyUooUVJ234PdncRxH9lRUOjTB86mQ3d6S/rcXRMWTcMJTFaYS6ZNntBpRRcyYhn29CdQFrhc= 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 1594893751373228.51464362481215; Thu, 16 Jul 2020 03:02:31 -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-48-YisXcZDSPyGxXjteonfbYQ-1; Thu, 16 Jul 2020 06:00:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 007941092; Thu, 16 Jul 2020 10:00:52 +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 D38A278490; Thu, 16 Jul 2020 10:00:51 +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 A0078180531F; Thu, 16 Jul 2020 10:00:51 +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 06GA0liH015480 for ; Thu, 16 Jul 2020 06:00:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id C74A82DE72; Thu, 16 Jul 2020 10:00:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F92D2DE6F for ; Thu, 16 Jul 2020 10:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893750; 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=u6Tk1pdjYbP2KEVenZenULLqQ7ux5nb+9vZKuJ/6eMM=; b=UepzDAassQm4ouJZGG+CnZlcD4tmuro4a4CmS8pTMWHFanFpt8iip+C15opRekTywGquC5 9bR3METXs70e2+kvTUR94AjMzBPLeOpQP3tsrprL/3lTTF7noaPKt1stRCWpcDggfy21BA 8b0Cq2ZNpZI96kA6Pd5b8SbTg1dGRcA= X-MC-Unique: YisXcZDSPyGxXjteonfbYQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 026/351] meson: add headers check Date: Thu, 16 Jul 2020 11:54:22 +0200 Message-Id: <9b66dcbd9c24d593777f173730b15450234b2e65.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.11 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 --- configure.ac | 90 ---------------------------------------------------- meson.build | 72 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 90 deletions(-) diff --git a/configure.ac b/configure.ac index 904c2a0fdcf..4a40f3fc34e 100644 --- a/configure.ac +++ b/configure.ac @@ -207,28 +207,6 @@ LIBVIRT_CHECK_YAJL =20 AC_CHECK_SIZEOF([long]) =20 -dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([\ - asm/hwcap.h \ - ifaddrs.h \ - libtasn1.h \ - util.h \ - libutil.h \ - linux/magic.h \ - mntent.h \ - net/ethernet.h \ - net/if.h \ - pty.h \ - pwd.h \ - stdarg.h \ - syslog.h \ - sys/ioctl.h \ - sys/mount.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/ucred.h \ - xlocale.h \ - ]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include ]]) =20 @@ -256,11 +234,6 @@ AC_CHECK_DECLS([SEEK_HOLE], [], [], #include ]) =20 =20 -dnl Our only use of libtasn1.h is in the testsuite, and can be skipped -dnl if the header is not present. Assume -ltasn1 is present if the -dnl header could be found. -AM_CONDITIONAL([HAVE_LIBTASN1], [test "x$ac_cv_header_libtasn1_h" =3D "xye= s"]) - AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) =20 @@ -344,54 +317,6 @@ LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS =20 =20 - - -dnl -dnl check for kvm headers -dnl -AC_CHECK_HEADERS([linux/kvm.h]) - - -dnl -dnl check for kernel headers required by src/bridge.c -dnl -if test "$with_linux" =3D "yes"; then - # Various kernel versions have headers that are not self-standing, but - # yet are incompatible with the corresponding glibc headers. In order - # to guarantee compilation across a wide range of versions (from RHEL 5 - # to rawhide), we first have to probe whether glibc and kernel can be - # used in tandem; and if not, provide workarounds that ensure that - # ABI-compatible IPv6 types are present for use by the kernel headers. - # These probes mirror the usage in virnetdevbridge.c - AC_CACHE_CHECK( - [whether and headers are compatible], - [lv_cv_netinet_linux_compatible], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]])], - [lv_cv_netinet_linux_compatible=3Dyes], - [lv_cv_netinet_linux_compatible=3Dno])]) - if test "x$lv_cv_netinet_linux_compatible" !=3D xyes; then - AC_DEFINE([NETINET_LINUX_WORKAROUND], [1], - [define to 1 if Linux kernel headers require a workaround to avoid - compilation errors when mixed with glibc netinet headers]) - fi - AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linu= x/if_tun.h],, - [AC_MSG_ERROR([You must install kernel-headers in order to compile l= ibvirt with QEMU or LXC support])], - [[#include - #if NETINET_LINUX_WORKAROUND - # define in6_addr in6_addr_ - # define sockaddr_in6 sockaddr_in6_ - # define ipv6_mreq ipv6_mreq_ - # define in6addr_any in6addr_any_ - # define in6addr_loopback in6addr_loopback_ - #endif - #include - ]]) -fi - - dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 @@ -482,20 +407,6 @@ if test $with_storage =3D yes; then fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" =3D "yes"]) =20 -dnl -dnl check for kernel headers required by btrfs ioctl -dnl -if test "$with_linux" =3D "yes"; then - AC_CHECK_HEADERS([linux/btrfs.h]) -fi - -dnl -dnl check for xfs dev headers required by xfs ioctl -dnl -if test "$with_linux" =3D "yes"; then - AC_CHECK_HEADERS([xfs/xfs.h]) -fi - dnl dnl check for DEVLINK_CMD_ESWITCH_GET dnl @@ -505,7 +416,6 @@ dnl along with the original spelling of this constant dnl (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt) dnl if test "$with_linux" =3D "yes"; then - AC_CHECK_HEADERS([linux/devlink.h]) AC_CHECK_DECLS([DEVLINK_CMD_ESWITCH_GET], [], [], [[#include ]]) fi diff --git a/meson.build b/meson.build index eb71a66cdf2..62e51230888 100644 --- a/meson.build +++ b/meson.build @@ -664,6 +664,78 @@ foreach function : functions endforeach =20 =20 +# various header checks + +headers =3D [ + 'asm/hwcap.h', + 'ifaddrs.h', + 'libtasn1.h', + 'libutil.h', + 'linux/kvm.h', + 'linux/magic.h', + 'mntent.h', + 'net/ethernet.h', + 'net/if.h', + 'pty.h', + 'pwd.h', + 'stdarg.h', + 'sys/ioctl.h', + 'sys/mount.h', + 'sys/syscall.h', + 'sys/sysctl.h', + 'sys/ucred.h', + 'syslog.h', + 'util.h', + 'xlocale.h', +] + +if host_machine.system() =3D=3D 'linux' + # check for kernel headers required by btrfs ioctl + headers +=3D 'linux/btrfs.h' + # check for xfs dev headers required by xfs ioctl + headers +=3D 'xfs/xfs.h' + # check for DEVLINK_CMD_ESWITCH_GET + headers +=3D 'linux/devlink.h' +endif + +foreach name : headers + if cc.has_header(name) + conf.set('HAVE_@0@'.format(name.underscorify().to_upper()), 1) + endif +endforeach + +# check for kernel headers required by src/util/virnetdevbridge.c +if host_machine.system() =3D=3D 'linux' + # Various kernel versions have headers that are not self-standing, but + # yet are incompatible with the corresponding glibc headers. In order + # to guarantee compilation across a wide range of versions (from RHEL 5 + # to rawhide), we first have to probe whether glibc and kernel can be + # used in tandem; and if not, provide workarounds that ensure that + # ABI-compatible IPv6 types are present for use by the kernel headers. + netinet_workaround_code =3D ''' + #include + #include + + int main(void) { return 0; } + ''' + if not cc.compiles(netinet_workaround_code) + conf.set('NETINET_LINUX_WORKAROUND', 1) + endif + + required_headers =3D [ + 'linux/param.h', + 'linux/sockios.h', + 'linux/if_bridge.h', + 'linux/if_tun.h', + ] + foreach name : required_headers + if not cc.has_header(name) + error('You must install kernel-headers in order to compile libvirt w= ith QEMU or LXC support') + endif + endforeach +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893744; cv=none; d=zohomail.com; s=zohoarc; b=CFTKtgkJChiea6x8wUW6G0z/fVHuaZXo9P98+Tf8teRx/l4TyIJG1P38Wm+T7lybL8fuLmFEuxzZ6jpzLJIDIqnWhz4HH3Hhnx+MiykFpraSk9jMpubK1Zny+zQUUa9QGKq/JTwRqUXORtXeWXTLUwAQCrkv/TU7+TnILVIo8Kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893744; 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=4aH998LiFL8RmHXWBxvWo4oNM0dz1koBBfE5Pdn4B/U=; b=hyMRvXTPn8+oCMGhJjunKkbO/HBLlyQcodinfFwt+czAiYrNzrvQ2O03OziJHcdLeczIOIc0HARghZrf7UeiOtsf/2g+h3o8CHMflCybdBPi+WPJyAan9abhjbsFK0sm5dKw91gJNNTnJsGoW1ca9NVvgKjcel+dFVb6fio90DI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159489374492959.57575317204555; Thu, 16 Jul 2020 03:02:24 -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-123-omOHDn6SNXGjS80hXL0wHQ-1; Thu, 16 Jul 2020 06:01:00 -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 6D18880BCAE; Thu, 16 Jul 2020 10:00:54 +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 4D3637980F; Thu, 16 Jul 2020 10:00:54 +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 1BD631804759; Thu, 16 Jul 2020 10:00:54 +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 06GA0mDa015491 for ; Thu, 16 Jul 2020 06:00:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0D162DE71; Thu, 16 Jul 2020 10:00:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A5B92DE6F for ; Thu, 16 Jul 2020 10:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893743; 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=4aH998LiFL8RmHXWBxvWo4oNM0dz1koBBfE5Pdn4B/U=; b=F9JvG3Yx9DVHIdq2vIApA3HO2PBF5XB5lOo4vF5jXTf/0X+74sjtopKbqJSZuvX7bASUTj hXEjUHhAwq+gL+kNArLU9ay39xcDQHjmEFrfc3CP1aZdUHveAHdRaY0CudunnfHuj0Qv+g 3b2iGKClQHAonHSP/lkdQgv2ReOR/Qs= X-MC-Unique: omOHDn6SNXGjS80hXL0wHQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 027/351] meson: add symbols check Date: Thu, 16 Jul 2020 11:54:23 +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 --- configure.ac | 87 ---------------------------------------------------- meson.build | 72 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 87 deletions(-) diff --git a/configure.ac b/configure.ac index 4a40f3fc34e..1ffa4f931ee 100644 --- a/configure.ac +++ b/configure.ac @@ -207,9 +207,6 @@ LIBVIRT_CHECK_YAJL =20 AC_CHECK_SIZEOF([long]) =20 -dnl Check whether endian provides handy macros. -AC_CHECK_DECLS([htole64], [], [], [[#include ]]) - AC_CHECK_TYPE([struct ifreq], [AC_DEFINE([HAVE_STRUCT_IFREQ],[1], [Defined if struct ifreq exists in net/if.h])], @@ -223,16 +220,6 @@ AC_CHECK_TYPE([struct sockpeercred], [], [[#include ]]) =20 -AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLA= G_LRO, - ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATU= RES, - ETHTOOL_SCOALESCE, ETHTOOL_GCOALESCE], - [], [], [[#include - ]]) - -AC_CHECK_DECLS([SEEK_HOLE], [], [], - [#include - #include ]) - =20 AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) @@ -407,27 +394,6 @@ if test $with_storage =3D yes; then fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" =3D "yes"]) =20 -dnl -dnl check for DEVLINK_CMD_ESWITCH_GET -dnl -dnl Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also -dnl available, as it was introudced in kernel 4.8 -dnl along with the original spelling of this constant -dnl (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt) -dnl -if test "$with_linux" =3D "yes"; then - AC_CHECK_DECLS([DEVLINK_CMD_ESWITCH_GET], [], [], - [[#include ]]) -fi - -dnl -dnl check for VHOST_VSOCK_SET_GUEST_CID -dnl -if test "$with_linux" =3D "yes"; then - AC_CHECK_DECLS([VHOST_VSOCK_SET_GUEST_CID], [], [], - [[#include ]]) -fi - dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python3]) if test -z "$PYTHON"; then @@ -478,9 +444,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" =3D "yes"]) =20 -dnl GET_VLAN_VID_CMD is required for virNetDevGetVLanID -AC_CHECK_DECLS([GET_VLAN_VID_CMD], [], [], [[#include ]]) - # Check for Linux vs. BSD ifreq members AC_CHECK_MEMBERS([struct ifreq.ifr_newname, struct ifreq.ifr_ifindex, @@ -491,41 +454,6 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_newname, #include ]) =20 -# Check for BSD approach for setting MAC addr -AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ - #include - #include - #include - ]], - [[ - link_addr(0, 0)]])], - [AC_DEFINE([HAVE_DECL_LINK_ADDR], - [1], - [whether link_addr is available])]) - -# Check for BSD approach for bridge management -AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], - [AC_DEFINE([HAVE_BSD_BRIDGE_MGMT], - [1], - [whether BSD style bridge management is availabl= e])], - [], - [#include - #include - #include - #include - ]) - -# Check for BSD CPU affinity availability -AC_CHECK_DECLS([cpuset_getaffinity], - [AC_DEFINE([HAVE_BSD_CPU_AFFINITY], - [1], - [whether BSD CPU affinity management is availabl= e])], - [], - [#include - #include - ]) - # Check for BSD kvm (kernel memory interface) if test $with_freebsd =3D yes; then AC_CHECK_LIB([kvm], [kvm_getprocs], [], @@ -533,21 +461,6 @@ if test $with_freebsd =3D yes; then ) fi =20 -AC_CHECK_DECLS([clock_serv_t, host_get_clock_service, clock_get_time], - [AC_DEFINE([HAVE_MACH_CLOCK_ROUTINES], - [1], - [whether Mach clock routines are available])], - [], - [#include - #include - ]) - -# Check if we have new enough kernel to support BPF devices for cgroups v2 -if test "$with_linux" =3D "yes"; then - AC_CHECK_DECLS([BPF_PROG_QUERY, BPF_CGROUP_DEVICE], - [], [], [#include ]) -fi - # Check if we need to look for ifconfig if test "$want_ifconfig" =3D "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/meson.build b/meson.build index 62e51230888..c79d557b289 100644 --- a/meson.build +++ b/meson.build @@ -736,6 +736,78 @@ if host_machine.system() =3D=3D 'linux' endif =20 =20 +# check various symbols + +symbols =3D [ + # Check whether endian provides handy macros. + [ 'endian.h', 'htole64' ], + + [ 'linux/ethtool.h', 'ETH_FLAG_TXVLAN' ], + [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ], + [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ], + [ 'linux/ethtool.h', 'ETH_FLAG_LRO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GGSO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GGRO' ], + [ 'linux/ethtool.h', 'ETHTOOL_GFLAGS' ], + [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ], + [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], + [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], + + # GET_VLAN_VID_CMD is required for virNetDevGetVLanID + [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], + + [ 'unistd.h', 'SEEK_HOLE' ], + + # GET_VLAN_VID_CMD is required for virNetDevGetVLanID + [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ], + + # Check for BSD approach for setting MAC addr + [ 'net/if_dl.h', 'link_addr' ], +] + +if host_machine.system() =3D=3D 'linux' + symbols +=3D [ + # check for DEVLINK_CMD_ESWITCH_GET + # Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also available, as it was + # introudced in kernel 4.8 along with the original spelling of this + # constant (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt). + [ 'linux/devlink.h', 'DEVLINK_CMD_ESWITCH_GET' ], + + # check for VHOST_VSOCK_SET_GUEST_CID + [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], + + # Check if we have new enough kernel to support BPF devices for cgroup= s v2 + [ 'linux/bpf.h', 'BPF_PROG_QUERY' ], + [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], + ] +endif + +foreach symbol : symbols + if cc.has_header_symbol(symbol[0], symbol[1]) + conf.set('HAVE_DECL_@0@'.format(symbol[1].to_upper()), 1) + endif +endforeach + +# Check for BSD approach for bridge management +if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD') and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD') and + cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL')) + conf.set('HAVE_BSD_BRIDGE_MGMT', 1) +endif + +# Check for BSD CPU affinity availability +if cc.has_header_symbol('sys/cpuset.h', 'cpuset_getaffinity') + conf.set('HAVE_BSD_CPU_AFFINITY', 1) +endif + +# whether Mach clock routines are available +if (cc.has_header_symbol('mach/clock.h', 'clock_serv_t') and + cc.has_header_symbol('mach/clock.h', 'host_get_clock_service') and + cc.has_header_symbol('mach/clock.h', 'clock_get_time')) + conf.set('HAVE_MACH_CLOCK_ROUTINES', 1) +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893671; cv=none; d=zohomail.com; s=zohoarc; b=WK/9FkFwCCACSWhTwX7Geg0KzuFvLxKTBMinEmZXBasCF0LVatXNk2DE9K/se3/65tt+x3F6BpTUF1wvonmLb7C9B+UFx9ozIxvzkpcrnEzAeq3KeYTfwipcxdTOFR4Q+2h9kdBbUjpbPvACVR7vwAQ3QEYL58pBQBhxBIMXJYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893671; 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=ErNz+2qlXAsEuLw0yDPPbxi5I8uiCeEjGc1MjRz5C04=; b=GTzcCzxds+n9i3kSl/fWjFfYHMbqVzK7A66F9+g5xnwCA7gI7b2deW+A0dVsOViMYmxWlqAn9IaCeO5lu0ZZZpfDWIehrnvccLws2taj06Znqjz0WCaASpMIfcayDm2OMw2omn1c5vYDBweWFmmJ0C5YnfhGZ8DpApG/htzHTvw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893671361310.4960321558751; Thu, 16 Jul 2020 03:01:11 -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-496-KbDcPbHYMVCD6d6Q5c4V1Q-1; Thu, 16 Jul 2020 06:01:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE3B018A1DE5; Thu, 16 Jul 2020 10:00:56 +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 BF77172E4A; Thu, 16 Jul 2020 10:00:56 +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 90CED96248; Thu, 16 Jul 2020 10:00:56 +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 06GA0n4G015516 for ; Thu, 16 Jul 2020 06:00:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98B932DE71; Thu, 16 Jul 2020 10:00:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13BAF2DE6F for ; Thu, 16 Jul 2020 10:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893670; 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=ErNz+2qlXAsEuLw0yDPPbxi5I8uiCeEjGc1MjRz5C04=; b=ORoKimY9QV1YVwTdxFLBuAXVi7XO6jLM56gE968iHqVXn8Z8XkpUf4D3tR5j/oK1CauRSg Hmwav3BujPDimk1ak2xVgwzcEmhj+sEP0uSWxpm7FRJjaIOcbjUgkcWlHJdMpBlFg7hbwd BQU9o/lVqwCm1tINKgVCzABgCpM/TOs= X-MC-Unique: KbDcPbHYMVCD6d6Q5c4V1Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 028/351] meson: add types check Date: Thu, 16 Jul 2020 11:54:24 +0200 Message-Id: <9ef8c2f2fbf6ef34325c0cca47ba32d3ba9b5628.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.11 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 --- configure.ac | 15 --------------- meson.build | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 1ffa4f931ee..69067091f09 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,6 @@ AC_PROG_CPP dnl get 64-int interfaces on 32-bit platforms AC_SYS_LARGEFILE =20 -AC_TYPE_UID_T - dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL =20 @@ -207,19 +205,6 @@ LIBVIRT_CHECK_YAJL =20 AC_CHECK_SIZEOF([long]) =20 -AC_CHECK_TYPE([struct ifreq], - [AC_DEFINE([HAVE_STRUCT_IFREQ],[1], - [Defined if struct ifreq exists in net/if.h])], - [], [[#include - #include - ]]) - -AC_CHECK_TYPE([struct sockpeercred], - [AC_DEFINE([HAVE_STRUCT_SOCKPEERCRED], [1], - [Defined if struct sockpeercred is available])], - [], [[#include - ]]) - =20 AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) diff --git a/meson.build b/meson.build index c79d557b289..aa492c9549a 100644 --- a/meson.build +++ b/meson.build @@ -808,6 +808,33 @@ if (cc.has_header_symbol('mach/clock.h', 'clock_serv_t= ') and endif =20 =20 +# check various types + +types =3D [ + [ 'struct ifreq', '#include \n#include '] , + [ 'struct sockpeercred', '#include ') + conf.set(type, 'int') + endif + endforeach +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893767; cv=none; d=zohomail.com; s=zohoarc; b=cjxfnNi7qXStTVN9xt5S73gwrAvsZy+a9Jz0VJvOR8V+42UFlKZotOvEJpZ8AHRC2b7J2AbGtPZH/E8WPM04g0byX0Gk/rIHYrZBxr1+YYfIqrPpX6EQ/i0J9RVjoCa7gfePbyGmqLYC8XZW6TDV/8amlhOgvvmhpxgWbj3io4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893767; 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=jA1iU0PmaMJNx3dcv1JPaIuisiaSBSXqm0HytJCYJj0=; b=Exy8aIW+GB5lUvVz9DWH+8JfJjiiYsPCsEFnNvE1ZhyDeWFa05QT9ZxCFKFJup70tVkT06e4pOGXD4bxw2105VVsmizl2OrP9RNdwqrVR40sElt3/y59qW6L1Rchlt7OXU0j/ZMZDMaIonxcRtj6Nog0rrLx5usQtcWMMlMOI3E= 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 1594893767148599.2101411504235; Thu, 16 Jul 2020 03:02:47 -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-23-RYMOyhp-P8SHCLMz0WvD7A-1; Thu, 16 Jul 2020 06:02:41 -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 E3A8D100F8C4; Thu, 16 Jul 2020 10:02:06 +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 62B218C8CC; Thu, 16 Jul 2020 10:02:06 +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 2946296236; Thu, 16 Jul 2020 10:02:06 +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 06GA0oRT015529 for ; Thu, 16 Jul 2020 06:00:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9857B2DE71; Thu, 16 Jul 2020 10:00:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFB012DE6F for ; Thu, 16 Jul 2020 10:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893766; 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=jA1iU0PmaMJNx3dcv1JPaIuisiaSBSXqm0HytJCYJj0=; b=UI9nTmd9j1gDwfHq87Hse76/HeykX6vWQ72BOIfFHCOK05DjaUTR9ssi8Yq7xEfjP12rSk wM7S5j7XfW3d2RG2AvVBAznnGQcIYwPL86V2A4A0dTzUi6SVBt0tG5d+vcO49wRENmKWnS AQCB50lWO61tPiSWJLIQY3wiaXhgtHQ= X-MC-Unique: RYMOyhp-P8SHCLMz0WvD7A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 029/351] meson: add members check Date: Thu, 16 Jul 2020 11:54:25 +0200 Message-Id: <5c2ef75133fed0dd5018c1c00bb2871bd31fccc6.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.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 --- configure.ac | 9 --------- meson.build | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 69067091f09..a426ba2a355 100644 --- a/configure.ac +++ b/configure.ac @@ -429,15 +429,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" =3D "yes"]) =20 -# Check for Linux vs. BSD ifreq members -AC_CHECK_MEMBERS([struct ifreq.ifr_newname, - struct ifreq.ifr_ifindex, - struct ifreq.ifr_index, - struct ifreq.ifr_hwaddr], - [], [], - [#include - #include - ]) =20 # Check for BSD kvm (kernel memory interface) if test $with_freebsd =3D yes; then diff --git a/meson.build b/meson.build index aa492c9549a..d474745f31e 100644 --- a/meson.build +++ b/meson.build @@ -835,6 +835,25 @@ if host_machine.system() =3D=3D 'windows' endif =20 =20 +# check various members + +members =3D [ + # Check for Linux vs. BSD ifreq members + [ 'struct ifreq', 'ifr_newname', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_ifindex', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_index', '#include \n#include ' ], + [ 'struct ifreq', 'ifr_hwaddr', '#include \n#include ' ], +] + +foreach member : members + if cc.has_member(member[0], member[1], prefix: member[2]) + type =3D member[0].underscorify().to_upper() + member =3D member[1].underscorify().to_upper() + conf.set('HAVE_@0@_@1@'.format(type, member), 1) + endif +endforeach + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893667; cv=none; d=zohomail.com; s=zohoarc; b=cOgqmBC1oSTM7rAmlPgCiBwmRG3I5+JMLweQZwwQYXujak186dhYqnv4v8iJJmAuS6ltagnldpsZ6VtuXx+1txUh/hRmhAiTGnKdrXOt5hgcRDNzYGXLIoVS2HO5c8LdsclyHwTMn7CF2HM95MW7xhLOlhZJQeSXEN+cQJWxnBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893667; 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=pS+VT2EYwjsEZI8/iLu5ogm2+S28uB6YmsqNu2q1HeE=; b=E4YWD/8CEKqXr2LXBvg98+Oc4inWQF4S+6Fu94ALZzIuFpwbWlNoUsYxSe2jFg3ExwmWzUDjWPQxnVc8f8qMXz18LZo9yC4AH36b32susJbt15hy1HGHTaAkXihtu4TDqQYCSzaH8sY+HqBpRaXa0FoVq/5ms6LLr8hAQ3+qSQs= 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 1594893667309234.70465930270404; Thu, 16 Jul 2020 03:01:07 -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-33-wZ3Zpbb7PiCtoToMqtqfYg-1; Thu, 16 Jul 2020 06:01:02 -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 C94FC80BCB1; Thu, 16 Jul 2020 10:00:56 +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 A69F961982; Thu, 16 Jul 2020 10:00:56 +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 73A1596249; Thu, 16 Jul 2020 10:00:56 +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 06GA0pKh015539 for ; Thu, 16 Jul 2020 06:00:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6914F2DE6F; Thu, 16 Jul 2020 10:00:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D82992DE71 for ; Thu, 16 Jul 2020 10:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893666; 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=pS+VT2EYwjsEZI8/iLu5ogm2+S28uB6YmsqNu2q1HeE=; b=OVKtLDckjtUeWWg5YLIVGlMn5n/C1pwZsk5pU6xtEuM3bvhW2sZ/mVuzL7Ann3obi4R1bz 9/8x/GZyvT6i3v/axEaxa+7olOPq5UwteoQmOuIsGxRlDu/L/1R/+4Kl6xmnHoGNwsxUmy W5TsJcz3GzlYYjsk81Gg64yH3hEELvE= X-MC-Unique: wZ3Zpbb7PiCtoToMqtqfYg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 030/351] meson: add sizeof check Date: Thu, 16 Jul 2020 11:54:26 +0200 Message-Id: <2d07aad4bb2ef3da076b4f8c5959a3b25f4e1470.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 --- configure.ac | 2 -- meson.build | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a426ba2a355..b85fa9a9a6f 100644 --- a/configure.ac +++ b/configure.ac @@ -203,8 +203,6 @@ LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL =20 -AC_CHECK_SIZEOF([long]) - =20 AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) diff --git a/meson.build b/meson.build index d474745f31e..121022e5f78 100644 --- a/meson.build +++ b/meson.build @@ -854,6 +854,11 @@ foreach member : members endforeach =20 =20 +# check various types sizeof + +conf.set('SIZEOF_LONG', cc.sizeof('long')) + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893674; cv=none; d=zohomail.com; s=zohoarc; b=P6umHZ8MdvD+nRZoIB5gqBH/esNsqrNvrbey/zJ+IkBgDLFnMZtq86Iq8BChTmFt3mvCCxXwBryomTc3VUFd9/mfwsT8mp5SL/Z0iBkQAjvLWdeXAW9ZrPWsbE4zzlZlYcetUyfFEwp/6FAguqauvR5NfHjwLSo6l7ZvoT8vDkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893674; 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=0DRglel3DZiNUcnDW81UCtkeBhBEag/7ckM10dSLi1k=; b=f1lv2JTPIT3KnfXkA7V5x14mthXKsyoV6N/WINZ/s2ie6ZGSGoDMTvNi3zgouG5r2CvBeg2C28BP/OAtKWe9p0r484i+AzNnUTeMfX/kpqYpS7z6PDbAGiHTiLkUoXm4otOFdXIoMSk8/1vQw5z5EnBaLetgB3ZeVdGxYJOZuZU= 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 1594893674398915.2429242696039; Thu, 16 Jul 2020 03:01:14 -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-179-itsYh2QUObq9qW-r1X1OVg-1; Thu, 16 Jul 2020 06:01:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4129A8027F7; Thu, 16 Jul 2020 10:00:59 +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 1B4AE2DE6F; Thu, 16 Jul 2020 10:00:59 +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 DC2451809561; Thu, 16 Jul 2020 10:00:58 +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 06GA0qo9015551 for ; Thu, 16 Jul 2020 06:00:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5106E2DE6B; Thu, 16 Jul 2020 10:00:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFCBF2B6DC for ; Thu, 16 Jul 2020 10:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893673; 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=0DRglel3DZiNUcnDW81UCtkeBhBEag/7ckM10dSLi1k=; b=Eh4XIhtnb2WH9XAI9kxoQwWcg8M5F82A0QwAvWqzMjJ8OHo25z/xzd8Hf+ADkg3RvYjwgn BlaKbSUmz+MLGv88RqAzLLY6lCrjCkZhQbjUhRKpTnxScFjouu9gdEUCdCYkxQdl8lQbz7 ZUGs57RWc9mJAHC3+Woi4EebG9u8rqg= X-MC-Unique: itsYh2QUObq9qW-r1X1OVg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 031/351] meson: add programs checks Date: Thu, 16 Jul 2020 11:54:27 +0200 Message-Id: <258be7c3061dfed2e467e55aaeb61eadbacd72c0.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.23 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 --- configure.ac | 39 ------------- m4/virt-external-programs.m4 | 106 ----------------------------------- meson.build | 82 +++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 145 deletions(-) delete mode 100644 m4/virt-external-programs.m4 diff --git a/configure.ac b/configure.ac index b85fa9a9a6f..d8ff2ba3900 100644 --- a/configure.ac +++ b/configure.ac @@ -40,9 +40,6 @@ m4_ifndef([AM_SILENT_RULES], =20 AC_CANONICAL_HOST =20 -dnl Where we look for daemons and admin binaries during configure -LIBVIRT_SBIN_PATH=3D"$PATH:/sbin:/usr/sbin:/usr/local/sbin" - dnl Checks for C compiler. AC_PROG_CC AC_PROG_INSTALL @@ -62,10 +59,6 @@ m4_ifndef([LT_INIT], [ AM_PROG_CC_C_O AM_PROG_LD =20 -dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case -dnl we're working on BSD) -want_ifconfig=3Dno - dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are kno= wn @@ -90,7 +83,6 @@ if test $with_linux =3D no; then fi =20 if test $with_freebsd =3D yes; then - want_ifconfig=3Dyes with_firewalld=3Dno fi =20 @@ -208,12 +200,6 @@ AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) =20 =20 -dnl -dnl Check for external programs -dnl - -LIBVIRT_CHECK_EXTERNAL_PROGRAMS - dnl dnl Virtualization drivers check dnl @@ -377,17 +363,6 @@ if test $with_storage =3D yes; then fi AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" =3D "yes"]) =20 -dnl Allow perl/python overrides -AC_PATH_PROGS([PYTHON], [python3]) -if test -z "$PYTHON"; then - AC_MSG_ERROR(['python3' binary is required to build libvirt]) -fi -AC_DEFINE_UNQUOTED([PYTHON], "$PYTHON", [path to python binary]) -AC_PATH_PROG([FLAKE8], [flake8]) -if test -z "$FLAKE8"; then - AC_MSG_WARN(['flake8' binary is required to check python code style]) -fi - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. @@ -395,11 +370,6 @@ RUNUTF8=3D"LC_ALL=3D LANG=3DC LC_CTYPE=3Den_US.UTF-8" AC_SUBST(RUNUTF8) =20 =20 -AC_PATH_PROG([PERL], [perl]) -if test -z "$PERL"; then - AC_MSG_ERROR(['perl' binary is required to build libvirt]) -fi - dnl MinGW checks LIBVIRT_WIN_CHECK_COMMON LIBVIRT_WIN_CHECK_MINGW @@ -435,15 +405,6 @@ if test $with_freebsd =3D yes; then ) fi =20 -# Check if we need to look for ifconfig -if test "$want_ifconfig" =3D "yes"; then - AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) - if test -z "$IFCONFIG_PATH"; then - AC_MSG_ERROR([Failed to find ifconfig.]) - fi - AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconf= ig binary]) -fi - GNUmakefile=3DGNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 deleted file mode 100644 index d905beed71d..00000000000 --- a/m4/virt-external-programs.m4 +++ /dev/null @@ -1,106 +0,0 @@ -dnl The External programs check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ - dnl Do we have rpcgen? - AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) - AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" !=3D "xno"]) - - dnl Miscellaneous external programs. - AC_PATH_PROG([XMLLINT], [xmllint], []) - if test -z "$XMLLINT" - then - AC_MSG_ERROR("xmllint is required to build libvirt") - fi - AC_PATH_PROG([XSLTPROC], [xsltproc], []) - if test -z "$XSLTPROC" - then - AC_MSG_ERROR("xsltproc is required to build libvirt") - fi - - dnl Drop the rst2html (aka HTML4) variants once we - dnl stop supporting Ubuntu 16.04 (Xenial) - AC_PATH_PROGS([RST2HTML], [rst2html5 rst2html5.py rst2html5-3 rst2html r= st2html.py rst2html-3], []) - if test -z "$RST2HTML" - then - AC_MSG_ERROR("rst2html5/rst2html is required to build libvirt") - fi - AC_PATH_PROGS([RST2MAN], [rst2man rst2man.py rst2man-3], []) - if test -z "$RST2MAN" - then - AC_MSG_ERROR("rst2man is required to build libvirt") - fi - AC_PATH_PROG([AUGPARSE], [augparse], [/usr/bin/augparse]) - AC_PROG_MKDIR_P - AC_PROG_LN_S - - dnl External programs that we can use if they are available. - dnl We will hard-code paths to these programs unless we cannot - dnl detect them, in which case we'll search for the program - dnl along the $PATH at runtime and fail if it's not there. - AC_PATH_PROG([DMIDECODE], [dmidecode], [dmidecode], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([DNSMASQ], [dnsmasq], [dnsmasq], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([RADVD], [radvd], [radvd], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([TC], [tc], [tc], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([UDEVADM], [udevadm], [udevadm], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MM_CTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([OVS_VSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([SCRUB], [scrub], [scrub], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([ADDR2LINE], [addr2line], [addr2line], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MDEVCTL], [mdevctl], [mdevctl], [$LIBVIRT_SBIN_PATH]) - - AC_DEFINE_UNQUOTED([DMIDECODE], ["$DMIDECODE"], - [Location or name of the dmidecode program]) - AC_DEFINE_UNQUOTED([DNSMASQ], ["$DNSMASQ"], - [Location or name of the dnsmasq program]) - AC_DEFINE_UNQUOTED([RADVD], ["$RADVD"], - [Location or name of the radvd program]) - AC_DEFINE_UNQUOTED([TC], ["$TC"], - [Location or name of the tc program (see iproute2)]) - AC_DEFINE_UNQUOTED([MM_CTL], ["$MM_CTL"], - [Location or name of the mm-ctl program]) - AC_DEFINE_UNQUOTED([OVS_VSCTL], ["$OVS_VSCTL"], - [Location or name of the ovs-vsctl program]) - AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"], - [Location or name of the udevadm program]) - AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"], - [Location or name of the modprobe program]) - AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"], - [Location or name of the rmmod program]) - AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], - [Location or name of the scrub program (for wiping al= gorithms)]) - AC_DEFINE_UNQUOTED([ADDR2LINE], ["$ADDR2LINE"], - [Location of addr2line program]) - AC_DEFINE_UNQUOTED([MDEVCTL], ["$MDEVCTL"], - [Location or name of the mdevctl program]) - - AC_PATH_PROG([IP_PATH], [ip], [/sbin/ip], [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([IP_PATH], ["$IP_PATH"], [path to ip binary]) - - AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [$LIBVIRT_SBIN= _PATH]) - AC_DEFINE_UNQUOTED([IPTABLES_PATH], ["$IPTABLES_PATH"], [path to iptable= s binary]) - - AC_PATH_PROG([IP6TABLES_PATH], [ip6tables], [/sbin/ip6tables], [$LIBVIRT= _SBIN_PATH]) - AC_DEFINE_UNQUOTED([IP6TABLES_PATH], ["$IP6TABLES_PATH"], [path to ip6ta= bles binary]) - - AC_PATH_PROG([EBTABLES_PATH], [ebtables], [/sbin/ebtables], [$LIBVIRT_SB= IN_PATH]) - AC_DEFINE_UNQUOTED([EBTABLES_PATH], ["$EBTABLES_PATH"], [path to ebtable= s binary]) -]) diff --git a/meson.build b/meson.build index 121022e5f78..3f86f931de0 100644 --- a/meson.build +++ b/meson.build @@ -859,6 +859,88 @@ endforeach conf.set('SIZEOF_LONG', cc.sizeof('long')) =20 =20 +# Where we look for daemons and admin binaries during configure + +libvirt_sbin_path =3D [ + '/sbin', + '/usr/sbin', + '/usr/local/sbin', +] + + +# required programs check + +required_programs =3D [ + 'perl', + 'python3', + 'xmllint', + 'xsltproc', +] + +required_programs_groups =3D [ + {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']}, + # Drop the rst2html (aka HTML4) variants once we stop supporting Ubuntu = 16.04 (Xenial) + {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3', = 'rst2html', 'rst2html.py', 'rst2html-3']}, + {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']}, +] + +if host_machine.system() =3D=3D 'freebsd' + required_programs +=3D 'ifconfig' +endif + +foreach name : required_programs + prog =3D find_program(name, required: true, dirs: libvirt_sbin_path) + varname =3D name.underscorify() + conf.set_quoted(varname.to_upper(), prog.path()) + set_variable('@0@_prog'.format(varname), prog) +endforeach + +foreach item : required_programs_groups + prog =3D find_program(item.get('prog'), required: true, dirs: libvirt_sb= in_path) + varname =3D item.get('name').underscorify() + conf.set_quoted(varname.to_upper(), prog.path()) + set_variable('@0@_prog'.format(varname), prog) +endforeach + + +# optional programs + +optional_programs =3D [ + 'addr2line', + 'augparse', + 'dmidecode', + 'dnsmasq', + 'ebtables', + 'flake8', + 'ip', + 'ip6tables', + 'iptables', + 'mdevctl', + 'mm-ctl', + 'modprobe', + 'ovs-vsctl', + 'radvd', + 'rmmod', + 'scrub', + 'tc', + 'udevadm', +] + +foreach name : optional_programs + prog =3D find_program(name, required: false, dirs: libvirt_sbin_path) + varname =3D name.underscorify() + if prog.found() + prog_path =3D prog.path() + else + prog_path =3D name + endif + + conf.set_quoted(varname.to_upper(), prog_path) + conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog_path) + set_variable('@0@_prog'.format(varname), prog) +endforeach + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893769; cv=none; d=zohomail.com; s=zohoarc; b=KjGIYgrQjbWOlgRguOR6z1PJ+iUPXEVy0TMW7y9nwJ0WWZfYfTcqiUyXwmRWioVuuOt/glBl0Xkf+MbVoML6BNIKE0M5xxHFbF5zTbZYHk/fYCq7WdtcNiLpoWm57nbZNJoQtkicTZZZ5GFGsRNnUDtFBmL+66xUJoJWmUPc5gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893769; 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=bUaTLBYGC4sxz7UgtJ9Jcpp0zDYy+/Av+cSoCrHkqZE=; b=T/Jvrqc48o8sovoP5ni2G+9N5HCxHo8fm9v3bvCVXlVBv7OwjVOHuLAp0aNr2wQxycF8iLTX2S6DxotnrCnRrTI4M5XQYGNsdP6QAEgykie741mpACBchghfNnV9K1Eygr185zMiz6r3KLQqlj9zx7ZzrYe8XOWU8mN9lWLw57c= 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 1594893769879180.86817585668916; Thu, 16 Jul 2020 03:02:49 -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-81--Nyce9xPMH23o0xOJPC-rg-1; Thu, 16 Jul 2020 06:02:44 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEBCF1888AD8; Thu, 16 Jul 2020 10:02:08 +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 BE2C072ADB; Thu, 16 Jul 2020 10:02:08 +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 8B1BE1809557; Thu, 16 Jul 2020 10:02:08 +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 06GA0rWh015568 for ; Thu, 16 Jul 2020 06:00:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 395FC2DE6F; Thu, 16 Jul 2020 10:00:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8D172DE6B for ; Thu, 16 Jul 2020 10:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893768; 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=bUaTLBYGC4sxz7UgtJ9Jcpp0zDYy+/Av+cSoCrHkqZE=; b=g6Jid9lzIhGSXF7P0gZ2dgr4bRBUwlZed3Lts4b5YEfs7NFsqSyGn6HwJaHYTRxBaLLeCi /tBT17jXV2RFGePQhkhBe9ldnzOJldGJ3lvNPMlCqWr0smqRJ7VKwtZWi3WspuCThIyJ/T gxK1iC24TS+LUlwVvN4ZCPkMTSzuk44= X-MC-Unique: -Nyce9xPMH23o0xOJPC-rg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 032/351] meson: add iscsiadm as optional program Date: Thu, 16 Jul 2020 11:54:28 +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.15 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" We compile src/util/viriscsi unconditionally where we require ISCSIADM to be defined. Signed-off-by: Pavel Hrdina --- m4/virt-storage-iscsi.m4 | 6 ------ meson.build | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4 index eb0b08671c3..0e04079a1cc 100644 --- a/m4/virt-storage-iscsi.m4 +++ b/m4/virt-storage-iscsi.m4 @@ -24,7 +24,6 @@ AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI], [ =20 AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ if test "$with_storage_iscsi" =3D "yes" || test "$with_storage_iscsi" = =3D "check"; then - AC_PATH_PROG([ISCSIADM], [iscsiadm], [], [$LIBVIRT_SBIN_PATH]) if test "$with_storage_iscsi" =3D "yes" ; then if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSC= SI storage driver]) ; fi else @@ -37,11 +36,6 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend f= or storage driver is enabled]) fi fi - if test -z "$ISCIADM" ; then - AC_DEFINE_UNQUOTED([ISCSIADM],["iscsiadm"],[Name of iscsiadm program]) - else - AC_DEFINE_UNQUOTED([ISCSIADM],["$ISCSIADM"],[Location of iscsiadm prog= ram]) - fi AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" =3D "ye= s"]) ]) =20 diff --git a/meson.build b/meson.build index 3f86f931de0..d4b3a9e910d 100644 --- a/meson.build +++ b/meson.build @@ -915,6 +915,7 @@ optional_programs =3D [ 'ip', 'ip6tables', 'iptables', + 'iscsiadm', 'mdevctl', 'mm-ctl', 'modprobe', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893770; cv=none; d=zohomail.com; s=zohoarc; b=XHVU9PwPE3klhLPjnyIR1tO9CvIN6OU6zgwOftgEJPfboZEaWxn2Xu1chWW2LBUnRM4IasGx+q5Mcwe6Kf/Fh0bqY0OLoLuHGxksrKZWV68nWRLNJgZ4crwxhXRVcHQy5Gldc6U1uLTmclZ1rikkbyHq4zCdFn+dIKHj2Jk3+rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893770; 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=iy7RFqucATDLY+CEMt9TTudfVFvyYhj/yzr51O3Eqnc=; b=N/Rc+gQ1b6quNgF7dREfPthi22pzNL1Sa3wbGswvNp+6sOoe/HxjixXpQB9YVr1yslAXp5aLpr0vJvCpWfQ2LeUPrXOHJ4/x3nj5Opq5yNhPKmoTiGbBGEBiScCEQ5p7+fW3lcWKnizQG4AdcsALaL/yOXFqPo2fikVy8qBziIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893770568689.2045967595498; Thu, 16 Jul 2020 03:02:50 -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-102-6_5SQHJEMKSK3GvhY8vOfg-1; Thu, 16 Jul 2020 06:02:46 -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 6D26B891992; Thu, 16 Jul 2020 10:02:11 +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 4638C6FEFE; Thu, 16 Jul 2020 10:02:11 +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 10FA496222; Thu, 16 Jul 2020 10:02:11 +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 06GA0sOC015583 for ; Thu, 16 Jul 2020 06:00:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 20EF12B6DC; Thu, 16 Jul 2020 10:00:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9045B2DE6F for ; Thu, 16 Jul 2020 10:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893769; 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=iy7RFqucATDLY+CEMt9TTudfVFvyYhj/yzr51O3Eqnc=; b=VStObHjbENBgt4jTFmOhk4m1XXTUOIQ5ubrtmpX+o2H0IU4fiuLogocoylD5bsAXPtO5vu 8UJ2hB1wfGkLsKHbn/vIHSVwXstEmcxu7qCgtZzqmlBB/rEEQxliAtBDJbKEnZQWA7TfHh 9P/60VYEys6H3djQl7zPG3PvEi4ASNA= X-MC-Unique: 6_5SQHJEMKSK3GvhY8vOfg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 033/351] meson: add acl build dependency Date: Thu, 16 Jul 2020 11:54:29 +0200 Message-Id: <3e2ac866ca7fb0a8deb4e5304a8218600173e186.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 --- configure.ac | 2 -- m4/virt-acl.m4 | 37 ------------------------------------- meson.build | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-acl.m4 diff --git a/configure.ac b/configure.ac index d8ff2ba3900..53c87b4e293 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_ACL LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT @@ -480,7 +479,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_ACL LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT diff --git a/m4/virt-acl.m4 b/m4/virt-acl.m4 deleted file mode 100644 index d548729b1dd..00000000000 --- a/m4/virt-acl.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl ACL support -dnl -dnl Copyright (C) 2017 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_ACL], [ - - AC_CHECK_HEADERS([sys/acl.h]) - - ACL_CFLAGS=3D"" - ACL_LIBS=3D"" - with_acl=3Dno - if test "x$ac_cv_header_sys_acl_h:x$with_linux" =3D "xyes:xyes"; then - ACL_LIBS=3D"-lacl" - with_acl=3Dyes - fi - AC_SUBST([ACL_CFLAGS]) - AC_SUBST([ACL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_ACL], [ - LIBVIRT_RESULT_LIB([ACL]) -]) diff --git a/meson.build b/meson.build index d4b3a9e910d..d8ff8e0d658 100644 --- a/meson.build +++ b/meson.build @@ -942,6 +942,16 @@ foreach name : optional_programs endforeach =20 =20 +# generic build dependencies + +if host_machine.system() =3D=3D 'linux' and cc.has_header('sys/acl.h') + acl_dep =3D cc.find_library('acl', required: false) + conf.set('HAVE_SYS_ACL_H', 1) +else + acl_dep =3D dependency('', required: false) +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -960,6 +970,11 @@ configure_file(output: 'meson-config.h', configuration= : conf) =20 # print configuration summary =20 +libs_summary =3D { + 'acl': acl_dep.found(), +} +summary(libs_summary, section: 'Libraries', bool_yn: true) + test_summary =3D { 'Coverage': coverage_flags.length() > 0, } --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893730; cv=none; d=zohomail.com; s=zohoarc; b=JS13DV/KFj7643rJMBeg9WEP+7MPqM+ZGkum9EkQNHwUydPzTGYAejOPmmaqq8557ueyo/k4BrdyJF36Yx2VFhyc3gIb/CD97EciG4T/mSlS1jGuqLoMPJEx2ROowdpPcmA3zJEsMNuR8PsBsDfxkGcVIs8dpFqaHpjcY0DgrqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893730; 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=p2uu5yWWou5obYpinxYBpvtHQw9Sq40FtB9XzZRrgYY=; b=jSHbgWuYlSjRRyZDfV8RV9bZqj+ZaiBt0cafl98WGxAJMpo6lcLuQKlS0c9T0cWLVcXX9I5uVR/14CrCkPnwalf1FHbKK5MqukJY7nyskMtubTO6RFrb5SaKKRvwhKMLRWg70DjoJnRd4WjYQiF6ee2u8a4WJCbBkxiB56nWT8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893730231731.1250259003707; Thu, 16 Jul 2020 03:02:10 -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-179-bBPXJri1OWKz24tjaPgT-g-1; Thu, 16 Jul 2020 06:01:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31AD980572E; Thu, 16 Jul 2020 10:00:59 +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 0C91B2B6DC; Thu, 16 Jul 2020 10:00:59 +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 C9A621800FDE; Thu, 16 Jul 2020 10:00:58 +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 06GA0t9B015592 for ; Thu, 16 Jul 2020 06:00:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0915F2B6DC; Thu, 16 Jul 2020 10:00:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 786DB2DE6B for ; Thu, 16 Jul 2020 10:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893729; 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=p2uu5yWWou5obYpinxYBpvtHQw9Sq40FtB9XzZRrgYY=; b=detGX9Yi9r17+CvJX44R6HKpqNjyQSdi+lmmSh/QPy2qZnAcZ+B0wyB6RrleY4c4/JRSBz d0OT+pXCr6HAfN1teHALNESnFu2VPhuCv9rzPR6AUJ8gnWmMTDJ8rAsZiclpuMYqD4uE6k 6+Js2jhshyDiidgsEWEaihZyY6ZLt5A= X-MC-Unique: bBPXJri1OWKz24tjaPgT-g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 034/351] meson: add AppArmor build dependency Date: Thu, 16 Jul 2020 11:54:30 +0200 Message-Id: <812e0158ec3b28946e5907f44d7434fb9c94a7e5.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.23 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" APPARMOR_MOUNT is not used so dropping it in meson. Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-apparmor.m4 | 41 ----------------------------------------- meson.build | 8 ++++++++ meson_options.txt | 4 ++++ 4 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 m4/virt-apparmor.m4 diff --git a/configure.ac b/configure.ac index 53c87b4e293..5bf4727faa7 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT LIBVIRT_ARG_BASH_COMPLETION @@ -150,7 +149,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT LIBVIRT_CHECK_BASH_COMPLETION @@ -479,7 +477,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT LIBVIRT_RESULT_BASH_COMPLETION diff --git a/m4/virt-apparmor.m4 b/m4/virt-apparmor.m4 deleted file mode 100644 index ebddfce2015..00000000000 --- a/m4/virt-apparmor.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl The libapparmor.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_APPARMOR],[ - LIBVIRT_ARG_WITH_FEATURE([APPARMOR], [AppArmor], [check]) - LIBVIRT_ARG_WITH([APPARMOR_MOUNT], [set AppArmor mount point], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_APPARMOR],[ - LIBVIRT_CHECK_LIB([APPARMOR], [apparmor], - [aa_change_profile], [sys/apparmor.h]) - - if test "$with_apparmor" =3D "yes"; then - AC_DEFINE_UNQUOTED([APPARMOR_DIR], - "/etc/apparmor.d", - [path to apparmor directory]) - AC_DEFINE_UNQUOTED([APPARMOR_PROFILES_PATH], - "/sys/kernel/security/apparmor/profiles", - [path to kernel profiles]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_APPARMOR],[ - LIBVIRT_RESULT_LIB([APPARMOR]) -]) diff --git a/meson.build b/meson.build index d8ff8e0d658..be0bc975116 100644 --- a/meson.build +++ b/meson.build @@ -951,6 +951,13 @@ else acl_dep =3D dependency('', required: false) endif =20 +apparmor_dep =3D cc.find_library('AppArmor', required: get_option('apparmo= r')) +if apparmor_dep.found() + conf.set('WITH_APPARMOR', 1) + conf.set_quoted('APPARMOR_DIR', '/etc/apparmor.d') + conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') +endif + =20 # define top include directory =20 @@ -972,6 +979,7 @@ configure_file(output: 'meson-config.h', configuration:= conf) =20 libs_summary =3D { 'acl': acl_dep.found(), + 'apparmor': apparmor_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 0f79f8aea03..dc60d569dd2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,3 +6,7 @@ option('runstatedir', type: 'string', value: '', descriptio= n: 'State directory f option('test_suite', type: 'boolean', value: true, description: 'Whether t= o enable and build test suite by default') option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts), use VIR_TEST_EX= PENSIVE to override') option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') + + +# build dependencies options +option('apparmor', type: 'feature', value: 'auto', description: 'apparmor = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893776; cv=none; d=zohomail.com; s=zohoarc; b=OJGqYVSsQjinN5p352yl4VU09SdvCnrSELSGfeE5E359k7FAeYHhXLgMMNHddbutslfTIS9Ig63OzSDl7uKlgTsJjKSd4WlQyPBwWJHbks2lGrtw6GFt21Nt1PyZ7jxdaftpQHlAuYnk5LJDUIRU6XoPhhx620WZhtfcDR7d3Lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893776; 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=svLYDW7PXuvNwEX9LIpV6DiyfeL1F3v2ZvK2Sm0Dnq4=; b=RNijd/kMy2j9rDyOBTO1/2/texJevEIMPAzL/bhDrp0MRVOwJ9hN8JYdd/OochdGLw3hiFgMSqITNjvV6/PoW/NhTzFe50SjsFg8n/Q7H8Y233jes4G7NvnkiS4jxFhBT7+Bxk8MW847hGeaIY6RSUAhREkjeJMVDCQaI8aj3Os= 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 1594893776203704.249288014824; Thu, 16 Jul 2020 03:02:56 -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-429-FUYCg_5DOBup44czivPeug-1; Thu, 16 Jul 2020 06:02:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BA201017387; Thu, 16 Jul 2020 10:02:14 +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 09A345D9DC; Thu, 16 Jul 2020 10:02:14 +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 CB27E1809547; Thu, 16 Jul 2020 10:02:13 +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 06GA0t7A015601 for ; Thu, 16 Jul 2020 06:00:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E685A2DE6F; Thu, 16 Jul 2020 10:00:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 616732B6DC for ; Thu, 16 Jul 2020 10:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893774; 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=svLYDW7PXuvNwEX9LIpV6DiyfeL1F3v2ZvK2Sm0Dnq4=; b=FTtD0MWhWKxZa/tgOnI4MP3GGGCY6O4jXLg/NTEqK96lbm4IiHsY5fXM2rzNz8OCZaJ6yT HDADidV4iQ3MArFvOFub/oim5wp8FFTcJaTpSlb43Suq9aGD+Jsjp/UlUkfVUk9rhVdBml i2Zh4KQL75IonahqmCYxSw0pYDQHdTM= X-MC-Unique: FUYCg_5DOBup44czivPeug-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 035/351] meson: add attr build option Date: Thu, 16 Jul 2020 11:54:31 +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.14 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 --- configure.ac | 3 --- m4/virt-attr.m4 | 13 ------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 m4/virt-attr.m4 diff --git a/configure.ac b/configure.ac index 5bf4727faa7..6d5fcb4281d 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BLKID @@ -149,7 +148,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BLKID @@ -477,7 +475,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BLKID diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4 deleted file mode 100644 index 478549c17f1..00000000000 --- a/m4/virt-attr.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl The libattr.so library - -AC_DEFUN([LIBVIRT_ARG_ATTR],[ - LIBVIRT_ARG_WITH_FEATURE([ATTR], [attr], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_ATTR],[ - LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_ATTR],[ - LIBVIRT_RESULT_LIB([ATTR]) -]) diff --git a/meson.build b/meson.build index be0bc975116..3d7bd8c4149 100644 --- a/meson.build +++ b/meson.build @@ -958,6 +958,8 @@ if apparmor_dep.found() conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor= /profiles') endif =20 +attr_dep =3D cc.find_library('attr', required: get_option('attr')) + =20 # define top include directory =20 @@ -980,6 +982,7 @@ configure_file(output: 'meson-config.h', configuration:= conf) libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), + 'attr': attr_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index dc60d569dd2..be7ad8b96f9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,4 @@ option('test_coverage', type: 'boolean', value: false, de= scription: 'turn on cod =20 # build dependencies options option('apparmor', type: 'feature', value: 'auto', description: 'apparmor = support') +option('attr', type: 'feature', value: 'auto', description: 'attr support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893735; cv=none; d=zohomail.com; s=zohoarc; b=ZMzLBCg/D53WR7p0Wgx4tgbcg+awMMThHFYucXg8Lg/eu/S8R2Yqnoi19+6QccWyJb0o2PucmVdOjHOhVCYuPxjpS886geHJmrynVm00Wiqd7jdMNHqOuZmZG6AkAArV0dIOdLLY3DE3c8Oes7qdMRPhRRO5Ai8Lb7TwgYfmVWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893735; 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=1rhIVqYlGHmPAlaZ+2gVMwDzrIWDLGOoRifY95mmhlk=; b=i5z9JnTdxDRAX8uNgiSCwzPeiU/omcQEUC7P87jH6KboLvcM+61vrZx/Hwq6SvfahlSILSWMS5XlzreBT1zMFnWQ11CvihVDJlGkPUKOl9m02GqF2QwsgpL4Xfrz0B6k4mIz2gI8L2wqykqzgq/WlaXKeZ/azblYj8pyd7/pKyQ= 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 1594893735445102.44100185798686; Thu, 16 Jul 2020 03:02: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-332-MxBWwDc4OhaqdEcsYIURlA-1; Thu, 16 Jul 2020 06:01: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 6F74280BCAB; Thu, 16 Jul 2020 10:01:02 +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 49CF570102; Thu, 16 Jul 2020 10:01: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 0DDA6180143C; Thu, 16 Jul 2020 10:01: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 06GA0uBu015613 for ; Thu, 16 Jul 2020 06:00:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFE162DE79; Thu, 16 Jul 2020 10:00:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 492B52DE73 for ; Thu, 16 Jul 2020 10:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893734; 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=1rhIVqYlGHmPAlaZ+2gVMwDzrIWDLGOoRifY95mmhlk=; b=gdR9I5JeMunby5M7kgtAFEWeokL4RxsB9Ialtq9gymSOUEieKjtVY9ZQ+c52KcyuKyE34R DLh1NMYh/JlAeVgXW7/pmSi75n1tiEkCLdCtHQiOTQxVjeFuDoYQfuN4YNLzD9qE3OQI5N PDjiN/3ZoBl8/rS7QWOSwVNom2VNvuk= X-MC-Unique: MxBWwDc4OhaqdEcsYIURlA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 036/351] meson: add audit build dependency Date: Thu, 16 Jul 2020 11:54:32 +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.12 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 --- configure.ac | 3 --- m4/virt-audit.m4 | 31 ------------------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 m4/virt-audit.m4 diff --git a/configure.ac b/configure.ac index 6d5fcb4281d..2c9f38f9ba6 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_AUDIT LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG @@ -148,7 +147,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_AUDIT LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG @@ -475,7 +473,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_AUDIT LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG diff --git a/m4/virt-audit.m4 b/m4/virt-audit.m4 deleted file mode 100644 index f2e855e88f0..00000000000 --- a/m4/virt-audit.m4 +++ /dev/null @@ -1,31 +0,0 @@ -dnl The libaudit.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_AUDIT],[ - LIBVIRT_ARG_WITH_FEATURE([AUDIT], [audit], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_AUDIT],[ - LIBVIRT_CHECK_LIB([AUDIT], [audit], - [audit_encode_nv_string], [libaudit.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_AUDIT],[ - LIBVIRT_RESULT_LIB([AUDIT]) -]) diff --git a/meson.build b/meson.build index 3d7bd8c4149..7aacfc2011c 100644 --- a/meson.build +++ b/meson.build @@ -960,6 +960,11 @@ endif =20 attr_dep =3D cc.find_library('attr', required: get_option('attr')) =20 +audit_dep =3D cc.find_library('audit', required: get_option('audit')) +if audit_dep.found() + conf.set('WITH_AUDIT', 1) +endif + =20 # define top include directory =20 @@ -983,6 +988,7 @@ libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), 'attr': attr_dep.found(), + 'audit': audit_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index be7ad8b96f9..16822374180 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,3 +11,4 @@ option('test_coverage', type: 'boolean', value: false, de= scription: 'turn on cod # build dependencies options option('apparmor', type: 'feature', value: 'auto', description: 'apparmor = support') option('attr', type: 'feature', value: 'auto', description: 'attr support') +option('audit', type: 'feature', value: 'auto', description: 'audit suppor= t') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893893; cv=none; d=zohomail.com; s=zohoarc; b=M60KRiyEGk1zQgjQhV6XnFrtQCSDimBjNvgOHa31GYTlAjoaYAUpXWz1Sxtg1IJZV8GSUzswDGb7+W6NBLHLGni5bKVdDQ1r7qu4ABuxiZ0FQ/2ARQlHXwflWvh30fIK2Cd3/wrL02rHKnrC027E7kReXH++oefhFegXs739Jc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893893; 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=crjo02wPojTD4afwOxcbXY1YS2zijfm8wZE6Y0nUUv8=; b=QQAvfQyddB1tqRO0An/cn5HuplhA+4yRI0WeqdIfo2hJud12TSr9rdWK74b+LrfooIIJ9tYdnNob2w5XlMEaeTrvGYJaCYA5oZV1gwaXNLFvuGMl591inTwyLb3ioajMR0Hu6hA7TvBOc0ErjvQStH6XNGENEfAgtKWdQArF7zI= 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 1594893893989487.40580965370714; Thu, 16 Jul 2020 03:04:53 -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-439-QgHl3GUSPnGfh-Yh4G1bBQ-1; Thu, 16 Jul 2020 06:02:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 963E36D847; Thu, 16 Jul 2020 10:02:16 +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 76F7E78471; Thu, 16 Jul 2020 10:02:16 +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 43D7E96222; Thu, 16 Jul 2020 10:02:16 +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 06GA0vWP015626 for ; Thu, 16 Jul 2020 06:00:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id B98222DE73; Thu, 16 Jul 2020 10:00:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 342142DE81 for ; Thu, 16 Jul 2020 10:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893892; 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=crjo02wPojTD4afwOxcbXY1YS2zijfm8wZE6Y0nUUv8=; b=Y9YWOEuJ54oVPSiW/76WQLKIjyJIf7xSc2k5pQh90+Qi/vXDymXGCJoNacvspAxoUmG5nc QdIP/Ym0TIJdP6b+ku6U7cSZO6Kd69V0Nr6AKL5qf5aQ8ufddpeGqf6fzy0u3fKqjzJ5q6 Xd9Mk2nZABQeQ7/GHzWa38BMKrkXrbw= X-MC-Unique: QgHl3GUSPnGfh-Yh4G1bBQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 037/351] meson: add readline build option Date: Thu, 16 Jul 2020 11:54:33 +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.11 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 --- configure.ac | 3 -- m4/virt-readline.m4 | 86 --------------------------------------------- meson.build | 64 +++++++++++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 65 insertions(+), 89 deletions(-) delete mode 100644 m4/virt-readline.m4 diff --git a/configure.ac b/configure.ac index 2c9f38f9ba6..b822e862535 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_POLKIT -LIBVIRT_ARG_READLINE LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX @@ -177,7 +176,6 @@ LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_READLINE LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX @@ -502,7 +500,6 @@ LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_READLINE LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 deleted file mode 100644 index cd12110c4e2..00000000000 --- a/m4/virt-readline.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl The readline library -dnl -dnl Copyright (C) 2005-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_READLINE],[ - LIBVIRT_ARG_WITH_FEATURE([READLINE], [readline], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_READLINE],[ - - # We have to check for readline.pc's presence beforehand because for - # the longest time the library didn't ship a .pc file at all - PKG_CHECK_EXISTS([readline], [use_pkgconfig=3D1], [use_pkgconfig=3D0]) - - if test $use_pkgconfig =3D 1; then - # readline 7.0 is the first version which includes pkg-config support - LIBVIRT_CHECK_PKG([READLINE], [readline], [7.0]) - else - # This function is present in all reasonable (5.0+) readline versions; - # however, the macOS base system contains a library called libedit whi= ch - # takes over the readline name despite lacking many of its features. We - # want to make sure we only enable readline support when linking again= st - # the actual readline library, and the availability of this specific - # functions is as good a witness for that fact as any. - AC_CHECK_DECLS([rl_completion_quote_character], - [], [], - [[#include - #include ]]) - - if test "$ac_cv_have_decl_rl_completion_quote_character" =3D "no" ; th= en - if test "$with_readline" =3D "yes" ; then - AC_MSG_ERROR([readline is missing rl_completion_quote_character]) - else - with_readline=3Dno; - fi - fi - - # The normal library check... - LIBVIRT_CHECK_LIB([READLINE], [readline], [readline], [readline/readli= ne.h]) - fi - - # We need this to avoid compilation issues with modern compilers. - # See 9ea3424a178 for a more detailed explanation - if test "$with_readline" =3D "yes" ; then - case "$READLINE_CFLAGS" in - *-D_FUNCTION_DEF*) ;; - *) READLINE_CFLAGS=3D"-D_FUNCTION_DEF $READLINE_CFLAGS" ;; - esac - fi - - # Gross kludge for readline include path obtained through pkg-config. - # - # As of 8.0, upstream readline.pc has -I${includedir}/readline among - # its Cflags, which is clearly wrong. This does not affect Linux - # because ${includedir} is already part of the default include path, - # but on other platforms that's not the case and the result is that - # can't be located, causing the build to fail. - # A patch solving this issue has already been posted upstream, so once - # the fix has landed in FreeBSD ports and macOS homebrew we can safely - # drop the kludge and rely on pkg-config alone on those platforms. - # - # [1] http://lists.gnu.org/archive/html/bug-readline/2019-04/msg00007.ht= ml - case "$READLINE_CFLAGS" in - *include/readline*) READLINE_CFLAGS=3D$(echo $READLINE_CFLAGS | sed s,= include/readline,include,g) ;; - *) ;; - esac -]) - -AC_DEFUN([LIBVIRT_RESULT_READLINE],[ - LIBVIRT_RESULT_LIB([READLINE]) -]) diff --git a/meson.build b/meson.build index 7aacfc2011c..c30b14c1643 100644 --- a/meson.build +++ b/meson.build @@ -965,6 +965,69 @@ if audit_dep.found() conf.set('WITH_AUDIT', 1) endif =20 +# readline 7.0 is the first version which includes pkg-config support +readline_version =3D '7.0' +readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) +if not readline_dep.found() + readline_dep =3D cc.find_library('readline', required: get_option('readl= ine')) + + if readline_dep.found() + # This function is present in all reasonable (5.0+) readline versions; + # however, the macOS base system contains a library called libedit whi= ch + # takes over the readline name despite lacking many of its features. We + # want to make sure we only enable readline support when linking again= st + # the actual readline library, and the availability of this specific + # functions is as good a witness for that fact as any. + correct_rl =3D cc.has_function('rl_completion_quote_character', prefix= : '#include ') + if not correct_rl and get_option('readline').enabled() + error('readline is missing rl_completion_quote_character') + else + readline_dep =3D dependency('', required: false) + endif + endif +endif +if readline_dep.found() + # Gross kludge for readline include path obtained through pkg-config. + # + # As of 8.0, upstream readline.pc has -I${includedir}/readline among + # its Cflags, which is clearly wrong. This does not affect Linux + # because ${includedir} is already part of the default include path, + # but on other platforms that's not the case and the result is that + # can't be located, causing the build to fail. + # A patch solving this issue has already been posted upstream, so once + # the fix has landed in FreeBSD ports and macOS homebrew we can safely + # drop the kludge and rely on pkg-config alone on those platforms. + # + # [1] http://lists.gnu.org/archive/html/bug-readline/2019-04/msg00007.ht= ml + if readline_dep.type_name() =3D=3D 'pkgconfig' and host_machine.system()= !=3D 'linux' + pkg_config_prog =3D find_program('pkg-config') + rc =3D run_command(pkg_config_prog, '--cflags', 'readline', check: tru= e) + cflags =3D rc.stdout().strip() + if cflags.contains('include/readline') + rc =3D run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + cflags, 'include/readline', 'include', + ), + check: true, + ) + readline_dep =3D declare_dependency( + compile_args: rc.stdout().strip().split(), + dependencies: [ readline_dep ], + ) + endif + endif + + # We need this to avoid compilation issues with modern compilers. + # See 9ea3424a178 for a more detailed explanation + readline_dep =3D declare_dependency( + compile_args: [ '-D_FUNCTION_DEF' ], + dependencies: [ readline_dep ], + ) + + conf.set('WITH_READLINE', 1) +endif + =20 # define top include directory =20 @@ -989,6 +1052,7 @@ libs_summary =3D { 'apparmor': apparmor_dep.found(), 'attr': attr_dep.found(), 'audit': audit_dep.found(), + 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 16822374180..aafc694533a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,3 +12,4 @@ option('test_coverage', type: 'boolean', value: false, de= scription: 'turn on cod option('apparmor', type: 'feature', value: 'auto', description: 'apparmor = support') option('attr', type: 'feature', value: 'auto', description: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit suppor= t') +option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893882; cv=none; d=zohomail.com; s=zohoarc; b=fP3mlxclnf42J4tBkY12UoWsruffVkQDT8e5XpfXrhMpypkYJEzTBwpOyEtqX9FvrJ7HVpheb1P0j1jsQS1Pzm7/p/uRYDsrzxMrnUlvgn2/t/8T1wTQ08nDdjD+r4/dHOSEdwGjiAhs/3QGE8AwwNaF6tb/ce2mM2Mu4F1hBYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893882; 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=O2nNTf121TBTybPReiPk0ywRv0bNUHZ3bgTi+CX5g3k=; b=blBUsH8PudHcmh4uEo0IBIAydI8xAT7ecpYpoSNbk+5c0tf5j44LtcG9y2ZyXxaXpdSaABPl4agvroOLK/IiMuDAjhL8BDPU+acfbhk8mHT1yPwl5sJ8Rnhas33XhjnmHJop7ls5WjZtcRN0r4gaPzs/oRiLUzzIOlsvxCDUdEE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893882780701.4429522054988; Thu, 16 Jul 2020 03:04:42 -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-393-qNky_W_cO9Swpz2jlLA3ZA-1; Thu, 16 Jul 2020 06:02:52 -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 F26841030C20; Thu, 16 Jul 2020 10:02:18 +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 D23BD74F64; Thu, 16 Jul 2020 10:02:18 +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 9B6A896221; Thu, 16 Jul 2020 10:02:18 +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 06GA0wiv015646 for ; Thu, 16 Jul 2020 06:00:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEDF72B6E6; Thu, 16 Jul 2020 10:00:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28BD82DE93 for ; Thu, 16 Jul 2020 10:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893881; 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=O2nNTf121TBTybPReiPk0ywRv0bNUHZ3bgTi+CX5g3k=; b=PTsy9XDqk7Nu7CbxXQaRX8VyyXqM75CTJtraEeuKq2mtx8PFzGizoE71/ZMRS6Kf8OQZ69 5ys8sBARyvFJoIez/vkV3NzAc6v3eoFU2UA85XSDqteWpeurT0fyiL+MxCGqH1jHfp+R1b Z3IZzkS+JjlRPZHqOWwvv2kWO/iOrvs= X-MC-Unique: qNky_W_cO9Swpz2jlLA3ZA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 038/351] meson: add bash_completion build options Date: Thu, 16 Jul 2020 11:54:34 +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 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 --- configure.ac | 3 -- m4/virt-bash-completion.m4 | 70 -------------------------------------- meson.build | 30 ++++++++++++++++ meson_options.txt | 2 ++ 4 files changed, 32 insertions(+), 73 deletions(-) delete mode 100644 m4/virt-bash-completion.m4 diff --git a/configure.ac b/configure.ac index b822e862535..a8f838c0ccf 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL @@ -146,7 +145,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL @@ -471,7 +469,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL diff --git a/m4/virt-bash-completion.m4 b/m4/virt-bash-completion.m4 deleted file mode 100644 index c8342176f8b..00000000000 --- a/m4/virt-bash-completion.m4 +++ /dev/null @@ -1,70 +0,0 @@ -dnl Bash completion support -dnl -dnl Copyright (C) 2017 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl -dnl Inspired by libguestfs code. -dnl - -AC_DEFUN([LIBVIRT_ARG_BASH_COMPLETION],[ - LIBVIRT_ARG_WITH_FEATURE([BASH_COMPLETION], [bash-completion], [check], = [2.0]) - LIBVIRT_ARG_WITH([BASH_COMPLETIONS_DIR], - [directory containing bash completions scripts], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_BASH_COMPLETION], [ - AC_REQUIRE([LIBVIRT_CHECK_READLINE]) - - if test "x$with_readline" !=3D "xyes" ; then - if test "x$with_bash_completion" =3D "xyes" ; then - AC_MSG_ERROR([readline is required for bash completion support]) - else - with_bash_completion=3Dno - fi - fi - - LIBVIRT_CHECK_PKG([BASH_COMPLETION], [bash-completion], [2.0]) - - if test "x$with_bash_completion" =3D "xyes" ; then - if test "x$with_bash_completions_dir" =3D "xcheck"; then - AC_MSG_CHECKING([for bash-completions directory]) - BASH_COMPLETIONS_DIR=3D"$($PKG_CONFIG --variable=3Dcompletionsdir ba= sh-completion)" - AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) - - dnl Replace bash completions's exec_prefix with our own. - dnl Note that ${exec_prefix} is kept verbatim at this point in time, - dnl and will only be expanded later, when make is called: this makes - dnl it possible to override such prefix at compilation or installati= on - dnl time - bash_completions_prefix=3D"$($PKG_CONFIG --variable=3Dprefix bash-co= mpletion)" - if test "x$bash_completions_prefix" =3D "x" ; then - bash_completions_prefix=3D"/usr" - fi - - BASH_COMPLETIONS_DIR=3D'${exec_prefix}'"${BASH_COMPLETIONS_DIR#$bash= _completions_prefix}" - elif test "x$with_bash_completions_dir" =3D "xno" || test "x$with_bash= _completions_dir" =3D "xyes"; then - AC_MSG_ERROR([bash-completions-dir must be used only with valid path= ]) - else - BASH_COMPLETIONS_DIR=3D$with_bash_completions_dir - fi - AC_SUBST([BASH_COMPLETIONS_DIR]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_BASH_COMPLETION],[ - LIBVIRT_RESULT_LIB([BASH_COMPLETION]) -]) diff --git a/meson.build b/meson.build index c30b14c1643..5cca3b7d5c2 100644 --- a/meson.build +++ b/meson.build @@ -965,6 +965,9 @@ if audit_dep.found() conf.set('WITH_AUDIT', 1) endif =20 +bash_completion_version =3D '2.0' +bash_completion_dep =3D dependency('bash-completion', version: '>=3D' + ba= sh_completion_version, required: get_option('bash_completion')) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1029,6 +1032,32 @@ if readline_dep.found() endif =20 =20 +# generic build dependencies checks + +if bash_completion_dep.found() and not readline_dep.found() + if get_option('bash_completion').enabled() + error('readline is required for bash completion support') + else + bash_completion_dep =3D dependency('', required: false) + endif +endif +if bash_completion_dep.found() + bash_completion_dir =3D get_option('bash_completion_dir') + if bash_completion_dir =3D=3D '' + bash_completion_dir =3D bash_completion_dep.get_pkgconfig_variable('co= mpletionsdir') + bash_completion_prefix =3D bash_completion_dep.get_pkgconfig_variable(= 'prefix') + rc =3D run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + bash_completion_dir, bash_completion_prefix, prefix, + ), + check: true, + ) + bash_completion_dir =3D rc.stdout().strip() + endif +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -1052,6 +1081,7 @@ libs_summary =3D { 'apparmor': apparmor_dep.found(), 'attr': attr_dep.found(), 'audit': audit_dep.found(), + 'bash_completion': bash_completion_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index aafc694533a..5313b9bb5fb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,4 +12,6 @@ option('test_coverage', type: 'boolean', value: false, de= scription: 'turn on cod option('apparmor', type: 'feature', value: 'auto', description: 'apparmor = support') option('attr', type: 'feature', value: 'auto', description: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit suppor= t') +option('bash_completion', type: 'feature', value: 'auto', description: 'ba= sh-completion support') +option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893676; cv=none; d=zohomail.com; s=zohoarc; b=YWaWxBgrdOwAKeiLKdnp4rGemAgdHY1lrEdnTeISi9PfX4mIYvIpBI+s+w1IYiRaqrXb1DESSjlFqcGo2Y833W//b8+1u8jN66Er0NfYLn2HvHsr9QZUEk3jowBxJ/gk9+s/3NQqBCn61cfbNztby1SjQCdhMaFRoTvjjsLa65Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893676; 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=Wxd/o9zClyHehK3Pip4NlH9HJn34S9R4KmG5T/m4TZM=; b=mCVivVNLevY7p/mUsQPNiB6X6dNpixSY1fPfLlOM691iUl8UC2RPDtEjbciJ+DfYLUCzGybfqUEzi0axfEemb66vhqrf/1T8mo9a6BrY8kniTTxdm5ZAgnsXrx9VwF1XVbKj5Z1QtDX0u/41lDi7WC9LQ1IakfWK1Cd8Ti30rgI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893676917484.7780774584186; Thu, 16 Jul 2020 03:01:16 -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-282-_bTxQiCIMkaQ_fw-N4OqXQ-1; Thu, 16 Jul 2020 06:01:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8548B1081; Thu, 16 Jul 2020 10:01:02 +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 65EF96147E; Thu, 16 Jul 2020 10:01: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 26F2F1806B0C; Thu, 16 Jul 2020 10:01: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 06GA0xgU015659 for ; Thu, 16 Jul 2020 06:00:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9809B2B6DC; Thu, 16 Jul 2020 10:00:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 123712B6E6 for ; Thu, 16 Jul 2020 10:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893675; 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=Wxd/o9zClyHehK3Pip4NlH9HJn34S9R4KmG5T/m4TZM=; b=Do9ynOxu5eYNvZSKL+2UYUMzinYiGelhbO0fjIYCwg3QkzUXp7RebseSEb2i4Flmq8BkIR uW31ql7qfKdTigdzkv3agTN+meDGvCZqwvaE1SHmwGR/jEdusa5l3POr9BHtRb1btAufyM GxbhRTJiygDNelSGMzv82SmT8B4NsRY= X-MC-Unique: _bTxQiCIMkaQ_fw-N4OqXQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 039/351] meson: add blkid build dependency Date: Thu, 16 Jul 2020 11:54:35 +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.16 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 --- configure.ac | 3 --- m4/virt-blkid.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-blkid.m4 diff --git a/configure.ac b/configure.ac index a8f838c0ccf..25fb8ca8f5f 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS @@ -145,7 +144,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS @@ -469,7 +467,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS diff --git a/m4/virt-blkid.m4 b/m4/virt-blkid.m4 deleted file mode 100644 index 609d0d58031..00000000000 --- a/m4/virt-blkid.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libblkid.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_BLKID],[ - LIBVIRT_ARG_WITH_FEATURE([BLKID], [blkid], [check], [2.17]) -]) - -AC_DEFUN([LIBVIRT_CHECK_BLKID],[ - LIBVIRT_CHECK_PKG([BLKID], [blkid], [2.17]) -]) - -AC_DEFUN([LIBVIRT_RESULT_BLKID],[ - LIBVIRT_RESULT_LIB([BLKID]) -]) diff --git a/meson.build b/meson.build index 5cca3b7d5c2..7988a7b0a13 100644 --- a/meson.build +++ b/meson.build @@ -968,6 +968,12 @@ endif bash_completion_version =3D '2.0' bash_completion_dep =3D dependency('bash-completion', version: '>=3D' + ba= sh_completion_version, required: get_option('bash_completion')) =20 +blkid_version =3D '2.17' +blkid_dep =3D dependency('blkid', version: '>=3D' + blkid_version, require= d: get_option('blkid')) +if blkid_dep.found() + conf.set('WITH_BLKID', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1082,6 +1088,7 @@ libs_summary =3D { 'attr': attr_dep.found(), 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), + 'blkid': blkid_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 5313b9bb5fb..73e64f26b0a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,4 +14,5 @@ option('attr', type: 'feature', value: 'auto', descriptio= n: 'attr support') option('audit', type: 'feature', value: 'auto', description: 'audit suppor= t') option('bash_completion', type: 'feature', value: 'auto', description: 'ba= sh-completion support') option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') +option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894086; cv=none; d=zohomail.com; s=zohoarc; b=AgcYQRO+4AQb9cWi1R9LUa6s5rMKqhID8qQp0j6Bol54UcQRVe25t/6VASND2Q8Do3mB5+H6cXWRN0Tz0dJuo/QGfX4d1gPDlzVGjte3MeTsOdVFpfABvpD7lr2E5nYowzRrawlLoKRe5FSnP2JgolMclYAvja3eS7jua1zK9Nw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894086; 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=GtTsTRE948kSXMmd23SoO5HgHhzefP5rUPk2IRrbR0k=; b=HDUWWKOLTHBS4Bo8cBVUoCbvuAY3EQneIJk/EE0CPXXl9S2XfCqEJU4AOCBhJZsflZREXk7dNR7JRd9opBZ+Y58TIHp7zVoigZECey2ClZPu4nqBClKDmlMee19bXXIfFsqPJivkAmBTWyUD/bb0I02EqGSr9SkX7VayXXv7g0E= 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 1594894086647757.1326675577848; Thu, 16 Jul 2020 03:08:06 -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-297-lFG6VAavN5KhnNsHj1H_Lg-1; Thu, 16 Jul 2020 06:01:12 -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 294178027F9; Thu, 16 Jul 2020 10:01:06 +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 0461B1053B21; Thu, 16 Jul 2020 10:01:05 +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 C1A0D1804768; Thu, 16 Jul 2020 10:01:05 +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 06GA100V015674 for ; Thu, 16 Jul 2020 06:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7FAD92B6DC; Thu, 16 Jul 2020 10:01:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEA822DE69 for ; Thu, 16 Jul 2020 10:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894085; 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=GtTsTRE948kSXMmd23SoO5HgHhzefP5rUPk2IRrbR0k=; b=GrVQtt8iSKZCvYrBXTa+AbEF+P23HSYx3I5mbRzG+Qmk3clycp6Xa7cm6xiHDjmtcDkmC7 0gVsh3Nx+cvtZ0DAYhQV/wQZ4nEfVIPcxjIgqNOT4TOMs4ZWMe0FQY+xj57NYi4bdBnqhb AD5/y5GbuaJv0eQQn0yuEsbCOrx0WbM= X-MC-Unique: lFG6VAavN5KhnNsHj1H_Lg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 040/351] meson: add capng build dependency Date: Thu, 16 Jul 2020 11:54:36 +0200 Message-Id: <46a79b038c7456ed4b21aed93186c2aa54d11449.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 --- configure.ac | 3 --- m4/virt-capng.m4 | 30 ------------------------------ meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-capng.m4 diff --git a/configure.ac b/configure.ac index 25fb8ca8f5f..acd326adf71 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_CAPNG LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD @@ -144,7 +143,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_CAPNG LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER @@ -467,7 +465,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CAPNG LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN diff --git a/m4/virt-capng.m4 b/m4/virt-capng.m4 deleted file mode 100644 index bf9fcd2aa84..00000000000 --- a/m4/virt-capng.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libcapng.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_CAPNG],[ - LIBVIRT_ARG_WITH_FEATURE([CAPNG], [cap-ng], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CAPNG],[ - LIBVIRT_CHECK_LIB([CAPNG], [cap-ng], [capng_updatev], [cap-ng.h]) -]) - -AC_DEFUN([LIBVIRT_RESULT_CAPNG],[ - LIBVIRT_RESULT_LIB([CAPNG]) -]) diff --git a/meson.build b/meson.build index 7988a7b0a13..d504e7720d2 100644 --- a/meson.build +++ b/meson.build @@ -974,6 +974,11 @@ if blkid_dep.found() conf.set('WITH_BLKID', 1) endif =20 +capng_dep =3D cc.find_library('cap-ng', required: get_option('capng')) +if capng_dep.found() + conf.set('WITH_CAPNG', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1089,6 +1094,7 @@ libs_summary =3D { 'audit': audit_dep.found(), 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), + 'capng': capng_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 73e64f26b0a..f53c94c6982 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -15,4 +15,5 @@ option('audit', type: 'feature', value: 'auto', descripti= on: 'audit support') option('bash_completion', type: 'feature', value: 'auto', description: 'ba= sh-completion support') option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') +option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893690; cv=none; d=zohomail.com; s=zohoarc; b=IclIipem7m0GFRveJDuC4RHm9gzYVaCbmCI+6MBb4G3rDEJpZxpEoF2SpUni2xMs2RF0/0mjhf7gip9JSDSZ9cIiaVf9h5BkA95kGiSN6VJu1bg/NX0ICRUyl5BbE93z6X9YsJ05Ez67NIkA1HDz64Bo9ATom5R1/OpRWv0Was0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893690; 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=hSEa7kCM2KlbkRGsy7m0fLHcPv5I82P/jKvAJeIc/w4=; b=HtqpJVPQS0W6DzvtWC+Sd9jVykOh5owS+aPkDIk41BQlJjoGJZT5HbKNd2JVDVC9y+aUvxRGuGrnfFECB7LY15voAnKfOIqs6f3p7rVgFah124VnTPK+YxJHxwcwDpAJivSJXJQi6uxYLHk/99ZoTe8YTpzoxX7VWvur1Gx3/BA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893690097497.07263947971285; Thu, 16 Jul 2020 03:01:30 -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-186-hH-3CBofOLy5AkgrQVN7iA-1; Thu, 16 Jul 2020 06:01:12 -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 0C2628027F4; Thu, 16 Jul 2020 10:01:06 +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 DB50D7010C; Thu, 16 Jul 2020 10:01:05 +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 A7AA09623E; Thu, 16 Jul 2020 10:01:05 +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 06GA11p2015687 for ; Thu, 16 Jul 2020 06:01:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F8842B6E2; Thu, 16 Jul 2020 10:01:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6B6C2DE7F for ; Thu, 16 Jul 2020 10:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893689; 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=hSEa7kCM2KlbkRGsy7m0fLHcPv5I82P/jKvAJeIc/w4=; b=iCsY5uzXLVFo4IqvubYfebOPB4QB0qiHkboLBUpYdokfSOAAV1DhTITpXFGU3rEhYCmA0Z xG7eGIFeBMGJ9nt+YwkfGVKcCbg8Aw4MoIRH5zHPBo/jo2pjfx8CfvU5I1cwBoemXz7mwe iRWxXHDTIrLi5VyAFBY4n6bvpqhi6qo= X-MC-Unique: hH-3CBofOLy5AkgrQVN7iA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 041/351] meson: add curl build dependency Date: Thu, 16 Jul 2020 11:54:37 +0200 Message-Id: <621deba490843a494eaaf4af8769719bb23edb58.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 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 --- configure.ac | 3 --- m4/virt-curl.m4 | 38 -------------------------------------- meson.build | 17 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 m4/virt-curl.m4 diff --git a/configure.ac b/configure.ac index acd326adf71..f89ea566c03 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_CURL LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE @@ -143,7 +142,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_CURL LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN @@ -465,7 +463,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_CURL LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN LIBVIRT_RESULT_FIREWALLD diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4 deleted file mode 100644 index 84fcd69a8e0..00000000000 --- a/m4/virt-curl.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The libcurl.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_CURL],[ - LIBVIRT_ARG_WITH_FEATURE([CURL], [libcurl], [check], [7.18.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CURL],[ - LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0]) - - # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version - # of that #defines several wrapper macros around underlying - # functions to add type safety for gcc only. However, these macros - # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by - # disabling the wrappers; even if it removes some type-check safety. - CURL_CFLAGS=3D"-DCURL_DISABLE_TYPECHECK $CURL_CFLAGS" - AC_SUBST(CURL_CFLAGS) -]) - -AC_DEFUN([LIBVIRT_RESULT_CURL],[ - LIBVIRT_RESULT_LIB([CURL]) -]) diff --git a/meson.build b/meson.build index d504e7720d2..26378134118 100644 --- a/meson.build +++ b/meson.build @@ -979,6 +979,22 @@ if capng_dep.found() conf.set('WITH_CAPNG', 1) endif =20 +curl_version =3D '7.18.0' +curl_dep =3D dependency('libcurl', version: '>=3D' + curl_version, require= d: get_option('curl')) +if curl_dep.found() + # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version + # of that #defines several wrapper macros around underlying + # functions to add type safety for gcc only. However, these macros + # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by + # disabling the wrappers; even if it removes some type-check safety. + curl_dep =3D declare_dependency( + compile_args: [ '-DCURL_DISABLE_TYPECHECK' ], + dependencies: [ curl_dep ], + ) + + conf.set('WITH_CURL', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1095,6 +1111,7 @@ libs_summary =3D { 'bash_completion': bash_completion_dep.found(), 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), + 'curl': curl_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f53c94c6982..f0d5e05b469 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,4 +16,5 @@ option('bash_completion', type: 'feature', value: 'auto',= description: 'bash-com option('bash_completion_dir', type: 'string', value: '', description: 'dir= ectory containing bash completion scripts') option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') +option('curl', type: 'feature', value: 'auto', description: 'curl support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893727; cv=none; d=zohomail.com; s=zohoarc; b=Z183rOgexSeUbrmNEreZTjw8EyS9YyYbRMUJOORkXl7bQFrp4sPHijMnqOILKI9h8MBe6OWAmM/mphrxMZ3+ht94vNXr8veOgXs6HbZi9nUHuGTY01QyngLm7e9DOtXHCiMOb0PVOLLtFXQAz8U73SdvNtQldoO3PlqtuOAyZDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893727; 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=UkYDaYoN9JloIQlL2slU+QioIho1IVfppR1g1OVjqP4=; b=V9YnkMgyH77dTpFNggZkw+K1iS0Z0DQjzFf8je1cLapyEPb7tl0q4ctdsBNgvzjT2SZ2M9wc8zXNZ7Pf/pmYes+5sRF7hb119YLQB6lSY2BirwVZJtlZfEanuOHOAUdoCYcHb4LDTSvCCLukEnRfAhS/PHmFhVrkjS5jt1I1qeI= 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 159489372771647.061096351988; Thu, 16 Jul 2020 03:02:07 -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-238-ozUZzUzTPzKcMaVzJVkWvw-1; Thu, 16 Jul 2020 06:01:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F2EB10059AA; Thu, 16 Jul 2020 10:01:13 +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 5C8872E03B; Thu, 16 Jul 2020 10:01:13 +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 258F6180476B; Thu, 16 Jul 2020 10:01:13 +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 06GA1BwS015764 for ; Thu, 16 Jul 2020 06:01:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D86F2E036; Thu, 16 Jul 2020 10:01:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 783762E034 for ; Thu, 16 Jul 2020 10:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893726; 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=UkYDaYoN9JloIQlL2slU+QioIho1IVfppR1g1OVjqP4=; b=HVz9RQIw3Ynr57Yj2Zch7qykzi87re69HQmvgnWTzSqulDZXN0M9PVxr2nXWQleX3D/LUy ua2UsQg8mmkhDs0u/IEo9Ag3rCNZVOrafbUtkJEEgMpFeSTmgfvXQZuGSy6z+obAkC+DUG gn42V4eXn8ifmcS8GTdKrOQTBQ3fR50= X-MC-Unique: ozUZzUzTPzKcMaVzJVkWvw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 042/351] meson: add dbus build dependency Date: Thu, 16 Jul 2020 11:54:38 +0200 Message-Id: <55664405617394431e13bb0afbb698d77938e098.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.23 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" Convert #if VAL into #ifdef VAL in order to make meson more readable and because it's not necessary to have both defines existing. Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-dbus.m4 | 41 ----------------------------------------- meson.build | 17 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 m4/virt-dbus.m4 diff --git a/configure.ac b/configure.ac index f89ea566c03..3499b372036 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_DBUS LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE @@ -142,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN LIBVIRT_CHECK_FIREWALLD @@ -463,7 +461,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_DLOPEN LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD_ZONE diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 deleted file mode 100644 index f5af1a8022b..00000000000 --- a/m4/virt-dbus.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl The libdbus.so library -dnl -dnl Copyright (C) 2012-2014 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_DBUS],[ - LIBVIRT_ARG_WITH_FEATURE([DBUS], [dbus-1], [check], [1.0.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DBUS],[ - LIBVIRT_CHECK_PKG([DBUS], [dbus-1], [1.0.0]) - - if test "$with_dbus" =3D "yes" ; then - old_CFLAGS=3D"$CFLAGS" - old_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $DBUS_CFLAGS" - LIBS=3D"$LIBS $DBUS_LIBS" - AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) - AC_CHECK_TYPES([DBusBasicValue], [], [], [[#include ]]) - CFLAGS=3D"$old_CFLAGS" - LIBS=3D"$old_LIBS" - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_DBUS],[ - LIBVIRT_RESULT_LIB([DBUS]) -]) diff --git a/meson.build b/meson.build index 26378134118..081641c8617 100644 --- a/meson.build +++ b/meson.build @@ -995,6 +995,22 @@ if curl_dep.found() conf.set('WITH_CURL', 1) endif =20 +dbus_version =3D '1.0.0' +dbus_dep =3D dependency('dbus-1', version: '>=3D' + dbus_version, required= : get_option('dbus')) +if dbus_dep.found() + conf.set('WITH_DBUS', 1) + + function =3D 'dbus_watch_get_unix_fd' + if cc.has_function(function, dependencies: dbus_dep) + conf.set('HAVE_@0@'.format(function.to_upper()), 1) + endif + + type =3D 'DBusBasicValue' + if cc.has_type(type, dependencies: dbus_dep, prefix: '#include ') + conf.set('HAVE_@0@'.format(type.to_upper()), 1) + endif +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1112,6 +1128,7 @@ libs_summary =3D { 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), 'curl': curl_dep.found(), + 'dbus': dbus_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index f0d5e05b469..957c88a1622 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,4 +17,5 @@ option('bash_completion_dir', type: 'string', value: '', = description: 'directory option('blkid', type: 'feature', value: 'auto', description: 'blkid suppor= t') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('curl', type: 'feature', value: 'auto', description: 'curl support') +option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893685; cv=none; d=zohomail.com; s=zohoarc; b=MkDexcakHA78E8nA0MRn09V0Vf5xVSPO98LduxtSgjnHy4rUlJrD5U99y88twJzd9AlbqUcQohv3bj+QVnzmwGkrtO6d1Y84LY/0FULze8OSJ8t8mW29MBTb56ozgLTIM1ZIMcDnUxJrc3hV2XiLM97SlGgM60C5xjKGEfgQYwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893685; 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=rxizR95qGhzK5WDu5/wO2df5eBdm1SNSZ7M9Kf6x7vM=; b=ORFIsuF5+y1BJWk5G47I7guND0bjX/GcwDjxALVY7cJVxg0bruNYuIDFAFeks2XhVMjRxsSmuHN7xeSEFeS2397ENygQ4vk7sIk5JkpUSJkGLKvyP8Y1bV9lloDc4FV6116eO0XvlIgUtEotxVvvBhn4hTDSOWm2t5sadQEtcKo= 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 1594893685629900.8039836325323; Thu, 16 Jul 2020 03:01:25 -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-157-No2Gv1VAN-y6rmMTH8ASVg-1; Thu, 16 Jul 2020 06:01:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAB0218A1DE8; Thu, 16 Jul 2020 10:01:16 +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 B7BCA7303B; Thu, 16 Jul 2020 10:01:16 +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 43889180476E; Thu, 16 Jul 2020 10:01:15 +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 06GA1Dhp015795 for ; Thu, 16 Jul 2020 06:01:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id E378D2E040; Thu, 16 Jul 2020 10:01:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 522822E035 for ; Thu, 16 Jul 2020 10:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893684; 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=rxizR95qGhzK5WDu5/wO2df5eBdm1SNSZ7M9Kf6x7vM=; b=fosFUzFBAoi7hJ8UsYKc69QcQYApJPEr1u6uHZkCXTCzuxAeHYD/SGD6L6vYiPCiB3Hdh7 cWvij9qIS04CSuXMn+lycnSvtJQQBEf9HgdnkCZjjzRcaE6iPd4goPG07scBSqlHYEnTXQ 9oAVWr3LMMFrCp434vcGQdw4a6EnXQU= X-MC-Unique: No2Gv1VAN-y6rmMTH8ASVg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 043/351] meson: add devmapper build dependency Date: Thu, 16 Jul 2020 11:54:39 +0200 Message-Id: <8469329fded859f5ef323610c99aa484b050c1bf.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.15 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 --- configure.ac | 1 - m4/virt-devmapper.m4 | 32 -------------------------------- meson.build | 13 +++++++++++++ 3 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-devmapper.m4 diff --git a/configure.ac b/configure.ac index 3499b372036..9bb397d8e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE diff --git a/m4/virt-devmapper.m4 b/m4/virt-devmapper.m4 deleted file mode 100644 index 165caa69685..00000000000 --- a/m4/virt-devmapper.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The devmapper library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_DEVMAPPER], [ - DEVMAPPER_REQUIRED=3D1.0.0 - - with_devmapper=3Dcheck - - LIBVIRT_CHECK_PKG([DEVMAPPER], [devmapper], [$DEVMAPPER_REQUIRED], []) - - if test "x$with_devmapper" =3D "xno"; then - # devmapper is missing pkg-config files in ubuntu, suse, etc - with_devmapper=3Dcheck - LIBVIRT_CHECK_LIB([DEVMAPPER], [devmapper], [dm_task_run], [libdevmapp= er.h]) - fi -]) diff --git a/meson.build b/meson.build index 081641c8617..01525c05055 100644 --- a/meson.build +++ b/meson.build @@ -1011,6 +1011,19 @@ if dbus_dep.found() endif endif =20 +devmapper_version =3D '1.0.0' +devmapper_dep =3D dependency('devmapper', version: '>=3D' + devmapper_vers= ion, required: false) +if not devmapper_dep.found() + # devmapper is missing pkg-config files in ubuntu, suse, etc + devmapper_dep =3D cc.find_library('devmapper', required: false) + if devmapper_dep.found() and not cc.has_function('dm_task_run', dependen= cies: tmp) + devmapper_dep =3D dependency('', required: false) + endif +endif +if devmapper_dep.found() + conf.set('WITH_DEVMAPPER', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893689; cv=none; d=zohomail.com; s=zohoarc; b=AdMfQioCNtSZXg/5texP0ZJdxQ3VDiDsybzh5kBFUX8lqLbo6lgUu6JfitlTVdDzL8Vgvne+ruHFXklscXt9eH6BVIQvGkkPnT4bGaKvBMb15DLqHjGNkdw/FSs2vJD5T7fJce8E9P30iIidkRjJuQfcIyG8Tz8knF1DsUH2yk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893689; 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=/HYwC/l/Tz/a7acKG4UHQ5KGarCDMd8ZhXGdsUXVw/o=; b=gDPIcQXnHxpdmRmH9eCJGacABQj6uFWpZ2bIKeXogEa2RQWGxSBV88/NaV28BvoO8kDRaCCjVG3mzjDfOENrsc7rN2wf70HC3ZcX8/sOaNUVZKI7dm1voCOqA/oiId8d98eygcIXNwSBXBukLJgr1fKeDx9L0M37a0FiLJzL0vg= 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 1594893689141998.7142060935898; Thu, 16 Jul 2020 03:01:29 -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-419-bmkTSFdgO-Kqc32e9qk89w-1; Thu, 16 Jul 2020 06:01:23 -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 2A45C18A1DE5; Thu, 16 Jul 2020 10:01:18 +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 04E5C70596; Thu, 16 Jul 2020 10:01:18 +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 C836E9623A; Thu, 16 Jul 2020 10:01:17 +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 06GA1E7R015802 for ; Thu, 16 Jul 2020 06:01:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D3B352B6DC; Thu, 16 Jul 2020 10:01:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 467232E040 for ; Thu, 16 Jul 2020 10:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893687; 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=/HYwC/l/Tz/a7acKG4UHQ5KGarCDMd8ZhXGdsUXVw/o=; b=TE4fzjLz5dprPdPEKIT2BSephU/KfJy2ydFhT3dql7ied3xATiFKAKfelWCPep8KuFsNc7 XZA3XcS9TW5ysFsjPVZNNNp03tjHe8/Kk4vcAYnYl7X1nxEJ0YeWi1OnRNWWHEJzPsIQf3 KEelQjOcdlXV/+nyVPvYod/Gzw9WEtY= X-MC-Unique: bmkTSFdgO-Kqc32e9qk89w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 044/351] meson: add dlopen build dependency Date: Thu, 16 Jul 2020 11:54:40 +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.12 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 --- configure.ac | 2 -- m4/virt-dlopen.m4 | 45 --------------------------------------------- meson.build | 10 ++++++++++ 3 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 m4/virt-dlopen.m4 diff --git a/configure.ac b/configure.ac index 9bb397d8e3e..0dc9dc3bcfb 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_DLOPEN LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE @@ -460,7 +459,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DLOPEN LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE diff --git a/m4/virt-dlopen.m4 b/m4/virt-dlopen.m4 deleted file mode 100644 index 412ce79adec..00000000000 --- a/m4/virt-dlopen.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl The dlopen library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_DLOPEN], [ - - with_dlopen=3Dyes - with_dlfcn=3Dyes - - AC_CHECK_HEADER([dlfcn.h],, [with_dlfcn=3Dno]) - AC_SEARCH_LIBS([dlopen], [dl],, [with_dlopen=3Dno]) - - case $ac_cv_search_dlopen:$host_os in - 'none required'* | *:mingw* | *:msvc*) - DLOPEN_LIBS=3D ;; - no*) - AC_MSG_ERROR([Unable to find dlopen()]) ;; - *) - if test "x$with_dlfcn" !=3D "xyes"; then - AC_MSG_ERROR([Unable to find dlfcn.h]) - fi - DLOPEN_LIBS=3D$ac_cv_search_dlopen ;; - esac - - AC_SUBST([DLOPEN_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DLOPEN], [ - LIBVIRT_RESULT_LIB([DLOPEN]) -]) diff --git a/meson.build b/meson.build index 01525c05055..31f4e730ce7 100644 --- a/meson.build +++ b/meson.build @@ -1024,6 +1024,15 @@ if devmapper_dep.found() conf.set('WITH_DEVMAPPER', 1) endif =20 +dlopen_use =3D host_machine.system() !=3D 'windows' +dlopen_dep =3D cc.find_library('dl', required: dlopen_use) +if dlopen_dep.found() + if not cc.has_header('dlfcn.h') + error('Unable to find dlfcn.h') + endif + conf.set('HAVE_DLFCN_H', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1142,6 +1151,7 @@ libs_summary =3D { 'capng': capng_dep.found(), 'curl': curl_dep.found(), 'dbus': dbus_dep.found(), + 'dlopen': dlopen_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893724; cv=none; d=zohomail.com; s=zohoarc; b=RJY3O71J6+RmXJzek+EqwfLpFKqSm+yX67LKkJNV+GlGDgpAK4vmKzsIKOgHnHKBgD81hcXTiPDYEZFqLkBDjWUn7TshU860jxZBhXohtoC61IRfSqaH2ta7FipV5BUQMJYFyINsmCFhrsV7arxNpN45Udt24bV8x4C5D59xp40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893724; 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=AxPEnL9Q+mkLe3QX6vq5R40h8esTNhhMDbiudme1SWo=; b=nuKelbGU1oCnZ6R1htufJ2wfJUkRAUHiHkKVUnYPZBFvkhWIe/iJ1E3DUdQUS8fH4mkDJxyNnZHRiWJ2PPqmxMHF2yg9l2x5PbmjzyVDRGYAgO7RKfIlTHNgne9fJkS+yq96GMJfROol6OUsSP2m4ym6orFwHKuzRcUWPQuV3LQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893724259225.15537311335083; Thu, 16 Jul 2020 03:02:04 -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-296-UG8WeJ5oMbCKO4c1Jy7K4g-1; Thu, 16 Jul 2020 06:01:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F29E8005B0; Thu, 16 Jul 2020 10:01:20 +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 5F309617A2; Thu, 16 Jul 2020 10:01:20 +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 26F3D1804771; Thu, 16 Jul 2020 10:01:20 +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 06GA1FSA015819 for ; Thu, 16 Jul 2020 06:01:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id C2F422E046; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 398172E035 for ; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893723; 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=AxPEnL9Q+mkLe3QX6vq5R40h8esTNhhMDbiudme1SWo=; b=OQGCK6FI3WBrzFdsVFjdSyfUFUJbMr04AKom3DZbKkJDHPTQpYLDb3+XXDaL5uF8bl16nF 1zXn9zvHjRH9W/z6NH2sSk14g7EVfWygctPaUZE3964RwOLb+IhTYWkhd+o64OCuGX1Y/x VJglgB20UbeQ0+d7ugjsWzd5PIzujQI= X-MC-Unique: UG8WeJ5oMbCKO4c1Jy7K4g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 045/351] meson: add firewalld build option Date: Thu, 16 Jul 2020 11:54:41 +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.16 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 --- configure.ac | 7 ------- m4/virt-firewalld.m4 | 43 ------------------------------------------- meson.build | 9 +++++++++ meson_options.txt | 1 + 4 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-firewalld.m4 diff --git a/configure.ac b/configure.ac index 0dc9dc3bcfb..825d14c6384 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,6 @@ if test $with_linux =3D no; then with_storage_scsi=3Dno fi =20 -if test $with_freebsd =3D yes; then - with_firewalld=3Dno -fi - =20 AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) @@ -114,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER @@ -141,7 +136,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB @@ -459,7 +453,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4 deleted file mode 100644 index 89efa47589b..00000000000 --- a/m4/virt-firewalld.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The firewalld support -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_FIREWALLD], [ - LIBVIRT_ARG_WITH_FEATURE([FIREWALLD], [firewalld], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [ - AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - - if test "x$with_firewalld" =3D "xcheck" ; then - with_firewalld=3D$with_dbus - fi - - if test "x$with_firewalld" =3D "xyes" ; then - if test "x$with_dbus" !=3D "xyes" ; then - AC_MSG_ERROR([You must have dbus enabled for firewalld support]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD], [1], [whether firewalld support i= s enabled]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD], [test "x$with_firewalld" !=3D "xno"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD], [ - LIBVIRT_RESULT_LIB([FIREWALLD]) -]) diff --git a/meson.build b/meson.build index 31f4e730ce7..385a959e88b 100644 --- a/meson.build +++ b/meson.build @@ -1122,6 +1122,14 @@ if bash_completion_dep.found() endif endif =20 +if host_machine.system() !=3D 'freebsd' + if not get_option('firewalld').disabled() and dbus_dep.found() + conf.set('WITH_FIREWALLD', 1) + elif get_option('firewalld').enabled() + error('You must have dbus enabled for firewalld support') + endif +endif + =20 # define top include directory =20 @@ -1152,6 +1160,7 @@ libs_summary =3D { 'curl': curl_dep.found(), 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), + 'firewalld': conf.has('WITH_FIREWALLD'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 957c88a1622..d9e614131cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,4 +18,5 @@ option('blkid', type: 'feature', value: 'auto', descripti= on: 'blkid support') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') +option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894743; cv=none; d=zohomail.com; s=zohoarc; b=QcT2QRpvZ/9TJtPRiCCVn4ozTjI+YRkFi7614Lop61njI+aaCO/BBuZLbBOMYa3yci0LlV/ZbepGnOJt5yT4umw387a7rggTQm5nR49ZT49HaVTQAEnnFViBxizh9lfOavejyhrxdpVRrMeqza7gz8oyeduIUMZ5gTXiiGjzGpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894743; 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=nXptoE0hVRi5qSnTFMcS8D7g8VKmCoASbw6LWc7EiSQ=; b=W6mZzVfMQbYdUHHsIhViahe6oeA9V6zKECpU06ZJV6W7bseWDdTJqSFuggLJGBQ1dD6zI7AU4QIPz04fZeM1h6SxYdknU1DYwrIWlMJxxRN++c0oEoVLXJeqdbjwaRh0JblcfJflVWxi2SbHOdhbqCaWl6I6GQ5ssFwQ3HQZi1Y= 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 1594894743641455.6535299121001; Thu, 16 Jul 2020 03:19:03 -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-366-PJ0Mygw4OSSivUN3kHUjQw-1; Thu, 16 Jul 2020 06:02:54 -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 15AC2804492; Thu, 16 Jul 2020 10:02:22 +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 E67321053B01; Thu, 16 Jul 2020 10:02:21 +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 B4FD796232; Thu, 16 Jul 2020 10:02:21 +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 06GA1Ivj015843 for ; Thu, 16 Jul 2020 06:01:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 291EC2E040; Thu, 16 Jul 2020 10:01:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9874A2E04F for ; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894742; 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=nXptoE0hVRi5qSnTFMcS8D7g8VKmCoASbw6LWc7EiSQ=; b=PUVS0JpY7yTfvpToXBnqrLrzqefL+eilO9td9qgqvB+R71J9UDlXsC2TV1b+vLEnw36M/I U4u66wJP4vXxbwbwSUhlZdS3bP3DXBQACCFFv6jGDdKOnq+djJ8Gv5o+9AtN6xedB8UtcG 6f8MGOMY5eH0WUsD2lMAptAH4qpd3ZE= X-MC-Unique: PJ0Mygw4OSSivUN3kHUjQw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 046/351] meson: add firewalld_zone build option Date: Thu, 16 Jul 2020 11:54:42 +0200 Message-Id: <849ef67827c11f067aa6afc292a1f462ef0cc1f8.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 --- configure.ac | 3 --- m4/virt-firewalld-zone.m4 | 45 --------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-firewalld-zone.m4 diff --git a/configure.ac b/configure.ac index 825d14c6384..086505d95f6 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL @@ -136,7 +135,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER @@ -453,7 +451,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER diff --git a/m4/virt-firewalld-zone.m4 b/m4/virt-firewalld-zone.m4 deleted file mode 100644 index b67d1a0b2fb..00000000000 --- a/m4/virt-firewalld-zone.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl firewalld_zone check - whether or not to install the firewall "libvirt= " zone -dnl -dnl Copyright (C) 2019 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_FIREWALLD_ZONE], [ - LIBVIRT_ARG_WITH([FIREWALLD_ZONE], [Whether to install firewalld libvirt= zone], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD_ZONE], [ - AC_REQUIRE([LIBVIRT_CHECK_FIREWALLD]) - AC_MSG_CHECKING([for whether to install firewalld libvirt zone]) - - if test "x$with_firewalld_zone" =3D "xcheck" ; then - with_firewalld_zone=3D$with_firewalld - fi - - if test "x$with_firewalld_zone" =3D "xyes" ; then - if test "x$with_firewalld" !=3D "xyes" ; then - AC_MSG_ERROR([You must have firewalld support enabled to enable fire= walld-zone]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD_ZONE], [1], [whether firewalld libv= irt zone is installed]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD_ZONE], [test "x$with_firewalld_zone" !=3D= "xno"]) - AC_MSG_RESULT($with_firewalld_zone) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD_ZONE], [ - LIBVIRT_RESULT([firewalld-zone], [$with_firewalld_zone]) -]) diff --git a/meson.build b/meson.build index 385a959e88b..573a414b846 100644 --- a/meson.build +++ b/meson.build @@ -1130,6 +1130,12 @@ if host_machine.system() !=3D 'freebsd' endif endif =20 +if not get_option('firewalld_zone').disabled() and conf.has('WITH_FIREWALL= D') + conf.set('WITH_FIREWALLD_ZONE', 1) +elif get_option('firewalld_zone').enabled() + error('You must have firewalld support enabled to enable firewalld_zone') +endif + =20 # define top include directory =20 @@ -1161,6 +1167,7 @@ libs_summary =3D { 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), + 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index d9e614131cd..75417751dd6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -19,4 +19,5 @@ option('capng', type: 'feature', value: 'auto', descripti= on: 'cap-ng support') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') +option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893759; cv=none; d=zohomail.com; s=zohoarc; b=daPjQBkhIsp8WTmtsL/YZss6DokZGN0El8rZjQg09h8qGtZHstQOGX+zoPm7VEmmaX/lZhCgJof80A7h6R4m7/Q2bFx1+eStHhmUZunH1gDjbV23kKKOxFFWzCTX8B4cD1KQk29ju4xhijBXUbiMvUEF9u/pYcL8hsun4Zfh7Xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893759; 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=vTJWMTCuZhnExA4kl3ZZLHpDsyJS9bPhpHNR891ZUDA=; b=RX6S2MTQc6/92awsD7jlUhZYrl+H6fjy1iuUMDN9h9SmkHaZTtv/fDAwg2VO6eymnugRfsA0Vy5PF0h5wJ7WzfxqZgDbKXc8KFXjUvuqv3HgtMLbFvgY70P1bXI7nOHuaqFFFHOuzqX4gDHWVb9ud+8RXTp7/DXwc8XfqPCUAQg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893759705698.8008560783745; Thu, 16 Jul 2020 03:02:39 -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-378-GziTP9uzPaCvX--1Qo3mTQ-1; Thu, 16 Jul 2020 06:01:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4756F10059A9; Thu, 16 Jul 2020 10:01:24 +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 244E72E052; Thu, 16 Jul 2020 10:01:24 +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 B5EDD1804776; Thu, 16 Jul 2020 10:01:23 +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 06GA1MK1015923 for ; Thu, 16 Jul 2020 06:01:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90D812E046; Thu, 16 Jul 2020 10:01:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A3B52E040 for ; Thu, 16 Jul 2020 10:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893758; 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=vTJWMTCuZhnExA4kl3ZZLHpDsyJS9bPhpHNR891ZUDA=; b=ha9mKorPWUTmngoajyiJdIkzvhhwHWeLbwfWdJB6231o0MkFL9CxAMvzzZhKxsZccjkg9q nXT4amJDEfGx9ZmNyjEDHtRR2GrzlDFQ3Q/SIOMx3HOH8y6KzKxuuvs/mSW1cOEWN8poNc v050sZd3wIm5EMXVfx/L5oTToSDtb5s= X-MC-Unique: GziTP9uzPaCvX--1Qo3mTQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 047/351] meson: add fuse build dependency Date: Thu, 16 Jul 2020 11:54:43 +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.84 on 10.5.11.23 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 --- configure.ac | 3 --- m4/virt-fuse.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-fuse.m4 diff --git a/configure.ac b/configure.ac index 086505d95f6..b136bf6a4cd 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI @@ -135,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS @@ -451,7 +449,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4 deleted file mode 100644 index cc5726fe646..00000000000 --- a/m4/virt-fuse.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libfuse.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_FUSE],[ - LIBVIRT_ARG_WITH_FEATURE([FUSE], [fuse], [check], [2.8.6]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FUSE],[ - LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6]) -]) - -AC_DEFUN([LIBVIRT_RESULT_FUSE],[ - LIBVIRT_RESULT_LIB([FUSE]) -]) diff --git a/meson.build b/meson.build index 573a414b846..7ed5a0218f9 100644 --- a/meson.build +++ b/meson.build @@ -1033,6 +1033,12 @@ if dlopen_dep.found() conf.set('HAVE_DLFCN_H', 1) endif =20 +fuse_version =3D '2.8.6' +fuse_dep =3D dependency('fuse', version: '>=3D' + fuse_version, required: = get_option('fuse')) +if fuse_dep.found() + conf.set('WITH_FUSE', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1168,6 +1174,7 @@ libs_summary =3D { 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), + 'fuse': fuse_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 75417751dd6..9aae950b8ca 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,4 +20,5 @@ option('curl', type: 'feature', value: 'auto', descriptio= n: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') +option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893704; cv=none; d=zohomail.com; s=zohoarc; b=HZ//BDy0ouCG+VBqeaSmrkMaJpCXhc3rgMcnavlNzt4r5eMFfFEycLAxceveMuY/pLlemanXVAtTNur6ZBkQh1Cg6y+m8ymRtZOOlaG4wFBnWMSUYME+Hun9VL8A8K/aUwHq9QasdJ8XG/w2FgEzZ+W8yYNPWtuKRBzEEHiOpG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893704; 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=3GCqEhKRRLc2E/R0QgMYbi7w0q8Uf1hK+8UZtrZVrI8=; b=iYuVyS+pwSnLoQynlxlxyinqNQGZk9+AoreDqc/MkR3sDjL0OBiaiGy7hYGbEDDvjG3tSZaAyCSwi/Nuzx56PoyKIHIFcd2NBxZGzGAMQZgVyquzSEuJ+T/CzkoiflxsNKf3GtjBth/h7zKGC6doj2zvyX4c1EtAgHy9YKN3Hz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893704496258.7059180224726; Thu, 16 Jul 2020 03:01:44 -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-402-r5GoKp2jPEa09PkIyvUwUw-1; Thu, 16 Jul 2020 06:01:32 -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 B18A510059AA; Thu, 16 Jul 2020 10:01:26 +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 8DDB170A13; Thu, 16 Jul 2020 10:01:26 +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 5B8BD96251; Thu, 16 Jul 2020 10:01:26 +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 06GA1OCX015940 for ; Thu, 16 Jul 2020 06:01:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 900892E040; Thu, 16 Jul 2020 10:01:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 080BA2E03A for ; Thu, 16 Jul 2020 10:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893703; 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=3GCqEhKRRLc2E/R0QgMYbi7w0q8Uf1hK+8UZtrZVrI8=; b=Oa6dhdoeg2ooAiFh3NxEymyqfo2vCHvtjrLoXp0iG7yzL3mtp/fqI8zc91BMQiUNxCQSnX ri4gTaYmlYCzSO9Ef7u+n8xPVW1L+XaIvNuvYnUmvV6yqxh/o1sccNXpvTtFfio7PGQafO clyatofqmlQ3LQ/v8ehG1Yc9A7Y/ROw= X-MC-Unique: r5GoKp2jPEa09PkIyvUwUw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 048/351] meson: add GLib dependency Date: Thu, 16 Jul 2020 11:54:44 +0200 Message-Id: <844fba94deedb8bc99aeec91f685a5a040a49dde.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 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 --- configure.ac | 2 -- m4/virt-glib.m4 | 36 ------------------------------------ meson.build | 9 +++++++++ 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 m4/virt-glib.m4 diff --git a/configure.ac b/configure.ac index b136bf6a4cd..0a8a0221206 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL @@ -449,7 +448,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL diff --git a/m4/virt-glib.m4 b/m4/virt-glib.m4 deleted file mode 100644 index 03e51711c0c..00000000000 --- a/m4/virt-glib.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The glib.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_GLIB], [ - LIBVIRT_ARG_WITH([GLIB], [glib-2.0 location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLIB],[ - GLIB_REQUIRED=3D2.48.0 - - LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0 gio-2.0], [$GLIB_REQUIRE= D]) - - if test "$with_glib" =3D "no" ; then - AC_MSG_ERROR([glib-2.0, gobject-2.0 >=3D $GLIB_REQUIRED are required f= or libvirt]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_GLIB], [ - LIBVIRT_RESULT_LIB([GLIB]) -]) diff --git a/meson.build b/meson.build index 7ed5a0218f9..132d887be2a 100644 --- a/meson.build +++ b/meson.build @@ -1039,6 +1039,14 @@ if fuse_dep.found() conf.set('WITH_FUSE', 1) endif =20 +glib_version =3D '2.48.0' +glib_dep =3D dependency('glib-2.0', version: '>=3D' + glib_version) +gobject_dep =3D dependency('gobject-2.0', version: '>=3D' + glib_version) +gio_dep =3D dependency('gio-2.0', version: '>=3D' + glib_version) +glib_dep =3D declare_dependency( + dependencies: [ glib_dep, gobject_dep, gio_dep ], +) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1175,6 +1183,7 @@ libs_summary =3D { 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), + 'glib_dep': glib_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893778; cv=none; d=zohomail.com; s=zohoarc; b=j5KE5KSTM8cHz4N/4c7ICkldyfUcFQAkXexrzHyHCqKoxFdVsClac7jAHvd8GAdtUWV8i4GimzZUryxyze3Jpk4s+/059hyVICqTvnt+cI11u+VXNnfnzbdWVmWhV8Gguq2Ju32p+qktYdFwpsu4a80SumQw87x/eE7Okq1Ky84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893778; 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=nrO/zxOqT2othhpOUpBSKn/B+HrfUpj9Y/A3GhhNU00=; b=dISocitwZYRs6wqjcch8t3nG+YgT5/7eoX7D3B5kDyqpMOrCemR8QC0N28AuqoMmg8K/AR0jZJwTUYR0TGy7Jr7X1XOtgj0IRHNWMKavov7arn/Qglpv3/B+VHPLDhGs3lT0Tv74bbr2kAArvkz/OVulBtuo/0s5E6HdQMxBsn0= 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 1594893778600407.7209957736595; Thu, 16 Jul 2020 03:02:58 -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-119-ME56UilcM-ip39jdjyfz6A-1; Thu, 16 Jul 2020 06:02:53 -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 72B1C891224; Thu, 16 Jul 2020 10:02:24 +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 4E01D61982; Thu, 16 Jul 2020 10:02:24 +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 1D99F96232; Thu, 16 Jul 2020 10:02:24 +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 06GA1pxu016063 for ; Thu, 16 Jul 2020 06:01:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA1162B6DB; Thu, 16 Jul 2020 10:01:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 217C32E040 for ; Thu, 16 Jul 2020 10:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893777; 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=nrO/zxOqT2othhpOUpBSKn/B+HrfUpj9Y/A3GhhNU00=; b=FJrHuhOMA9zhfwYZXpVCtRgncSTsfcx2r20qhHdtjPrRowiWXT0DGaeHuLVIAOhm20G/bZ frDmZNxE9mS6q6vWyfubbYpb/YISx+BEJxv6UUKVg8Q+av+oi+P+OCngH0agaqjXMY+/ru sf3WjGz8Nf+Ix0YMl9cvmLuYo4kU8RQ= X-MC-Unique: ME56UilcM-ip39jdjyfz6A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 049/351] meson: add glusterfs build dependency Date: Thu, 16 Jul 2020 11:54:45 +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.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 --- configure.ac | 3 --- m4/virt-gluster.m4 | 32 -------------------------------- meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 m4/virt-gluster.m4 diff --git a/configure.ac b/configure.ac index 0a8a0221206..fa9fecccc73 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP @@ -134,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI @@ -448,7 +446,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4 deleted file mode 100644 index 7edff40047f..00000000000 --- a/m4/virt-gluster.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The gluster libgfapi.so library -dnl -dnl Copyright (C) 2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier -dnl versions may be possible but only with further testing -AC_DEFUN([LIBVIRT_ARG_GLUSTER],[ - LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[ - LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_RESULT_GLUSTER],[ - LIBVIRT_RESULT_LIB([GLUSTERFS]) -]) diff --git a/meson.build b/meson.build index 132d887be2a..4ee7031b32c 100644 --- a/meson.build +++ b/meson.build @@ -1047,6 +1047,9 @@ glib_dep =3D declare_dependency( dependencies: [ glib_dep, gobject_dep, gio_dep ], ) =20 +glusterfs_version =3D '3.4.1' +glusterfs_dep =3D dependency('glusterfs-api', version: '>=3D' + glusterfs_= version, required: get_option('glusterfs')) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1184,6 +1187,7 @@ libs_summary =3D { 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), + 'glusterfs': glusterfs_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 9aae950b8ca..cc3e5bbabab 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,4 +21,5 @@ option('dbus', type: 'feature', value: 'auto', descriptio= n: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') +option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893751; cv=none; d=zohomail.com; s=zohoarc; b=f1gRlfCvVfq6S3V84wuCag54O/Wr83Lj+k1IlfV8TPAmnTt0dd1NCkgow+SEyEjo6QKTGmw7W/QQpdq/g+Yzsk5Sf613yraPzy79U8Kduq62KCgAzDRjq4MgStggVmf75Y9/yR+u0RDITZPp4sBCVgC8CLG60+FPzv1zbEC/GB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893751; 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=TsbMW8vwuXhCSjulibdP0QuUHXd3mlSmkFG+qk8xJDM=; b=eOfOKBXyInJXHay0eZBBKlpeLQ45FadzKoEGU8XhcvwRApSWFjbwXnhGCDfjtR3F36bcqh0AR4FleyiMjxI7MXi0zjplWIrBLhs3pTTeXjom1OYSiM+5PMip44a+7Yc21qFBoLnSPLWdGGy+fdZbQNfrli70jNXiwJXnoxrlysI= 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 1594893751009431.6273064780362; Thu, 16 Jul 2020 03:02:31 -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-455-0FspXCThPiKWIYUMnEHkvw-1; Thu, 16 Jul 2020 06:02:27 -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 32F83ED83; Thu, 16 Jul 2020 10:02:01 +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 8D914872F3; Thu, 16 Jul 2020 10:02:00 +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 56AC31809554; Thu, 16 Jul 2020 10:02:00 +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 06GA1x4l016088 for ; Thu, 16 Jul 2020 06:01:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05C482E05A; Thu, 16 Jul 2020 10:01:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52ABE2E046 for ; Thu, 16 Jul 2020 10:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893749; 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=TsbMW8vwuXhCSjulibdP0QuUHXd3mlSmkFG+qk8xJDM=; b=bCYqVav2oisNXfCAi5nUftxA41ADFPiXPeC13pIMIePfPCcEe7rGVBjWXInRGhHSj/RDD6 7IbkTPJXl5fwnw2/x2cmbstVqCCFKWpVew5W/arjoWf1JL59ZKAYZKkQ1T/zCIfH2BKqQe sV3cN8InkenjpoDmYn8jyM0oD3QCE3I= X-MC-Unique: 0FspXCThPiKWIYUMnEHkvw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 050/351] meson: add GnuTLS build dependency Date: Thu, 16 Jul 2020 11:54:46 +0200 Message-Id: <8264e110f45ac083bbb7a483e2ad75e6e0faaf82.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.13 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 --- configure.ac | 2 -- m4/virt-gnutls.m4 | 30 ------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 m4/virt-gnutls.m4 diff --git a/configure.ac b/configure.ac index fa9fecccc73..de31d11e63b 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL @@ -446,7 +445,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 deleted file mode 100644 index 6829ca55cf5..00000000000 --- a/m4/virt-gnutls.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The gnutls libgnutls.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ - LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [3.2.0]) - - dnl Require gnutls >=3D 3.2.0 because of 3.2.11 in Ubuntu 14.04 - dnl That should have all the functions we use (in >=3D 2.12) - dnl and also use nettle, because it's >=3D 3.0 -]) - -AC_DEFUN([LIBVIRT_RESULT_GNUTLS],[ - LIBVIRT_RESULT_LIB([GNUTLS]) -]) diff --git a/meson.build b/meson.build index 4ee7031b32c..5a9e9f26db1 100644 --- a/meson.build +++ b/meson.build @@ -1050,6 +1050,9 @@ glib_dep =3D declare_dependency( glusterfs_version =3D '3.4.1' glusterfs_dep =3D dependency('glusterfs-api', version: '>=3D' + glusterfs_= version, required: get_option('glusterfs')) =20 +gnutls_version =3D '3.2.0' +gnutls_dep =3D dependency('gnutls', version: '>=3D' + gnutls_version) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1188,6 +1191,7 @@ libs_summary =3D { 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), + 'gnutls': gnutls_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895403; cv=none; d=zohomail.com; s=zohoarc; b=a3q4wsjgpgj7yG6wjWDt+HlV/zqWu90E+wGiUPRb2JJtdpfx0RBFOYpl1CoEybvnHFTvDdiy59LGiSpv6XriWLy1nsVxNCsJP9eyP6cXoUd2AUiv/75QpwTsPOV8YEpUTv3OecySY1RvqQpZJhsylw1MLffv+wIP0px/7scTiRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895403; 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=DIeRXOwJVF6L0HsC6h92f+0T1znDU2DHkk4LXFKBibI=; b=cyluV0pg0a/eE3snT52ZsmG8IJ7nhJs8dVlV6M6TQ4LLJzPYfEpbYKbSZQc9i6kVlXMPYo/6yDPNRTLXTz+22RAr3aHHk5HZ/3cIr4NbDXqKKYtV67wzYUzTYU69aFc98w/v1W2q7NX5OFi8OM6BM/JWFqUh3s84trpUyX7u2d0= 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 1594895403218188.58252258137736; Thu, 16 Jul 2020 03:30:03 -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-271-QMgJZm4lPFKFJezfadVxyg-1; Thu, 16 Jul 2020 06:02:30 -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 905A58B429D; Thu, 16 Jul 2020 10:02: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 63EF477351; Thu, 16 Jul 2020 10:02: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 2D5D31809554; Thu, 16 Jul 2020 10:02: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 06GA205i016103 for ; Thu, 16 Jul 2020 06:02:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E88A82B6E6; Thu, 16 Jul 2020 10:02:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6265D2B6DB for ; Thu, 16 Jul 2020 10:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895401; 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=DIeRXOwJVF6L0HsC6h92f+0T1znDU2DHkk4LXFKBibI=; b=dDLC99JIBZOaNUCii9teUGNyTOHRXpCuvEyXZy2qGcCVM4ps2EaC/nFK8UTEz39YHwCiar 3KIr6qn72ID9N4sCpIDAEqupQR7h4oXAZA3liggfn08bXbc0Z5US7Xwl0opANGe31zniIu LEoinGzMk1PLYWQvKBuzf2TZ/v+ez7U= X-MC-Unique: QMgJZm4lPFKFJezfadVxyg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 051/351] meson: add hal build dependency Date: Thu, 16 Jul 2020 11:54:47 +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.12 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 --- configure.ac | 3 --- m4/virt-hal.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-hal.m4 diff --git a/configure.ac b/configure.ac index de31d11e63b..5a37af6f27f 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH @@ -133,7 +132,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED @@ -445,7 +443,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4 deleted file mode 100644 index e37bbf979b4..00000000000 --- a/m4/virt-hal.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libhal.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_HAL],[ - LIBVIRT_ARG_WITH_FEATURE([HAL], [hal], [check], [0.5.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_HAL],[ - LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_HAL],[ - LIBVIRT_RESULT_LIB([HAL]) -]) diff --git a/meson.build b/meson.build index 5a9e9f26db1..ef76c2fad07 100644 --- a/meson.build +++ b/meson.build @@ -1053,6 +1053,12 @@ glusterfs_dep =3D dependency('glusterfs-api', versio= n: '>=3D' + glusterfs_version, r gnutls_version =3D '3.2.0' gnutls_dep =3D dependency('gnutls', version: '>=3D' + gnutls_version) =20 +hal_version =3D '0.5.0' +hal_dep =3D dependency('hal', version: '>=3D' + hal_version, required: get= _option('hal')) +if hal_dep.found() + conf.set('WITH_HAL', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1192,6 +1198,7 @@ libs_summary =3D { 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), + 'hal': hal_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index cc3e5bbabab..9ba8ad0dd83 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,4 +22,5 @@ option('firewalld', type: 'feature', value: 'auto', descr= iption: 'firewalld supp option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') +option('hal', type: 'feature', value: 'auto', description: 'hal support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893972; cv=none; d=zohomail.com; s=zohoarc; b=kaghgZU2PNM/DdKj8rVEWfHflFP0enJGL/+7iFJ3+A/2XxjR8v2fsOJeCyYAz/iMGBo275A2zw2FqVXACSSImE5d5ZCy8OO4haYDX+pGNkw87asCYdjvaIskR/U8Mjt9vFHaC0+9LwrxJM7bcLMiJoOmuflB5PvGyInUO9QlUUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893972; 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=IQZlSXImvYgeDqofDVBjHdKjr27uITPN5cvafgNp9A4=; b=gfWWGOJsEcAmJbmm+Tt3NSRxNKiFGJqLnw5RVOoZixz2wnr5m+aaGZgJLwVaAKPHCuWwsYGCRSs/j8AeDAWBeuz55i3dQWMTg2D2vHAKx//Quz/SWIhy5hnBWYBp+mj/2hB7M2ocjjyRGRg4utmJnKvUj50n319Rvs3mRyUrSus= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893972768623.8344885175254; Thu, 16 Jul 2020 03:06: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-17-DlquDfeaPGKpUTc-Iu-DVA-1; Thu, 16 Jul 2020 06:02:36 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D13B8039FD; Thu, 16 Jul 2020 10:02:06 +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 E323B6FED1; Thu, 16 Jul 2020 10:02:05 +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 AF3BE1809554; Thu, 16 Jul 2020 10:02:05 +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 06GA21CA016110 for ; Thu, 16 Jul 2020 06:02:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id EF95C2B6E6; Thu, 16 Jul 2020 10:02:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66F612B6DB for ; Thu, 16 Jul 2020 10:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893971; 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=IQZlSXImvYgeDqofDVBjHdKjr27uITPN5cvafgNp9A4=; b=G6ZBnuWuZvQgk43hLc7pswQR45fOCX5r35W3cs75B3T6iq1VqTxBCFgqQiAiOmWbHdDFQ4 1CQEzaRbWIqZ+0g7EIQNgP+xF1S6TkQmyYDL7W3lSenhmzIj4ttSFdipquqQzR3gWInEup 1Rcgno6h8RPaX6A/NaWAkMhCxGCIljc= X-MC-Unique: DlquDfeaPGKpUTc-Iu-DVA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 052/351] meson: add kvm build dependency Date: Thu, 16 Jul 2020 11:54:48 +0200 Message-Id: <73dcf63469c4451d82e39c963a86905e8967f2d7.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.11 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 --- configure.ac | 7 ------- meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 5a37af6f27f..3726854d524 100644 --- a/configure.ac +++ b/configure.ac @@ -361,13 +361,6 @@ fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" =3D "yes"]) =20 =20 -# Check for BSD kvm (kernel memory interface) -if test $with_freebsd =3D yes; then - AC_CHECK_LIB([kvm], [kvm_getprocs], [], - [AC_MSG_ERROR([BSD kernel memory interface library is re= quired to build on FreeBSD])] - ) -fi - GNUmakefile=3DGNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/meson.build b/meson.build index ef76c2fad07..62529932518 100644 --- a/meson.build +++ b/meson.build @@ -1059,6 +1059,12 @@ if hal_dep.found() conf.set('WITH_HAL', 1) endif =20 +# Check for BSD kvm (kernel memory interface) +if host_machine.system() =3D=3D 'freebsd' + kvm_dep =3D cc.find_library('kvm') + add_project_link_arguments('-lkvm', language: 'c') +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893769; cv=none; d=zohomail.com; s=zohoarc; b=NKScaZMOmukc4eI5+4zpCeqPYULv734NYiavEvtlbqLbCJAHmaz0samfE8BL2dWJrDOaw6z2v2HtHdHKFUwpP0rBqAQEH2mkANRESBxgLbgETGPfbYm8QiQeAFMNyoo6Un7PsUXE+QKQF1inmqhX1fuiCKwfUnNeinB9CTVaep4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893769; 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=37D8z6i20AWyJ4ArDST92Q2HItswvsW0dh7nglQICjU=; b=daJs9f1HMnGqPvr0dRSpJ+hov+Ef1hJBw1ceCX04nnPC3OXQd8GQqHbg4yczgf07sDdRqx7y8QAFSqo64TElHrJPV418Qb/12lOdDqE64huJFiQfP7YRhKT5BjgQiNbg8WKTwNFeq3+okDE/u624CNipF+BXB22esTMYZa5uDf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893769301691.8712731762507; Thu, 16 Jul 2020 03:02:49 -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-166-nSb1LGtgPsme9IKJTl5Epg-1; Thu, 16 Jul 2020 06:02:44 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2086698F3; Thu, 16 Jul 2020 10:02:08 +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 7A61673028; Thu, 16 Jul 2020 10:02:08 +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 2C84C96222; Thu, 16 Jul 2020 10:02:08 +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 06GA24eu016148 for ; Thu, 16 Jul 2020 06:02:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 17C4C2B6E6; Thu, 16 Jul 2020 10:02:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 841D22B6DB for ; Thu, 16 Jul 2020 10:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893768; 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=37D8z6i20AWyJ4ArDST92Q2HItswvsW0dh7nglQICjU=; b=FenwwubmWC2h/GfHdVBURo2BRdr7+/ReZ3CIDr8VYd3K4Pz8bko68Dm70FbOAS1mbpj453 VgZ0PTwWsHb6OOVxAr5aYQvWT9+10/vgXP5YaaA91LP3mNLvy5RrO4TfkWsbptdwerVJOY iFUveJtvCKVTtOIbk0hCkvosg7Ngbuo= X-MC-Unique: nSb1LGtgPsme9IKJTl5Epg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 053/351] meson: add libiscsi build dependency Date: Thu, 16 Jul 2020 11:54:49 +0200 Message-Id: <562cebfe72f1a7505a98a2c3778597648a0679b9.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.15 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 --- configure.ac | 3 --- m4/virt-libiscsi.m4 | 30 ------------------------------ meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-libiscsi.m4 diff --git a/configure.ac b/configure.ac index 3726854d524..b74cb72db4a 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML @@ -132,7 +131,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP @@ -436,7 +434,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH diff --git a/m4/virt-libiscsi.m4 b/m4/virt-libiscsi.m4 deleted file mode 100644 index 2747f00ec4e..00000000000 --- a/m4/virt-libiscsi.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl Libiscsi library -dnl -dnl Copyright (C) 2018 Clementine Hayat. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_LIBISCSI],[ - LIBVIRT_ARG_WITH_FEATURE([LIBISCSI], [libiscsi], [check], [1.18.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBISCSI],[ - LIBVIRT_CHECK_PKG([LIBISCSI], [libiscsi], [1.18.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBISCSI],[ - LIBVIRT_RESULT_LIB(LIBISCSI) -]) diff --git a/meson.build b/meson.build index 62529932518..9d43be1375c 100644 --- a/meson.build +++ b/meson.build @@ -1065,6 +1065,9 @@ if host_machine.system() =3D=3D 'freebsd' add_project_link_arguments('-lkvm', language: 'c') endif =20 +libiscsi_version =3D '1.18.0' +libiscsi_dep =3D dependency('libiscsi', version: '>=3D' + libiscsi_version= , required: get_option('libiscsi')) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1205,6 +1208,7 @@ libs_summary =3D { 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), 'hal': hal_dep.found(), + 'libiscsi': libiscsi_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 9ba8ad0dd83..c06e6ee9256 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,4 +23,5 @@ option('firewalld_zone', type: 'feature', value: 'auto', = description: 'whether t option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('hal', type: 'feature', value: 'auto', description: 'hal support') +option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893825; cv=none; d=zohomail.com; s=zohoarc; b=W4FjbyNe9+BdkItNDKDUg/XdUMuufEfSwsreMjdYgZTEv7uGSXwcHEiz+QXx47NeneBSSMcN8UA4Rwwyvk+GBtb/BrtXcZvrA8jpGJnyLWEHTmwBNl2vA5iRA/KBdlkhdf/+ckBVA2Rd8K1hQemc7IB5ugcBF9C5JqUeJE0w+ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893825; 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=2IHj7ZY6xS9WZpLpiNHJLkHwqG3Acei3L8Vt6duVAyk=; b=f6ImZQgLzsqkgy93Co6TQf/Cf5ksUEsgjS5BbJbiKID7y/EbfsSHswFgxdwttcNhkaPm8x8XSiyzOZasDPwXBGFZkjRUAtmP3UZR9z8PYNK7k1Z9v6Dg/Sqc+UR0t86/e9OxggQPGv2NiQ1tj60jnmBKdk+2tdLQRWEUOttvuqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 159489382563516.50064515679253; Thu, 16 Jul 2020 03:03:45 -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-167-hPavLMG8MQ6mVMBM6k67ug-1; Thu, 16 Jul 2020 06:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E0CE803CFF; Thu, 16 Jul 2020 10:02:11 +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 0974578A58; Thu, 16 Jul 2020 10:02:11 +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 8752D1809557; Thu, 16 Jul 2020 10:02:10 +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 06GA25R9016154 for ; Thu, 16 Jul 2020 06:02:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BCDA2B6DB; Thu, 16 Jul 2020 10:02:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 773B02B6E6 for ; Thu, 16 Jul 2020 10:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893824; 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=2IHj7ZY6xS9WZpLpiNHJLkHwqG3Acei3L8Vt6duVAyk=; b=bfePtc9sDHEPwMxtaEFxceg4C0l+xh7DI27RsH2Le4JxrtJiZR10ANBJCTu2JwYM/adnxD KAzysDD/qclGe0Bv/Cn/r+bYlFAombthvoLzE5Gwfi1qdLXC+bpHDkEDFr+FQ4uJGsnam3 tdFISp5TDiD37FyldFQ+xgq4tXIN2Fs= X-MC-Unique: hPavLMG8MQ6mVMBM6k67ug-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 054/351] meson: add macvtap build option Date: Thu, 16 Jul 2020 11:54:50 +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.14 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 --- configure.ac | 3 --- m4/virt-macvtap.m4 | 56 ---------------------------------------------- meson.build | 20 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 21 insertions(+), 59 deletions(-) delete mode 100644 m4/virt-macvtap.m4 diff --git a/configure.ac b/configure.ac index b74cb72db4a..456e60e62bc 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,6 @@ fi LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML -LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS @@ -136,7 +135,6 @@ LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML -LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL @@ -439,7 +437,6 @@ LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML -LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS diff --git a/m4/virt-macvtap.m4 b/m4/virt-macvtap.m4 deleted file mode 100644 index c5da96ecf2f..00000000000 --- a/m4/virt-macvtap.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl The macvtap support -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_MACVTAP], [ - LIBVIRT_ARG_WITH([MACVTAP], [enable macvtap device], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_MACVTAP], [ - AC_MSG_CHECKING([whether to compile with macvtap support]) - if test "$with_macvtap" !=3D "no" ; then - AC_TRY_COMPILE([ #include - #include ], - [ int x =3D MACVLAN_MODE_BRIDGE; - int y =3D IFLA_VF_MAX; ], - [ with_macvtap=3Dyes ], - [ if test "$with_macvtap" =3D "yes" ; then - AC_MSG_ERROR([Installed linux headers don't show su= pport for macvtap device.]) - fi - with_macvtap=3Dno ]) - if test "$with_macvtap" =3D "yes" ; then - val=3D1 - else - val=3D0 - fi - AC_DEFINE_UNQUOTED([WITH_MACVTAP], $val, [whether macvtap support is e= nabled]) - fi - AM_CONDITIONAL([WITH_MACVTAP], [test "$with_macvtap" =3D "yes"]) - AC_MSG_RESULT([$with_macvtap]) - - if test "$with_macvtap" =3D yes; then - AC_CHECK_DECLS([MACVLAN_MODE_PASSTHRU], [], [], [[ - #include - #include - ]]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_MACVTAP], [ - LIBVIRT_RESULT_LIB([MACVTAP]) -]) diff --git a/meson.build b/meson.build index 9d43be1375c..ce3dbca83e0 100644 --- a/meson.build +++ b/meson.build @@ -1068,6 +1068,25 @@ endif libiscsi_version =3D '1.18.0' libiscsi_dep =3D dependency('libiscsi', version: '>=3D' + libiscsi_version= , required: get_option('libiscsi')) =20 +use_macvtap =3D false +if not get_option('macvtap').disabled() + if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and + cc.has_header_symbol('linux/if_link.h', 'IFLA_VF_MAX')) + use_macvtap =3D true + endif + + if get_option('macvtap').enabled() and not use_macvtap + error('Installed linux headers don\'t show support for macvtap device.= ') + endif +endif +if use_macvtap + conf.set('WITH_MACVTAP', 1) + + if cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_PASSTHRU') + conf.set('HAVE_DECL_MACVLAN_MODE_PASSTHRU', 1) + endif +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1209,6 +1228,7 @@ libs_summary =3D { 'gnutls': gnutls_dep.found(), 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), + 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index c06e6ee9256..44e756bdcf3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,4 +24,5 @@ option('fuse', type: 'feature', value: 'auto', descriptio= n: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') +option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893986; cv=none; d=zohomail.com; s=zohoarc; b=EDdpgivNdzGmcCffieA3mSlVegLRvkdJiYJ27xqnZrqqFo8G13O+WVL6RD2z+mcfeYn2+UorwZgkpU62EqVyFbcMq1hTScvRcqv9rlPXaOI4PnjXfISlXfr5kqi32krwyvWOGDlpfklYDP0yQKDEc9shP8covC1Dl3NyDYgKDAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893986; 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=IZHCg/aqlRHAHe0I8ZFNXjutPu4Cw3tqkYdpMYnQRWI=; b=eLgaOl4VK2VUNMEf8Ajn0vk86gWpkI0IAiWorf44oqqE/Bcrpn3XqjsHNINwABmtHlbcX+rkwxUQvsJ1TPpmFyT2aKrPL1yByp8fKDT2KSKuinC7wwiwxlZMmyNn2iV5ftRPDal/H2IRG+wjEOt/JgJ6KTGcfHuJ2i4qFncwPNU= 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 1594893986636619.663541390379; Thu, 16 Jul 2020 03:06:26 -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-244-G9WeoA4cM36hPfOXdpZBNA-1; Thu, 16 Jul 2020 06:02: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 C0D39800480; Thu, 16 Jul 2020 10:02:13 +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 9B2EE1001B07; Thu, 16 Jul 2020 10:02:13 +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 6640196222; Thu, 16 Jul 2020 10:02:13 +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 06GA28tx016177 for ; Thu, 16 Jul 2020 06:02:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18A50341FA; Thu, 16 Jul 2020 10:02:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EF772B6DB for ; Thu, 16 Jul 2020 10:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893985; 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=IZHCg/aqlRHAHe0I8ZFNXjutPu4Cw3tqkYdpMYnQRWI=; b=FiZSz45psdN04KBEpOdHTtu+xmPXfSphZBRlBY8+9H1jSTpPhJaVn9MNGH6FAPsbKYqzHa 9eC7a3nwKdpb3LI0jWfQs7gZn74u6JtUVmWClJa8rbqyPTzKeT51RiUMKcuUuPDIt9Ggd/ mupCXERJV3eIXBif40SoMvLy4whckzE= X-MC-Unique: G9WeoA4cM36hPfOXdpZBNA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 055/351] meson: add libnl build dependency Date: Thu, 16 Jul 2020 11:54:51 +0200 Message-Id: <3cbdbdb3b0379f991c1e1b00cbe58eb4f0d52597.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 --- configure.ac | 2 -- m4/virt-libnl.m4 | 47 ----------------------------------------------- meson.build | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 m4/virt-libnl.m4 diff --git a/configure.ac b/configure.ac index 456e60e62bc..755fe0073f0 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBNL LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH @@ -432,7 +431,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBNL LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL diff --git a/m4/virt-libnl.m4 b/m4/virt-libnl.m4 deleted file mode 100644 index cd780cf90e7..00000000000 --- a/m4/virt-libnl.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libnl library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_LIBNL], [ - AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) - - with_libnl=3Dno - - if test "$with_linux" =3D "yes"; then - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - with_libnl=3Dyes - AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is availab= le]) - PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0]) - LIBNL_CFLAGS=3D"$LIBNL_CFLAGS $LIBNL_ROUTE_CFLAGS" - LIBNL_LIBS=3D"$LIBNL_LIBS $LIBNL_ROUTE_LIBS" - ], [:]) - fi - if test "$with_libnl" =3D no; then - if test "$with_macvtap" =3D "yes"; then - AC_MSG_ERROR([libnl3-devel is required for macvtap support]) - fi - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$with_libnl" =3D "yes"]) - - AC_SUBST([LIBNL_CFLAGS]) - AC_SUBST([LIBNL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBNL], [ - LIBVIRT_RESULT_LIB([LIBNL]) -]) diff --git a/meson.build b/meson.build index ce3dbca83e0..d096a531bb7 100644 --- a/meson.build +++ b/meson.build @@ -1068,6 +1068,21 @@ endif libiscsi_version =3D '1.18.0' libiscsi_dep =3D dependency('libiscsi', version: '>=3D' + libiscsi_version= , required: get_option('libiscsi')) =20 +libnl_version =3D '3.0' +if host_machine.system() =3D=3D 'linux' + libnl_dep =3D dependency('libnl-3.0', version: '>=3D' + libnl_version, r= equired: false) + libnl_route_dep =3D dependency('libnl-route-3.0', version: '>=3D' + libn= l_version, required: false) + + if libnl_dep.found() and libnl_route_dep.found() + libnl_dep =3D declare_dependency( + dependencies: [ libnl_dep, libnl_route_dep ], + ) + conf.set('HAVE_LIBNL', 1) + endif +else + libnl_dep =3D dependency('', required: false) +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1190,6 +1205,10 @@ elif get_option('firewalld_zone').enabled() error('You must have firewalld support enabled to enable firewalld_zone') endif =20 +if conf.has('WITH_MACVTAP') and not conf.has('HAVE_LIBNL') + error('libnl3-devel is required for macvtap support') +endif + =20 # define top include directory =20 @@ -1228,6 +1247,7 @@ libs_summary =3D { 'gnutls': gnutls_dep.found(), 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), + 'libnl': libnl_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893769; cv=none; d=zohomail.com; s=zohoarc; b=X7lATBoybvIYzg7PD8/RseCc8Obx+C4xWcDjeZS9zXgXBWVp9C8Fa2V9JUS5v1ZPMvtNwH9gEBPAcbOSF/ek5Hi8Q5D/9+WcrYlD1G6DvHcfWzM4e+3dKU+ALkxsaEBM0RD/Wvuf2igRi6Jor8KVrwzb2AqOlaWx/zrvTDIzEzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893769; 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=2SRa0fsq5GzgRhcZGoCXjAI+n7DNv9q9qfeAO5Qrgis=; b=d060xv5tpHb59dFdd+wOSmGz9J3PsMnxgCCPMph+thysrnW0Vhs6vohqTe7ST0BVn3zeL1ZNpWiyV3Xea3WTYgPDOR8xxZCz3pGSddfUFwiCa+4WiyMqSSRi791I/G947madJY727h+NnN+mlgUNhiXXCdQnLNF8x3bcsHTNSeU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893769895983.3831039555913; Thu, 16 Jul 2020 03:02:49 -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-249-1ZfqfmsJOcSuayyhWTQ3mQ-1; Thu, 16 Jul 2020 06:02:28 -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 58859100CC87; Thu, 16 Jul 2020 10:02:16 +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 33ECC61983; Thu, 16 Jul 2020 10:02:16 +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 CB7851809557; Thu, 16 Jul 2020 10:02:15 +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 06GA2AtW016198 for ; Thu, 16 Jul 2020 06:02:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C42E12E025; Thu, 16 Jul 2020 10:02:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 370AD47380 for ; Thu, 16 Jul 2020 10:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893768; 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=2SRa0fsq5GzgRhcZGoCXjAI+n7DNv9q9qfeAO5Qrgis=; b=QqqbOCP++7vxup4IHLDaNbtcJlotTmaB/MoHJ4vdltA6ucU59A6Zchrf/UzmH7EX8q+hIo QezpWVJtzlkPxeuPGzBkhnpCm5uJ50lvkywKwOD0NfywxvpayQvm91bAwK3EyeW72D8AkN /2xurFyVEaz8NZsDEdIRAtOum5grRuo= X-MC-Unique: 1ZfqfmsJOcSuayyhWTQ3mQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 056/351] meson: add libparted dependency Date: Thu, 16 Jul 2020 11:54:52 +0200 Message-Id: <09b4bf7f015f7913b3dd95959c51487d0a729091.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 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 --- configure.ac | 1 - m4/virt-parted.m4 | 38 -------------------------------------- meson.build | 11 +++++++++++ 3 files changed, 11 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-parted.m4 diff --git a/configure.ac b/configure.ac index 755fe0073f0..b09a185c053 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBPARTED LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML diff --git a/m4/virt-parted.m4 b/m4/virt-parted.m4 deleted file mode 100644 index a73050a8b10..00000000000 --- a/m4/virt-parted.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The parted check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_LIBPARTED], [ - PARTED_REQUIRED=3D"1.8.0" - - with_libparted=3Dcheck - - LIBVIRT_CHECK_PKG([LIBPARTED], [libparted], [$PARTED_REQUIRED]) - - if test "x$with_libparted" =3D "xyes"; then - AC_PATH_PROG([PARTED], [parted], [], [$LIBVIRT_SBIN_PATH]) - if test -z "$PARTED" ; then - with_libparted=3Dno - fi - fi - - if test "x$with_libparted" =3D "xyes"; then - AC_DEFINE_UNQUOTED([PARTED], ["$PARTED"], - [Location or name of the parted program]) - fi -]) diff --git a/meson.build b/meson.build index d096a531bb7..38e18f5c750 100644 --- a/meson.build +++ b/meson.build @@ -1083,6 +1083,17 @@ else libnl_dep =3D dependency('', required: false) endif =20 +libparted_version =3D '1.8.0' +libparted_dep =3D dependency('libparted', version: '>=3D' + libparted_vers= ion, required: false) +if libparted_dep.found() + parted_prog =3D find_program('parted', required: false, dirs: libvirt_sb= in_path) + if parted_prog.found() + conf.set_quoted('PARTED', parted_prog.path()) + else + libparted_dep =3D dependency('', required: false) + endif +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893765; cv=none; d=zohomail.com; s=zohoarc; b=YIBdLS4HE2jqOGfQ4ZKmA+vWxd10cOU6dCJYaery8hZytYYivb8sDOxS0A2kceVOcStYVEbGNLPlSC609h09n8ZWBMY67PvDSNIXigMmYcOXtbWkOyYqfXILcLVruyWpd3a0es8SCMo3y9kyqKYZIkYx2rqAeoDAz/2wMzh2IsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893765; 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=QVyo1Qphxk5LIhjd0Rtbw22rkDDdNL763qPK7429p5w=; b=c9oOjRsUJ43w/VrEHVrc6wSMU9yeZs1wy4fCy7sHQKEIN4JBCD8fSOLUW7yaieumBoS3AQeto15X7XJMsbrcH6Iws3uV70oltz8G7pUlJYnb+ohjLN25x0WtEaz5Ucmv/F8ZESHkM6tf8m8tItsHd9vOtBw+r8xDHQ0Es6R8YBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893765904375.50672833211604; Thu, 16 Jul 2020 03:02:45 -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-451-jra1PFfjMA-pcgTR6NmTRQ-1; Thu, 16 Jul 2020 06:02:36 -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 E15AE100CD49; Thu, 16 Jul 2020 10:02:26 +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 BD07F79D06; Thu, 16 Jul 2020 10:02:26 +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 884DC1809561; Thu, 16 Jul 2020 10:02:26 +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 06GA2BdC016210 for ; Thu, 16 Jul 2020 06:02:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A77D92B6E6; Thu, 16 Jul 2020 10:02:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228F92B6DB for ; Thu, 16 Jul 2020 10:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893764; 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=QVyo1Qphxk5LIhjd0Rtbw22rkDDdNL763qPK7429p5w=; b=eqp6Mr/GzDQs1ALHTnrXxxGMGCH1P8E+jpQP3gEcikYd5IDklMQBXzbp8saNj+sXYjMlud VGOpzN2nBKIN9Q/Aa+xCXqyTJON0zjo26T5nawZobKL+M26cipx4otjnuC91LFtCYO0HUT WN9tLgsxigxh7yZpfMjVzL5DbwzY5N8= X-MC-Unique: jra1PFfjMA-pcgTR6NmTRQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 057/351] meson: add libpcap build option Date: Thu, 16 Jul 2020 11:54:53 +0200 Message-Id: <8296c33e3f006cce07cfa827952615e30e3e660b.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.13 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 --- configure.ac | 3 --- m4/virt-libpcap.m4 | 62 ---------------------------------------------- meson.build | 18 ++++++++++++++ meson_options.txt | 1 + 4 files changed, 19 insertions(+), 65 deletions(-) delete mode 100644 m4/virt-libpcap.m4 diff --git a/configure.ac b/configure.ac index b09a185c053..6d5e4e034fb 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_LIBPCAP LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_NETCF @@ -130,7 +129,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_NETCF @@ -430,7 +428,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBPCAP LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML diff --git a/m4/virt-libpcap.m4 b/m4/virt-libpcap.m4 deleted file mode 100644 index 605c2fdea71..00000000000 --- a/m4/virt-libpcap.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl The pcap library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_LIBPCAP], [ - LIBVIRT_ARG_WITH([LIBPCAP], [libpcap location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBPCAP], [ - LIBPCAP_REQUIRED=3D"1.5.0" - LIBPCAP_CONFIG=3D"pcap-config" - LIBPCAP_CFLAGS=3D"" - LIBPCAP_LIBS=3D"" - - if test "x$with_libpcap" !=3D "xno"; then - case $with_libpcap in - ''|yes|check) LIBPCAP_CONFIG=3D"pcap-config" ;; - *) LIBPCAP_CONFIG=3D"$with_libpcap/bin/pcap-config" ;; - esac - AS_IF([test "x$LIBPCAP_CONFIG" !=3D "x"], [ - AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >=3D $LIBPCAP_REQUIRED ) - if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then - if test "x$with_libpcap" !=3D "xcheck"; then - AC_MSG_ERROR([You must install libpcap >=3D $LIBPCAP_REQUIRED to= compile libvirt]) - fi - AC_MSG_RESULT(no) - with_libpcap=3D"no" - else - LIBPCAP_LIBS=3D"`$LIBPCAP_CONFIG --libs`" - LIBPCAP_CFLAGS=3D"`$LIBPCAP_CONFIG --cflags`" - with_libpcap=3D"yes" - AC_MSG_RESULT(yes) - fi - ]) - fi - - if test "x$with_libpcap" =3D "xyes"; then - AC_DEFINE_UNQUOTED([HAVE_LIBPCAP], 1, [whether libpcap can be used]) - fi - - AC_SUBST([LIBPCAP_CFLAGS]) - AC_SUBST([LIBPCAP_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBPCAP], [ - LIBVIRT_RESULT_LIB([LIBPCAP]) -]) diff --git a/meson.build b/meson.build index 38e18f5c750..2346ae31d5a 100644 --- a/meson.build +++ b/meson.build @@ -1094,6 +1094,23 @@ if libparted_dep.found() endif endif =20 +libpcap_version =3D '1.5.0' +libpcap_dep =3D dependency('libpcap', version: '>=3D' + libpcap_version, r= equired: false) +if not libpcap_dep.found() + pcap_config_prog =3D find_program('pcap-config', required: get_option('l= ibpcap')) + if pcap_config_prog.found() + pcap_args =3D run_command(pcap_config_prog, '--cflags').stdout().strip= ().split() + pcap_libs =3D run_command(pcap_config_prog, '--libs').stdout().strip()= .split() + libpcap_dep =3D declare_dependency( + compile_args: pcap_args, + link_args: pcap_libs, + ) + endif +endif +if libpcap_dep.found() + conf.set('HAVE_LIBPCAP', 1) +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1259,6 +1276,7 @@ libs_summary =3D { 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libnl': libnl_dep.found(), + 'libpcap': libpcap_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 44e756bdcf3..9e4e3f66429 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,5 +24,6 @@ option('fuse', type: 'feature', value: 'auto', descriptio= n: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') +option('libpcap', type: 'feature', value: 'auto', description: 'libpcap su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893873; cv=none; d=zohomail.com; s=zohoarc; b=kqr6/H7LyhU9djqvjRMy23ZP2YbCWPyPLD8lVSHlQxk2ZIQyU7Kbzjm6wPnu4t+VreL98YM8EWbn5tkf0yKvHyLhj6C49czUA8LpYOIIjHj7BEV6if2bNQSxArrRAI9wsCCSeiRjWA7k0ZsnJdLgFyG1djabhl8iPH9boi6PL/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893873; 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=9N6pSdZza5HZwAVK2p9dAGuPkxuLXtQQwY+EdIpTJWo=; b=J60Of4OpK45BrOKCrJeX7aQlBN4DeCPUsNsz1r35C270yHVo6DcNN3YJJ1Azja4oAH2FtOI8BnXufQLDpNeuiBdHhafYyUuTJAmwlGXEWwJGRVlhfxPZm4qXhdEZ2o40ekE567tmhGmOjZh943x+JVmyqvTbyQEFI/r7k4bzsS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893873639221.44896540563138; Thu, 16 Jul 2020 03:04:33 -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-36-TJeqcLqNNO2Uo54RT7D92g-1; Thu, 16 Jul 2020 06:02:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C00CC802B7F; Thu, 16 Jul 2020 10:02:18 +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 9F1AC78483; Thu, 16 Jul 2020 10:02:18 +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 59B4996236; Thu, 16 Jul 2020 10:02:18 +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 06GA2CeO016222 for ; Thu, 16 Jul 2020 06:02:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 915C92B6E6; Thu, 16 Jul 2020 10:02:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B00E2B6DB for ; Thu, 16 Jul 2020 10:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893872; 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=9N6pSdZza5HZwAVK2p9dAGuPkxuLXtQQwY+EdIpTJWo=; b=IR5ui4Xicf88zWCsNiPj+BAo5ZTD0Gw1qDqJDL80bagf11yLCnY/3fairKc4Ly6aBMCbkp 96AHMMZk42lYs8ztEFvNqPuNPAch7XlnihelAwUY0mSZ3f+TfNt7Qhq5ubj5rE7QwArAmD XytumOHSsoF/EeUmRnyexG/Q7JYuJ18= X-MC-Unique: TJeqcLqNNO2Uo54RT7D92g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 058/351] meson: add libssh build dependency Date: Thu, 16 Jul 2020 11:54:54 +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.11 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 --- configure.ac | 4 ---- m4/virt-libssh.m4 | 51 ----------------------------------------------- meson.build | 22 ++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 23 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-libssh.m4 diff --git a/configure.ac b/configure.ac index 6d5e4e034fb..1709f56a8b5 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,6 @@ if test "$with_remote" =3D "no" ; then with_libvirtd=3Dno with_ssh2=3Dno with_sasl=3Dno - with_libssh=3Dno fi # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then @@ -110,7 +109,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS @@ -129,7 +127,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS @@ -428,7 +425,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBSSH LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_NETCF diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 deleted file mode 100644 index 132447da163..00000000000 --- a/m4/virt-libssh.m4 +++ /dev/null @@ -1,51 +0,0 @@ -dnl The libssh.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_LIBSSH],[ - LIBVIRT_ARG_WITH_FEATURE([LIBSSH], [libssh], [check], [0.7]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ - LIBVIRT_CHECK_PKG([LIBSSH], [libssh], [0.7]) - - if test "$with_libssh" =3D "yes" ; then - old_CFLAGS=3D"$CFLAGS" - old_LIBS=3D"$LIBS" - CFLAGS=3D"$CFLAGS $LIBSSH_CFLAGS" - LIBS=3D"$LIBS $LIBSSH_LIBS" - AC_CHECK_FUNC([ssh_get_server_publickey], - [], - [AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey], - [ssh_get_publickey is deprecated and replaced by ssh_get_serve= r_publickey.])]) - AC_CHECK_FUNC([ssh_session_is_known_server], - [], - [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_kn= own], - [ssh_is_server_known is deprecated and replaced by ssh_session= _is_known_server.])]) - AC_CHECK_FUNC([ssh_session_update_known_hosts], - [], - [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_kno= wnhost], - [ssh_write_knownhost is deprecated and replaced by ssh_session= _update_known_hosts.])]) - CFLAGS=3D"$old_CFLAGS" - LIBS=3D"$old_LIBS" - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBSSH],[ - LIBVIRT_RESULT_LIB([LIBSSH]) -]) diff --git a/meson.build b/meson.build index 2346ae31d5a..2ab3aa87dea 100644 --- a/meson.build +++ b/meson.build @@ -1111,6 +1111,27 @@ if libpcap_dep.found() conf.set('HAVE_LIBPCAP', 1) endif =20 +libssh_version =3D '0.7' +if get_option('driver_remote').enabled() + libssh_dep =3D dependency('libssh', version: '>=3D' + libssh_version, re= quired: get_option('libssh')) + if libssh_dep.found() + conf.set('WITH_LIBSSH', 1) + + functions =3D [ + [ 'ssh_get_server_publickey', 'ssh_get_publickey' ], + [ 'ssh_session_is_known_server', 'ssh_is_server_known' ], + [ 'ssh_session_update_known_hosts', 'ssh_write_knownhost' ], + ] + foreach name : functions + if not cc.has_function(name[0], dependencies: libssh_dep) + conf.set(name[0], name[1]) + endif + endforeach + endif +else + libssh_dep =3D dependency('', required: false) +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1277,6 +1298,7 @@ libs_summary =3D { 'libiscsi': libiscsi_dep.found(), 'libnl': libnl_dep.found(), 'libpcap': libpcap_dep.found(), + 'libssh': libssh_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 9e4e3f66429..9588db5b835 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,5 +25,6 @@ option('glusterfs', type: 'feature', value: 'auto', descr= iption: 'glusterfs supp option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap su= pport') +option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893755; cv=none; d=zohomail.com; s=zohoarc; b=OZhkcaMiU0Rl5b0pdSkuq4Un+ws6nAiLJ3EakLa4GpOqm4cAvhqkNUkxFw5/2WWmkr59AxWx2zAT43Kl21LWLwR/Z4fN3T2Nvs3wIcO4Kf4p6lO0/SELu54DMbxahdU6t9rJU+l2G6ZMBq7XP1teUkcmPPnviqKfgLb3nO91rGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893755; 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=nMmNbvibAmwaHWbPqHZy7a78M6GAWEACKLfocJMoeKc=; b=DzknW7Q9XFhoxIqblCQkMwaLYmzNTmI6v70SPtooCCqElJgjZUvqEl8LHICO8oe8o8QQ+BjPKFxMe9wB8pukTXAeM4byOlgdfucEjeR9xXaa8guXi9bFh5vZIKnAHNkgYlt9QmMwP2JKqcvzfuvyhiBaAvSeZZZZGp1C5/7Dh8Y= 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 159489375587038.17771591393512; Thu, 16 Jul 2020 03:02:35 -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-23-0vczmThPMEKKJ1IEH-Unhg-1; Thu, 16 Jul 2020 06:02:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65899100CCEC; Thu, 16 Jul 2020 10:02:21 +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 197C372AE4; Thu, 16 Jul 2020 10:02:21 +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 D77F41806B0C; Thu, 16 Jul 2020 10:02:20 +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 06GA2D1n016235 for ; Thu, 16 Jul 2020 06:02:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F7C02DE69; Thu, 16 Jul 2020 10:02:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8A5A2B6DB for ; Thu, 16 Jul 2020 10:02:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893754; 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=nMmNbvibAmwaHWbPqHZy7a78M6GAWEACKLfocJMoeKc=; b=aimbgfqDj/bU8tbB2ZKyA9IBAQpfIrk6BNnGStCXUCcjDYrTgfXzNR9MgOaIR9WDluebiG ZhTmDrv8kQ0TxAmxFNiMWsxYNNgvGs5Icuxz6SVc6HuCNu13fEAS3EefJV1l7yaCiZkIzI uBOPkmjzCyu2HAXGbchOZpQJ3c0ykFk= X-MC-Unique: 0vczmThPMEKKJ1IEH-Unhg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 059/351] meson: add libssh2 build dependency Date: Thu, 16 Jul 2020 11:54:55 +0200 Message-Id: <5760af0d4d0078f34532f8c2bcb1f0626e6041d9.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.15 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 --- configure.ac | 4 ---- m4/virt-ssh2.m4 | 30 ------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 m4/virt-ssh2.m4 diff --git a/configure.ac b/configure.ac index 1709f56a8b5..c81db75ae33 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,6 @@ fi # RPC, we don't need several libraries. if test "$with_remote" =3D "no" ; then with_libvirtd=3Dno - with_ssh2=3Dno with_sasl=3Dno fi # Stateful drivers are useful only when building the daemon. @@ -121,7 +120,6 @@ LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX -LIBVIRT_ARG_SSH2 LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK @@ -140,7 +138,6 @@ LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX -LIBVIRT_CHECK_SSH2 LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK @@ -439,7 +436,6 @@ LIBVIRT_RESULT_RBD LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX -LIBVIRT_RESULT_SSH2 LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR diff --git a/m4/virt-ssh2.m4 b/m4/virt-ssh2.m4 deleted file mode 100644 index f712f81fe2c..00000000000 --- a/m4/virt-ssh2.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libssh2.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SSH2],[ - LIBVIRT_ARG_WITH_FEATURE([SSH2], [libssh2], [check], [1.3]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SSH2],[ - LIBVIRT_CHECK_PKG([SSH2], [libssh2], [1.3]) -]) - -AC_DEFUN([LIBVIRT_RESULT_SSH2],[ - LIBVIRT_RESULT_LIB([SSH2]) -]) diff --git a/meson.build b/meson.build index 2ab3aa87dea..6f37862611a 100644 --- a/meson.build +++ b/meson.build @@ -1132,6 +1132,16 @@ else libssh_dep =3D dependency('', required: false) endif =20 +libssh2_version =3D '1.3' +if get_option('driver_remote').enabled() + libssh2_dep =3D dependency('libssh2', version: '>=3D' + libssh2_version,= required: get_option('libssh2')) + if libssh2_dep.found() + conf.set('WITH_SSH2', 1) + endif +else + libssh2_dep =3D dependency('', required: false) +endif + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1299,6 +1309,7 @@ libs_summary =3D { 'libnl': libnl_dep.found(), 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), + 'libssh2': libssh2_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } diff --git a/meson_options.txt b/meson_options.txt index 9588db5b835..a6e53ca36dc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,5 +26,6 @@ option('hal', type: 'feature', value: 'auto', description= : 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi = support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap su= pport') option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') +option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893975; cv=none; d=zohomail.com; s=zohoarc; b=gwHfuZcN7bKS9TW1cnnHkZxci4uS/W5DWd6QP24DYBBWAzRo/0fK3FYfc66/91jV0aARSQT+HOY3szePi8uDD2aHOdcsU6repA7YkO614eQPtmrNUR/DQoVtSp7Z40nZ34tSuaEcT/3ceWOwTlUW8WsSKf0stDGlOjoGmtmIE4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893975; 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=vW4JqmVfEPgYi04Ic5CLK1lT05Q9VfsYfI9gIcDuqK8=; b=hHvG5VIsG0y9FSrQpIZm1U5yTdt9utS3CO3ElgtjWdXlDG+h7c6Vam6uZHndeco+5ntiMMlojZE0/lbJWHFjDxq0zL39O2e/FyZPktKvsjA2hS8JV2kRxmm6UPP5lPIDM7q2cfkAggzLZml5yypgjLy/wf3+iDiT0IXPg+yyJac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893975333178.01808430966332; Thu, 16 Jul 2020 03:06: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-475-g5moZaUPPhaSYp2olL0imQ-1; Thu, 16 Jul 2020 06:02:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E463194092C; Thu, 16 Jul 2020 10:02:17 +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 1D5F378A55; Thu, 16 Jul 2020 10:02:17 +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 DFC2C1809554; Thu, 16 Jul 2020 10:02:16 +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 06GA2E0F016248 for ; Thu, 16 Jul 2020 06:02:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A8792B6DB; Thu, 16 Jul 2020 10:02:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4FE32DE6D for ; Thu, 16 Jul 2020 10:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893974; 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=vW4JqmVfEPgYi04Ic5CLK1lT05Q9VfsYfI9gIcDuqK8=; b=ItfAzXZruQ6K84OXJMjmAmyb9AbwpvI1aiL1COOR80xT2kcZIdqShnsVZB9lvP7B4wt4HO 0+bY6vBrV5JT0YOlLyUa9WxlsP22n/FeTNRp0t40PIh506ZxVZiEz0BthxfXnt6AIuvBl1 bx6K50OGsze6WCK2ToMYlwAwl4zEHoE= X-MC-Unique: g5moZaUPPhaSYp2olL0imQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 060/351] meson: add libxml build dependency Date: Thu, 16 Jul 2020 11:54:56 +0200 Message-Id: <977cbd76373733b03e1a7e93f79cdcef64e883f8.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.14 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 --- configure.ac | 3 --- m4/virt-libxml.m4 | 36 ------------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-libxml.m4 diff --git a/configure.ac b/configure.ac index c81db75ae33..6710900fa35 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_LIBXML LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS @@ -125,7 +124,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL @@ -423,7 +421,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4 deleted file mode 100644 index cce54d88fb1..00000000000 --- a/m4/virt-libxml.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The libxml-2.0 library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_LIBXML], [ - LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBXML], [ - LIBXML_REQUIRED=3D"2.9.1" - - LIBVIRT_CHECK_PKG([LIBXML], [libxml-2.0], [$LIBXML_REQUIRED]) - - if test "$with_libxml" =3D "no" ; then - AC_MSG_ERROR([libxml2 >=3D $LIBXML_REQUIRED is required for libvirt]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBXML], [ - LIBVIRT_RESULT_LIB([LIBXML]) -]) diff --git a/meson.build b/meson.build index 6f37862611a..55cf12a951c 100644 --- a/meson.build +++ b/meson.build @@ -1142,6 +1142,9 @@ else libssh2_dep =3D dependency('', required: false) endif =20 +libxml_version =3D '2.9.1' +libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1310,6 +1313,7 @@ libs_summary =3D { 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), + 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893840; cv=none; d=zohomail.com; s=zohoarc; b=ajvZrYisSSLqhOJCZ6o6RhaDTYCqvWPaIl7MGcr+OETyL0sR/VTA92diNm5q1VppyNAO6lia4H9MWVsR+uJdthE4lFwTJZO6J9WTqDqI3PycRynW5ldlcEEfINijT1BvKg4susSY6Kz5LLhmSAdPvDsQdf5XnwEiclF3e11h838= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893840; 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=fDtOQ4+Zotn5RWeFy87C2WcyqwilfCqvQBzc0uGW2y0=; b=j8SJIKjRu/iBKPwSInXoJsu/4Jr2bWVv7R73ixTetYecHwPB9itRGe5sxvwwTobM3UbafXISi/VinRQYQUHTbZGuzay7fyt4IjdbvKYcU67ahb+3KPrTotEckOhXpnywmrrKD51Iem2rinUnzgnpji3fmKqKIp24ppUIG6u7HtY= 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 159489384077399.96639204328505; Thu, 16 Jul 2020 03:04:00 -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-401-sWdEo2b8NRaSbxXH7yd8uQ-1; Thu, 16 Jul 2020 06:02:32 -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 4D9D6100CCD8; Thu, 16 Jul 2020 10:02:20 +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 2901A60C47; Thu, 16 Jul 2020 10:02:20 +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 E72CC1806B0A; Thu, 16 Jul 2020 10:02:19 +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 06GA2J51016298 for ; Thu, 16 Jul 2020 06:02:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 34EFA2B6DB; Thu, 16 Jul 2020 10:02:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1F2A2E025 for ; Thu, 16 Jul 2020 10:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893839; 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=fDtOQ4+Zotn5RWeFy87C2WcyqwilfCqvQBzc0uGW2y0=; b=fyEOQiGgM5jLr89pk8J33BhkWvPB6vMpstrhm9jPkwPJW3nZDcURQnz03S9nFyb8BxwgQS G/guyM8ZjDUqf99ZCJwMV31w3TMpRXTduNp4xa3AW8Crovt2p+JZR1IU5iDemRy3XEZ1tg XmHJgZHqSxybRw8D0ZQLOI4HRaYrzYU= X-MC-Unique: sWdEo2b8NRaSbxXH7yd8uQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 061/351] meson: add netcf build options Date: Thu, 16 Jul 2020 11:54:57 +0200 Message-Id: <87577b7b6ec0200131aecff23846af60a0c765ea.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 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 --- configure.ac | 3 --- m4/virt-netcf.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-netcf.m4 diff --git a/configure.ac b/configure.ac index 6710900fa35..798a30bbd3d 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL @@ -124,7 +123,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER @@ -421,7 +419,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 deleted file mode 100644 index ada6b5a7a98..00000000000 --- a/m4/virt-netcf.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libnetcf.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NETCF],[ - LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NETCF],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NETCF],[ - LIBVIRT_RESULT_LIB([NETCF]) -]) diff --git a/meson.build b/meson.build index 55cf12a951c..025878a0df6 100644 --- a/meson.build +++ b/meson.build @@ -1164,6 +1164,12 @@ if use_macvtap endif endif =20 +netcf_version =3D '0.1.8' +netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) +if netcf_dep.found() + conf.set('WITH_NETCF', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1315,6 +1321,7 @@ libs_summary =3D { 'libssh2': libssh2_dep.found(), 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), + 'netcf': netcf_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a6e53ca36dc..dc248ee0fe4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,4 +28,5 @@ option('libpcap', type: 'feature', value: 'auto', descrip= tion: 'libpcap support' option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') +option('netcf', type: 'feature', value: 'auto', description: 'netcf suppor= t') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893794; cv=none; d=zohomail.com; s=zohoarc; b=WztagDXDv3TcxPVpw8XgnD9BUw7XqdpvRyo98tZVGKaaroQxfN30hTPWX9d4RvBmTJnqPsS2KxDtbcDXsyLyzMAn8zTnUZvOuQdUwcz4yQvh2r1njH4w08zQCYHaTWXYGBus5ZaTGJp27INb6sZVKXs9L8C3Hbhbsnaz2nyyFAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893794; 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=X5yWMqVpQNbDDLEfurGpv+fEbJoo/1q5wAKESfhrfEg=; b=V0PzTAe1hnXQW3l+gpKBdgEJUyPoRD47H51aI7r7Xu6Qp627CiElbdMt8m/lUQeMU3vUNLr6iBVZjh5BmNoSj+WC2Fl5VIODP4Ptn82qEAH61KkMO5TivjuDRYK/wieSRNwgmjvNBfMDLjRjYDMxDTHu9N2/OlLDKXbDPnhz+a4= 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 1594893794297745.3791519409019; Thu, 16 Jul 2020 03:03:14 -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-203-ArnAuXMENOe4C8-gLXGZIw-1; Thu, 16 Jul 2020 06:02:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05ADF1013245; Thu, 16 Jul 2020 10:02:24 +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 9C07772AF5; Thu, 16 Jul 2020 10:02:23 +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 6328896232; Thu, 16 Jul 2020 10:02:23 +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 06GA2KP9016314 for ; Thu, 16 Jul 2020 06:02:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 250792B6DB; Thu, 16 Jul 2020 10:02:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93E7C341F7 for ; Thu, 16 Jul 2020 10:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893793; 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=X5yWMqVpQNbDDLEfurGpv+fEbJoo/1q5wAKESfhrfEg=; b=ClmaFhAucwrrKRn1WwIkPkoDBEDfGhxCae4F2A1QPD1Bs+nYObMOTgpNY9Uu640Mv8QOLx uBHq6Kd3yyl18PoyW62YpiAkHjc+PRZAtnb19DaNCgbooW7HFo+jnoWLojmf1XlPZA70mr gnD2q/ZiHjagLqJFoYin4DzfVGWdH2o= X-MC-Unique: ArnAuXMENOe4C8-gLXGZIw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 062/351] meson: add nls build dependency Date: Thu, 16 Jul 2020 11:54:58 +0200 Message-Id: <7707c3a7fb3e05f3a8cd99d42d49f3fd97b5aa7b.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.15 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 --- configure.ac | 4 --- m4/virt-nls.m4 | 72 ----------------------------------------------- meson.build | 39 +++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 40 insertions(+), 76 deletions(-) delete mode 100644 m4/virt-nls.m4 diff --git a/configure.ac b/configure.ac index 798a30bbd3d..87ba8d059f2 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN @@ -123,7 +122,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN @@ -141,7 +139,6 @@ LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL =20 =20 -AC_CHECK_LIB([intl],[gettext],[]) AC_CHECK_LIB([util],[openpty],[]) =20 =20 @@ -419,7 +416,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN diff --git a/m4/virt-nls.m4 b/m4/virt-nls.m4 deleted file mode 100644 index fd8707033af..00000000000 --- a/m4/virt-nls.m4 +++ /dev/null @@ -1,72 +0,0 @@ -dnl gettext utilities -dnl -dnl Copyright (C) 2018 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NLS],[ - LIBVIRT_ARG_ENABLE([NLS], [NLS], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NLS],[ - if test "x$enable_nls" !=3D "xno" - then - AC_CHECK_FUNC([gettext], [], [ - AC_CHECK_LIB([intl], [gettext], [], [ - if test "x$enable_nls" =3D "xcheck" - then - enable_nls=3Dno - else - AC_MSG_ERROR([gettext() is required to build libvirt]") - fi - ]) - ]) - fi - - if test "x$enable_nls" !=3D "xno" - then - AC_CHECK_HEADERS([libintl.h], [enable_nls=3Dyes],[ - if test "x$enable_nls" =3D "xcheck" - then - enable_nls=3Dno - else - AC_MSG_ERROR([libintl.h is required to build libvirt]") - fi - ]) - fi - - dnl GNU gettext tools (optional). - AC_CHECK_PROG([XGETTEXT], [xgettext], [xgettext], [no]) - AC_CHECK_PROG([MSGFMT], [msgfmt], [msgfmt], [no]) - AC_CHECK_PROG([MSGMERGE], [msgmerge], [msgmerge], [no]) - - dnl Check they are the GNU gettext tools. - AC_MSG_CHECKING([msgfmt is GNU tool]) - if $MSGFMT --version >/dev/null 2>&1 && $MSGFMT --version | grep -q 'GNU= gettext'; then - msgfmt_is_gnu=3Dyes - else - msgfmt_is_gnu=3Dno - fi - AC_MSG_RESULT([$msgfmt_is_gnu]) - AM_CONDITIONAL([ENABLE_NLS], [test "x$enable_nls" =3D "xyes"]) - AM_CONDITIONAL([HAVE_GNU_GETTEXT_TOOLS], - [test "x$XGETTEXT" !=3D "xno" && test "x$MSGFMT" !=3D "xno" && \ - test "x$MSGMERGE" !=3D "xno" && test "x$msgfmt_is_gnu" !=3D "xno"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NLS],[ - LIBVIRT_RESULT([NLS], [$enable_nls]) -]) diff --git a/meson.build b/meson.build index 025878a0df6..9a32159472e 100644 --- a/meson.build +++ b/meson.build @@ -1170,6 +1170,44 @@ if netcf_dep.found() conf.set('WITH_NETCF', 1) endif =20 +have_gnu_gettext_tools =3D false +if not get_option('nls').disabled() + have_gettext =3D cc.has_function('gettext') + if not have_gettext + intl_lib =3D cc.find_library('intl', required: false) + have_gettext =3D intl_lib.found() + if have_gettext + add_project_link_arguments('-lintl', language: 'c') + endif + endif + if not have_gettext and get_option('nls').enabled() + error('gettext() is required to build libvirt') + endif + + if cc.has_header('libintl.h') + conf.set('HAVE_LIBINTL_H', 1) + elif get_option('nls').enabled() + error('libintl.h is required to build libvirt') + endif + + gettext_progs =3D [ + 'xgettext', + 'msgfmt', + 'msgmerge', + ] + foreach name : gettext_progs + prog =3D find_program(name, required: false) + set_variable('@0@_prog'.format(name), prog) + endforeach + + if xgettext_prog.found() and msgfmt_prog.found() and msgmerge_prog.found= () + rc =3D run_command(msgfmt_prog, '--version') + if rc.returncode() =3D=3D 0 and rc.stdout().contains('GNU gettext') + have_gnu_gettext_tools =3D true + endif + endif +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1322,6 +1360,7 @@ libs_summary =3D { 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'netcf': netcf_dep.found(), + 'NLS': have_gnu_gettext_tools, 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index dc248ee0fe4..d906281900d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,4 +29,5 @@ option('libssh', type: 'feature', value: 'auto', descript= ion: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('netcf', type: 'feature', value: 'auto', description: 'netcf suppor= t') +option('nls', type: 'feature', value: 'auto', description: 'nls support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894750; cv=none; d=zohomail.com; s=zohoarc; b=O1dLhrCXuSVjpxf4ZPNmdLtMvzJ3vWs5tYP8lRRHASldExdnoC3zOTb/qpc1G2kNzqd3NIXpfpLqBIHt+jTNUrvaq/xPxd0bSuTYdsbqq3mKjbr83wJ6uaQizNi0BUYHZnhOlAPp2SdN+tsNL6GeRhiKo7mHrvPzh14KLy9xQqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894750; 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=5CPmE+sVbmtiY3SLVdPng+iS9CM3YoQUl+dxfFL9MLs=; b=hupwrA2btR/3fQz+BlZGJFSp4mIaggguCbAO0PUqzY6cQ8pKWkB43xNoMJmjZMbF3uMNuDaiaG9gLdNJrw2cSXIZDv5qP/2WXG7qU9UT5qnZn7WB2jux/yAABaxL2mHV1mhOcLTc6cNVe1U2k0Q5BAxYRRMPWvSf7giolujyqlo= 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 1594894749996341.2598879584343; Thu, 16 Jul 2020 03:19: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-481-X2hnbguoN2q8JI5DcmGsSw-1; Thu, 16 Jul 2020 06:02:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D249388C7A8; Thu, 16 Jul 2020 10:02:22 +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 B173A78471; Thu, 16 Jul 2020 10:02:22 +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 7CA45180CB27; Thu, 16 Jul 2020 10:02:22 +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 06GA2L7t016335 for ; Thu, 16 Jul 2020 06:02:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4395B2B6DC; Thu, 16 Jul 2020 10:02:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BDBD2B6DB for ; Thu, 16 Jul 2020 10:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894748; 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=5CPmE+sVbmtiY3SLVdPng+iS9CM3YoQUl+dxfFL9MLs=; b=QBvPzwkutKUMCKqMDqnY9XgRwk/9Gv0geYQxMnom9o0CJlrfohi/4sCvOjmroaKdr+nnMK u3YyqPKzbkCfc8I+A6V1Hg73gh0YPZp9I/gGIB0akjcBsnWXKXF+o4bDeffBFz1e6JOToz V803MCIqFuibose+09/RLPBUNFjJjw4= X-MC-Unique: X2hnbguoN2q8JI5DcmGsSw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 063/351] meson: add numactl build dependency Date: Thu, 16 Jul 2020 11:54:59 +0200 Message-Id: <85c77f0bd400a0c5b721b04ea992513af40adcdf.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.11 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 --- configure.ac | 3 --- m4/virt-numactl.m4 | 34 ---------------------------------- meson.build | 10 ++++++++++ meson_options.txt | 1 + 4 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 m4/virt-numactl.m4 diff --git a/configure.ac b/configure.ac index 87ba8d059f2..2f3730581ef 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi # Check for compiler and library settings. =20 LIBVIRT_ARG_NSS -LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS @@ -122,7 +121,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS @@ -417,7 +415,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS -LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4 deleted file mode 100644 index f93ffd56dee..00000000000 --- a/m4/virt-numactl.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl The libnuma.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NUMACTL],[ - LIBVIRT_ARG_WITH_FEATURE([NUMACTL], [numa], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[ - LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h]) - AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitse= t=3Dyes]) - if test "$have_numa_bitmask_isbitset" =3D "yes"; then - AC_DEFINE_UNQUOTED([HAVE_NUMA_BITMASK_ISBITSET], 1, [whether numa_bitm= ask_isbitset is available]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_NUMACTL],[ - LIBVIRT_RESULT_LIB([NUMACTL]) -]) diff --git a/meson.build b/meson.build index 9a32159472e..cda54c0e862 100644 --- a/meson.build +++ b/meson.build @@ -1208,6 +1208,15 @@ if not get_option('nls').disabled() endif endif =20 +numactl_dep =3D cc.find_library('numa', required: get_option('numactl')) +if numactl_dep.found() + conf.set('WITH_NUMACTL', 1) + + if cc.has_function('numa_bitmask_isbitset', dependencies: [ numactl_dep = ]) + conf.set('HAVE_NUMA_BITMASK_ISBITSET', 1) + endif +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1361,6 +1370,7 @@ libs_summary =3D { 'macvtap': conf.has('WITH_MACVTAP'), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, + 'numaclt': numactl_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index d906281900d..a29ea23d21a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -30,4 +30,5 @@ option('libssh2', type: 'feature', value: 'auto', descrip= tion: 'libssh2 support' option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') option('netcf', type: 'feature', value: 'auto', description: 'netcf suppor= t') option('nls', type: 'feature', value: 'auto', description: 'nls support') +option('numactl', type: 'feature', value: 'auto', description: 'numactl su= pport') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893782; cv=none; d=zohomail.com; s=zohoarc; b=ht79V9xCe5SBJNoUqDkzA4gJ6O/2pHstX6IoGq1e2GoyvtY+BjrhTJz4Wd/+i1AdRVQgbrFoKBUVFl1858GL6rLW2SpkJYcAVlSjp/bvMrs+RgrnWgrumKKtS7b7/PuDrop07zlutsDPlHQpxEU12UQ/mEW+W2ki1xi2CIwqjM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893782; 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=vljHhS0sZgNxty5H58nFQlM0adMtvUCMivG7GVviRQo=; b=VabzB2B3XqUAoeCKA8zu4GlPACg7BT/7GV/SBS37HBzzVFLWkwA0r9Ka17dbW0O6JyFTJDquLnuC64vFXAu8ZTGZySEJsk9+vr9guxs/P+m7a3jSTbvAT+I/MiXcsLqZTFVBQErJHwgWrINPmCZcfwlMXvzLZiL9uhzqqK/Ru/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893782175468.9677484741902; Thu, 16 Jul 2020 03:03:02 -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-278-T3Oe-z65NDG55VzT73B_jw-1; Thu, 16 Jul 2020 06:02:57 -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 9B73918FF688; Thu, 16 Jul 2020 10:02:25 +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 34A0270123; Thu, 16 Jul 2020 10:02:25 +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 ECF31180599D; Thu, 16 Jul 2020 10:02:24 +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 06GA2MN8016345 for ; Thu, 16 Jul 2020 06:02:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 021772B6E2; Thu, 16 Jul 2020 10:02:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A3A12B6DB for ; Thu, 16 Jul 2020 10:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893780; 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=vljHhS0sZgNxty5H58nFQlM0adMtvUCMivG7GVviRQo=; b=gJ0QIjeD1yQW5fLBQW+mFvvxRKJ+OTiqLo3MPeYP12ADyPMn/g7OHyfUqwDev8agLMq4DJ AQifkivJrpGkg4IMGaCFu1ozbZJm39QXSzlG04guE1sHC8WEy1WMAxQInTHcdeX3L8fNZt GOA6rG2NU8zfmgRikPhROpay19ZS7n4= X-MC-Unique: T3Oe-z65NDG55VzT73B_jw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 064/351] meson: add openwsman build dependency Date: Thu, 16 Jul 2020 11:55:00 +0200 Message-Id: <0048e188f42fef4de1c290fd8c32c7427665a8f0.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 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 --- configure.ac | 3 --- m4/virt-openwsman.m4 | 30 ------------------------------ meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-openwsman.m4 diff --git a/configure.ac b/configure.ac index 2f3730581ef..ce8d3b76657 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi # Check for compiler and library settings. =20 LIBVIRT_ARG_NSS -LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_POLKIT @@ -122,7 +121,6 @@ LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER -LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_POLKIT @@ -415,7 +413,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS -LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_POLKIT diff --git a/m4/virt-openwsman.m4 b/m4/virt-openwsman.m4 deleted file mode 100644 index c952ef89361..00000000000 --- a/m4/virt-openwsman.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libopenwsman.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_OPENWSMAN],[ - LIBVIRT_ARG_WITH_FEATURE([OPENWSMAN], [openwsman], [check], [2.2.3]) -]) - -AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[ - LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3]) -]) - -AC_DEFUN([LIBVIRT_RESULT_OPENWSMAN],[ - LIBVIRT_RESULT_LIB([OPENWSMAN]) -]) diff --git a/meson.build b/meson.build index cda54c0e862..0fc7f3f4bb7 100644 --- a/meson.build +++ b/meson.build @@ -1217,6 +1217,9 @@ if numactl_dep.found() endif endif =20 +openwsman_version =3D '2.2.3' +openwsman_dep =3D dependency('openwsman', version: '>=3D' + openwsman_vers= ion, required: get_option('openwsman')) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1371,6 +1374,7 @@ libs_summary =3D { 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, 'numaclt': numactl_dep.found(), + 'openwsman': openwsman_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a29ea23d21a..05d5e44f420 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -31,4 +31,5 @@ option('macvtap', type: 'feature', value: 'auto', descrip= tion: 'enable macvtap d option('netcf', type: 'feature', value: 'auto', description: 'netcf suppor= t') option('nls', type: 'feature', value: 'auto', description: 'nls support') option('numactl', type: 'feature', value: 'auto', description: 'numactl su= pport') +option('openwsman', type: 'feature', value: 'auto', description: 'openwsma= n support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893793; cv=none; d=zohomail.com; s=zohoarc; b=d2HjrJ9DlB8OjzB2H4YfoxCAUy0S9DTwojsyA6WXhs0qohsn1cfYIzldM+46IrIzG7h89JOs1LjzBYNEXKJZiTy6IHgfGVMUxdl9ltH1TSR8NfrqFp6MXYFrWNT5tVEz/u6Ro/K+606aoTjPmWhdyjP4maBha1dTagSIBGr5+Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893793; 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=oEV8r8Mbpn/Y8ev+SnFNj+6wmt7e12C8ygxPs12h6+o=; b=DwiJyVnN7+NtV2RcclKMiPHaDVVmphkt7ES8JCB1Z8hK09/3hNyX3nxxYtkAKiZCch7cQMCyszTH7hu2XIH9y9lKq6ZvEgT+HKDJjgC6eGWu3MpJwILEZCuo73g+WqmUqtAqG6xunX21skjpWqspKMJ71rapqW4WmaOIozblktA= 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 1594893793828125.77123761124733; Thu, 16 Jul 2020 03:03:13 -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-496-Vru4o21qN0aDk7jEolbFzg-1; Thu, 16 Jul 2020 06:02:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B63E803F63; Thu, 16 Jul 2020 10:02:26 +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 0120C73024; Thu, 16 Jul 2020 10:02:25 +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 BF6731809554; Thu, 16 Jul 2020 10:02:25 +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 06GA2MJ7016364 for ; Thu, 16 Jul 2020 06:02:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA7B12B6DB; Thu, 16 Jul 2020 10:02:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C592E184 for ; Thu, 16 Jul 2020 10:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893792; 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=oEV8r8Mbpn/Y8ev+SnFNj+6wmt7e12C8ygxPs12h6+o=; b=LrH1DoZQn+fArvfQV+5rOSWS7Mhmtq9ycOVexakX3D9XUbARO51oxgvlEOHxXLtajfQw90 DxnkZYRGtm5mm2iLZO3Bh4ZDnPsXQ+4W/Ok71RHXdb4RwRQkclaXDG28DDZfsYIJH3dDtT X+zHFBvd+2oqL7vqvyY7g0t4YnOecj8= X-MC-Unique: Vru4o21qN0aDk7jEolbFzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 065/351] meson: add parallels-sdk build check Date: Thu, 16 Jul 2020 11:55:01 +0200 Message-Id: <6f6ab82b9520f9a61be334b06cfc4a660e429c64.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.15 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 --- m4/virt-driver-vz.m4 | 4 ---- meson.build | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4 index 9a8bc42efa1..11045e8b393 100644 --- a/m4/virt-driver-vz.m4 +++ b/m4/virt-driver-vz.m4 @@ -22,12 +22,8 @@ AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[ ]) =20 AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ - PARALLELS_SDK_REQUIRED=3D"7.0.22" - if test "$with_vz" =3D "yes" || test "$with_vz" =3D "check"; then - PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk >=3D $PARALLELS_= SDK_REQUIRED], - [PARALLELS_SDK_FOUND=3Dyes], [PARALLELS_SDK_FOUN= D=3Dno]) =20 if test "$with_vz" =3D "yes" && test "$PARALLELS_SDK_FOUND" =3D "n= o"; then AC_MSG_ERROR([Parallels Virtualization SDK is needed to build = the Virtuozzo driver.]) diff --git a/meson.build b/meson.build index 0fc7f3f4bb7..a9ebcd18842 100644 --- a/meson.build +++ b/meson.build @@ -1220,6 +1220,9 @@ endif openwsman_version =3D '2.2.3' openwsman_dep =3D dependency('openwsman', version: '>=3D' + openwsman_vers= ion, required: get_option('openwsman')) =20 +parallels_sdk_version =3D '7.0.22' +parallels_sdk_dep =3D dependency('parallels-sdk', version: '>=3D' + parall= els_sdk_version, required: false) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893928; cv=none; d=zohomail.com; s=zohoarc; b=OEmvnBzNFkdjoiCCIDoeszyMVT7WWCd8aZkpvFTQu+AsaoPaebE4Fkx0bfNgLRNCGIyPKs7wGakxGxKIup9ajjTx9x1uF09hG03ExsEyPEQgQZcJyrMJHsh4amWEhFAbIxOjTXj7rbat1+6p5/Hvge73g93jIso/X6RI2cH7IpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893928; 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=NiKLky6/NU6hGsL4YZaFo4jhq5JT2jkfMW01dDSsG3U=; b=Oi/XrLT0gOwCagv4vxDTyhvqfgfvS/qmE1X//v7mKgY/1RmNBcDTuTtRs+Py5Yen8ZYT6qTZsM57y3gAtIv7C8TuPbsVoE6msbF/qnKR2Htx5rSgy4zG9V42TfSR/a11a7kZkr0Bxlf43BauOCMq0yPYg53viv4+JcdmrRQCE08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893928198916.5422437944119; Thu, 16 Jul 2020 03:05:28 -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-211-ZGTxcjK2MVyVn_cufKkbkg-1; Thu, 16 Jul 2020 06:02:36 -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 116F6100D931; Thu, 16 Jul 2020 10:02:28 +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 A077061982; Thu, 16 Jul 2020 10:02:27 +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 645FE96222; Thu, 16 Jul 2020 10:02:27 +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 06GA2OhC016376 for ; Thu, 16 Jul 2020 06:02:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B5F12B6DB; Thu, 16 Jul 2020 10:02:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9940F2DE6B for ; Thu, 16 Jul 2020 10:02:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893927; 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=NiKLky6/NU6hGsL4YZaFo4jhq5JT2jkfMW01dDSsG3U=; b=NVxpXvJjuMvDTxP3NZfqxIbDBWS7TAMZ6pK42OnjRuniefQxOr8u9YqwqzudgCDqTY0m4Q RJAmbveJAbiCGcCq5pcFPKTdsRkijyKVAtIGvoKFedofE9WFM7mVGPFMjWYw0lTtXo90u+ M1Vjb8h8oEjfc1ORxzv2j1VtIflqb58= X-MC-Unique: ZGTxcjK2MVyVn_cufKkbkg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 066/351] meson: add pciaccess build option Date: Thu, 16 Jul 2020 11:55:02 +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.12 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 --- configure.ac | 3 --- m4/virt-pciaccess.m4 | 30 ------------------------------ meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-pciaccess.m4 diff --git a/configure.ac b/configure.ac index ce8d3b76657..49e6cb6e84e 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi # Check for compiler and library settings. =20 LIBVIRT_ARG_NSS -LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK @@ -121,7 +120,6 @@ LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER -LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_PTHREAD @@ -413,7 +411,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS -LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_RBD diff --git a/m4/virt-pciaccess.m4 b/m4/virt-pciaccess.m4 deleted file mode 100644 index da92647d467..00000000000 --- a/m4/virt-pciaccess.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libpciaccess.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_PCIACCESS],[ - LIBVIRT_ARG_WITH_FEATURE([PCIACCESS], [pciaccess], [check], [0.10.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_PCIACCESS],[ - LIBVIRT_CHECK_PKG([PCIACCESS], [pciaccess], [0.10.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_PCIACCESS],[ - LIBVIRT_RESULT_LIB([PCIACCESS]) -]) diff --git a/meson.build b/meson.build index a9ebcd18842..17116af59da 100644 --- a/meson.build +++ b/meson.build @@ -1223,6 +1223,9 @@ openwsman_dep =3D dependency('openwsman', version: '>= =3D' + openwsman_version, requi parallels_sdk_version =3D '7.0.22' parallels_sdk_dep =3D dependency('parallels-sdk', version: '>=3D' + parall= els_sdk_version, required: false) =20 +pciaccess_version =3D '0.10.0' +pciaccess_dep =3D dependency('pciaccess', version: '>=3D' + pciaccess_vers= ion, required: get_option('pciaccess')) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1378,6 +1381,7 @@ libs_summary =3D { 'NLS': have_gnu_gettext_tools, 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), + 'pciaccess': pciaccess_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 05d5e44f420..991245e0841 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -32,4 +32,5 @@ option('netcf', type: 'feature', value: 'auto', descripti= on: 'netcf support') option('nls', type: 'feature', value: 'auto', description: 'nls support') option('numactl', type: 'feature', value: 'auto', description: 'numactl su= pport') option('openwsman', type: 'feature', value: 'auto', description: 'openwsma= n support') +option('pciaccess', type: 'feature', value: 'auto', description: 'pciacces= s support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893784; cv=none; d=zohomail.com; s=zohoarc; b=ESozOcIwRH2YjExBFp+Jn5K218HOP9OPQRUm6EWGzn5CtgIpF/EO1uM76IUoczwdau2dYOUu9E0TxwnwQ1Pc8Kn1PYz2DnZ4767mv4elhjqsm2nVXK+gXhwNCZKLB1Qun64oZmgEUC3fsog79D8GDSUWWDGwxYnj9HO0kkW+k6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893784; 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=oT8JCfIj9iOh/yNAvKk+A0Eq9uVgj1QB7BwFtNoX2VE=; b=KFt2sLl+PwlADr/2gek3+MBpQfNkIizh+cNJhG22LbXOUzslf2Z9hL1bqAH4bfMHZkTtKOXrdUCQAdw5fmoAO/7nca32DY4jgqF46GK4Z9t6JB4dMKqLHcEnvwQm3J1Au8LbUUmNu8Hx8O+HF/BYEH9IKTV+Dl/1xW16M75ShzA= 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 1594893784085216.8198280650181; Thu, 16 Jul 2020 03:03:04 -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-349-GRBo5gp8NZqUhe1h-a2e1g-1; Thu, 16 Jul 2020 06:03:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B878019057B8; Thu, 16 Jul 2020 10:02:28 +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 6EB817951E; Thu, 16 Jul 2020 10:02:28 +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 3724C1809563; Thu, 16 Jul 2020 10:02:28 +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 06GA2PSa016387 for ; Thu, 16 Jul 2020 06:02:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 13FED2B6DB; Thu, 16 Jul 2020 10:02:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 816162DE6B for ; Thu, 16 Jul 2020 10:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893783; 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=oT8JCfIj9iOh/yNAvKk+A0Eq9uVgj1QB7BwFtNoX2VE=; b=gO+6uml3zuBYVvZFem+LRLqwyBarvJY5tuzPqM4BxDybpNl2012Cc9oMt4EvGQjtNvKNcF L8rMFTsg++GRtPX1OHymEK7MYAN8uYXpOLEReZXFwejjnR/D0cCvK/ZvF+JZX51pAMtQ1W SAaR8Lu5qIyoBzXFKAgQGOisMk//ErM= X-MC-Unique: GRBo5gp8NZqUhe1h-a2e1g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 067/351] meson: add polkit build option Date: Thu, 16 Jul 2020 11:55:03 +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.14 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 --- configure.ac | 3 --- m4/virt-polkit.m4 | 62 ----------------------------------------------- meson.build | 13 ++++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 m4/virt-polkit.m4 diff --git a/configure.ac b/configure.ac index 49e6cb6e84e..359bfe4fa54 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_POLKIT LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX @@ -121,7 +120,6 @@ LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_POLKIT LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL @@ -412,7 +410,6 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS -LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_RBD LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4 deleted file mode 100644 index 06da9e4ba6f..00000000000 --- a/m4/virt-polkit.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl The polkit library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_POLKIT], [ - LIBVIRT_ARG_WITH([POLKIT], [use PolicyKit for UNIX socket access checks], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_POLKIT], [ - AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - - if test "x$with_win" =3D "xyes"; then - with_polkit=3Dno - fi - - if test "x$with_polkit" =3D "xcheck"; then - dnl For --with-polkit=3Dcheck, also require the pkcheck binary, even - dnl though we talk to polkit directly over D-Bus. - AC_PATH_PROG([PKCHECK_PATH], [pkcheck], [], [$LIBVIRT_SBIN_PATH]) - if test "x$PKCHECK_PATH" =3D "x" ; then - with_polkit=3D"no" - fi - fi - - if test "x$with_polkit" =3D "xyes" || test "x$with_polkit" =3D "xcheck";= then - dnl For --with-polkit=3Dyes, all we need is D-Bus. - if test "x$with_dbus" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, - [use PolicyKit for UNIX socket access checks]) - with_polkit=3D"yes" - else - if test "x$with_polkit" =3D "xcheck" ; then - with_polkit=3Dno - else - AC_MSG_ERROR( - [You must install dbus to compile libvirt with polkit-1]) - fi - fi - fi - - AM_CONDITIONAL([WITH_POLKIT], [test "x$with_polkit" =3D "xyes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_POLKIT], [ - LIBVIRT_RESULT([polkit], [$with_polkit]) -]) diff --git a/meson.build b/meson.build index 17116af59da..e6dc0aa8717 100644 --- a/meson.build +++ b/meson.build @@ -1226,6 +1226,12 @@ parallels_sdk_dep =3D dependency('parallels-sdk', ve= rsion: '>=3D' + parallels_sdk_ve pciaccess_version =3D '0.10.0' pciaccess_dep =3D dependency('pciaccess', version: '>=3D' + pciaccess_vers= ion, required: get_option('pciaccess')) =20 +if not get_option('polkit').disabled() and host_machine.system() !=3D 'win= dows' + pkcheck_prog =3D find_program('pkcheck', required: false, dirs: libvirt_= sbin_path) +else + pkcheck_prog =3D dependency('', required: false) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1333,6 +1339,12 @@ if conf.has('WITH_MACVTAP') and not conf.has('HAVE_L= IBNL') error('libnl3-devel is required for macvtap support') endif =20 +if (pkcheck_prog.found() or get_option('polkit').enabled()) and dbus_dep.f= ound() + conf.set('WITH_POLKIT', 1) +elif get_option('polkit').enabled() + error('You must install dbus to compile libvirt with polkit-1') +endif + =20 # define top include directory =20 @@ -1382,6 +1394,7 @@ libs_summary =3D { 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), + 'polkit': conf.has('WITH_POLKIT'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 991245e0841..3dfe4ca0166 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -33,4 +33,5 @@ option('nls', type: 'feature', value: 'auto', description= : 'nls support') option('numactl', type: 'feature', value: 'auto', description: 'numactl su= pport') option('openwsman', type: 'feature', value: 'auto', description: 'openwsma= n support') option('pciaccess', type: 'feature', value: 'auto', description: 'pciacces= s support') +option('polkit', type: 'feature', value: 'auto', description: 'use PolicyK= it for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893837; cv=none; d=zohomail.com; s=zohoarc; b=HfcCnlxhTwzPbmZlSS0JQ+9TFSdpYQxD3/m8otUhd95ovfIZxJWaxfw6pR4Z2/oKWfdqXguUa4KgUaKLdVAN2Pk8i7hwUjUpOFURyvm1N1hy+6cO1ILQHX35icG1Ip7I5Wk5mC7R8aozdTUxv8i1+5+jYFrYovn1mZuR2GDyzuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893837; 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=ub3OYckD7hFAZIv5NSsq0ItT8lOqqgGvXUbjKiXr440=; b=CMU8mn1E/XRwJiLyXIIDp71lyU19vOe5zANYsFjoEdVXb4uw2g+z7mYIzLTR/1YGXeIKBLiq7aElrAcNDGKCQE/rkzn3K8I728GYCVYhemLgnaToLu/kQw/PVwJqY5hcD2kZAyPbjBR/AQKE9MQQmWL6Ly5vK3LEMjHaEz3Oi44= 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 1594893837555322.0468858045821; Thu, 16 Jul 2020 03:03:57 -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-361-sPg0o-nMPg2kecx-Btg_9w-1; Thu, 16 Jul 2020 06:03:00 -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 1940A5AEFA; Thu, 16 Jul 2020 10:02:31 +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 E6E68610AF; Thu, 16 Jul 2020 10:02:30 +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 B0F6F96222; Thu, 16 Jul 2020 10:02:30 +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 06GA2Q0W016402 for ; Thu, 16 Jul 2020 06:02:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id F27332B6E2; Thu, 16 Jul 2020 10:02:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69DB72B6DB for ; Thu, 16 Jul 2020 10:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893836; 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=ub3OYckD7hFAZIv5NSsq0ItT8lOqqgGvXUbjKiXr440=; b=H3QSv6zntVq0pFbo6wYBFZ9ceKJizttlL5wcSPONwIwYF/DgPUj6BIMLfEiarkZ+N3WV6W Xt5d4dlH/5gG/2lOqvhYYUPIfwk2v5qHu7DJts4IsrxIOXgH+9Rqz7Q59sDu7cqJjuqxQp nBp4FJa1H7U6hSEFjEFEJ8uvpDiLucQ= X-MC-Unique: sPg0o-nMPg2kecx-Btg_9w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 068/351] meson: add rbd build dependency Date: Thu, 16 Jul 2020 11:55:04 +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.12 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 --- m4/virt-storage-rbd.m4 | 12 ------------ meson.build | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4 index f3d9d049084..cd3b24ea2fa 100644 --- a/m4/virt-storage-rbd.m4 +++ b/m4/virt-storage-rbd.m4 @@ -25,18 +25,6 @@ AC_DEFUN([LIBVIRT_STORAGE_ARG_RBD], [ AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [ LIBRBD_LIBS=3D if test "$with_storage_rbd" =3D "yes" || test "$with_storage_rbd" =3D "c= heck"; then - AC_CHECK_HEADER([rbd/librbd.h], [LIBRBD_FOUND=3Dyes; break;]) - - if test "$LIBRBD_FOUND" =3D "yes"; then - LIBRBD_LIBS=3D"-lrbd -lrados" - - old_LIBS=3D"$LIBS" - LIBS=3D"$LIBS $LIBRBD_LIBS" - AC_CHECK_FUNCS([rbd_get_features],[],[LIBRBD_FOUND=3Dno]) - AC_CHECK_FUNCS([rbd_list2]) - LIBS=3D"$old_LIBS" - fi - if test "$LIBRBD_FOUND" =3D "yes"; then with_storage_rbd=3Dyes AC_DEFINE_UNQUOTED([WITH_STORAGE_RBD], [1], diff --git a/meson.build b/meson.build index e6dc0aa8717..d272b5cca05 100644 --- a/meson.build +++ b/meson.build @@ -1232,6 +1232,21 @@ else pkcheck_prog =3D dependency('', required: false) endif =20 +rbd_dep =3D cc.find_library('rbd', required: false) +rados_dep =3D cc.find_library('rados', required: false) +if rbd_dep.found() and not cc.has_function('rbd_get_features', dependencie= s: rbd_dep) + rbd_dep =3D dependency('', required: false) +endif +if rbd_dep.found() and rados_dep.found() + if cc.has_function('rbd_list2', dependencies: rbd_dep) + conf.set('HAVE_RBD_LIST2', 1) + endif + + rbd_dep =3D declare_dependency(dependencies: [ rbd_dep, rados_dep ]) +else + rbd_dep =3D dependency('', required: false) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1395,6 +1410,7 @@ libs_summary =3D { 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), 'polkit': conf.has('WITH_POLKIT'), + 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893762; cv=none; d=zohomail.com; s=zohoarc; b=KgmxtPH8xxjWswxXw/PZBfoeDNzN3hGjmXfLBGCepjIBPNUoqpAjYGJJn/j2s9305pzI1IiswhVAujloMYrqSbz7FoLU8lUB3KJVeGmQkG8QcNMecSpesYwbTNkEf5VrIu0oGThyBrzKPOM/Q39haoN6/RnfiPKszTef0g7mIwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893762; 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=fpIq62YLwoYOM68DVkpkYuf4QVGywcm74UOHa7o260I=; b=kTujGA1f/tP/Febt3OP5G2qRve1EqvQrTWGb9Ga8qZs5az76D8HmBDEpnjD5fDod93lMyiWsARvjhZBPcmbzKpmaIrKh4rnCEeuKiaToDJClpQ8DG7lJiZZ/ZMirIZB9a7H0nhKKOTwl9ti5sSGwL+D3RZyVy6//FSbmgzlamdk= 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 1594893762244467.1897038283772; Thu, 16 Jul 2020 03:02:42 -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-399-VRao7lhOOLuHKn_l2x3pzQ-1; Thu, 16 Jul 2020 06:02:38 -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 51326107B2A8; Thu, 16 Jul 2020 10:02:30 +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 0D36D7BEBD; Thu, 16 Jul 2020 10:02:30 +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 C22D51809554; Thu, 16 Jul 2020 10:02:29 +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 06GA2QXi016412 for ; Thu, 16 Jul 2020 06:02:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB2922B6E2; Thu, 16 Jul 2020 10:02:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55B352B6DB for ; Thu, 16 Jul 2020 10:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893761; 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=fpIq62YLwoYOM68DVkpkYuf4QVGywcm74UOHa7o260I=; b=BOd6+PiWF+ZB2gLi4/jGh5NUQy/Ph8D7ESZe7/giIhFV0IbTu+U0XYSur9aAC9ok3mVAQd vY2KItUw+dPuLzQQ+XSEmFE+agxG7JWyuJGLDyOPQ8zMZP+GPfXyf2c0mj9/mNwPrh5CLm PRTgW5kgIfvcYArPw2y5dUIUCWXZ+Vw= X-MC-Unique: VRao7lhOOLuHKn_l2x3pzQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 069/351] meson: add sanlock build option Date: Thu, 16 Jul 2020 11:55:05 +0200 Message-Id: <5cf1cad6baf1276d7b81cdf5f3badd0a10664dcc.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.13 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 --- configure.ac | 3 --- m4/virt-sanlock.m4 | 47 ---------------------------------------------- meson.build | 13 +++++++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-sanlock.m4 diff --git a/configure.ac b/configure.ac index 359bfe4fa54..97b0f6c4bb8 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_SANLOCK LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX LIBVIRT_ARG_UDEV @@ -121,7 +120,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_UDEV @@ -411,7 +409,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_UDEV diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 deleted file mode 100644 index eb05ab6934b..00000000000 --- a/m4/virt-sanlock.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libsanlock_client.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SANLOCK],[ - LIBVIRT_ARG_WITH_FEATURE([SANLOCK], [sanlock-client], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ - LIBVIRT_CHECK_PKG([SANLOCK], [libsanlock_client], [3.2.4]) - - if test "x$with_sanlock" =3D "xyes" ; then - old_cppflags=3D"$CPPFLAGS" - old_libs=3D"$LIBS" - CPPFLAGS=3D"$CPPFLAGS $SANLOCK_CFLAGS" - LIBS=3D"$LIBS $SANLOCK_LIBS" - - AC_CHECK_LIB([sanlock_client], [sanlock_strerror], - [sanlock_strerror=3Dyes], [sanlock_strerror=3Dno]) - if test "x$sanlock_strerror" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_SANLOCK_STRERROR], 1, - [whether sanlock supports sanlock_strerror]) - fi - - CPPFLAGS=3D"$old_cppflags" - LIBS=3D"$old_libs" - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_SANLOCK],[ - LIBVIRT_RESULT_LIB([SANLOCK]) -]) diff --git a/meson.build b/meson.build index d272b5cca05..1bdca816379 100644 --- a/meson.build +++ b/meson.build @@ -1310,6 +1310,18 @@ if readline_dep.found() conf.set('WITH_READLINE', 1) endif =20 +if not get_option('sanlock').disabled() + sanlock_dep =3D dependency('libsanlock_client', required: false) + + if sanlock_dep.found() + conf.set('WITH_SANLOCK', 1) + # check for sanlock_strerror introduced in sanlock-3.5.0 + if cc.has_function('sanlock_strerror', dependencies: sanlock_dep) + conf.set('HAVE_SANLOCK_STRERROR', 1) + endif + endif +endif + =20 # generic build dependencies checks =20 @@ -1412,6 +1424,7 @@ libs_summary =3D { 'polkit': conf.has('WITH_POLKIT'), 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), + 'sanlock': conf.has('WITH_SANLOCK'), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 3dfe4ca0166..964fe5e8aea 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -35,3 +35,4 @@ option('openwsman', type: 'feature', value: 'auto', descr= iption: 'openwsman supp option('pciaccess', type: 'feature', value: 'auto', description: 'pciacces= s support') option('polkit', type: 'feature', value: 'auto', description: 'use PolicyK= it for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline = support') +option('sanlock', type: 'feature', value: 'auto', description: 'sanlock su= pport') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893785; cv=none; d=zohomail.com; s=zohoarc; b=RC7LF4goWQL7gqV7ZvuB2p8+bneYNGI4UxJX/366h8jOO8Z0rx0Ai88FbzMEZ4tb6arA77xb+oQlHh6YEzueY8xU2d9EsZ3Sm9KOLQsjeuAhqOKgVGDQ2oy1X7NQPQSVCexwdBfjPsoy3pVLP9sejWI54V5Sio/CtbNL+lF6iaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893785; 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=8nPkrNgXHPhkN0QPKhqxEQtGr4epiIZDL34sNwZHohs=; b=SXibGWQxmzjk3BErVYft1ZjbSuvxHXZ/tSSOSEwHnkkQVBvw8FF1jR3ksvxss5E/YKrj2DRHAFrpx/KHdw31g1lhRQukRIQr5x72CcHGw6gVl7E81YMEQ4fqxkHa4vMNQpVzDFCo1f1WDVx6pAJzSZUEjqBQmVZmqEeISmNBWrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893785048509.59201389250984; Thu, 16 Jul 2020 03:03:05 -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-364--Sg1Ow8sNxKMRbkBxoX2mg-1; Thu, 16 Jul 2020 06:03:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A62D58039FB; Thu, 16 Jul 2020 10:02:32 +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 85CD2724C2; Thu, 16 Jul 2020 10:02:32 +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 51DC696232; Thu, 16 Jul 2020 10:02:32 +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 06GA2R7n016422 for ; Thu, 16 Jul 2020 06:02:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C4B572B6E6; Thu, 16 Jul 2020 10:02:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F0FC2B6DB for ; Thu, 16 Jul 2020 10:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893783; 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=8nPkrNgXHPhkN0QPKhqxEQtGr4epiIZDL34sNwZHohs=; b=SEeLK3i33J4RWTAF5h8F3vAqIqv8PMJGik7lsL1UYXvsXGQ8xyDqMDBZQdGz+x75qKoEeb aKaT4mNW473n/s10EDtG0v4skGRea6mIuZ9YWKNqBdXSx5IrRzDglGdL/IiMybCOmLc5ao JvVjlVEmfHWUDwEiCwK2HDdZLjBhsFg= X-MC-Unique: -Sg1Ow8sNxKMRbkBxoX2mg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 070/351] meson: add sasl build dependency Date: Thu, 16 Jul 2020 11:55:06 +0200 Message-Id: <4c91b190b9264ed8e512dc0af5707481dd61af41.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.11 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 --- configure.ac | 4 ---- m4/virt-sasl.m4 | 30 ------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 m4/virt-sasl.m4 diff --git a/configure.ac b/configure.ac index 97b0f6c4bb8..c8d7bbf7a92 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,6 @@ fi # RPC, we don't need several libraries. if test "$with_remote" =3D "no" ; then with_libvirtd=3Dno - with_sasl=3Dno fi # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then @@ -110,7 +109,6 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_SASL LIBVIRT_ARG_SELINUX LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT @@ -120,7 +118,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT @@ -409,7 +406,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT diff --git a/m4/virt-sasl.m4 b/m4/virt-sasl.m4 deleted file mode 100644 index 674e1693502..00000000000 --- a/m4/virt-sasl.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libsasl2.so or libsasl.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SASL],[ - LIBVIRT_ARG_WITH_FEATURE([SASL], [sasl], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SASL],[ - LIBVIRT_CHECK_PKG([SASL], [libsasl2], [2.1.26]) -]) - -AC_DEFUN([LIBVIRT_RESULT_SASL],[ - LIBVIRT_RESULT_LIB([SASL]) -]) diff --git a/meson.build b/meson.build index 1bdca816379..d7f3fa7a198 100644 --- a/meson.build +++ b/meson.build @@ -1322,6 +1322,16 @@ if not get_option('sanlock').disabled() endif endif =20 +sasl_version =3D '2.1.26' +if get_option('driver_remote').enabled() + sasl_dep =3D dependency('libsasl2', version: '>=3D' + sasl_version, requ= ired: get_option('sasl')) + if sasl_dep.found() + conf.set('WITH_SASL', 1) + endif +else + sasl_dep =3D dependency('', required: false) +endif + =20 # generic build dependencies checks =20 @@ -1425,6 +1435,7 @@ libs_summary =3D { 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), 'sanlock': conf.has('WITH_SANLOCK'), + 'sasl': sasl_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 964fe5e8aea..a674876713c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,3 +36,4 @@ option('pciaccess', type: 'feature', value: 'auto', descr= iption: 'pciaccess supp option('polkit', type: 'feature', value: 'auto', description: 'use PolicyK= it for UNIX socket access checks') option('readline', type: 'feature', value: 'auto', description: 'readline = support') option('sanlock', type: 'feature', value: 'auto', description: 'sanlock su= pport') +option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893867; cv=none; d=zohomail.com; s=zohoarc; b=Gh5GF+QU1nFFpzIzsxCYunooIhOoDSjI/a4kbKBDS8FTvQuK3zG/wznhXZCNIsRlyZJBxqwwPGfD8W0IGreMnKudp2tIv6eFlN/3f0Apv1IySpwmHQRx1bWwZguAd9Qdni7PE739Oqhg0llLuVA3evUa7PTujti7QYfw7Bfxz+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893867; 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=Pt1YH5DVDf9QwEVC2gZX66OA+i5Cobi9ogDgpgsU3IY=; b=FCEcFzYzCo7DKTOcFCBau5LlIyyuAmJI/VuyfTHmgZvr8qbKuqSh7wsa8NYSa2PrbGvWEnHjsQmWxeB2Ok62Ppmb/MmLHCPQY/B7XvBrYCcQieEA0R2DUfDvGBQQYSwfw5px1ipJlZkGkH8/mgRMLSqRKUAPBHIEJRZYBGDcpdk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893867683392.68328501463395; Thu, 16 Jul 2020 03:04:27 -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-428-jbJf4U1qNrK56CIVnHgjvg-1; Thu, 16 Jul 2020 06:03:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02FB419253C7; Thu, 16 Jul 2020 10:02:35 +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 D3A4578A50; Thu, 16 Jul 2020 10:02:34 +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 9EA791809554; Thu, 16 Jul 2020 10:02:34 +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 06GA2S01016435 for ; Thu, 16 Jul 2020 06:02:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id B43EA2B6DB; Thu, 16 Jul 2020 10:02:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2ADDF2E023 for ; Thu, 16 Jul 2020 10:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893866; 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=Pt1YH5DVDf9QwEVC2gZX66OA+i5Cobi9ogDgpgsU3IY=; b=e5V1JzaTv4dvYajoVevZzlhi8nFEYpfja1sc6VunFN/P664OXhCSkw7B+WNiJyaeVuRnFD B3V+zqKGF+XqsuEy28usnfF7NjNgSllr2agxv46qmXTLEh0EFgvE1Bjw1Ay2+gsmBHIuB3 FuQ57fVczW6L61s/62/nm9xnQKgklOM= X-MC-Unique: jbJf4U1qNrK56CIVnHgjvg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 071/351] meson: add SELinux build dependency Date: Thu, 16 Jul 2020 11:55:07 +0200 Message-Id: <58469e49cee5a35fca30c138304d3da73d31975d.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.14 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 --- configure.ac | 3 --- m4/virt-selinux.m4 | 47 ---------------------------------------------- meson.build | 15 +++++++++++++++ meson_options.txt | 2 ++ 4 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-selinux.m4 diff --git a/configure.ac b/configure.ac index c8d7bbf7a92..0a51a07be0e 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_SELINUX LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK @@ -118,7 +117,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_PTHREAD -LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK @@ -406,7 +404,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 deleted file mode 100644 index fb541e207ed..00000000000 --- a/m4/virt-selinux.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The libselinux.so library -dnl -dnl Copyright (C) 2012-2014, 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SELINUX],[ - LIBVIRT_ARG_WITH_FEATURE([SELINUX], [SELinux], [check]) - LIBVIRT_ARG_WITH([SELINUX_MOUNT], [set SELinux mount point], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SELINUX],[ - LIBVIRT_CHECK_LIB([SELINUX], [selinux], - [fgetfilecon_raw], [selinux/selinux.h]) - - if test "$with_selinux" =3D "yes"; then - AC_MSG_CHECKING([SELinux mount point]) - if test "$with_selinux_mount" =3D "check" || test -z "$with_selinux_mo= unt"; then - if test -d /sys/fs/selinux ; then - SELINUX_MOUNT=3D/sys/fs/selinux - else - SELINUX_MOUNT=3D/selinux - fi - else - SELINUX_MOUNT=3D$with_selinux_mount - fi - AC_MSG_RESULT([$SELINUX_MOUNT]) - AC_DEFINE_UNQUOTED([SELINUX_MOUNT], ["$SELINUX_MOUNT"], [SELinux mount= point]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_SELINUX],[ - LIBVIRT_RESULT_LIB([SELINUX]) -]) diff --git a/meson.build b/meson.build index d7f3fa7a198..fa4dbee3ef3 100644 --- a/meson.build +++ b/meson.build @@ -1332,6 +1332,20 @@ else sasl_dep =3D dependency('', required: false) endif =20 +selinux_dep =3D cc.find_library('selinux', required: get_option('selinux')) +if selinux_dep.found() + selinux_mount =3D get_option('selinux_mount') + if selinux_mount =3D=3D '' + if run_command('test', '-d', '/sys/fs/selinux').returncode() =3D=3D 0 + selinux_mount =3D '/sys/fs/selinux' + else + selinux_mount =3D '/selinux' + endif + endif + conf.set_quoted('SELINUX_MOUNT', selinux_mount) + conf.set('WITH_SELINUX', 1) +endif + =20 # generic build dependencies checks =20 @@ -1436,6 +1450,7 @@ libs_summary =3D { 'readline': readline_dep.found(), 'sanlock': conf.has('WITH_SANLOCK'), 'sasl': sasl_dep.found(), + 'selinux': selinux_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index a674876713c..40830f9494a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -37,3 +37,5 @@ option('polkit', type: 'feature', value: 'auto', descript= ion: 'use PolicyKit for option('readline', type: 'feature', value: 'auto', description: 'readline = support') option('sanlock', type: 'feature', value: 'auto', description: 'sanlock su= pport') option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') +option('selinux', type: 'feature', value: 'auto', description: 'selinux su= pport') +option('selinux_mount', type: 'string', value: '', description: 'set SELin= ux mount point') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894348; cv=none; d=zohomail.com; s=zohoarc; b=ManQZFVc0xdwD2uyNOessCospPhAh49jh4lb7vHRDCTYNzlh3tI2A33mqYr0kIyVeHG9KXn+senHyn/nadIX2cOk4NGZRG/saI4RkLr+YfyiELDMYmDTuX/AxudjrLLdyIgHPb95eqKA03co32hwYsLXp9xBisc2aRgoVLc7QX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894348; 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=TRqu5HsIkQkS5BtIcFavUlOjFO6RtDNsSrHYfgc9208=; b=Mfckwvj2mKJKBojwVnkvFpe8HzNbB4bwFsXj5yyhgMOkh73YqEgEfrVi7gSK+FP4ghUpX/W8YE9Vm5Z8zoz9ArG4At3lh7Dd4C1n3pBUmcQ57sK6nLdacimNWGoW4ixlLnupp7xuUjGfppTvZPI93VVBVFzCeFmrDvinxxEmdmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894348209772.5522467640103; Thu, 16 Jul 2020 03:12:28 -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-272-CuX2xG71M3qveWxgBdPlwQ-1; Thu, 16 Jul 2020 06:03:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82DEE1E01; Thu, 16 Jul 2020 10:02:33 +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 6007978A59; Thu, 16 Jul 2020 10:02:33 +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 30C7C96238; Thu, 16 Jul 2020 10:02:33 +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 06GA2TvK016450 for ; Thu, 16 Jul 2020 06:02:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id B36CC2B6E6; Thu, 16 Jul 2020 10:02:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17BB32B6DB for ; Thu, 16 Jul 2020 10:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894347; 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=TRqu5HsIkQkS5BtIcFavUlOjFO6RtDNsSrHYfgc9208=; b=df2uUGuv0DGN+B9pyByL03npxqoLL961LEnCQihuU4XfE+yA91Y3IwHDpWo2+gKbKE8FtT wmFTVxSoOWR4lc/18omoYq06X/wgnLXRQfXXAswko/VG3nF1c4K/3MCIwra2Iv2g/f4rQ7 tttW7IuAVjsfran6cT3TD2vQXZo1l1M= X-MC-Unique: CuX2xG71M3qveWxgBdPlwQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 072/351] meson: add thread build dependency Date: Thu, 16 Jul 2020 11:55:08 +0200 Message-Id: <19297ee6e169433d0a51733c6c0225aa0f8563e5.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.14 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 --- configure.ac | 1 - m4/virt-pthread.m4 | 58 ---------------------------------------------- meson.build | 18 ++++++++++++++ 3 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 m4/virt-pthread.m4 diff --git a/configure.ac b/configure.ac index 0a51a07be0e..60cde7c3da7 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_PTHREAD LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK diff --git a/m4/virt-pthread.m4 b/m4/virt-pthread.m4 deleted file mode 100644 index 0b52b40bb82..00000000000 --- a/m4/virt-pthread.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The libpthread.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_PTHREAD], [ - dnl Availability of pthread functions - - AC_SEARCH_LIBS([pthread_mutexattr_init],[pthread ""]) - - if test "$ac_cv_func_pthread_mutexattr_init" =3D "no" - then - AC_MSG_ERROR([libpthread is required for building libvirt]) - fi - THREAD_LIBS=3D"" - if test "x$ac_cv_func_pthread_mutexattr_init" !=3D "x" - then - THREAD_LIBS=3D"-l$ac_cv_func_pthread_mutexattr_init" - fi - AC_SUBST([THREAD_LIBS]) - - AC_CHECK_HEADER([pthread.h],,[ - AC_MSG_ERROR([pthread.h is required for building libvirt]) - ]) - - dnl At least mingw64-winpthreads #defines pthread_sigmask to 0, - dnl which in turn causes compilation to complain about unused variables. - dnl Expose this broken implementation, so we can work around it. - AC_CACHE_CHECK([whether pthread_sigmask does anything], - [lv_cv_pthread_sigmask_works], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]], [[ - #ifdef pthread_sigmask - int (*foo)(int, const sigset_t *, sigset_t *) =3D &pthread_sigmask; - return !foo; - #endif - ]])], [lv_cv_pthread_sigmask_works=3Dyes], [lv_cv_pthread_sigmask_work= s=3Dno])]) - if test "x$lv_cv_pthread_sigmask_works" !=3D xyes; then - AC_DEFINE([FUNC_PTHREAD_SIGMASK_BROKEN], [1], - [Define to 1 if pthread_sigmask is not a real function]) - fi -]) diff --git a/meson.build b/meson.build index fa4dbee3ef3..41c6075985d 100644 --- a/meson.build +++ b/meson.build @@ -1346,6 +1346,24 @@ if selinux_dep.found() conf.set('WITH_SELINUX', 1) endif =20 +thread_dep =3D dependency('threads', required: true) +pthread_sigmask_code =3D ''' + #include + #include + + int main() { + #ifdef pthread_sigmask + int (*foo)(int, const sigset_t *, sigset_t *) =3D &pthread_sigmask; + return !foo; + #endif + + return 0; + } +''' +if not cc.compiles(pthread_sigmask_code) + conf.set('FUNC_PTHREAD_SIGMASK_BROKEN', 1) +endif + =20 # generic build dependencies checks =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894092; cv=none; d=zohomail.com; s=zohoarc; b=KczmhCeZzpiWf7kn+RNsQtS9xJ9w3YuJ++tWCQMuxPcoBVF231HrmWAkaI2/zr3dWDJNnLh7JzekT3MvTjPwvLGUvUHssGF1ym+H90YGUyrJVubScriOCH4Gmz1skUhXWi4Tjse4E8DPx5/TYaV6KCkUyGNoRXaqHG9OMVw2/mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894092; 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=Bd8wGtAjRu/2/AanozXI7C2zi0HsKsDCXua1r0UV31A=; b=ZWmcd1vPSzI+xQMpROhKkMuQy5wzxo10Xuivid9eGDBl4n62nQs1qxtyF9ADp/e0L3KiYqnRgkI8735CAbHn4sCYe/tueZYii15caNO2MJvkDW0HWjS8SLKIqsu3JcvPwlpOiHsecg9iQ4Q2ERthcM9Ji1333qLMQxS646EBUms= 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 1594894092722444.1262494996448; Thu, 16 Jul 2020 03:08: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-7-5zfJNzfdOI2cpOwBWFIx5Q-1; Thu, 16 Jul 2020 06:03:05 -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 734BD803622; Thu, 16 Jul 2020 10:02:37 +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 53BBF79D06; Thu, 16 Jul 2020 10:02:37 +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 2402696232; Thu, 16 Jul 2020 10:02:37 +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 06GA2UGb016458 for ; Thu, 16 Jul 2020 06:02:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8CF192DE6F; Thu, 16 Jul 2020 10:02:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 084232B6DB for ; Thu, 16 Jul 2020 10:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894091; 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=Bd8wGtAjRu/2/AanozXI7C2zi0HsKsDCXua1r0UV31A=; b=TWnAdlS6OkoyVkiY+B7JQ1wreFo5rXgq6eXYBMMxyFj5hDCSOP7zum7iZqE3ZItccP1GoC z6042V/7sQQB2XHHrj56ucMSjRodYrEJCnPNd31aTS8LbhZZmxBZV84rtoWcmE9dWoA7lY waXMqZFkceWue1sY3oPzFdsrtURgP7s= X-MC-Unique: 5zfJNzfdOI2cpOwBWFIx5Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 073/351] meson: add udev build options Date: Thu, 16 Jul 2020 11:55:09 +0200 Message-Id: <3cf2b5eaded1eb04fa1004e455a928f8ad3ad327.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.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 --- configure.ac | 3 --- m4/virt-udev.m4 | 36 ------------------------------------ meson.build | 11 +++++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-udev.m4 diff --git a/configure.ac b/configure.ac index 60cde7c3da7..da4873ea6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -109,14 +109,12 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_UDEV LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR @@ -403,7 +401,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 deleted file mode 100644 index 2e0f993e339..00000000000 --- a/m4/virt-udev.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The libudev.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_UDEV],[ - LIBVIRT_ARG_WITH_FEATURE([UDEV], [libudev], [check], [219]) -]) - -AC_DEFUN([LIBVIRT_CHECK_UDEV],[ - AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS]) - LIBVIRT_CHECK_PKG([UDEV], [libudev], [219]) - - if test "$with_udev" =3D "yes" && test "$with_pciaccess" !=3D "yes" ; th= en - AC_MSG_ERROR([You must install the pciaccess module to build with udev= ]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_UDEV],[ - AC_REQUIRE([LIBVIRT_RESULT_PCIACCESS]) - LIBVIRT_RESULT_LIB([UDEV]) -]) diff --git a/meson.build b/meson.build index 41c6075985d..453522fd79a 100644 --- a/meson.build +++ b/meson.build @@ -1364,6 +1364,12 @@ if not cc.compiles(pthread_sigmask_code) conf.set('FUNC_PTHREAD_SIGMASK_BROKEN', 1) endif =20 +udev_version =3D '219' +udev_dep =3D dependency('libudev', version: '>=3D' + udev_version, require= d: get_option('udev')) +if udev_dep.found() + conf.set('WITH_UDEV', 1) +endif + =20 # generic build dependencies checks =20 @@ -1414,6 +1420,10 @@ elif get_option('polkit').enabled() error('You must install dbus to compile libvirt with polkit-1') endif =20 +if udev_dep.found() and not pciaccess_dep.found() + error('You must install the pciaccess module to build with udev') +endif + =20 # define top include directory =20 @@ -1469,6 +1479,7 @@ libs_summary =3D { 'sanlock': conf.has('WITH_SANLOCK'), 'sasl': sasl_dep.found(), 'selinux': selinux_dep.found(), + 'udev': udev_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 40830f9494a..42b63444ee4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -39,3 +39,4 @@ option('sanlock', type: 'feature', value: 'auto', descrip= tion: 'sanlock support' option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt') option('selinux', type: 'feature', value: 'auto', description: 'selinux su= pport') option('selinux_mount', type: 'string', value: '', description: 'set SELin= ux mount point') +option('udev', type: 'feature', value: 'auto', description: 'udev support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894354; cv=none; d=zohomail.com; s=zohoarc; b=LOIvzkvZ6D7V81a5/M4c15y6D9HANBJ0Ic6xumghv8XMo0IRj/5AlYF/cjmi6QbS3W/hb6FmYH3jrQGtHG4OXzS/4VH7UhuVKeLMeqI0K0uX+hqO/oQs6ftQAAroIlg8P6wnzlGWJsTNtBi3lDHPAcOgP0anSklG3scFDxX7iHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894354; 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=LUYJHcJ3L3eCCp7sBorUYQf+8kW3fXYm8Rs6QJJhoS0=; b=mEjwXdajIPsmZ9lcxh6EZKsw26YOSgSKsozfuzalF4LoXf6c10LoTrbutG433de+LVRRB9sdpeqTDS+u5WlAN5wrWyZW48xmUM3i27ZtmmAhpm+zP5lJOgLFFBof/ohY1BVWFT43Vj3M90eiZEryuiHrHj6OqoFFseOoNe8yGNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894354608502.2540857053567; Thu, 16 Jul 2020 03:12:34 -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-433-Km8ouf9BO6G7kCMNBum6uA-1; Thu, 16 Jul 2020 06:03:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 61CDE101440E; Thu, 16 Jul 2020 10:02:37 +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 2BDFD710D7; Thu, 16 Jul 2020 10:02:36 +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 EBB001809547; Thu, 16 Jul 2020 10:02:35 +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 06GA2VGq016471 for ; Thu, 16 Jul 2020 06:02:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75D362B6E2; Thu, 16 Jul 2020 10:02:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44262B6DB for ; Thu, 16 Jul 2020 10:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894353; 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=LUYJHcJ3L3eCCp7sBorUYQf+8kW3fXYm8Rs6QJJhoS0=; b=DEnt3RhVNMQ2fYCQ4w0qAkDqOgAufDBV/mZ9PhqpZj/sN1x4a5TQw2TG3J08XP7VSakLyf EMSU2fXb6lMgtzwCHbe8xrLJU2zIGzUOSnR2NId4Sfjvjfvz8+7lrdWK5L24w6Y/LBDugn tvsKUyVRpxQjtHos1+a4BZxBLk+SKUc= X-MC-Unique: Km8ouf9BO6G7kCMNBum6uA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 074/351] meson: add util build dependency Date: Thu, 16 Jul 2020 11:55:10 +0200 Message-Id: <7779c610812bf989df3c34ee24dbee121a6ae5e2.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.15 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 --- configure.ac | 2 -- meson.build | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index da4873ea6fd..4d437a54021 100644 --- a/configure.ac +++ b/configure.ac @@ -121,8 +121,6 @@ LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL =20 =20 -AC_CHECK_LIB([util],[openpty],[]) - =20 dnl dnl Virtualization drivers check diff --git a/meson.build b/meson.build index 453522fd79a..fa1236e87b8 100644 --- a/meson.build +++ b/meson.build @@ -1370,6 +1370,11 @@ if udev_dep.found() conf.set('WITH_UDEV', 1) endif =20 +util_dep =3D cc.find_library('util', required: false) +if util_dep.found() + add_project_link_arguments('-lutil', language: 'c') +endif + =20 # generic build dependencies checks =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893791; cv=none; d=zohomail.com; s=zohoarc; b=BgP4m7Xv69HVIPipt+jmDaQcJYCsqg1jHmkquNnBI3yxh9G62JMKQCLcquQoCW26gHgZuVMT3G2PgKEarIjWUit0gOcGukXmFFEYQ5Tj8VMT0dHMBoO3eZS4NYFSL7Neep176QRfFEdzJ1NkbuHYjfQhQB02L0UyhdPIAw2YQIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893791; 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=oiYCI7Hdaq3chNhtiJJg6xLg9cP7vxUhBKYme+1AFFA=; b=JXuYLGowIh2OYw/EpiblB5tspBjKRpUPt61g6fz+6WcKS0BvZUkWVgty8y9O0jSYZnTNC4TzDwTw1p9G3/OpJdU+F+g40zX7wWFvCY0g4qUJbICoYGAO09tvwU0RuNhMDMWoQaXYChrwryoZkKFPA0T5qlDi2TXrj29dld22eUc= 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 1594893791812292.2376401956168; Thu, 16 Jul 2020 03:03:11 -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-235-nqL5CINJNe6-QnNt7-LX0A-1; Thu, 16 Jul 2020 06:03:08 -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 B287E185BE08; Thu, 16 Jul 2020 10:02:38 +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 912451001B07; Thu, 16 Jul 2020 10:02: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 5DC0C1809557; Thu, 16 Jul 2020 10:02: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 06GA2WN4016487 for ; Thu, 16 Jul 2020 06:02:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D8512B6E2; Thu, 16 Jul 2020 10:02:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCB6A2B6DB for ; Thu, 16 Jul 2020 10:02:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893790; 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=oiYCI7Hdaq3chNhtiJJg6xLg9cP7vxUhBKYme+1AFFA=; b=evGoNr6ViSGmjEDh5/5nnFSZwvDux+bLJ0vZbk4pRrt/tw0Sr1GZgscT9NltM9KWCH84cf dY0OfPd6yhTidrwCdkxpnlRkW8JuCHhUcGZDf1VM0RpfWTpTR8x88c1ny7iwBnkKWxSwxV pLrJkOMy9HULY4YObKeQgRWO9baKK/k= X-MC-Unique: nqL5CINJNe6-QnNt7-LX0A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 075/351] meson: add virtualport build dependency Date: Thu, 16 Jul 2020 11:55:11 +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.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 --- configure.ac | 3 -- m4/virt-virtualport.m4 | 65 ------------------------------------------ meson.build | 13 +++++++++ meson_options.txt | 1 + 4 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 m4/virt-virtualport.m4 diff --git a/configure.ac b/configure.ac index 4d437a54021..86e4b63ddf7 100644 --- a/configure.ac +++ b/configure.ac @@ -109,13 +109,11 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_VIRTUALPORT LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL @@ -399,7 +397,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_VIRTUALPORT LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) diff --git a/m4/virt-virtualport.m4 b/m4/virt-virtualport.m4 deleted file mode 100644 index b758efc3c4a..00000000000 --- a/m4/virt-virtualport.m4 +++ /dev/null @@ -1,65 +0,0 @@ -dnl The virtualport support check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_VIRTUALPORT], [ - LIBVIRT_ARG_WITH([VIRTUALPORT], [enable virtual port support], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_VIRTUALPORT],[ - AC_REQUIRE([LIBVIRT_CHECK_MACVTAP]) - - dnl Warn the user and error out if they requested virtualport support - dnl with configure options, but the required macvtap support isn't avail= able - - if test "$with_virtualport" =3D "yes"; then - if test "$with_macvtap" =3D "no"; then - AC_MSG_ERROR([--with-virtualport requires --with-macvtap]) - fi - fi - - dnl virtualport checks - - if test "$with_macvtap" !=3D "yes"; then - with_virtualport=3Dno - fi - if test "$with_virtualport" !=3D "no"; then - AC_MSG_CHECKING([whether to compile with virtual port support]) - AC_TRY_COMPILE([ #include - #include ], - [ int x =3D IFLA_PORT_MAX; ], - [ with_virtualport=3Dyes ], - [ if test "$with_virtualport" =3D "yes" ; then - AC_MSG_ERROR([Installed linux headers don't show su= pport for virtual port support.]) - fi - with_virtualport=3Dno ]) - if test "$with_virtualport" =3D "yes"; then - val=3D1 - else - val=3D0 - fi - AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, - [whether vsi vepa support is enabled]) - AC_MSG_RESULT([$with_virtualport]) - fi - AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_VIRTUALPORT],[ - LIBVIRT_RESULT_LIB([VIRTUALPORT]) -]) diff --git a/meson.build b/meson.build index fa1236e87b8..f5cc0e1d41f 100644 --- a/meson.build +++ b/meson.build @@ -1375,6 +1375,14 @@ if util_dep.found() add_project_link_arguments('-lutil', language: 'c') endif =20 +if not get_option('virtualport').disabled() + if cc.has_header_symbol('linux/if_link.h', 'IFLA_PORT_MAX') + conf.set('WITH_VIRTUALPORT', 1) + elif get_option('virtualport').enabled() + error('Installed linux headers don\'t show support for virtual port su= pport.') + endif +endif + =20 # generic build dependencies checks =20 @@ -1429,6 +1437,10 @@ if udev_dep.found() and not pciaccess_dep.found() error('You must install the pciaccess module to build with udev') endif =20 +if conf.has('WITH_VIRTUALPORT') and not conf.has('WITH_MACVTAP') + error('macvtap is required for virtualport support') +endif + =20 # define top include directory =20 @@ -1485,6 +1497,7 @@ libs_summary =3D { 'sasl': sasl_dep.found(), 'selinux': selinux_dep.found(), 'udev': udev_dep.found(), + 'virtualport': conf.has('WITH_VIRTUALPORT'), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 42b63444ee4..025cc663027 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -40,3 +40,4 @@ option('sasl', type: 'feature', value: 'auto', descriptio= n: 'sasl supprt') option('selinux', type: 'feature', value: 'auto', description: 'selinux su= pport') option('selinux_mount', type: 'string', value: '', description: 'set SELin= ux mount point') option('udev', type: 'feature', value: 'auto', description: 'udev support') +option('virtualport', type: 'feature', value: 'auto', description: 'enable= virtual port support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893845; cv=none; d=zohomail.com; s=zohoarc; b=Afn1hWiB4QN1SzIppUerBcuj1UsFARu2vhmTP3jW6NmnLFbSUXPNFPY+sBPzOg+BdNOwCcF9hCBPC59b/WvqKJFW3iSFz4X3vH1VDFq0xb6Kbp9/qQP5zTlObQdTQ/F2T5I/x+BAHyxpXbWTDsqX8u7S+8Xn7n3vgBqKCENRhsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893845; 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=8iKrWblDmUe+gy+sIh681lQdlIfxzKPr+zD4c2ssTuY=; b=XQEDJ8TQR66sZENV09StlbPsp0cveAl2Ui73NeSPUrnEqJ4J5BxqY8EVyguYZJG6oHQKv4Nl4FLHfs7wHztHu1WWQxoywp4gXfQ2F3ehwB2oDydIcNGpJWfIqh7vczKFqY/LKs52qImIyzPDL/dnXwHl+zkYIAeU8GCMEkXnItw= 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 1594893845679917.7301527279178; Thu, 16 Jul 2020 03:04:05 -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-393-wMLNQCZSPWqAJMgYev5-cQ-1; Thu, 16 Jul 2020 06:03:05 -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 BCE41802B47; Thu, 16 Jul 2020 10:02:39 +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 9940760C47; Thu, 16 Jul 2020 10:02:39 +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 6A42996237; Thu, 16 Jul 2020 10:02:39 +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 06GA2XxO016502 for ; Thu, 16 Jul 2020 06:02:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D67B2B6DB; Thu, 16 Jul 2020 10:02:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4B102DE6D for ; Thu, 16 Jul 2020 10:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893844; 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=8iKrWblDmUe+gy+sIh681lQdlIfxzKPr+zD4c2ssTuY=; b=QO/lB5DaCXBK7MEScxrKApZSbufkTh/3yNQ1kXnV2dzZjTC4Sv5j8rRLlcOZ9Hs61hW/l1 zMTHCB68AIuT3LcKGfQ5jVpaYNAE7JqX5BYwIFKpdFBUCKgaFAHb3zKnFZ6dUISNERRl07 IqOdpKrMLB9KjcAmusbx9Q8nYWeCtb8= X-MC-Unique: wMLNQCZSPWqAJMgYev5-cQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 076/351] meson: add win32 build dependency Date: Thu, 16 Jul 2020 11:55:12 +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.12 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 --- configure.ac | 3 --- m4/virt-win-common.m4 | 42 ------------------------------------------ m4/virt-win-mingw.m4 | 28 ---------------------------- meson.build | 26 ++++++++++++++++++++++++++ 4 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 m4/virt-win-common.m4 delete mode 100644 m4/virt-win-mingw.m4 diff --git a/configure.ac b/configure.ac index 86e4b63ddf7..0b02b259c65 100644 --- a/configure.ac +++ b/configure.ac @@ -291,8 +291,6 @@ AC_SUBST(RUNUTF8) =20 =20 dnl MinGW checks -LIBVIRT_WIN_CHECK_COMMON -LIBVIRT_WIN_CHECK_MINGW LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES =20 @@ -402,7 +400,6 @@ LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) -LIBVIRT_WIN_RESULT_COMMON LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) diff --git a/m4/virt-win-common.m4 b/m4/virt-win-common.m4 deleted file mode 100644 index ebc9d0836e4..00000000000 --- a/m4/virt-win-common.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl The MinGW common checks -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_WIN_CHECK_COMMON], [ - WIN32_EXTRA_CFLAGS=3D - WIN32_EXTRA_LIBS=3D - - case "$host" in - *-*-mingw* ) - WIN32_EXTRA_LIBS=3D"-lole32 -loleaut32" - # If the host is Windows, and shared libraries are disabled, we - # need to add -DLIBVIRT_STATIC to the CFLAGS for proper linking - if test "x$enable_shared" =3D "xno"; then - WIN32_EXTRA_CFLAGS=3D"-DLIBVIRT_STATIC" - fi - ;; - esac - - AC_SUBST([WIN32_EXTRA_CFLAGS]) - AC_SUBST([WIN32_EXTRA_LIBS]) -]) - -AC_DEFUN([LIBVIRT_WIN_RESULT_COMMON], [ - details=3D"CFLAGS=3D'$WIN32_EXTRA_CFLAGS' LIBS=3D'$WIN32_EXTRA_LIBS'" - LIBVIRT_RESULT([MinGW], [$with_win], [$details]) -]) diff --git a/m4/virt-win-mingw.m4 b/m4/virt-win-mingw.m4 deleted file mode 100644 index 3003bcf031f..00000000000 --- a/m4/virt-win-mingw.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl The MinGW check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_WIN_CHECK_MINGW], [ - MINGW_EXTRA_LDFLAGS=3D - case "$host" in - *-*-mingw*) - MINGW_EXTRA_LDFLAGS=3D"-no-undefined" - esac - - AC_SUBST([MINGW_EXTRA_LDFLAGS]) -]) diff --git a/meson.build b/meson.build index f5cc0e1d41f..3f05a1c0c6b 100644 --- a/meson.build +++ b/meson.build @@ -1383,6 +1383,27 @@ if not get_option('virtualport').disabled() endif endif =20 +if host_machine.system() =3D=3D 'windows' + ole32_dep =3D cc.find_library('ole32') + oleaut32_dep =3D cc.find_library('oleaut32') + win32_dep =3D declare_dependency( + dependencies: [ + ole32_dep, + oleaut32_dep, + ], + ) + if get_option('default_library') =3D=3D 'static' + win32_flags =3D [ '-DLIBVIRT_STATIC' ] + else + win32_flags =3D [] + endif + win32_link_flags =3D [ '-Wl,-no-undefined' ] +else + win32_dep =3D dependency('', required: false) + win32_flags =3D [] + win32_link_flags =3D [] +endif + =20 # generic build dependencies checks =20 @@ -1501,6 +1522,11 @@ libs_summary =3D { } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 +win_summary =3D { + 'MinGW': host_machine.system() =3D=3D 'windows', +} +summary(win_summary, section: 'Windows', bool_yn: true) + test_summary =3D { 'Coverage': coverage_flags.length() > 0, } --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894029; cv=none; d=zohomail.com; s=zohoarc; b=jOWJZB/SKSjfdNMJCwZWHSbj4m5ESCn9mme0CGrqKJuDQUrXn2VCgiG+X83TIKD5qXdVMbDeQAUYFAUXvPMWcpwYmznUOp/OtkCASXIO/p191XntYlGWN8nlGujZ6IhnG9LiSx0GdehVVvLpK4BZspHw5HmEOc7qu2/fvQI4Uxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894029; 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=cC5qQe07nMEBtDh6LVUzrLRAKlQXiLmlVljNt/DpJbE=; b=Q22XgyiFRu3YyqwjhKaiR+3XfCYVSXbTZajdu1U+jldHt6YrjrJTo8tzYfQEkEES8teTE5lljCvFL8WZxoHa+legD2f//QYSqMCPEH3SyE/sUcoxAMTOJFlD/MnnviFvZnkuDRfWoK5qkioZ94mn3VYpvqAFKQhQuDL70fLiS64= 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 1594894029392712.7427960933464; Thu, 16 Jul 2020 03:07: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-9-HXeA4mjPMRyDo48B6rXsrw-1; Thu, 16 Jul 2020 06:03:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38C6C15E06; Thu, 16 Jul 2020 10:02:41 +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 17E8C72ADA; Thu, 16 Jul 2020 10:02:41 +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 DAAB496237; Thu, 16 Jul 2020 10:02:40 +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 06GA2YG8016508 for ; Thu, 16 Jul 2020 06:02:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 36DD12B6DB; Thu, 16 Jul 2020 10:02:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A44D52DE6D for ; Thu, 16 Jul 2020 10:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894028; 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=cC5qQe07nMEBtDh6LVUzrLRAKlQXiLmlVljNt/DpJbE=; b=ZvjIv8hEzZLRVXEIGluGTXA84nlW0A+nxCRn12YnBMQFwfnOIPazTzvmPE/PSBbzvBBR1H v3csLBBPwxoAGBJHlbFsZWApaFahMyAJovx0GR28hmwb91wLh04bnJX4gN6qx8JnXkoI9I lso56otIUMPVFtnwAmy2yPbf9N1vaGA= X-MC-Unique: HXeA4mjPMRyDo48B6rXsrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 077/351] meson: add wireshark build dependency Date: Thu, 16 Jul 2020 11:55:13 +0200 Message-Id: <64f67b3e9b5ca85df06906ca905587b1488560ec.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.15 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 --- configure.ac | 6 ---- m4/virt-wireshark.m4 | 71 -------------------------------------------- meson.build | 44 +++++++++++++++++++++++++++ meson_options.txt | 2 ++ 4 files changed, 46 insertions(+), 77 deletions(-) delete mode 100644 m4/virt-wireshark.m4 diff --git a/configure.ac b/configure.ac index 0b02b259c65..5e92466c4aa 100644 --- a/configure.ac +++ b/configure.ac @@ -109,12 +109,10 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL =20 @@ -414,10 +412,6 @@ LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Developer Tools]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_WIRESHARK -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Privileges]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_QEMU_PRIVILEGES diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 deleted file mode 100644 index 2eee8a6ce86..00000000000 --- a/m4/virt-wireshark.m4 +++ /dev/null @@ -1,71 +0,0 @@ -dnl The libvirt.so wireshark plugin -dnl -dnl Copyright (C) 2015 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_WIRESHARK],[ - LIBVIRT_ARG_WITH_FEATURE([WIRESHARK_DISSECTOR], [wireshark], [check], [2= .4.0]) - LIBVIRT_ARG_WITH([WS_PLUGINDIR], - [wireshark plugins directory for use when installing - wireshark plugin], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ - LIBVIRT_CHECK_PKG([WIRESHARK_DISSECTOR], [wireshark], [2.4.0]) - - dnl Check for system location of wireshark plugins - if test "x$with_wireshark_dissector" !=3D "xno" ; then - if test "x$with_ws_plugindir" =3D "xcheck" ; then - ws_plugindir=3D"$($PKG_CONFIG --variable plugindir wireshark)" - ws_exec_prefix=3D"$($PKG_CONFIG --variable exec_prefix wireshark)" - ws_modversion=3D"$($PKG_CONFIG --modversion wireshark)" - if test "x$ws_plugindir" =3D "x" ; then - dnl On some systems the plugindir variable may not be stored withi= n pkg config. - dnl Fall back to older style of constructing the plugin dir path. - ws_plugindir=3D"$libdir/wireshark/plugins/$ws_modversion" - else - if test "x$ws_exec_prefix" =3D "x" ; then - dnl If wireshark's exec_prefix cannot be retrieved from pkg-conf= ig, - dnl this is our best bet - ws_exec_prefix=3D"/usr" - fi - dnl Replace wireshark's exec_prefix with our own. - dnl Note that ${exec_prefix} is kept verbatim at this point in tim= e, - dnl and will only be expanded later, when make is called: this mak= es - dnl it possible to override such prefix at compilation or installa= tion - dnl time - ws_plugindir=3D'${exec_prefix}'"${ws_plugindir#$ws_exec_prefix}" - fi - - dnl Since wireshark 2.5.0 plugins can't live in top level - dnl plugindir but have to be under one of ["epan", - dnl "wiretap", "codecs"] subdir. The first one looks okay. - ws_plugindir=3D"$ws_plugindir/epan" - - elif test "x$with_ws_plugindir" =3D "xno" || test "x$with_ws_plugindir= " =3D "xyes"; then - AC_MSG_ERROR([ws-plugindir must be used only with valid path]) - else - ws_plugindir=3D$with_ws_plugindir - fi - fi - - AC_SUBST([ws_plugindir]) -]) - -AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[ - LIBVIRT_RESULT_LIB([WIRESHARK_DISSECTOR]) -]) diff --git a/meson.build b/meson.build index 3f05a1c0c6b..b710417db2f 100644 --- a/meson.build +++ b/meson.build @@ -1404,6 +1404,45 @@ else win32_link_flags =3D [] endif =20 +wireshark_version =3D '2.4.0' +wireshark_dep =3D dependency('wireshark', version: '>=3D' + wireshark_vers= ion, required: get_option('wireshark_dissector')) +if wireshark_dep.found() + wireshark_plugindir =3D get_option('wireshark_plugindir') + if wireshark_plugindir =3D=3D '' + wireshark_plugindir =3D wireshark_dep.get_pkgconfig_variable('plugindi= r') + endif + + # On some systems the plugindir variable may not be stored within pkg co= nfig. + # Fall back to older style of constructing the plugin dir path. + if wireshark_plugindir =3D=3D '' + wireshark_modversion =3D wireshark_dep.version() + wireshark_plugindir =3D '@0@/wireshark/plugins/@1@'.format( + libdir, wireshark_modversion + ) + else + wireshark_prefix =3D wireshark_dep.get_pkgconfig_variable('prefix') + if wireshark_prefix =3D=3D '' + # If wireshark's prefix cannot be retrieved from pkg-config, + # this is our best bet. + wireshark_prefix =3D '/usr' + endif + # Replace wireshark's prefix with our own. + # There is no replace method in meson so we have to workaround it. + rc =3D run_command( + 'python3', '-c', + 'print("@0@".replace("@1@", "@2@"))'.format( + wireshark_plugindir, wireshark_prefix, prefix, + ), + check: true, + ) + wireshark_plugindir =3D rc.stdout().strip() + endif + + # Since wireshark 2.5.0 plugins can't live in top level plugindir but ha= ve + # to be under one of ["epan", "wiretap", "codecs"] subdir. The first one= looks okay. + wireshark_plugindir =3D wireshark_plugindir / 'epan' +endif + =20 # generic build dependencies checks =20 @@ -1537,3 +1576,8 @@ misc_summary =3D { 'Warning Flags': supported_cc_flags, } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') + +devtools_summary =3D { + 'wireshark_dissector': wireshark_dep.found(), +} +summary(devtools_summary, section: 'Developer Tools', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 025cc663027..25aa81621f9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -41,3 +41,5 @@ option('selinux', type: 'feature', value: 'auto', descrip= tion: 'selinux support' option('selinux_mount', type: 'string', value: '', description: 'set SELin= ux mount point') option('udev', type: 'feature', value: 'auto', description: 'udev support') option('virtualport', type: 'feature', value: 'auto', description: 'enable= virtual port support') +option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') +option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893792; cv=none; d=zohomail.com; s=zohoarc; b=V8TP0GR+xDxPDEJ4785ITKpol5/jETj+FOY59SFUEmF8w76roNktFwSUWGyxpn8YEAej9GoHjpUJHlbgRdaaKKGr2elioxRBTU0fOhkKMu/J1w0coF+xhXgTsJn3kRPcdJWPBH8peAlm24T3qIB9iRyJGVfCloOzxRmjF2q777g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893792; 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=LMpnGEYEeulZRpXgQan18e2jNmANGfQUCmmcqeMriSE=; b=QVkziN/Nvq6nYYpeBNSL0afHzBRdy5vXtlTPjBiylICphReE90+kuBA2bvsKjDN83IMRL8ePkW8oNlgGTfNYBQFYgHIMDVSlxu7A1zxxP2sacd9fIBEtnlNPY7z/TrzdCpGTRFjfRLz9Z2ql3OVCKTEKP5T0LWBJdPjp69it788= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893792534835.4918162935472; Thu, 16 Jul 2020 03:03: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-368-BRPKIr2qPkO5-RRLflMFng-1; Thu, 16 Jul 2020 06:03:07 -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 B79271888AB0; Thu, 16 Jul 2020 10:02:43 +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 7CC9779D1F; Thu, 16 Jul 2020 10:02:43 +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 458261809557; Thu, 16 Jul 2020 10:02:43 +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 06GA2b71016542 for ; Thu, 16 Jul 2020 06:02:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id ED4DC2B6DB; Thu, 16 Jul 2020 10:02:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6595F2E160 for ; Thu, 16 Jul 2020 10:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893791; 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=LMpnGEYEeulZRpXgQan18e2jNmANGfQUCmmcqeMriSE=; b=BlmalvrKg4IKMmNC1bCXyQjzpcJfhhxApH9waGjp3UEs86reRMSCx6G0ZfBPH5vr4S4qEd bIHfOIsMPx7NHxTRHej7QlMzleKPDGWXHlrSkb4t6Pc5HCETpncHkB02YAml/nUqY2tK8v KFmX5g1dt+Ka1eoJDb/vtgEjQPHUU3U= X-MC-Unique: BRPKIr2qPkO5-RRLflMFng-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 078/351] meson: add xdr build dependency Date: Thu, 16 Jul 2020 11:55:14 +0200 Message-Id: <9644d034fc5cf8a89229d9676280ed214f7a5e56.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.13 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 --- configure.ac | 2 -- m4/virt-xdr.m4 | 40 ---------------------------------------- meson.build | 12 ++++++++++++ 3 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 m4/virt-xdr.m4 diff --git a/configure.ac b/configure.ac index 5e92466c4aa..1a1a855cba6 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,6 @@ LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL =20 =20 @@ -393,7 +392,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 deleted file mode 100644 index 09d0c2ba2f4..00000000000 --- a/m4/virt-xdr.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl The XDR implementation check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_XDR], [ - if test x"$with_remote" =3D x"yes" || test x"$with_libvirtd" =3D x"yes";= then - dnl On MinGW portablexdr provides XDR functions, on linux they are - dnl provided by libtirpc and on FreeBSD/macOS there is no need to - dnl use extra library as it's provided by libc directly. - - with_xdr=3D"yes" - - if test "$with_win" =3D "yes"; then - LIBVIRT_CHECK_LIB([XDR], [portablexdr], [xdrmem_create], [rpc/rpc.h]) - elif test "$with_linux" =3D "yes"; then - LIBVIRT_CHECK_PKG([XDR], [libtirpc], [0.1.10]) - else - AM_CONDITIONAL([WITH_XDR], [test "x$with_xdr" =3D "xyes"]) - fi - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_XDR], [ - LIBVIRT_RESULT_LIB([XDR]) -]) diff --git a/meson.build b/meson.build index b710417db2f..948ca4d93ab 100644 --- a/meson.build +++ b/meson.build @@ -1443,6 +1443,17 @@ if wireshark_dep.found() wireshark_plugindir =3D wireshark_plugindir / 'epan' endif =20 +# On MinGW portablexdr provides XDR functions, on linux they are +# provided by libtirpc and on FreeBSD/macOS there is no need to +# use extra library as it's provided by libc directly. +if host_machine.system() =3D=3D 'windows' + xdr_dep =3D cc.find_library('portablexdr', required: false) +elif host_machine.system() =3D=3D 'linux' + xdr_dep =3D dependency('libtirpc', required: false) +else + xdr_dep =3D declare_dependency() +endif + =20 # generic build dependencies checks =20 @@ -1558,6 +1569,7 @@ libs_summary =3D { 'selinux': selinux_dep.found(), 'udev': udev_dep.found(), 'virtualport': conf.has('WITH_VIRTUALPORT'), + 'xdr': xdr_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894635; cv=none; d=zohomail.com; s=zohoarc; b=AbqICvt551FFjMpRRfl8kgpO0Hhd1BIdpHSIOP5puDbuNfu1GRJVBc4Oo0yJQd4ZyAwz+fxRfp4HUevv/jsq8IrsHWxNZaz5oQkA16zERQsa+UdV94np8CCwFOQpVrraMSM9idjM/NYEpeptL0tQTbeP8un6l/QR+WvFTPvoVg8= 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=QkvnW0VL+ypoDZeTY9HDuXQnODxGMAsAJJeQQ3AT+vU=; b=dXrFGtZCQavwlKLlWGFVBwpYp5zuft2IDK4XD7mSHeJ2gBO8qBHRrWk21dPWSFSgSOMGO7nx9jAqgHu4DahUt3rPKOGlIX8r31LKtaMF78ZdAHD+JD7ImK0wzSHtk6iOhA08s/JIm9Hun4/DoMzYUscYI3+IBVZO+Z1eUbm8ZH0= 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 1594894635855682.1065089139523; 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-2-pS7XZ-VhNBKp1ssXwN7VJg-1; Thu, 16 Jul 2020 06:02:48 -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 AE2691083E84; Thu, 16 Jul 2020 10:02:41 +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 8D21510023A7; Thu, 16 Jul 2020 10:02:41 +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 516229623A; Thu, 16 Jul 2020 10:02:41 +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 06GA2cWA016554 for ; Thu, 16 Jul 2020 06:02:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id D5EF92B6DB; Thu, 16 Jul 2020 10:02:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50C012DE6D for ; Thu, 16 Jul 2020 10:02:38 +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=QkvnW0VL+ypoDZeTY9HDuXQnODxGMAsAJJeQQ3AT+vU=; b=dujA8G/wnnqDj/+LD3U83ZKmxFmtseJBvHGe/mw/XuSqPZ/TzH7o6IND4r8YZgurGpiY2N p95HyD5hhCcO8Kf6abpRgiFjV8fcy+FZVfE/twSzwetjbhos+I4/QH2R3F3ePUKHNFWQRe yE+gF4AlVCamy81df0N3ES1dFvSYw8A= X-MC-Unique: pS7XZ-VhNBKp1ssXwN7VJg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 079/351] meson: add yajl build dependency Date: Thu, 16 Jul 2020 11:55:15 +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.84 on 10.5.11.22 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 --- configure.ac | 3 --- m4/virt-yajl.m4 | 42 ------------------------------------------ meson.build | 25 +++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-yajl.m4 diff --git a/configure.ac b/configure.ac index 1a1a855cba6..7c872bbfe6c 100644 --- a/configure.ac +++ b/configure.ac @@ -109,11 +109,9 @@ fi =20 LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS -LIBVIRT_ARG_YAJL =20 LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_YAJL =20 =20 =20 @@ -392,7 +390,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) diff --git a/m4/virt-yajl.m4 b/m4/virt-yajl.m4 deleted file mode 100644 index b602abd0a7c..00000000000 --- a/m4/virt-yajl.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl The libyajl.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_YAJL],[ - LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_YAJL],[ - dnl YAJL JSON library http://lloyd.github.com/yajl/ - - PKG_CHECK_EXISTS([yajl], [use_pkgconfig=3D1], [use_pkgconfig=3D0]) - - if test $use_pkgconfig =3D 1; then - dnl 2.0.3 was the version where the pkg-config file was first added - LIBVIRT_CHECK_PKG([YAJL], [yajl], [2.0.3]) - else - dnl SLES 12 and openSUSE Leap 42.3 still use 2.0.1 - dnl TODO: delete this in July 2020 - LIBVIRT_CHECK_LIB([YAJL], [yajl], - [yajl_tree_parse], [yajl/yajl_common.h]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_YAJL],[ - LIBVIRT_RESULT_LIB([YAJL]) -]) diff --git a/meson.build b/meson.build index 948ca4d93ab..13062279c0a 100644 --- a/meson.build +++ b/meson.build @@ -1454,6 +1454,30 @@ else xdr_dep =3D declare_dependency() endif =20 +yajl_version =3D '2.0.3' +if not get_option('yajl').disabled() + yajl_dep =3D dependency('yajl', version: '>=3D' + yajl_version, required= : false) + # 2.0.3 was the version where the pkg-config file was first added + # SLES 12 and openSUSE Leap 42.3 still use 2.0.1 + # TODO: delete this in July 2020 + if not yajl_dep.found() + yajl_dep =3D cc.find_library('yajl', required: get_option('yajl')) + if yajl_dep.found() + has_func =3D cc.has_function('yajl_tree_parse', dependencies: yajl_d= ep, prefix: '#include ') + if not has_func and get_option('yajl').enabled() + error('yajl >=3D @0@ was not found'.format(yajl_version)) + elif not has_func + yajl_dep =3D dependency('', required: false) + endif + endif + endif +else + yajl_dep =3D dependency('', required: false) +endif +if yajl_dep.found() + conf.set('WITH_YAJL', 1) +endif + =20 # generic build dependencies checks =20 @@ -1570,6 +1594,7 @@ libs_summary =3D { 'udev': udev_dep.found(), 'virtualport': conf.has('WITH_VIRTUALPORT'), 'xdr': xdr_dep.found(), + 'yajl': yajl_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 25aa81621f9..a0615fcfdc1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -43,3 +43,4 @@ option('udev', type: 'feature', value: 'auto', descriptio= n: 'udev support') option('virtualport', type: 'feature', value: 'auto', description: 'enable= virtual port support') option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') +option('yajl', type: 'feature', value: 'auto', description: 'yajl support') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894701; cv=none; d=zohomail.com; s=zohoarc; b=WP9K9p84J8QJlVx10Iw8tFkMmYyiX2OlAwirq1e4FnsImp/SM5mHH9OvzWBVW2q1DpH/ayDBR/bZPXrrKvK72msioQ5TjcGmHtuD2tr4V2iCcT0ftNMcl7CoaRvwPrtkh60qIKMZDBfVyRMJ7cjRMspPTmgpubS+T8Tr4e/A3aI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894701; 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=1055yqCF3wnFrHKu+kDAG70IxFUuth8E9pczGf6q5Yw=; b=L+MCeyWSthCSKHc+uZ0u5zSKLjPkgt98+mV6Vn39zQ6VyrOMSdfZthLjSo1ocVOvqiifeaXCm55bR4A/wc/jmcN3XRHlqR5nkQcMECdY0g2TqJuP0TiGRJEUhNxcFxHw+Ws0nCfx0zGfnTQY43xS0Ya4qEaR/jyBitxd0+Sv+ZY= 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 1594894701368192.7272403641009; Thu, 16 Jul 2020 03:18:21 -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-491-1pJDfLULPcShE0t3Z82QEg-1; Thu, 16 Jul 2020 06:03:05 -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 458CB800491; Thu, 16 Jul 2020 10:02:42 +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 0D8E910098A1; Thu, 16 Jul 2020 10:02:42 +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 C571D9623D; Thu, 16 Jul 2020 10:02:41 +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 06GA2dh8016570 for ; Thu, 16 Jul 2020 06:02:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id BFC812B6E2; Thu, 16 Jul 2020 10:02:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A7042B6DB for ; Thu, 16 Jul 2020 10:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894700; 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=1055yqCF3wnFrHKu+kDAG70IxFUuth8E9pczGf6q5Yw=; b=PD1EGJh3b9801aRY6ROUJAqOKAeOfqKCMtyn+GORzwGunNJxEpza9/zQWYO/rIAwxGtyT3 dNtjv4HhWO/78VDiKsAJfJrCZEJsPnzxC3BL5pBbezDoONYpm1rurFYMRQNbww7uKBYCoj juQLf3YMVnrAo0tD42oNVX1GD2YdiGI= X-MC-Unique: 1pJDfLULPcShE0t3Z82QEg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 080/351] meson: add driver_remote build option Date: Thu, 16 Jul 2020 11:55:16 +0200 Message-Id: <68915fbd8f6a7019c244986e19e0946e21a2f878.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 --- configure.ac | 3 --- m4/virt-driver-remote.m4 | 48 ---------------------------------------- meson.build | 18 +++++++++++++++ meson_options.txt | 5 +++++ 4 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 m4/virt-driver-remote.m4 diff --git a/configure.ac b/configure.ac index 7c872bbfe6c..e9a684b1b58 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST -LIBVIRT_DRIVER_ARG_REMOTE LIBVIRT_DRIVER_ARG_LIBVIRTD LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -146,7 +145,6 @@ LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST -LIBVIRT_DRIVER_CHECK_REMOTE LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -354,7 +352,6 @@ LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST -LIBVIRT_DRIVER_RESULT_REMOTE LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_LIBVIRTD LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4 deleted file mode 100644 index 8d98e369b35..00000000000 --- a/m4/virt-driver-remote.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl The remote driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_REMOTE], [ - LIBVIRT_ARG_WITH_FEATURE([REMOTE], [remote driver], [yes]) - LIBVIRT_ARG_WITH([REMOTE_DEFAULT_MODE], [remote driver default mode], [l= egacy]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [ - if test "$with_remote" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled= ]) - fi - AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" =3D "yes"]) - - case "$with_remote_default_mode" in - legacy) - REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_LEGACY - ;; - direct) - REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_DIRECT - ;; - *) - AC_MSG_ERROR([Unknown remote mode '$with_remote_default_mode']) - ;; - esac - - AC_DEFINE_UNQUOTED([REMOTE_DRIVER_MODE_DEFAULT],[$REMOTE_DRIVER_MODE_DEF= AULT], [Default remote driver mode]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_REMOTE], [ - LIBVIRT_RESULT([Remote], [$with_remote]) -]) diff --git a/meson.build b/meson.build index 13062279c0a..6c31ae6c848 100644 --- a/meson.build +++ b/meson.build @@ -1537,6 +1537,19 @@ if conf.has('WITH_VIRTUALPORT') and not conf.has('WI= TH_MACVTAP') endif =20 =20 +# build driver options + +if get_option('driver_remote').enabled() + if not xdr_dep.found() and host_machine.system() not in [ 'freebsd', 'da= rwin' ] + error('XDR is required for remote driver') + endif + conf.set('WITH_REMOTE', 1) +endif + +remote_default_mode =3D get_option('remote_default_mode').to_upper() +conf.set('REMOTE_DRIVER_MODE_DEFAULT', 'REMOTE_DRIVER_MODE_@0@'.format(rem= ote_default_mode)) + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -1555,6 +1568,11 @@ configure_file(output: 'meson-config.h', configurati= on: conf) =20 # print configuration summary =20 +driver_summary =3D { + 'Remote': conf.has('WITH_REMOTE'), +} +summary(driver_summary, section: 'Drivers', bool_yn: true) + libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index a0615fcfdc1..4360540bf5a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -44,3 +44,8 @@ option('virtualport', type: 'feature', value: 'auto', des= cription: 'enable virtu option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') option('yajl', type: 'feature', value: 'auto', description: 'yajl support') + + +# build driver options +option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') +option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893876; cv=none; d=zohomail.com; s=zohoarc; b=GPvE1vcHM5CqcOv/QG9s8tX3TZwajKLVN7phGxZxWduvqZ0ImDe40v17TX1acWy++M9nGhganGTsmqb7gLOR1NJ2bytNo/4vQX/OE5rRpDnmO8KCbv2Q+6uHKSbN3PVjrTtqGaK++hFxpw1XWIbsLKODN+aFRZVAjBuaAwA/msw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893876; 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=SYuj6Wg7xqGPXmJXgYsXaIJ6DARcEcN8aDLiWzTXb18=; b=lHRoXgVciakmiG7riftCnhEhdjQhAbUn9LLD+iKbV2GbnAMBQbIBI9ILcW5/tjbYlRIag/d+q434Ko0hMRKqkprtc6Kwgwd2Wsbp+fc9jmJg/wBsmHshuxYFygi8oC9GvGyx0lo6Zr96OQCIerA9ooWfOS33wt919evQyHJTDK0= 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 1594893876706395.84658542385057; Thu, 16 Jul 2020 03:04:36 -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-58-yLaEnIL0Noe88k4yRK_PZg-1; Thu, 16 Jul 2020 06:03:12 -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 A327A1888ACF; Thu, 16 Jul 2020 10:02:44 +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 5E4166FEFB; Thu, 16 Jul 2020 10:02:44 +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 25C591809557; Thu, 16 Jul 2020 10:02:44 +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 06GA2eOb016592 for ; Thu, 16 Jul 2020 06:02:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id A98472B6E2; Thu, 16 Jul 2020 10:02:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 235B22B6DB for ; Thu, 16 Jul 2020 10:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893875; 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=SYuj6Wg7xqGPXmJXgYsXaIJ6DARcEcN8aDLiWzTXb18=; b=AncEV+VgXBA6yO7VwtDzWpiJsZv0rnblEsD2J8bLKpqzBZ+oqBO97FG/jl3Np1bP5rFPij iia3ebt+4yGrP7lKjNO8F3meVaDf3YN6QfQrNHKGyCfJ82yVYUQKDMb/lT1IRV7AuPMnkI CJJgRvcT4BsJhILoOpJL1sGZHun2+hs= X-MC-Unique: yLaEnIL0Noe88k4yRK_PZg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 081/351] meson: add libvirtd driver build option Date: Thu, 16 Jul 2020 11:55:17 +0200 Message-Id: <522b4b572c3c2f83bfd156219348f5814cb36a3a.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 --- configure.ac | 13 ------------- m4/virt-driver-libvirtd.m4 | 33 --------------------------------- meson.build | 23 +++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-libvirtd.m4 diff --git a/configure.ac b/configure.ac index e9a684b1b58..25250fd2c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -87,16 +87,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "ye= s"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) =20 -if test "$with_win" =3D "yes" ; then - # We don't support the daemon yet - with_libvirtd=3Dno -fi - -# The daemon requires remote support. Likewise, if we are not using -# RPC, we don't need several libraries. -if test "$with_remote" =3D "no" ; then - with_libvirtd=3Dno -fi # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then with_qemu=3Dno @@ -130,7 +120,6 @@ LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST -LIBVIRT_DRIVER_ARG_LIBVIRTD LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 @@ -145,7 +134,6 @@ LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST -LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 @@ -353,7 +341,6 @@ LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK -LIBVIRT_DRIVER_RESULT_LIBVIRTD LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) diff --git a/m4/virt-driver-libvirtd.m4 b/m4/virt-driver-libvirtd.m4 deleted file mode 100644 index 090f9532f94..00000000000 --- a/m4/virt-driver-libvirtd.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The libvirtd driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_LIBVIRTD], [ - LIBVIRT_ARG_WITH_FEATURE([LIBVIRTD], [libvirtd], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBVIRTD], [ - if test "$with_libvirtd" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_LIBVIRTD], 1, [whether libvirtd daemon is ena= bled]) - fi - AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LIBVIRTD], [ - LIBVIRT_RESULT([Libvirtd], [$with_libvirtd]) -]) diff --git a/meson.build b/meson.build index 6c31ae6c848..4aae01f62e5 100644 --- a/meson.build +++ b/meson.build @@ -1549,6 +1549,28 @@ endif remote_default_mode =3D get_option('remote_default_mode').to_upper() conf.set('REMOTE_DRIVER_MODE_DEFAULT', 'REMOTE_DRIVER_MODE_@0@'.format(rem= ote_default_mode)) =20 +if not get_option('driver_libvirtd').disabled() + use_libvirtd =3D true + + if host_machine.system() =3D=3D 'windows' + use_libvirtd =3D false + if get_option('driver_libvirtd').enabled() + error('libvirtd daemon is not supported on windows') + endif + endif + + if not conf.has('WITH_REMOTE') + use_libvirtd =3D false + if get_option('driver_libvirtd').enabled() + error('remote driver is required for libvirtd daemon') + endif + endif + + if use_libvirtd + conf.set('WITH_LIBVIRTD', 1) + endif +endif + =20 # define top include directory =20 @@ -1570,6 +1592,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 driver_summary =3D { 'Remote': conf.has('WITH_REMOTE'), + 'Libvirtd': conf.has('WITH_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 4360540bf5a..8731f78defe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,5 +47,6 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') =20 =20 # build driver options +option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893795; cv=none; d=zohomail.com; s=zohoarc; b=O9ySzx//BtbBWkeDZI5pi+Z6lWEYpx7Zt0EOdLuefScqvD5atyH68nVm4m4MoVGMcua0ShiuZxzsdQhLpedRPa9YAqGywsgkA4MO0X2LHsJkPSCk6DFmZjUy7K2x1/jDBIkYK/J3dYC5GBuBemgxt/6nv1o+4wSXUsv9X95jyvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893795; 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=Voc7b+MaGp3Rjsq1LrNkPv6QWBKfNESnT97IoEK6QiU=; b=dYUFvzAfQhcpc0BQFBmt+lSWRme9N+u9xpsS6Ly11pkcsFQadBoN2IvJhZ5rQJym9Kr9TuAHB732/0nw8WVsnkGWK72IvM/ALq/SvfQMO0tj+MUTbp6nfUj2spGJ5AcAdFbzQVxPbNLQSH5gW1YEaW1/5xqwoVLPg5e8hAJuaLc= 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 1594893795926907.115942707956; Thu, 16 Jul 2020 03:03: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-203-Drm40SyuO_6NOG0xghGI9g-1; Thu, 16 Jul 2020 06:03:12 -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 2D7CC1006B0D; Thu, 16 Jul 2020 10:02:47 +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 BC4FC610AF; Thu, 16 Jul 2020 10:02:46 +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 8548996237; Thu, 16 Jul 2020 10:02:46 +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 06GA2fBG016603 for ; Thu, 16 Jul 2020 06:02:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 921472B6E2; Thu, 16 Jul 2020 10:02:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CABD2B6DB for ; Thu, 16 Jul 2020 10:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893794; 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=Voc7b+MaGp3Rjsq1LrNkPv6QWBKfNESnT97IoEK6QiU=; b=cALbQKNgUoXtSa7tzqQX4wnDc3ZwwzT2DvPQmlMdPFqXkwNjn9b4aBdgRJ7zoEuKN4h+yq qmFHlZAGNvCDjtJP3uRCaWy6WpM9IwzzXtqY/lzDmwMjYvC6OeDSmRGBDY+E4y7o6lrgM9 9Bky3gFUzfJtcolfSyiwUl/6VqB/tTE= X-MC-Unique: Drm40SyuO_6NOG0xghGI9g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 082/351] meson: add BHyVe build option Date: Thu, 16 Jul 2020 11:55:18 +0200 Message-Id: <48f049f3522c50b46621e075ac3aad1a893cffef.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 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 --- configure.ac | 3 --- m4/virt-driver-bhyve.m4 | 56 ----------------------------------------- meson.build | 16 ++++++++++++ meson_options.txt | 1 + 4 files changed, 17 insertions(+), 59 deletions(-) delete mode 100644 m4/virt-driver-bhyve.m4 diff --git a/configure.ac b/configure.ac index 25250fd2c4c..155d7495840 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST @@ -130,7 +129,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST @@ -338,7 +336,6 @@ LIBVIRT_DRIVER_RESULT_LXC LIBVIRT_DRIVER_RESULT_ESX LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ -LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4 deleted file mode 100644 index 14b30c0b3e7..00000000000 --- a/m4/virt-driver-bhyve.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl The bhyve driver -dnl -dnl Copyright (C) 2014 Roman Bogorodskiy -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_BHYVE],[ - LIBVIRT_ARG_WITH_FEATURE([BHYVE], [BHyVe], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ - if test "$with_bhyve" !=3D "no"; then - AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin]) - AC_PATH_PROG([BHYVECTL], [bhyvectl], [], [$PATH:/usr/sbin]) - AC_PATH_PROG([BHYVELOAD], [bhyveload], [], [$PATH:/usr/sbin/]) - - if test -z "$BHYVE" || test -z "$BHYVECTL" || \ - test -z "$BHYVELOAD" || test "$with_freebsd" =3D "no"; then - if test "$with_bhyve" =3D "check"; then - with_bhyve=3D"no" - else - AC_MSG_ERROR([The bhyve driver cannot be enabled]) - fi - else - with_bhyve=3D"yes" - fi - fi - - if test "$with_bhyve" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_BHYVE], 1, [whether bhyve driver is enabl= ed]) - AC_DEFINE_UNQUOTED([BHYVE], ["$BHYVE"], - [Location of the bhyve tool]) - AC_DEFINE_UNQUOTED([BHYVECTL], ["$BHYVECTL"], - [Location of the bhyvectl tool]) - AC_DEFINE_UNQUOTED([BHYVELOAD], ["$BHYVELOAD"], - [Location of the bhyveload tool]) - fi - AM_CONDITIONAL([WITH_BHYVE], [test "$with_bhyve" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_BHYVE],[ - LIBVIRT_RESULT([Bhyve], [$with_bhyve]) -]) diff --git a/meson.build b/meson.build index 4aae01f62e5..5d9eb1142d0 100644 --- a/meson.build +++ b/meson.build @@ -1571,6 +1571,21 @@ if not get_option('driver_libvirtd').disabled() endif endif =20 +if not get_option('driver_bhyve').disabled() and host_machine.system() =3D= =3D 'freebsd' + bhyve_prog =3D find_program('bhyve', required: get_option('driver_bhyve'= )) + bhyvectl_prog =3D find_program('bhyvectl', required: get_option('driver_= bhyve')) + bhyveload_prog =3D find_program('bhyveload', required: get_option('drive= r_bhyve')) + + if bhyve_prog.found() and bhyvectl_prog.found() and bhyveload_prog.found= () + conf.set('WITH_BHYVE', 1) + conf.set_quoted('BHYVE', bhyve_prog.path()) + conf.set_quoted('BHYVECTL', bhyvectl_prog.path()) + conf.set_quoted('BHYVELOAD', bhyveload_prog.path()) + endif +elif get_option('driver_bhyve').enabled() + error('The bhyve driver cannot be enabled') +endif + =20 # define top include directory =20 @@ -1591,6 +1606,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'Bhyve': conf.has('WITH_BHYVE'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), } diff --git a/meson_options.txt b/meson_options.txt index 8731f78defe..0e1b43b8350 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,6 +47,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') =20 =20 # build driver options +option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe= driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893793; cv=none; d=zohomail.com; s=zohoarc; b=jd/DnzdiFu09QPJ0m1K/zU5TiEwHbAldfBEMj3TYRWu4QPEi2KKHbceotGO8Lg1pHpIRauZGDCb3iQtXy32+9gEEbsTwYvpefuiYYiXTOR8NicGcMB4Y3AQhUln9OVcC3n40GAThoinjAbMZuOAE1mIT1etBWvfPpa1uL4Bf3yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893793; 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=g57S1kHhXATx4xmJ0x6eJrQ98wzl03B+EI8sDq5RbJU=; b=NDfBj0hFAiUSbDSuyKcmG82rj/faYFEDeRP9MWXGqfgaU3Z7nR4XgY3PNIQRgqnEflELWmiThIThdrb9pVYxbr9ZpIUUZ/0fIZc/sCy+pz9lnZ/iyyEIhHQzsh0yBMCYGIMjjdhQ82DUEi73psDgkEO7Iwbwt0/7+pGsE8Q2PrI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893793182694.6116344662481; Thu, 16 Jul 2020 03:03:13 -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-64-7k2gwCt8N7yOZeiutfkc0A-1; Thu, 16 Jul 2020 06:03: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 23928803655; Thu, 16 Jul 2020 10:02:46 +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 F2BC261982; Thu, 16 Jul 2020 10:02:45 +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 BF4401806B0A; Thu, 16 Jul 2020 10:02:45 +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 06GA2grD016620 for ; Thu, 16 Jul 2020 06:02:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A2882B6E2; Thu, 16 Jul 2020 10:02:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E91852B6DB for ; Thu, 16 Jul 2020 10:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893792; 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=g57S1kHhXATx4xmJ0x6eJrQ98wzl03B+EI8sDq5RbJU=; b=B9H1rnqMdXJZGrXBBdu9m6FLQDV5IwLWhesxU6lG8kcrn01/cXfhq9I6e9h7v0rrJlTx28 KlBVwwcE8IovJtw9leMCi2nlrZiL5YQTOISKE0t3OdnqpXqb8nQHLll2p1n29mfZvTKNWV 3IIE4QbK72/++4/layRlkbYBd7tlymM= X-MC-Unique: 7k2gwCt8N7yOZeiutfkc0A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 083/351] meson: add ESX driver build option Date: Thu, 16 Jul 2020 11:55:19 +0200 Message-Id: <0923b6b05af29f34849ba1ebe24aecba7bfb3989.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 --- configure.ac | 3 --- m4/virt-driver-esx.m4 | 57 ------------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 m4/virt-driver-esx.m4 diff --git a/configure.ac b/configure.ac index 155d7495840..a85c52bea14 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK @@ -129,7 +128,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK @@ -333,7 +331,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC -LIBVIRT_DRIVER_RESULT_ESX LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST diff --git a/m4/virt-driver-esx.m4 b/m4/virt-driver-esx.m4 deleted file mode 100644 index 4a2944b617a..00000000000 --- a/m4/virt-driver-esx.m4 +++ /dev/null @@ -1,57 +0,0 @@ -dnl The ESX driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_ESX], [ - LIBVIRT_ARG_WITH_FEATURE([ESX], [ESX], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_ESX], [ - AC_REQUIRE([LIBVIRT_CHECK_CURL]) - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_VMWARE]) - - if test "$with_curl" !=3D "yes" ; then - if test "$with_esx" !=3D "yes"; then - with_esx=3Dno - else - AC_MSG_ERROR([Curl is required for the ESX driver]) - fi - else - if test "$with_esx" =3D "check"; then - with_esx=3Dyes - fi - fi - - if test "$with_esx" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled]) - fi - AM_CONDITIONAL([WITH_ESX], [test "$with_esx" =3D "yes"]) - - with_vmx=3Dyes - if test "$with_esx" !=3D "yes" && test "$with_vmware" !=3D "yes"; then - with_vmx=3Dno - fi - if test "$with_vmx" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_VMX], 1, [whether VMware VMX config handling = is enabled]) - fi - AM_CONDITIONAL([WITH_VMX], [test "$with_vmx" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_ESX], [ - LIBVIRT_RESULT([ESX], [$with_esx]) -]) diff --git a/meson.build b/meson.build index 5d9eb1142d0..153790c29ec 100644 --- a/meson.build +++ b/meson.build @@ -1586,6 +1586,13 @@ elif get_option('driver_bhyve').enabled() error('The bhyve driver cannot be enabled') endif =20 +if not get_option('driver_esx').disabled() and curl_dep.found() + conf.set('WITH_ESX', 1) + conf.set('WITH_VMX', 1) +elif get_option('driver_esx').enabled() + error('Curl is required for the ESX driver') +endif + =20 # define top include directory =20 @@ -1606,6 +1613,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'ESX': conf.has('WITH_ESX'), 'Bhyve': conf.has('WITH_BHYVE'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), diff --git a/meson_options.txt b/meson_options.txt index 0e1b43b8350..700b7d41287 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -48,6 +48,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') =20 # build driver options option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe= driver') +option('driver_esx', type: 'feature', value: 'enabled', description: 'esx = driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894030; cv=none; d=zohomail.com; s=zohoarc; b=cua94Ls6ifXg3dX53pr2ELkr1WNlFSsU56HGWmX/QXf+hz8i4AH9F5TVKU1DSxcIMfmdNy/bh3xT/7fMVKU2Hx3RNiHadmMHqZxiN+YzqcxTv0d8o1HZx5CgbT/NvtLhYvEuAoA5M5tRCrs/B8J3D+XA1pWS7w54tLfzk1cFwgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894030; 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=MLTCi80Ls2DMVVZG4xMEkRWk7KrhksfodzKoJp/K8AE=; b=ikenTbRoOScMvoFHzk1uoIzzY8ufN4Z59Iq91HeAmWMfCbYeEXk7+/9hOXW5Z/1SbRO5auSGevJdIgik61NXR47kXbBX/vzccFak87Pa0b4ErW58VXr/nTlPpayCuF9MAqa8BIEnPK4ZiBD5v2epVHaoHv3lWO5OH6hQPIWNV0k= 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 159489403019766.75708780193395; Thu, 16 Jul 2020 03:07:10 -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-131-sU6lLi6qMKaWgPFDw6fvow-1; Thu, 16 Jul 2020 06:03:09 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6BE5802C40; Thu, 16 Jul 2020 10:02:48 +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 75AAE2E023; Thu, 16 Jul 2020 10:02:48 +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 3F1901806B0D; Thu, 16 Jul 2020 10:02:48 +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 06GA2hpe016638 for ; Thu, 16 Jul 2020 06:02:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 62E1E2B6E2; Thu, 16 Jul 2020 10:02:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D11C82B6DB for ; Thu, 16 Jul 2020 10:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894028; 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=MLTCi80Ls2DMVVZG4xMEkRWk7KrhksfodzKoJp/K8AE=; b=RXNZq6netbPkxLWo1ZM1O4hUnJ6AjhdtUPedaRsc/zGTAA5AVh2rI9I/OJbXfBObPDpyj8 7pbW0gHoo5/oOMXtjh5eNX5vSLadeHOJfnY+uOkwSOgUXmcwrg6KHpPUjkR0rJrhtlxPq8 NTnv8wXVkCvXlEQjoXHbdsGQZpL0oSE= X-MC-Unique: sU6lLi6qMKaWgPFDw6fvow-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 084/351] meson: add Hyper-V driver build option Date: Thu, 16 Jul 2020 11:55:20 +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.84 on 10.5.11.23 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 --- configure.ac | 3 --- m4/virt-driver-hyperv.m4 | 47 ---------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-driver-hyperv.m4 diff --git a/configure.ac b/configure.ac index a85c52bea14..84cd16f4d95 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -128,7 +127,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -331,7 +329,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC -LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4 deleted file mode 100644 index f276a881f3b..00000000000 --- a/m4/virt-driver-hyperv.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The Hyper-V driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_HYPERV], [ - LIBVIRT_ARG_WITH_FEATURE([HYPERV], [Hyper-V], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [ - AC_REQUIRE([LIBVIRT_CHECK_OPENWSMAN]) - - if test "$with_hyperv" !=3D "no"; then - if test "$with_openwsman" !=3D "yes"; then - if test "$with_hyperv" =3D "check"; then - with_hyperv=3Dno - else - AC_MSG_ERROR([openwsman is required for the Hyper-V driver]) - fi - else - with_hyperv=3Dyes - fi - fi - - if test "$with_hyperv" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enable= d]) - fi - AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_HYPERV], [ - LIBVIRT_RESULT([Hyper-V], [$with_hyperv]) -]) diff --git a/meson.build b/meson.build index 153790c29ec..3c1ccb8f600 100644 --- a/meson.build +++ b/meson.build @@ -1593,6 +1593,12 @@ elif get_option('driver_esx').enabled() error('Curl is required for the ESX driver') endif =20 +if not get_option('driver_hyperv').disabled() and openwsman_dep.found() + conf.set('WITH_HYPERV', 1) +elif get_option('driver_hyperv').enabled() + error('openwsman is required for the Hyper-V driver') +endif + =20 # define top include directory =20 @@ -1614,6 +1620,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 driver_summary =3D { 'ESX': conf.has('WITH_ESX'), + 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), diff --git a/meson_options.txt b/meson_options.txt index 700b7d41287..c64700fcc4e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,6 +49,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') # build driver options option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe= driver') option('driver_esx', type: 'feature', value: 'enabled', description: 'esx = driver') +option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hype= r-V driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893969; cv=none; d=zohomail.com; s=zohoarc; b=FCJ6D6xV0G1LuVTwwYpJaBTY73ZDR/zhRC434Ruei6ukqve0zLn3iyWWziJuWp9WAHxNBJ0Hvv9FLpMic1sEhkaLj/K52y9KhvxmhIWGVKJHTto6BhZ7aKJfLH9M02RBWom51DeHAbS49Vwn2HtaOywyRud2WByl5UK0kK/+kM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893969; 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=nad2aP73KkMTXJJeEnuPvmBM7KX6Y8FDI7D31mqg85c=; b=nzXWk1tnWUy4t3KFI9I4+ljIjCDTkLN8kVP6taJ+TnSe5YdJ2892rqSz62Qm8LxIPnPK2RSxUl8GezMlUkIUy05KoG7VW5kcnPswhRTyFJCQtin6i1L0fvUcI2fyyR3q4n8mKg0jxVLuHbuD28/w3Q575SwvRs2cZO3ZKP39NgU= 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 1594893969968314.73143702268044; Thu, 16 Jul 2020 03:06: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-195-Vf5hKxumOK-7pYNF7361oA-1; Thu, 16 Jul 2020 06:03:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23DDC18A1E0C; Thu, 16 Jul 2020 10:02:51 +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 F0FC879503; Thu, 16 Jul 2020 10:02: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 B7866180CB27; Thu, 16 Jul 2020 10:02:50 +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 06GA2iei016647 for ; Thu, 16 Jul 2020 06:02:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BBBD2B6E2; Thu, 16 Jul 2020 10:02:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAA7C2B6DB for ; Thu, 16 Jul 2020 10:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893968; 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=nad2aP73KkMTXJJeEnuPvmBM7KX6Y8FDI7D31mqg85c=; b=JWWANF4EPULKHnCpSUh6g7YmiLDZ8oIxBiFuZc3SibqAQwS7B7n5HwtuZGZPqLFjj3xJ64 NWlkisf1kOIf/U80C7qY4dOdKtip7Wh9+hlkE5uS/72YkESzBK8ilr0/UP7yNVoHfwfvYn S7ZM7l8E2oUhimPx1vCBIozZCKkRJeQ= X-MC-Unique: Vf5hKxumOK-7pYNF7361oA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 085/351] meson: add libxl driver build option Date: Thu, 16 Jul 2020 11:55:21 +0200 Message-Id: <064359f152ae09bbb52bbc5f844bf17a7516dc25.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.14 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 --- configure.ac | 5 --- m4/virt-driver-libxl.m4 | 74 ----------------------------------------- meson.build | 52 +++++++++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 53 insertions(+), 79 deletions(-) delete mode 100644 m4/virt-driver-libxl.m4 diff --git a/configure.ac b/configure.ac index 84cd16f4d95..4725050080f 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes= "]) if test "$with_libvirtd" =3D "no" ; then with_qemu=3Dno with_lxc=3Dno - with_libxl=3Dno with_vbox=3Dno fi =20 @@ -112,7 +111,6 @@ dnl LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE -LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ @@ -123,7 +121,6 @@ LIBVIRT_DRIVER_ARG_INTERFACE LIBVIRT_DRIVER_CHECK_QEMU LIBVIRT_DRIVER_CHECK_OPENVZ LIBVIRT_DRIVER_CHECK_VMWARE -LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ @@ -327,7 +324,6 @@ LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX -LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST @@ -361,7 +357,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 deleted file mode 100644 index a958cb26fa6..00000000000 --- a/m4/virt-driver-libxl.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl The libxl driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_LIBXL], [ - LIBVIRT_ARG_WITH_FEATURE([LIBXL], [libxenlight], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ - LIBXL_LIBS=3D"" - LIBXL_CFLAGS=3D"" - LIBXL_FIRMWARE_DIR=3D"" - LIBXL_EXECBIN_DIR=3D"" - LIBXL_API_VERSION=3D"-DLIBXL_API_VERSION=3D0x040500" - - dnl search for libxl, aka libxenlight - old_with_libxl=3D"$with_libxl" - LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.6.0]) - if test "x$with_libxl" =3D "xyes" ; then - LIBXL_FIRMWARE_DIR=3D$($PKG_CONFIG --variable xenfirmwaredir xenlight) - LIBXL_EXECBIN_DIR=3D$($PKG_CONFIG --variable libexec_bin xenlight) - fi - - if test "$with_libxl" =3D "yes"; then - LIBXL_CFLAGS=3D"$LIBXL_CFLAGS $LIBXL_API_VERSION" - - dnl If building with libxl, use the libxl utility header and lib too - AC_CHECK_HEADERS([libxlutil.h]) - LIBXL_LIBS=3D"$LIBXL_LIBS -lxlutil" - if test "x$LIBXL_FIRMWARE_DIR" !=3D "x"; then - AC_DEFINE_UNQUOTED([LIBXL_FIRMWARE_DIR], ["$LIBXL_FIRMWARE_DIR"], [d= irectory containing Xen firmware blobs]) - fi - if test "x$LIBXL_EXECBIN_DIR" !=3D "x"; then - AC_DEFINE_UNQUOTED([LIBXL_EXECBIN_DIR], ["$LIBXL_EXECBIN_DIR"], [dir= ectory containing Xen libexec binaries]) - fi - dnl Check if the xtl_* infrastructure is in libxentoollog - dnl (since Xen 4.7) if not then assume it is in libxenctrl - dnl (as it was for 4.6 and earler) - AC_CHECK_LIB([xentoollog], [xtl_createlogger_stdiostream], [ - LIBXL_LIBS=3D"$LIBXL_LIBS -lxenstore -lxentoollog" - ],[ - LIBXL_LIBS=3D"$LIBXL_LIBS -lxenstore -lxenctrl" - ]) - fi - - dnl Check if Xen has support for PVH - AC_CHECK_DECL(LIBXL_DOMAIN_TYPE_PVH, [AC_DEFINE([HAVE_XEN_PVH], [1], [De= fine to 1 if Xen has PVH support.])], [], [#include ]) - - AC_SUBST([LIBXL_CFLAGS]) - AC_SUBST([LIBXL_LIBS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBXL], [ - LIBVIRT_RESULT_LIB([LIBXL]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LIBXL], [ - LIBVIRT_RESULT([libxl], [$with_libxl]) -]) diff --git a/meson.build b/meson.build index 3c1ccb8f600..813da0ff79e 100644 --- a/meson.build +++ b/meson.build @@ -1599,6 +1599,57 @@ elif get_option('driver_hyperv').enabled() error('openwsman is required for the Hyper-V driver') endif =20 +if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') + libxl_version =3D '4.6.0' + libxl_dep =3D dependency('xenlight', version: '>=3D' + libxl_version, re= quired: get_option('driver_libxl')) + + if libxl_dep.found() + libxl_firmware_dir =3D libxl_dep.get_pkgconfig_variable('xenfirmwaredi= r') + libxl_execbin =3D libxl_dep.get_pkgconfig_variable('libexec_bin') + if libxl_firmware_dir !=3D '' + conf.set_quoted('LIBXL_FIRMWARE_DIR', libxl_firmware_dir) + endif + if libxl_execbin !=3D '' + conf.set_quoted('LIBXL_EXECBIN_DIR', libxl_execbin) + endif + + # If building with libxl, use the libxl utility header and lib too + if cc.has_header('libxlutil.h') + conf.set('HAVE_LIBXLUTIL_H', 1) + endif + xl_util_dep =3D cc.find_library('xlutil') + + xen_store_dep =3D cc.find_library('xenstore') + + # xtl_* infrastructure is in libxentoollog since Xen 4.7 previously + # it was in libxenctrl. + if libxl_dep.version().version_compare('>=3D4.7.0') + xtl_link_dep =3D cc.find_library('xentoollog') + else + xtl_link_dep =3D cc.find_library('xenctrl') + endif + + libxl_dep =3D declare_dependency( + compile_args: '-DLIBXL_API_VERSION=3D0x040500', + dependencies: [ + libxl_dep, + xtl_link_dep, + xl_util_dep, + xen_store_dep, + ], + ) + + # Check if Xen has support for PVH + if cc.has_header_symbol('libxl.h', 'LIBXL_DOMAIN_TYPE_PVH') + conf.set('HAVE_XEN_PVH', 1) + endif + + conf.set('WITH_LIBXL', 1) + endif +elif get_option('driver_libxl').enabled() + error('libvirtd is required for libxenlight') +endif + =20 # define top include directory =20 @@ -1619,6 +1670,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'libxl': conf.has('WITH_LIBXL'), 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), diff --git a/meson_options.txt b/meson_options.txt index c64700fcc4e..5329fd4cd05 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -51,5 +51,6 @@ option('driver_bhyve', type: 'feature', value: 'auto', de= scription: 'BHyVe drive option('driver_esx', type: 'feature', value: 'enabled', description: 'esx = driver') option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hype= r-V driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') +option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893882; cv=none; d=zohomail.com; s=zohoarc; b=IedGmQZAqtgYg4+db/FoIHJzrWUXvxPtCbN/jpIKcmme4rw6k3GTFCiC6nOmqakK7jKBXxHDqKWE54qEd4xMoesOJLeaDRkizqv5J626w2m8f7HC8oFkleqTV/E5dVMCp1+maYCTL3JPN7Aa7By+A1+zJeWYHs/4H3V7vCwrCYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893882; 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=/hkNah80EyOA9vF96JixOvIO+23QJ73fQGwAHi301+Q=; b=bwgRo9p4Q/a1irCxBFPj0umzrwF643jxPaWAYVgyWMFwf0Vb4LAjepe2L6EWRmYhfNVtSBkFGaJDaNPXiziKq1etqvlrkGO5HcXMsH3Kb4bCgR9dpaBBvUmI2m8Qx2B7EWmEXtdZt3ZKVStScMLr/YW4LfxsWCYPQb2SK9sGKsk= 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 1594893882128460.5030418032111; Thu, 16 Jul 2020 03:04:42 -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-100-PextAPLpPwSFPU5TO84-HQ-1; Thu, 16 Jul 2020 06:03:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0894252A24; Thu, 16 Jul 2020 10:02:49 +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 DE29972AE7; Thu, 16 Jul 2020 10:02:48 +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 AC21696237; Thu, 16 Jul 2020 10:02:48 +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 06GA2jpf016654 for ; Thu, 16 Jul 2020 06:02:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 344B12B6E2; Thu, 16 Jul 2020 10:02:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A30DA2B6DB for ; Thu, 16 Jul 2020 10:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893881; 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=/hkNah80EyOA9vF96JixOvIO+23QJ73fQGwAHi301+Q=; b=BwVhTtzp0Rm43Gyjn+DirQiuz9VeCcewyJXord/Mt9DHI4jDgpepOWavdFPngFfYwRwod0 LBtKDOMYjEWLNYJLqrVggCzR1PVBbzNPZ1eNJ5j7QSkwfWOjviYrRtq6vXTFNwJWSWfzCg DvY80SKF8hWlJ2u/mfX+ik7aCdZB4ss= X-MC-Unique: PextAPLpPwSFPU5TO84-HQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 086/351] meson: add LXC driver build option Date: Thu, 16 Jul 2020 11:55: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.15 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 --- configure.ac | 8 ----- m4/virt-driver-lxc.m4 | 74 ------------------------------------------- meson.build | 34 ++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 35 insertions(+), 82 deletions(-) delete mode 100644 m4/virt-driver-lxc.m4 diff --git a/configure.ac b/configure.ac index 4725050080f..3139b41a36a 100644 --- a/configure.ac +++ b/configure.ac @@ -74,10 +74,6 @@ case $host in esac =20 if test $with_linux =3D no; then - if test "x$with_lxc" !=3D xyes - then - with_lxc=3Dno - fi with_dtrace=3Dno with_storage_scsi=3Dno fi @@ -90,7 +86,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes= "]) # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then with_qemu=3Dno - with_lxc=3Dno with_vbox=3Dno fi =20 @@ -112,7 +107,6 @@ LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX -LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK @@ -122,7 +116,6 @@ LIBVIRT_DRIVER_CHECK_QEMU LIBVIRT_DRIVER_CHECK_OPENVZ LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX -LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK @@ -324,7 +317,6 @@ LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX -LIBVIRT_DRIVER_RESULT_LXC LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK diff --git a/m4/virt-driver-lxc.m4 b/m4/virt-driver-lxc.m4 deleted file mode 100644 index d2951b596a6..00000000000 --- a/m4/virt-driver-lxc.m4 +++ /dev/null @@ -1,74 +0,0 @@ -dnl The LXC driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_LXC], [ - LIBVIRT_ARG_WITH_FEATURE([LXC], [Linux Container], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LXC], [ - if test "$with_libvirtd" =3D "no" ; then - with_lxc=3Dno - fi - - if test "$with_lxc" =3D "yes" || test "$with_lxc" =3D "check"; then - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include - #include - #include - ]], [[ - unshare(!(LO_FLAGS_AUTOCLEAR + EPOLL_CLOEXEC)); - ]]) - ], [ - with_lxc=3Dyes - AC_DEFINE([HAVE_DECL_LO_FLAGS_AUTOCLEAR], [1], - [Define to 1 if you have the declaration of `LO_FLAGS_AUTOCLEAR', - and to 0 if you don't.]) - ], [ - if test "$with_lxc" =3D "check"; then - with_lxc=3Dno - AC_MSG_NOTICE([Required kernel features were not found, disabling = LXC]) - else - AC_MSG_ERROR([Required kernel features for LXC were not found]) - fi - ]) - - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ - #include - #include - #include - ]], [[ - unshare(!(LOOP_CTL_GET_FREE)); - ]]) - ], [ - AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], - [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', - and to 0 if you don't.]) - ]) - fi - if test "$with_lxc" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) - fi - AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LXC], [ - LIBVIRT_RESULT([LXC], [$with_lxc]) -]) diff --git a/meson.build b/meson.build index 813da0ff79e..2ed93e857d0 100644 --- a/meson.build +++ b/meson.build @@ -1650,6 +1650,39 @@ elif get_option('driver_libxl').enabled() error('libvirtd is required for libxenlight') endif =20 +if not get_option('driver_lxc').disabled() and host_machine.system() =3D= =3D 'linux' and conf.has('WITH_LIBVIRTD') + lxc_support_code =3D ''' +#include +#include +#include + +void main(void) { + unshare(!(LO_FLAGS_AUTOCLEAR + EPOLL_CLOEXEC)); +} + ''' + if cc.compiles(lxc_support_code, name: 'lxc support', args: '-D_GNU_SOUR= CE') + conf.set('WITH_LXC', 1) + conf.set('HAVE_DECL_LO_FLAGS_AUTOCLEAR', 1) + elif get_option('driver_lxc').enabled() + error('Required kernel features for LXC were not found') + endif + + lxc_get_free_code =3D ''' +#include +#include +#include + +void main(void) { + unshare(!(LOOP_CTL_GET_FREE)); +} + ''' + if cc.compiles(lxc_get_free_code) + conf.set('HAVE_DECL_LOOP_CTL_GET_FREE', 1) + endif +elif get_option('driver_lxc').enabled() + error('linux and remote_driver are required for LXC') +endif + =20 # define top include directory =20 @@ -1671,6 +1704,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 driver_summary =3D { 'libxl': conf.has('WITH_LIBXL'), + 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), diff --git a/meson_options.txt b/meson_options.txt index 5329fd4cd05..ccc0a209378 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,5 +52,6 @@ option('driver_esx', type: 'feature', value: 'enabled', d= escription: 'esx driver option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hype= r-V driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') +option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894024; cv=none; d=zohomail.com; s=zohoarc; b=cYBPASh4PvuCoohbVdLwBzA/tq+wK7Q7cADrwKJHQtkIvzSNTRSL/azPcrEr3Nc2g3Un+uKT44qJceqnLA5tCRTdsxLUtvGg2Pf7qla1QpThtKfZpsYlWbo9iGV81bEx/4sdJ8YkerYHYWGyrSKoour7PFrylSEdRlltXQRIMnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894024; 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=SpfuwQNk8ijbnDCaWZZWydp6KpjhmVfwPl9hjtlsEfQ=; b=dG6ERRJO5+525dgeW6vdFDfmWt5ZqApkAA5SKD5Y0Mq8X3SBGgFX/6kljPY0VKwLcjkZh1nyBFl3Pmv7+2SZMugwv55HGX9iZBN9G0L2ThCVlpu+pBR0kkLCH+qUQwQSwEinOg93Xh0jC+k0ysOwggiHvYvW5QkZ9i6eD/DpKws= 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 1594894024098931.2576232941052; Thu, 16 Jul 2020 03:07:04 -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-17-XSARr7I9P_GtHq8q7vJBmQ-1; Thu, 16 Jul 2020 06:03:13 -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 2C09680DAE6; Thu, 16 Jul 2020 10:02:54 +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 D05A270108; Thu, 16 Jul 2020 10:02:53 +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 9ACE896236; Thu, 16 Jul 2020 10:02:53 +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 06GA2kwM016668 for ; Thu, 16 Jul 2020 06:02:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 247D42DE6D; Thu, 16 Jul 2020 10:02:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BADE2B6E2 for ; Thu, 16 Jul 2020 10:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894023; 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=SpfuwQNk8ijbnDCaWZZWydp6KpjhmVfwPl9hjtlsEfQ=; b=VDyFkw7bb0bImKr40hs0ehui/JqFIF1fKtpSLEAzmkGwPAOyhDvCHbHjF3aCX+pJvw0Xn6 YTNuUu4kIjw7hS873fQrNvKqBbstQOCr7NRYQtFl5dNnRD1QF5tcg7Ztycdy1h/xt9Qwkm a8DwlMOSmTcX2hA4rNbFZHni6F6He8g= X-MC-Unique: XSARr7I9P_GtHq8q7vJBmQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 087/351] meson: add OpenVZ driver build option Date: Thu, 16 Jul 2020 11:55:23 +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.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 --- configure.ac | 3 --- m4/virt-driver-openvz.m4 | 42 ---------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-driver-openvz.m4 diff --git a/configure.ac b/configure.ac index 3139b41a36a..30b84856d38 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ dnl Virtualization drivers check dnl =20 LIBVIRT_DRIVER_ARG_QEMU -LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ @@ -113,7 +112,6 @@ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 LIBVIRT_DRIVER_CHECK_QEMU -LIBVIRT_DRIVER_CHECK_OPENVZ LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ @@ -314,7 +312,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_QEMU -LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ diff --git a/m4/virt-driver-openvz.m4 b/m4/virt-driver-openvz.m4 deleted file mode 100644 index 3ad682b3437..00000000000 --- a/m4/virt-driver-openvz.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl The OpenVZ driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_OPENVZ], [ - LIBVIRT_ARG_WITH_FEATURE([OPENVZ], [OpenVZ], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_OPENVZ], [ - if test "$with_openvz" =3D "check"; then - with_openvz=3D$with_linux - fi - - if test "$with_openvz" =3D "yes" && test "$with_linux" =3D "no"; then - AC_MSG_ERROR([The OpenVZ driver can be enabled on Linux only.]) - fi - - if test "$with_openvz" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled= ]) - fi - - AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_OPENVZ], [ - LIBVIRT_RESULT([OpenVZ], [$with_openvz]) -]) diff --git a/meson.build b/meson.build index 2ed93e857d0..cae9743f5b2 100644 --- a/meson.build +++ b/meson.build @@ -1683,6 +1683,12 @@ elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif =20 +if not get_option('driver_openvz').disabled() and host_machine.system() = =3D=3D 'linux' + conf.set('WITH_OPENVZ', 1) +elif get_option('driver_openvz').enabled() + error('OpenVZ driver can be enabled on Linux only') +endif + =20 # define top include directory =20 @@ -1703,6 +1709,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'OpenVZ': conf.has('WITH_OPENVZ'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), diff --git a/meson_options.txt b/meson_options.txt index ccc0a209378..dbe56561752 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -53,5 +53,6 @@ option('driver_hyperv', type: 'feature', value: 'auto', d= escription: 'Hyper-V dr option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') +option('driver_openvz', type: 'feature', value: 'auto', description: 'Open= VZ driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893856; cv=none; d=zohomail.com; s=zohoarc; b=Q9d64+y5ceT6KwcaabLlfqUgjhCR4PfTOgT5LZrAr86PEtJ5H/cFwrfmyvwKtuFsLO51pPUfDRydp5RXopdb5vxQcREYR0XDeZYg/dPJMF+Dt2R2LVkeuTEjQOBHi8waUzgmfnds8yIw6RC04CWO6GsRTBxAZOC/7W+QrWDG6bA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893856; 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=7Y3uw3KsEoU86WZGZYJGHaFzL8K+2YM+C24EGByDqOI=; b=nqbpSE+LFSjq6RKNE8gFIGAtGHWP/3iY6q0WYpm66F4JwzUfivunwlk4h05+dsltbRkO29kCEW6XF9zPogwAIhQ+XmcvB59vORU8Oz2pTfFyr+tGDQNue6Kmuwc9FsxrhpmAMQ7oNqI+QlYhm1q4mO7AALgQ69TDdpEGTff9A9U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893856716175.165244873785; Thu, 16 Jul 2020 03:04:16 -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-322-J3uNRNqHPza1OuNFAMQU0Q-1; Thu, 16 Jul 2020 06:03:12 -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 6FBE1106B20A; Thu, 16 Jul 2020 10:02:51 +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 4BDCA1053B01; Thu, 16 Jul 2020 10:02:51 +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 1703B180599D; Thu, 16 Jul 2020 10:02:51 +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 06GA2lPi016686 for ; Thu, 16 Jul 2020 06:02:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0C0322DE73; Thu, 16 Jul 2020 10:02:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A59E2B6E2 for ; Thu, 16 Jul 2020 10:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893855; 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=7Y3uw3KsEoU86WZGZYJGHaFzL8K+2YM+C24EGByDqOI=; b=BtNxc7RRNC6f+lF3uG1Nj+AiMEtsrWGglL5z5bAo4+x53Wx4JUsa+N7qLuf3I3VZ0wOXTo 9o6V+Y6xM6vEZzttZRodq2JHHA57mZnMjoIL3CLZmEDJPoU65CLuJjP/xpslaaYPfWF2nN rxbB0ebnUz4Nhce21w8mT66FrsM9Zis= X-MC-Unique: J3uNRNqHPza1OuNFAMQU0Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 088/351] meson: add qemu driver build options Date: Thu, 16 Jul 2020 11:55:24 +0200 Message-Id: <368a216d8ace0d4b022636010326bd0f49d4986b.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 --- configure.ac | 8 --- m4/virt-driver-qemu.m4 | 132 ----------------------------------------- meson.build | 127 +++++++++++++++++++++++++++++++++++++++ meson_options.txt | 3 + 4 files changed, 130 insertions(+), 140 deletions(-) delete mode 100644 m4/virt-driver-qemu.m4 diff --git a/configure.ac b/configure.ac index 30b84856d38..d0189c8701a 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes= "]) =20 # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then - with_qemu=3Dno with_vbox=3Dno fi =20 @@ -103,7 +102,6 @@ dnl dnl Virtualization drivers check dnl =20 -LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ @@ -111,7 +109,6 @@ LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 -LIBVIRT_DRIVER_CHECK_QEMU LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ @@ -311,7 +308,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ @@ -366,7 +362,3 @@ LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Privileges]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_QEMU_PRIVILEGES -AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4 deleted file mode 100644 index 886261fce5c..00000000000 --- a/m4/virt-driver-qemu.m4 +++ /dev/null @@ -1,132 +0,0 @@ -dnl The QEMU driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_QEMU], [ - LIBVIRT_ARG_WITH_FEATURE([QEMU], [QEMU/KVM], [check]) - LIBVIRT_ARG_WITH([QEMU_USER], [username to run QEMU system instance as], - ['platform dependent']) - LIBVIRT_ARG_WITH([QEMU_GROUP], [groupname to run QEMU system instance as= ], - ['platform dependent']) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [ - dnl There is no way qemu driver will work without JSON support - AC_REQUIRE([LIBVIRT_CHECK_YAJL]) - if test "$with_qemu:$with_yajl" =3D "yes:no"; then - AC_MSG_ERROR([YAJL 2 is required to build QEMU driver]) - fi - if test "$with_qemu" =3D "check"; then - with_qemu=3D$with_yajl - fi - - if test "$with_qemu" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) - fi - AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" =3D "yes"]) - - if test $with_freebsd =3D yes || test $with_macos =3D yes; then - default_qemu_user=3Droot - default_qemu_group=3Dwheel - else - # Try to integrate gracefully with downstream packages by running QEMU - # processes using the same user and group they would - case $(grep ^ID=3D /etc/os-release 2>/dev/null) in - *arch*) - default_qemu_user=3Dnobody - default_qemu_group=3Dnobody - ;; - *centos*|*fedora*|*gentoo*|*rhel*|*suse*) - default_qemu_user=3Dqemu - default_qemu_group=3Dqemu - ;; - *debian*) - default_qemu_user=3Dlibvirt-qemu - default_qemu_group=3Dlibvirt-qemu - ;; - *ubuntu*) - default_qemu_user=3Dlibvirt-qemu - default_qemu_group=3Dkvm - ;; - *) - default_qemu_user=3Droot - default_qemu_group=3Droot - ;; - esac - # If the expected user and group don't exist, or we haven't hit any - # of the cases above because we're running on an unknown OS, the only - # sensible fallback is root:root - AC_MSG_CHECKING([for QEMU credentials ($default_qemu_user:$default_qem= u_group)]) - if getent passwd "$default_qemu_user" >/dev/null 2>&1 && \ - getent group "$default_qemu_group" >/dev/null 2>&1; then - AC_MSG_RESULT([ok]) - else - AC_MSG_RESULT([not found, using root:root instead]) - default_qemu_user=3Droot - default_qemu_group=3Droot - fi - fi - - if test "x$with_qemu_user" =3D "xplatform dependent" ; then - QEMU_USER=3D"$default_qemu_user" - else - QEMU_USER=3D"$with_qemu_user" - fi - if test "x$with_qemu_group" =3D "xplatform dependent" ; then - QEMU_GROUP=3D"$default_qemu_group" - else - QEMU_GROUP=3D"$with_qemu_group" - fi - AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) - AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) - - AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], - [/usr/libexec/qemu-bridge-helper], - [/usr/libexec:/usr/lib/qemu:/usr/lib]) - AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], - [QEMU bridge helper]) - AC_PATH_PROG([QEMU_PR_HELPER], [qemu-pr-helper], - [/usr/bin/qemu-pr-helper], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_PR_HELPER], ["$QEMU_PR_HELPER"], - [QEMU PR helper]) - AC_PATH_PROG([QEMU_SLIRP_HELPER], [slirp-helper], - [/usr/bin/slirp-helper], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_SLIRP_HELPER], ["$QEMU_SLIRP_HELPER"], - [QEMU slirp helper]) - - AC_PATH_PROG([QEMU_DBUS_DAEMON], [dbus-daemon], - [/usr/bin/dbus-daemon], - [/usr/bin:/usr/libexec]) - AC_DEFINE_UNQUOTED([QEMU_DBUS_DAEMON], ["$QEMU_DBUS_DAEMON"], - [QEMU dbus daemon]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_QEMU], [ - LIBVIRT_RESULT([QEMU], [$with_qemu]) -]) - -AC_DEFUN([LIBVIRT_RESULT_QEMU_PRIVILEGES], [ - if test "$QEMU_USER" =3D "root"; then - LIBVIRT_RESULT([QEMU], [$QEMU_USER:$QEMU_GROUP], - [!!! running QEMU as root is strongly discouraged !!!]) - else - LIBVIRT_RESULT([QEMU], [$QEMU_USER:$QEMU_GROUP]) - fi -]) diff --git a/meson.build b/meson.build index cae9743f5b2..b7710bd0fcb 100644 --- a/meson.build +++ b/meson.build @@ -1689,6 +1689,121 @@ elif get_option('driver_openvz').enabled() error('OpenVZ driver can be enabled on Linux only') endif =20 +if not get_option('driver_qemu').disabled() + use_qemu =3D true + + if not yajl_dep.found() + use_qemu =3D false + if get_option('driver_qemu').enabled() + error('YAJL 2 is required to build QEMU driver') + endif + endif + + if not conf.has('WITH_LIBVIRTD') + use_qemu =3D false + if get_option('driver_qemu').enabled() + error('libvirtd is required to build QEMU driver') + endif + endif + + if use_qemu + conf.set('WITH_QEMU', 1) + + if host_machine.system() in ['freebsd', 'darwin'] + default_qemu_user =3D 'root' + default_qemu_group =3D 'wheel' + else + os_release =3D run_command('grep', '^ID=3D', '/etc/os-release').stdo= ut() + if os_release.contains('arch') + default_qemu_user =3D 'nobody' + default_qemu_group =3D 'nobody' + elif ( os_release.contains('centos') or + os_release.contains('fedora') or + os_release.contains('gentoo') or + os_release.contains('rhel') or + os_release.contains('suse')) + default_qemu_user =3D 'qemu' + default_qemu_group =3D 'qemu' + elif os_release.contains('debian') + default_qemu_user =3D 'libvirt-qemu' + default_qemu_group =3D 'libvirt-qemu' + elif os_release.contains('ubuntu') + default_qemu_user =3D 'libvirt-qemu' + default_qemu_group =3D 'kvm' + else + default_qemu_user =3D 'root' + default_qemu_group =3D 'root' + endif + # If the expected user and group don't exist, or we haven't hit any + # of the cases above bacuse we're running on an unknown OS, the only + # sensible fallback is root:root + if ( run_command('getent', 'passwd', default_qemu_user).returncode()= !=3D 0 and + run_command('getent', 'group', default_qemu_group).returncode()= !=3D 0 ) + default_qemu_user =3D 'root' + default_qemu_group =3D 'root' + endif + endif + qemu_user =3D get_option('qemu_user') + if qemu_user =3D=3D '' + qemu_user =3D default_qemu_user + endif + qemu_group =3D get_option('qemu_group') + if qemu_group =3D=3D '' + qemu_group =3D default_qemu_group + endif + conf.set_quoted('QEMU_USER', qemu_user) + conf.set_quoted('QEMU_GROUP', qemu_group) + + qemu_bridge_prog =3D find_program( + 'qemu-bridge-helper', + dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ], + required: false + ) + if qemu_bridge_prog.found() + qemu_bridge_path =3D qemu_bridge_prog.path() + else + qemu_bridge_path =3D '/usr/libexec/qemu-bridge-helper' + endif + conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path) + + qemu_pr_prog =3D find_program( + 'qemu-pr-helper', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_pr_prog.found() + qemu_pr_path =3D qemu_pr_prog.path() + else + qemu_pr_path =3D '/usr/bin/qemu-pr-helper' + endif + conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path) + + qemu_slirp_prog =3D find_program( + 'slirp-helper', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_slirp_prog.found() + qemu_slirp_path =3D qemu_slirp_prog.path() + else + qemu_slirp_path =3D '/usr/bin/slirp-helper' + endif + conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path) + + qemu_dbus_daemon_prog =3D find_program( + 'dbus-daemon', + dirs: [ '/usr/bin', '/usr/libexec' ], + required: false + ) + if qemu_dbus_daemon_prog.found() + qemu_dbus_daemon_path =3D qemu_dbus_daemon_prog.path() + else + qemu_dbus_daemon_path =3D '/usr/bin/dbus-daemon' + endif + conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path) + endif +endif + =20 # define top include directory =20 @@ -1709,6 +1824,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), @@ -1783,3 +1899,14 @@ devtools_summary =3D { 'wireshark_dissector': wireshark_dep.found(), } summary(devtools_summary, section: 'Developer Tools', bool_yn: true) + +if conf.has('WITH_QEMU') + qemu_warn =3D '' + if qemu_user =3D=3D 'root' + qemu_warn =3D ' !!! running QEMU as root is strongly discouraged !!!' + endif + priv_summary =3D { + 'QEMU': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn), + } + summary(priv_summary, section: 'Privileges') +endif diff --git a/meson_options.txt b/meson_options.txt index dbe56561752..4f8cddd0aee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -54,5 +54,8 @@ option('driver_libvirtd', type: 'feature', value: 'auto',= description: 'libvirtd option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'Open= VZ driver') +option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/K= VM driver') +option('qemu_user', type: 'string', value: '', description: 'username to r= un QEMU system instance as') +option('qemu_group', type: 'string', value: '', description: 'groupname to= run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893796; cv=none; d=zohomail.com; s=zohoarc; b=N21NUZRo52R7RzNMClV6FfDH9pP5HA9k+uBcFJVy9YfilcRZ28ufF1SXpNbFcfMkKh+VrNz2l6bjvQq+VvyS9dMX+ZxL487YZUBlCHPwem5a/3DwzHkeC6eH5M2Ic+eKKIxy78bv+BiQ4pb43q4mTjr3F6bk8c19xdFPKS3orfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893796; 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=wzT06ILzpJAtwkvw9iiTCQHB3cAGmM/l2pO4FLXTUCY=; b=iDVyDmuHksVjAYxT1KwYfNpHJNR254AU5h8MFj3WLssnO0EzuKNWR9KWiMoQ7QTzn6XRj1Nw7QCyHZPyN2tk1S1nqwJw0LOwRRXjIaVhg3D8voKWBT70iUzod4cUdRZMQdzFACi2vmHpZnuc5rnFtIumsmkupAUsrIWjQO358Iw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159489379642245.60628865683532; Thu, 16 Jul 2020 03:03:16 -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-340-MPAxW6y4NuuwHb28ets6bQ-1; Thu, 16 Jul 2020 06:03:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34504106B243; Thu, 16 Jul 2020 10:02:49 +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 0F6452DE6D; Thu, 16 Jul 2020 10:02:49 +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 D12E09623A; Thu, 16 Jul 2020 10:02:48 +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 06GA2l8L016699 for ; Thu, 16 Jul 2020 06:02:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id E99F82DE73; Thu, 16 Jul 2020 10:02:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63A132B6E2 for ; Thu, 16 Jul 2020 10:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893795; 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=wzT06ILzpJAtwkvw9iiTCQHB3cAGmM/l2pO4FLXTUCY=; b=ZMC5Xa6+ZN9ZPyO7/K9jXr/3+7Z6IuaCZJbntyuVpy7rDsBKBpI6ZJMwEi/EwVAq8DVreX XvhSy1BYQtKEmTQEn4R/pRDojyEYpN1otAIhqW3SUW5ikhpa958O4hS5DzhIPqYocOA6cS jrUd8DYe+0RKcFGEBT7YbwAoKCn14MI= X-MC-Unique: MPAxW6y4NuuwHb28ets6bQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 089/351] meson: add test driver build option Date: Thu, 16 Jul 2020 11:55:25 +0200 Message-Id: <6453ace487e2c03f049660f21e492138471cacbe.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.23 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 --- configure.ac | 3 --- m4/virt-driver-test.m4 | 33 --------------------------------- meson.build | 5 +++++ meson_options.txt | 1 + 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 m4/virt-driver-test.m4 diff --git a/configure.ac b/configure.ac index d0189c8701a..ab1b2145756 100644 --- a/configure.ac +++ b/configure.ac @@ -105,14 +105,12 @@ dnl LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 @@ -311,7 +309,6 @@ AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ -LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-test.m4 b/m4/virt-driver-test.m4 deleted file mode 100644 index 460d1f4aeea..00000000000 --- a/m4/virt-driver-test.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The test driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_TEST], [ - LIBVIRT_ARG_WITH_FEATURE([TEST], [test driver], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_TEST], [ - if test "$with_test" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) - fi - AM_CONDITIONAL([WITH_TEST], [test "$with_test" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_TEST], [ - LIBVIRT_RESULT([Test], [$with_test]) -]) diff --git a/meson.build b/meson.build index b7710bd0fcb..6a32554bb41 100644 --- a/meson.build +++ b/meson.build @@ -1804,6 +1804,10 @@ if not get_option('driver_qemu').disabled() endif endif =20 +if get_option('driver_test').enabled() + conf.set('WITH_TEST', 1) +endif + =20 # define top include directory =20 @@ -1831,6 +1835,7 @@ driver_summary =3D { 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), + 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), } diff --git a/meson_options.txt b/meson_options.txt index 4f8cddd0aee..f9f9e3f79fe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -59,3 +59,4 @@ option('qemu_user', type: 'string', value: '', descriptio= n: 'username to run QEM option('qemu_group', type: 'string', value: '', description: 'groupname to= run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') +option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895403; cv=none; d=zohomail.com; s=zohoarc; b=TBVOx2QNNxzIKIgXV1pveXJ8S+5NFW0YB8+btLhw6iHvlvAEJWencwXypwnvSBHWV1hq/7WoPO3Gpfe5b+JsKffD72RNZeetwmoZYVdsmgC90izx+8C/6EJgJ+nrawpi67XEXsYe8zkNWI4Qq25lK1vWLsZ7lcRUZPc2tjqixAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895403; 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=tJV4Pov6qrs1VjU2RH9mKWlpSy7wun8+4ry0ELOH9cs=; b=WGFhDmYLJPpq1DlRx4QbL/rvd18oOuS/YUjzaTQ7Glsece6OV38GYZzbMh1VtZihWTPM215WGCQ1HNAa1tp90IGsyebT7uE2VufRIKfvORyX44zQN3xE032UIKLgpMQvVVbhwRKd2tWzJjkJdhMgNMjvjXFBfy4shXntoTk/LQs= 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 1594895403780512.2957853466436; Thu, 16 Jul 2020 03:30:03 -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-300-BdmKCgRgNwKtOdwqV2nNzQ-1; Thu, 16 Jul 2020 06:03:15 -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 CE889101A52C; Thu, 16 Jul 2020 10:02:56 +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 8D1FF79D1F; Thu, 16 Jul 2020 10:02:56 +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 4CABD1809557; Thu, 16 Jul 2020 10:02:56 +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 06GA2mYe016710 for ; Thu, 16 Jul 2020 06:02:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB32E2DE6B; Thu, 16 Jul 2020 10:02:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6202B6E2 for ; Thu, 16 Jul 2020 10:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895402; 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=tJV4Pov6qrs1VjU2RH9mKWlpSy7wun8+4ry0ELOH9cs=; b=aIn3tKjDT75OXTFKWClWWCJKyuB4a5TxV8aZxVs6gXJWxGvLbBgHkpjbTI00oRuhYN5T+V BX67uZFpGw7NPIeIAa1t3cDcre4UfQJHK/qKGDBlB5d07B5fRpE67Gz/pIf5ZJmtVwZQKl pb3N/X6HQA35e0M7nw205vgSOC4n72A= X-MC-Unique: BdmKCgRgNwKtOdwqV2nNzQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 090/351] meson: add vbox driver build options Date: Thu, 16 Jul 2020 11:55:26 +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 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 --- configure.ac | 8 -------- m4/virt-driver-vbox.m4 | 44 ------------------------------------------ meson.build | 6 ++++++ meson_options.txt | 2 ++ 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 m4/virt-driver-vbox.m4 diff --git a/configure.ac b/configure.ac index ab1b2145756..c0a6da1f3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,11 +83,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "ye= s"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) =20 -# Stateful drivers are useful only when building the daemon. -if test "$with_libvirtd" =3D "no" ; then - with_vbox=3Dno -fi - # Check for compiler and library settings. =20 LIBVIRT_ARG_NSS @@ -103,13 +98,11 @@ dnl Virtualization drivers check dnl =20 LIBVIRT_DRIVER_ARG_VMWARE -LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 LIBVIRT_DRIVER_CHECK_VMWARE -LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -307,7 +300,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_VMWARE -LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-vbox.m4 b/m4/virt-driver-vbox.m4 deleted file mode 100644 index 589b1c3ed5e..00000000000 --- a/m4/virt-driver-vbox.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl The VirtualBox driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_VBOX], [ - LIBVIRT_ARG_WITH_FEATURE([VBOX], [VirtualBox XPCOMC], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VBOX], [ - vbox_xpcomc_dir=3D - - if test "x$with_vbox" !=3D "xyes" && test "x$with_vbox" !=3D "xno"; then - # intentionally don't do any further checks here on the provided path - vbox_xpcomc_dir=3D$with_vbox - with_vbox=3Dyes - fi - - AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], - [Location of directory containing VirtualBox XPCOMC l= ibrary]) - - if test "x$with_vbox" =3D "xyes"; then - AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabl= ed]) - fi - AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VBOX], [ - LIBVIRT_RESULT([VBox], [$with_vbox]) -]) diff --git a/meson.build b/meson.build index 6a32554bb41..3309032face 100644 --- a/meson.build +++ b/meson.build @@ -1808,6 +1808,11 @@ if get_option('driver_test').enabled() conf.set('WITH_TEST', 1) endif =20 +if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') + conf.set('WITH_VBOX', 1) + conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) +endif + =20 # define top include directory =20 @@ -1830,6 +1835,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) driver_summary =3D { 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), + 'VBox': conf.has('WITH_VBOX'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), diff --git a/meson_options.txt b/meson_options.txt index f9f9e3f79fe..4ea5555a914 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -60,3 +60,5 @@ option('qemu_group', type: 'string', value: '', descripti= on: 'groupname to run Q option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') +option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') +option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893786; cv=none; d=zohomail.com; s=zohoarc; b=nCHeJVOUu7g8XUQKpQpY8bqGdahmiCpcVqOBnCGk7Ex5OfFehTlWM7ZhUx8XNMA9jpDMmGW9eaYG6M70wzKl9joleOX4uyGdpUKVYRethIeUSLxQ+KTmkwTJpaYm81ueceSEj99gqxh0PJXP/yfKTbPaxvykw2/gKOg7SwhmhYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893786; 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=AtzYv3pBAIk/ZRLkL/7VNmguNpS1YHCUr5nvaAa2t2M=; b=PIqGGFcyhUH6PhzUX5cFWyD9iEdiqAsLTFL3+iC/OYBiVf7KLlFm/pJiHZOW1X8/+WULYMSY43odMTS2Eql5eI8UDGa1ntU2XkXHzB75vJLL8JfKAhMgBjY1fsFCu/SCVfmNbYU3vzHCu9zSluLrZjP4mrKtHC3ymhgCP5+GaLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893786792948.6883941137634; Thu, 16 Jul 2020 03:03:06 -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-452-hQ4_3py1MWOObftULlkxrA-1; Thu, 16 Jul 2020 06:03:02 -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 5434B100A61F; Thu, 16 Jul 2020 10:02:54 +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 27CCD7B42A; Thu, 16 Jul 2020 10:02:54 +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 E4BF6180530D; Thu, 16 Jul 2020 10:02:53 +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 06GA2nOX016722 for ; Thu, 16 Jul 2020 06:02:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id C05D82DE71; Thu, 16 Jul 2020 10:02:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A0452B6E2 for ; Thu, 16 Jul 2020 10:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893785; 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=AtzYv3pBAIk/ZRLkL/7VNmguNpS1YHCUr5nvaAa2t2M=; b=GCn7/OVHeVAiogjAhQsY8Mv7JPOv2e0ZvZ0kY42MU7yKU3VhCuOSkredEqPU3180AWQUzw kgeWarYTy67xnclnTRSHbTyLKbAIdGIgQ7Om/I4+bkGA+WqEbJMfz0FdPYNXVwsAQVf0Aq LM7zkOeDmw1vhSwtCtvMb54DcPM2QkY= X-MC-Unique: hQ4_3py1MWOObftULlkxrA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 091/351] meson: add VMWare driver build option Date: Thu, 16 Jul 2020 11:55:27 +0200 Message-Id: <36fcf6932675f14279d045aa812967af715aa474.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.13 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 --- configure.ac | 3 --- m4/virt-driver-vmware.m4 | 33 --------------------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 m4/virt-driver-vmware.m4 diff --git a/configure.ac b/configure.ac index c0a6da1f3c6..531ff24feb8 100644 --- a/configure.ac +++ b/configure.ac @@ -97,12 +97,10 @@ dnl dnl Virtualization drivers check dnl =20 -LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 -LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -299,7 +297,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-vmware.m4 b/m4/virt-driver-vmware.m4 deleted file mode 100644 index 06504eb386d..00000000000 --- a/m4/virt-driver-vmware.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The VMware driver check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_VMWARE], [ - LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VMWARE], [ - if test "$with_vmware" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_VMWARE], 1, [whether VMware driver is enabled= ]) - fi - AM_CONDITIONAL([WITH_VMWARE], [test "$with_vmware" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VMWARE], [ - LIBVIRT_RESULT([VMware], [$with_vmware]) -]) diff --git a/meson.build b/meson.build index 3309032face..cd7ec2eaa00 100644 --- a/meson.build +++ b/meson.build @@ -1813,6 +1813,11 @@ if not get_option('driver_vbox').disabled() and conf= .has('WITH_LIBVIRTD') conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) endif =20 +if get_option('driver_vmware').enabled() + conf.set('WITH_VMWARE', 1) + conf.set('WITH_VMX', 1) +endif + =20 # define top include directory =20 @@ -1835,6 +1840,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) driver_summary =3D { 'QEMU': conf.has('WITH_QEMU'), 'OpenVZ': conf.has('WITH_OPENVZ'), + 'VMware': conf.has('WITH_VMWARE'), 'VBox': conf.has('WITH_VBOX'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), diff --git a/meson_options.txt b/meson_options.txt index 4ea5555a914..b6a49991f19 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -62,3 +62,4 @@ option('remote_default_mode', type: 'combo', choices: ['l= egacy', 'direct'], valu option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') +option('driver_vmware', type: 'feature', value: 'enabled', description: 'V= Mware driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893837; cv=none; d=zohomail.com; s=zohoarc; b=H2dSLR5xA6rNvzNzt6y7Lm+9OAvOyPkxWEWDtzq1PDUFHIpUPPR1/oaxVH1w9O/o2ZQhomlbJX+vfE9l+66PdyYsr/o+5STu/k5ClY1Xdsdw4dkfmyyvDqSleu5vu2ir1pYlfFE6yCeqtYhrEqIcz+89qtmZRm+Kiu888w5l4wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893837; 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=Nj6ziPmFdjPxdzQVypKTxGpoxkm/zJcZQamlh+Iv8vM=; b=VbsCR71IZnsIXb0E8l3vwe91uPS5K/VGhkX+Obk31LyIFacLEg+Ka+c26/N+P6lU4NJ68B2x8orsZOFpI7nY3cxGXD3bWespSKPZIkxBvOtl1r5fFhP+iCLhIMyxNWKxEMFd63JjVrtRpG8VC9kL+tlUL6bfdbJHcp/gWmE9DAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893837666702.5512624966946; Thu, 16 Jul 2020 03:03:57 -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-443-ZyvBS7UXPTKR_w-rxHfZog-1; Thu, 16 Jul 2020 06:03:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CCA3803538; Thu, 16 Jul 2020 10:02:59 +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 E4C8378A5B; Thu, 16 Jul 2020 10:02: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 B4A3A96221; Thu, 16 Jul 2020 10:02:58 +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 06GA2oNc016736 for ; Thu, 16 Jul 2020 06:02:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id A836E2DE81; Thu, 16 Jul 2020 10:02:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2379D2B6E2 for ; Thu, 16 Jul 2020 10:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893836; 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=Nj6ziPmFdjPxdzQVypKTxGpoxkm/zJcZQamlh+Iv8vM=; b=WNk/2FeE1+bPRhlCIjZbaGgaxR5SLbKQw+J/vPFWOtDhm6aHs55rzYvkaJEmRFePqxagUZ RyF+gYQRhkXrSnYsaOl6OIHMufbxqDgFKIBzi5xpl13pu3A+LZO+ZYxLf1Pxl18MTuIU7y SMDRrKeZ48wh0ST4LYMCYGnb+k9lKjo= X-MC-Unique: ZyvBS7UXPTKR_w-rxHfZog-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 092/351] meson: add Virtuozzo driver build option Date: Thu, 16 Jul 2020 11:55:28 +0200 Message-Id: <1d0c2b9c7997ca951c174390516badb1f94edade.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.14 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 --- configure.ac | 3 --- m4/virt-driver-vz.m4 | 43 ------------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-vz.m4 diff --git a/configure.ac b/configure.ac index 531ff24feb8..f2947074e5f 100644 --- a/configure.ac +++ b/configure.ac @@ -97,11 +97,9 @@ dnl dnl Virtualization drivers check dnl =20 -LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 -LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 @@ -297,7 +295,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4 deleted file mode 100644 index 11045e8b393..00000000000 --- a/m4/virt-driver-vz.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The Virtuozzo driver -dnl -dnl Copyright (C) 2005-2015 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_VZ],[ - LIBVIRT_ARG_WITH_FEATURE([VZ], [Virtuozzo], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[ - if test "$with_vz" =3D "yes" || - test "$with_vz" =3D "check"; then - - if test "$with_vz" =3D "yes" && test "$PARALLELS_SDK_FOUND" =3D "n= o"; then - AC_MSG_ERROR([Parallels Virtualization SDK is needed to build = the Virtuozzo driver.]) - fi - - with_vz=3D$PARALLELS_SDK_FOUND - if test "$with_vz" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_VZ], 1, - [whether vz driver is enabled]) - fi - fi - AM_CONDITIONAL([WITH_VZ], [test "$with_vz" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_VZ],[ - LIBVIRT_RESULT([vz], [$with_vz]) -]) diff --git a/meson.build b/meson.build index cd7ec2eaa00..19b51890abb 100644 --- a/meson.build +++ b/meson.build @@ -1818,6 +1818,12 @@ if get_option('driver_vmware').enabled() conf.set('WITH_VMX', 1) endif =20 +if not get_option('driver_vz').disabled() and parallels_sdk_dep.found() + conf.set('WITH_VZ', 1) +elif get_option('driver_vz').enabled() + error('Parallels Virtualization SDK is needed to build the Virtuozzo dri= ver.') +endif + =20 # define top include directory =20 @@ -1846,6 +1852,7 @@ driver_summary =3D { 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), 'Hyper-V': conf.has('WITH_HYPERV'), + 'vz': conf.has('WITH_VZ'), 'Bhyve': conf.has('WITH_BHYVE'), 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), diff --git a/meson_options.txt b/meson_options.txt index b6a49991f19..d6963fabd3c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -63,3 +63,4 @@ option('driver_test', type: 'feature', value: 'enabled', = description: 'test driv option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'enabled', description: 'V= Mware driver') +option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893800; cv=none; d=zohomail.com; s=zohoarc; b=DAdCDdVinADH6celGv0fKPkD7SgHI2aZ0ZPfuPPKd66GItWdGh/Xq2q8BOjtQo3T/7BDLlC9LGmMBH+THty5eiefRps06jTsK907SsIWLJhcQEYeR5UaxFlmYE4ozTgjQp3zt+IZGVMha0uzzVy4CnwyNdDZAmcTTZ5OYBLB/UA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893800; 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=DI3eWQSv+tuGo/opiyVIA8JbOltkHKIx+sR+API/zqI=; b=CWiLwf0fC2Cmm+G7UNiRHXdXKls1reQcKXUz0luDC7+PM1lomD5jk4lKTslRJ9l9XTvv7bYfG3M8h2pltw3dLHGce1ZH2E9Z6ghY7jqQHO8oZIUQ26qaCl7SApzt4Z8Pv29G1GfvFGlqk85pa3sxiCInBt69yh9qibNwXMFZrlg= 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 1594893800825874.7693481010921; Thu, 16 Jul 2020 03:03:20 -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-373-zLi_mGpaPzaZMmvPjGdAxg-1; Thu, 16 Jul 2020 06:03:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7DD0C80048A; Thu, 16 Jul 2020 10:03:01 +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 5B0BA79501; Thu, 16 Jul 2020 10:03:01 +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 262D81809547; Thu, 16 Jul 2020 10:03:01 +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 06GA2pHM016747 for ; Thu, 16 Jul 2020 06:02:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9118B2B6E2; Thu, 16 Jul 2020 10:02:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B3892B6DB for ; Thu, 16 Jul 2020 10:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893799; 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=DI3eWQSv+tuGo/opiyVIA8JbOltkHKIx+sR+API/zqI=; b=TEdPiI6GTUdaJUjbiSRZ73IkccsNWFbAFtzjw+XUOi7hIW8wobxYtUzqoZl1JX2u4aHwLb cPgjxTFa1y7zgVDvw04/hFkRK6CxnnZBmhMjMen+QR4IAPNVyUKc9QAmUl7D2lFfF13gn9 BJP0LBGi3sRueXkkpgi7tKPjTdAxmdo= X-MC-Unique: zLi_mGpaPzaZMmvPjGdAxg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 093/351] meson: add secdriver build options Date: Thu, 16 Jul 2020 11:55:29 +0200 Message-Id: <685a9655369384af40b66f1f36361738afda269b.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.14 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 --- configure.ac | 13 --------- m4/virt-secdriver-apparmor.m4 | 50 ----------------------------------- m4/virt-secdriver-selinux.m4 | 43 ------------------------------ meson.build | 18 +++++++++++++ meson_options.txt | 4 +++ 5 files changed, 22 insertions(+), 106 deletions(-) delete mode 100644 m4/virt-secdriver-apparmor.m4 delete mode 100644 m4/virt-secdriver-selinux.m4 diff --git a/configure.ac b/configure.ac index f2947074e5f..fdc7755716c 100644 --- a/configure.ac +++ b/configure.ac @@ -144,14 +144,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 =20 -dnl Security driver checks -LIBVIRT_SECDRIVER_ARG_SELINUX -LIBVIRT_SECDRIVER_ARG_APPARMOR - -LIBVIRT_SECDRIVER_CHECK_SELINUX -LIBVIRT_SECDRIVER_CHECK_APPARMOR - - LIBVIRT_ARG_WITH_FEATURE([SECRETS], [local secrets management driver], [ye= s]) =20 if test "$with_libvirtd" =3D "no"; then @@ -314,11 +306,6 @@ LIBVIRT_STORAGE_RESULT_GLUSTER LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Security Drivers]) -AC_MSG_NOTICE([]) -LIBVIRT_SECDRIVER_RESULT_SELINUX -LIBVIRT_SECDRIVER_RESULT_APPARMOR -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DRIVER_MODULES diff --git a/m4/virt-secdriver-apparmor.m4 b/m4/virt-secdriver-apparmor.m4 deleted file mode 100644 index 1894e66ed55..00000000000 --- a/m4/virt-secdriver-apparmor.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl The AppArmor security driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_SECDRIVER_ARG_APPARMOR], [ - LIBVIRT_ARG_WITH([SECDRIVER_APPARMOR], [use AppArmor security driver], [= check]) -]) - -AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_APPARMOR], [ - AC_REQUIRE([LIBVIRT_CHECK_APPARMOR]) - - if test "$with_apparmor" !=3D "yes" ; then - if test "$with_secdriver_apparmor" =3D "check" ; then - with_secdriver_apparmor=3Dno - fi - if test "$with_secdriver_apparmor" !=3D "no" ; then - AC_MSG_ERROR([You must install the AppArmor development package in o= rder to compile libvirt]) - fi - elif test "with_secdriver_apparmor" !=3D "no" ; then - with_secdriver_apparmor=3Dyes - AC_DEFINE_UNQUOTED([WITH_SECDRIVER_APPARMOR], 1, [whether AppArmor sec= urity driver is available]) - fi - AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmo= r" !=3D "no"]) - - LIBVIRT_ARG_WITH([APPARMOR_PROFILES], [install apparmor profiles], [no]) - if test "$with_apparmor" =3D "no"; then - with_apparmor_profiles=3D"no" - fi - AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles"= !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_SECDRIVER_RESULT_APPARMOR], [ - LIBVIRT_RESULT([AppArmor], [$with_secdriver_apparmor], - [install profiles: $with_apparmor_profiles]) -]) diff --git a/m4/virt-secdriver-selinux.m4 b/m4/virt-secdriver-selinux.m4 deleted file mode 100644 index 4174249a510..00000000000 --- a/m4/virt-secdriver-selinux.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The SElinux security driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_SECDRIVER_ARG_SELINUX], [ - LIBVIRT_ARG_WITH([SECDRIVER_SELINUX], [use SELinux security driver], [ch= eck]) -]) - -AC_DEFUN([LIBVIRT_SECDRIVER_CHECK_SELINUX], [ - AC_REQUIRE([LIBVIRT_CHECK_SELINUX]) - - if test "$with_selinux" !=3D "yes" ; then - if test "$with_secdriver_selinux" =3D "check" ; then - with_secdriver_selinux=3Dno - fi - if test "$with_secdriver_selinux" !=3D "no"; then - AC_MSG_ERROR([You must install the libselinux development package an= d enable SELinux with the --with-selinux=3Dyes in order to compile libvirt = --with-secdriver-selinux=3Dyes]) - fi - elif test "$with_secdriver_selinux" !=3D "no"; then - with_secdriver_selinux=3Dyes - AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux secur= ity driver is available]) - fi - AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux"= !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_SECDRIVER_RESULT_SELINUX], [ - LIBVIRT_RESULT([SELinux], [$with_secdriver_selinux]) -]) diff --git a/meson.build b/meson.build index 19b51890abb..eacfd57ee49 100644 --- a/meson.build +++ b/meson.build @@ -1824,6 +1824,18 @@ elif get_option('driver_vz').enabled() error('Parallels Virtualization SDK is needed to build the Virtuozzo dri= ver.') endif =20 +if not get_option('secdriver_apparmor').disabled() and apparmor_dep.found() + conf.set('WITH_SECDRIVER_APPARMOR', 1) +elif get_option('secdriver_apparmor').enabled() + error('You must install the AppArmor development package in order to com= pile libvirt.') +endif + +if not get_option('secdriver_selinux').disabled() and selinux_dep.found() + conf.set('WITH_SECDRIVER_SELINUX', 1) +elif get_option('secdriver_selinux').enabled() + error('You must install the libselinux development package in order to c= ompile libvirt.') +endif + =20 # define top include directory =20 @@ -1860,6 +1872,12 @@ driver_summary =3D { } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 +secdriver_summary =3D { + 'SELinux': conf.has('WITH_SECDRIVER_SELINUX'), + 'AppArmor': conf.has('WITH_SECDRIVER_APPARMOR'), +} +summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) + libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index d6963fabd3c..fd370244f56 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -64,3 +64,7 @@ option('driver_vbox', type: 'feature', value: 'enabled', = description: 'VirtualBo option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'enabled', description: 'V= Mware driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozz= o driver') + +option('secdriver_apparmor', type: 'feature', value: 'auto', description: = 'use AppArmor security driver') +option('apparmor_profiles', type: 'boolean', value: false, description: 'i= nstall apparmor profiles') +option('secdriver_selinux', type: 'feature', value: 'auto', description: '= use SELinux security driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893850; cv=none; d=zohomail.com; s=zohoarc; b=edDymhb+acYzwXV+CcfCV8EhmV/5KsJd4WvonUgBEDbmgal7xDQUx3YzRbgVOsuAK/m2dCCLj9PUXFoksaP/NGT7xjjaZ3FsuT7YEvegKHiQiKPux7NhCn5B7vJblW3uwZdJzVdQ5hJmWBAJLZXb+7R2ahsmEqFIfPIvAeaUKWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893850; 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=gwZ0fpMcLQPPBGmevYtaIL0HJxcpgOY/xs+q5f1ZlVQ=; b=nm12ZpDUWub/IzqOEyejFSQXK7iIkdW+3+Z7ujvQHeIioLcAWAI+DQon9Oh6vX5DCGwLEu74j4PFs6ZfmI5FirWxIt82AWR+St2tyzy/MoX58mWTSR3LzdDL+SKzuHVQwSGehALP9iUZciEwdreYReEpybSvGa3Hxi6RKb6IG2o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893850336240.0151882470807; Thu, 16 Jul 2020 03:04:10 -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-316-RcbqyjjcPeyyb-MMixaKtA-1; Thu, 16 Jul 2020 06:03:20 -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 06BA91014FEF; Thu, 16 Jul 2020 10:03:04 +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 D5EE96FEFB; Thu, 16 Jul 2020 10:03:03 +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 A2B7696222; Thu, 16 Jul 2020 10:03:03 +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 06GA2qHC016765 for ; Thu, 16 Jul 2020 06:02:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7AC552B6DB; Thu, 16 Jul 2020 10:02:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E92562DE81 for ; Thu, 16 Jul 2020 10:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893849; 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=gwZ0fpMcLQPPBGmevYtaIL0HJxcpgOY/xs+q5f1ZlVQ=; b=InaCTsApI7YQpXUmFPjG3FZIsGB4Ovjq17OqZo4vt93h+upujhG0CEEJ6bt2u3iPr2bKWg Xt0q60135YxZRVKKe6KUAqPyUFolIafQqARBhvpvJsC8DdHv6WIdKxwdIrsNIjFSyZtN89 snzXXQKeF50GDRmucYCxA5sN8zvd/zY= X-MC-Unique: RcbqyjjcPeyyb-MMixaKtA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 094/351] meson: add network driver build option Date: Thu, 16 Jul 2020 11:55:30 +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.12 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 --- configure.ac | 3 --- m4/virt-driver-network.m4 | 51 --------------------------------------- meson.build | 11 +++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 m4/virt-driver-network.m4 diff --git a/configure.ac b/configure.ac index fdc7755716c..2100beb582d 100644 --- a/configure.ac +++ b/configure.ac @@ -97,10 +97,8 @@ dnl dnl Virtualization drivers check dnl =20 -LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 -LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 =20 @@ -287,7 +285,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) diff --git a/m4/virt-driver-network.m4 b/m4/virt-driver-network.m4 deleted file mode 100644 index b98ce07c9cb..00000000000 --- a/m4/virt-driver-network.m4 +++ /dev/null @@ -1,51 +0,0 @@ -dnl The network driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_NETWORK], [ - LIBVIRT_ARG_WITH([NETWORK], [with virtual network driver], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_NETWORK], [ - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LIBVIRTD]) - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_QEMU]) - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LXC]) - - dnl there's no use compiling the network driver without the libvirt - dnl daemon, nor compiling it for macOS, where it breaks the compile - - if test "$with_libvirtd" =3D "no" || test "$with_macos" =3D "yes"; then - with_network=3Dno - fi - - if test "$with_network" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_NETWORK], 1, [whether network driver is enabl= ed]) - fi - AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" =3D "yes"]) - - with_bridge=3Dno - if test "$with_qemu:$with_lxc:$with_network" !=3D "no:no:no"; then - with_bridge=3Dyes - AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed]) - fi - AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_NETWORK], [ - LIBVIRT_RESULT([Network], [$with_network]) -]) diff --git a/meson.build b/meson.build index eacfd57ee49..bbc74e32dd5 100644 --- a/meson.build +++ b/meson.build @@ -1683,6 +1683,12 @@ elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif =20 +# there's no use compiling the network driver without the libvirt +# daemon, nor compiling it for macOS, where it breaks the compile +if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD= ') and host_machine.system() !=3D 'darwin' + conf.set('WITH_NETWORK', 1) +endif + if not get_option('driver_openvz').disabled() and host_machine.system() = =3D=3D 'linux' conf.set('WITH_OPENVZ', 1) elif get_option('driver_openvz').enabled() @@ -1836,6 +1842,10 @@ elif get_option('secdriver_selinux').enabled() error('You must install the libselinux development package in order to c= ompile libvirt.') endif =20 +if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or conf.has('WITH_NETWORK= ') + conf.set('WITH_BRIDGE', 1) +endif + =20 # define top include directory =20 @@ -1868,6 +1878,7 @@ driver_summary =3D { 'Bhyve': conf.has('WITH_BHYVE'), 'Test': conf.has('WITH_TEST'), 'Remote': conf.has('WITH_REMOTE'), + 'Network': conf.has('WITH_NETWORK'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index fd370244f56..045c211ca46 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -53,6 +53,7 @@ option('driver_hyperv', type: 'feature', value: 'auto', d= escription: 'Hyper-V dr option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') +option('driver_network', type: 'feature', value: 'auto', description: 'vir= tual network driver') option('driver_openvz', type: 'feature', value: 'auto', description: 'Open= VZ driver') option('driver_qemu', type: 'feature', value: 'auto', description: 'QEMU/K= VM driver') option('qemu_user', type: 'string', value: '', description: 'username to r= un QEMU system instance as') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893792; cv=none; d=zohomail.com; s=zohoarc; b=XATITgDsfmbp6RuZsinkXYnU8KUH/gJcUYZyh/mvnfEjhItveWQRY2wC2I8jh0rk2epkk9roRdNqwqGXkRYd43NegMYbFkF1wzjznm1GVLKrEhshZeyQ7CJ6qG/sAL6TP5m5rxEsmtJcBq2DdKUt+FHfQGrqg9IVByRyW2bS4nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893792; 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=M5A2auqgAqPXaoJyuKxZjhztlFuJE84CIO2W5/UiS18=; b=S6c560dUQeKaMrWQN0I6MWE0zBHkUh5Dw15GQ4QaTK5uvYv/r8xHTRSXvURRHGb1tsIctY6mncn5Y+BTFdMigS0eKixsmezuc7F+YUMIqG9bwgowwnw/bOCPtaJX5j9uDfKzblRwfjqqktbjWq8NDel/tVTJXDtvNlCKOau67pQ= 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 1594893792313295.9476073842616; Thu, 16 Jul 2020 03:03: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-457-5TWkT8kTMziGBPVHb8eZrA-1; Thu, 16 Jul 2020 06:03:07 -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 47238100A63E; Thu, 16 Jul 2020 10:02:59 +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 D61ED70101; Thu, 16 Jul 2020 10:02: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 A123896236; Thu, 16 Jul 2020 10:02:58 +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 06GA2rqt016773 for ; Thu, 16 Jul 2020 06:02:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 642792DE9C; Thu, 16 Jul 2020 10:02:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1CBB2DE7F for ; Thu, 16 Jul 2020 10:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893791; 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=M5A2auqgAqPXaoJyuKxZjhztlFuJE84CIO2W5/UiS18=; b=A1n63pzRlcVAUXjsMzkXiRevWKdBEgBS+xk+bBsLEBlHSV71CkOfZyJvM/LnY4KKpuH442 /NLCiZtg+3ATPqYVmRGfaSVpIZLp+6DCu9urUl+CR97vKVf8ebu/6yRpkW0wC3A0cezm1O /Ty5mkLrRwCRKIqt28/i1r/81hGsrrA= X-MC-Unique: 5TWkT8kTMziGBPVHb8eZrA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 095/351] meson: add interface driver build option Date: Thu, 16 Jul 2020 11:55:31 +0200 Message-Id: <6f396a382ee9a94acd21171cc6fb0e7e2f4e1a1f.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 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 --- configure.ac | 14 ----------- m4/virt-driver-interface.m4 | 49 ------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 m4/virt-driver-interface.m4 diff --git a/configure.ac b/configure.ac index 2100beb582d..9a806517594 100644 --- a/configure.ac +++ b/configure.ac @@ -92,16 +92,6 @@ LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS =20 =20 - -dnl -dnl Virtualization drivers check -dnl - -LIBVIRT_DRIVER_ARG_INTERFACE - -LIBVIRT_DRIVER_CHECK_INTERFACE - - dnl dnl in case someone want to build static binaries dnl STATIC_BINARIES=3D"-static" @@ -283,10 +273,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Drivers]) -AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_INTERFACE -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_DIR diff --git a/m4/virt-driver-interface.m4 b/m4/virt-driver-interface.m4 deleted file mode 100644 index 68a0219502a..00000000000 --- a/m4/virt-driver-interface.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl The interface driver -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_DRIVER_ARG_INTERFACE], [ - LIBVIRT_ARG_WITH_FEATURE([INTERFACE], [host interface driver], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_INTERFACE], [ - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LIBVIRTD]) - AC_REQUIRE([LIBVIRT_CHECK_NETCF]) - AC_REQUIRE([LIBVIRT_CHECK_UDEV]) - - dnl Don't compile the interface driver without libvirtd - if test "$with_libvirtd" =3D "no" ; then - with_interface=3Dno - fi - - dnl The interface driver depends on the netcf library or udev library - case $with_interface:$with_netcf:$with_udev in - check:*yes*) with_interface=3Dyes ;; - check:no:no) with_interface=3Dno ;; - yes:no:no) AC_MSG_ERROR([Requested the Interface driver without netcf = or udev support]) ;; - esac - - if test "$with_interface" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], [whether the interface drive= r is enabled]) - fi - AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_INTERFACE], [ - LIBVIRT_RESULT([Interface], [$with_interface]) -]) diff --git a/meson.build b/meson.build index bbc74e32dd5..b25d07fce94 100644 --- a/meson.build +++ b/meson.build @@ -1599,6 +1599,12 @@ elif get_option('driver_hyperv').enabled() error('openwsman is required for the Hyper-V driver') endif =20 +if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or netcf_dep.found()) + conf.set('WITH_INTERFACE', 1) +elif get_option('driver_interface').enabled() + error('Requested the Interface driver without netcf or udev and libvirtd= support') +endif + if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') libxl_version =3D '4.6.0' libxl_dep =3D dependency('xenlight', version: '>=3D' + libxl_version, re= quired: get_option('driver_libxl')) @@ -1880,6 +1886,7 @@ driver_summary =3D { 'Remote': conf.has('WITH_REMOTE'), 'Network': conf.has('WITH_NETWORK'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), + 'Interface': conf.has('WITH_INTERFACE'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 045c211ca46..3d7272348af 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -50,6 +50,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe= driver') option('driver_esx', type: 'feature', value: 'enabled', description: 'esx = driver') option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hype= r-V driver') +option('driver_interface', type: 'feature', value: 'auto', description: 'h= ost interface driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893895; cv=none; d=zohomail.com; s=zohoarc; b=T19tS4SoigAM1hTKufuBCFkuqKH6/4Ey+nxeAi/MwpICVuXsGnpf8G7aEiK6oTbPi1+JbOwpTFpaMycaFCQwxWbgF/1FtOdnz7/nnZKGvJRj8LlbAvnYU0+zqXofYMQbBi2ch0id66ZgvAPEBeWzeo6HhiO25b2fGqH0/0afXds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893895; 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=LwKWmB/Hqeg2vZML3MezWiclZXH84J4Pdpv744Q/r3s=; b=HECN8Kez7G4bSUdwoFwSOvTBwg+Np9lCACMIHdEMvx6jLHB3WkD79SAcTW6R8w6dykOJjPeJw2lLwkNuXYhFypyXgfYWa5NfF7SuaxFfgUsfSYQ2SOESJMuIKAedJlgvgdNF9Y27ezyghIrd8lHU9K/fxbQVM75CkVvS1mshqdo= 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 1594893895128641.8811531277803; Thu, 16 Jul 2020 03:04:55 -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-197-_A217852OO6T1TP3QkuOBg-1; Thu, 16 Jul 2020 06:03:20 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6204F101442F; Thu, 16 Jul 2020 10:03:06 +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 41A4379505; Thu, 16 Jul 2020 10:03:06 +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 0E8A3180CB27; Thu, 16 Jul 2020 10:03:06 +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 06GA2vAg016822 for ; Thu, 16 Jul 2020 06:02:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F5332DE7F; Thu, 16 Jul 2020 10:02:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDBC72DE9C for ; Thu, 16 Jul 2020 10:02:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893893; 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=LwKWmB/Hqeg2vZML3MezWiclZXH84J4Pdpv744Q/r3s=; b=fg1ZBYD3DFkC6kI21MLDHEHOK6COaA2Dgp1unfn60v+pqZXc7Uq0jM3Tim57Ai5GshcFjb 8ztbTfvDC/2AkBhM4/mrFThw4s1BOraaBP6YB3FjaGfzph1ad733+u1N372iwqWAdI5UAB 5tTeHfihemBv1mbFUMcmyHzSNYbdMWc= X-MC-Unique: _A217852OO6T1TP3QkuOBg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 096/351] meson: add secrets driver build option Date: Thu, 16 Jul 2020 11:55:32 +0200 Message-Id: <0bc272d7e18d1335857db16d7b6371c8c4d00508.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.14 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 --- configure.ac | 11 ----------- meson.build | 4 ++++ meson_options.txt | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 9a806517594..0ab742c970f 100644 --- a/configure.ac +++ b/configure.ac @@ -132,17 +132,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 =20 -LIBVIRT_ARG_WITH_FEATURE([SECRETS], [local secrets management driver], [ye= s]) - -if test "$with_libvirtd" =3D "no"; then - with_secrets=3Dno -fi -if test "$with_secrets" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_SECRETS], 1, [whether local secrets management = driver is available]) -fi -AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" =3D "yes"]) - - dnl dnl Storage driver checks dnl diff --git a/meson.build b/meson.build index b25d07fce94..3bd4e0423d2 100644 --- a/meson.build +++ b/meson.build @@ -1816,6 +1816,10 @@ if not get_option('driver_qemu').disabled() endif endif =20 +if not get_option('driver_secrets').disabled() and conf.has('WITH_LIBVIRTD= ') + conf.set('WITH_SECRETS', 1) +endif + if get_option('driver_test').enabled() conf.set('WITH_TEST', 1) endif diff --git a/meson_options.txt b/meson_options.txt index 3d7272348af..1e40eb214bf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -61,6 +61,7 @@ option('qemu_user', type: 'string', value: '', descriptio= n: 'username to run QEM option('qemu_group', type: 'string', value: '', description: 'groupname to= run QEMU system instance as') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') +option('driver_secrets', type: 'feature', value: 'auto', description: 'loc= al secrets management driver') option('driver_test', type: 'feature', value: 'enabled', description: 'tes= t driver') option('driver_vbox', type: 'feature', value: 'enabled', description: 'Vir= tualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Locatio= n of directory containing VirtualBox XPCOMC library') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893880; cv=none; d=zohomail.com; s=zohoarc; b=XR5rNTJp2mgHy6tOcQenj5v4DB5zK8wc/qQ6TevDtsuOWfNRFae8TeZzyl8cjXBsBRHoOyfXW/ISs/7uVGs2da8aX2T+/jmV3LWi91psZlveiRgpuIYs0qKvZjzFVDckwqgUzFb/jX2/+yQnMSywdTPBgyNlnqPjmR09gJdzWBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893880; 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=iV4o+9niTquFMrLOhB7v27hcV1w+M/ypJofYbdbKgoc=; b=RT7a+0nrmgV2wvRoAX/BHw/OztNblfuWWcpCrB0puFUCJC1cTxizplmAjx6ddue0FvBj16PWVH/dhcxmA0k44H8sxQ4hoLBnCRJ/484g/O/uphoO6W5fLRI1H9CWux2Xiq9v3lVGVGTVFV66hdj+KqrJXvgeqNq0XkzS3yhLlhQ= 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 1594893880088730.3125143308594; Thu, 16 Jul 2020 03:04:40 -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-428-JU5j4KvnPg-ruHDeDltWHg-1; Thu, 16 Jul 2020 06:03:17 -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 9925C800492; Thu, 16 Jul 2020 10:03:01 +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 4D6257BD59; Thu, 16 Jul 2020 10:03:01 +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 139E11809557; Thu, 16 Jul 2020 10:03:01 +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 06GA2wCx016833 for ; Thu, 16 Jul 2020 06:02:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3B9F72DE7F; Thu, 16 Jul 2020 10:02:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A69242DE9C for ; Thu, 16 Jul 2020 10:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893878; 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=iV4o+9niTquFMrLOhB7v27hcV1w+M/ypJofYbdbKgoc=; b=ZzLc+kKUFO7f2uNkLrhIqedJQNNb8NJwVRESVdhW13xA/cAWBpAs2biww6/xn86gOXkLFx SQUdn049h02xUb22P6CIx0te2jG+PDilwmdRgkS1tHkFIf7Sno5uPUAQcgYb2xr4uDdXPe Ijik9myROGtndPRYm4OGupmMx1x1kIM= X-MC-Unique: JU5j4KvnPg-ruHDeDltWHg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 097/351] meson: add node_device driver check Date: Thu, 16 Jul 2020 11:55:33 +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 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 --- configure.ac | 9 --------- meson.build | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 0ab742c970f..e4cd6c15e16 100644 --- a/configure.ac +++ b/configure.ac @@ -223,15 +223,6 @@ LV_LIBTOOL_OBJDIR=3D${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) =20 =20 -with_nodedev=3Dno; -if test "$with_hal" =3D "yes" || test "$with_udev" =3D "yes"; -then - with_nodedev=3Dyes - AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) -fi -AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" =3D "yes"]) - - GNUmakefile=3DGNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/meson.build b/meson.build index 3bd4e0423d2..6527473ceaf 100644 --- a/meson.build +++ b/meson.build @@ -1695,6 +1695,10 @@ if not get_option('driver_network').disabled() and c= onf.has('WITH_LIBVIRTD') and conf.set('WITH_NETWORK', 1) endif =20 +if hal_dep.found() or udev_dep.found() + conf.set('WITH_NODE_DEVICES', 1) +endif + if not get_option('driver_openvz').disabled() and host_machine.system() = =3D=3D 'linux' conf.set('WITH_OPENVZ', 1) elif get_option('driver_openvz').enabled() --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893909; cv=none; d=zohomail.com; s=zohoarc; b=MMhdPCPl/9rHelFPW0uDmTR9c0hUMW5UOJciuL8wmBIva4VTVxQ4RqsHA41mY+DUeeoR5t6YA8yUjogfFQPnOTON+nTLTkyV3NY7F0wZxw78DEA5JLoeKPAVp25lOWd2Fq3IFEysoVc7nnfxWWJYupWJwZq8EiSjjMEdUUxUZzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893909; 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=8chLD+nJeBWN173zqmoMBNJTzypXC4q6mGgHnJCa1SY=; b=hp9FTCKat61sXjjV+ZvrRIJwASaC6WsWDWoQB+TtNdFi8S8WJnPSrj+3SPZvyx6PG2yupCUP+8VIrXYwURjiwv1mfV2XzSghnVdUKIE/t/vPQSL75yvGi5euTxwh3eNTXRQ6/uc0gbd/HiO8KjGJWaNhIMGCzQgLjcuJfIRQGRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893909964837.5837656190093; Thu, 16 Jul 2020 03:05: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-211-9YGUCnRTPtiaw6n2quFJfw-1; Thu, 16 Jul 2020 06:03:19 -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 EBEC72CCE; Thu, 16 Jul 2020 10:03:03 +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 C57AF6FEFF; Thu, 16 Jul 2020 10:03:03 +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 91A3C96236; Thu, 16 Jul 2020 10:03:03 +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 06GA2x6D016851 for ; Thu, 16 Jul 2020 06:02:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 243662DE7F; Thu, 16 Jul 2020 10:02:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91EF82DE9D for ; Thu, 16 Jul 2020 10:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893908; 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=8chLD+nJeBWN173zqmoMBNJTzypXC4q6mGgHnJCa1SY=; b=AnGjlhkuSil33emAyfFUhXjkuQr/fWw/Ziy2tpmIbNH++c4un+yzE7cxNp2ZrD05fVgJKO x/ajtYN4Eh8Es54NfbXt9BeMTMCnNX+wFmPpIj/O/eYuZNIFRvbsRszyopOsZ4zBda+vfB 7HSd+W/4h81GwaBrK55A2tEgh07CTYo= X-MC-Unique: 9YGUCnRTPtiaw6n2quFJfw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 098/351] meson: add storage build check Date: Thu, 16 Jul 2020 11:55:34 +0200 Message-Id: <107697d1f572835a0bfae86a37c979015d5a9baf.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 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 --- configure.ac | 13 ------------- meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index e4cd6c15e16..49ead1baa8e 100644 --- a/configure.ac +++ b/configure.ac @@ -186,19 +186,6 @@ LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE =20 -with_storage=3Dno -for backend in dir fs lvm iscsi iscsi_direct scsi mpath rbd disk; do - if eval test \$with_storage_$backend =3D yes; then - with_storage=3Dyes - break - fi -done -if test $with_storage =3D yes; then - AC_DEFINE([WITH_STORAGE], [1], - [Define to 1 if at least one storage backend is in use]) -fi -AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" =3D "yes"]) - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. diff --git a/meson.build b/meson.build index 6527473ceaf..c865d6c2cbf 100644 --- a/meson.build +++ b/meson.build @@ -1861,6 +1861,15 @@ if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or = conf.has('WITH_NETWORK') endif =20 =20 +# check for storage drivers + +use_storage =3D false + +if use_storage + conf.set('WITH_STORAGE', 1) +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894025; cv=none; d=zohomail.com; s=zohoarc; b=M9pAvTWkdkoDhv9itqF66uRrhJocH2/TI+0od2/P/L18eDhxZYCXXS2OY+GFnHE6gNMbs4vs3cnTsc40s2NoJADwUDl+h+M6TN2T3fzjZoerZBWE5BG8PJtDNPgUHcCEvIqWwNHjK4rETP3xYIj+FPflhLkldDjnuq36SW8jVho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894025; 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=09DdLOrHpS1hgisoyV17oXTo+4tROPSuZmP9vTCy15U=; b=CbgY+ZPdJCX8IiExz9M/Wg+Luzi+slaz/ChK2TzEE4BjsZ1HFIE7Qf0iULVyO/v0hpdDd5iYUneLDQLJ+/6Qgm+Rscay0eWoYuRNsDb4/nZD0rC2nEDX2a22DOFklnEdI8bceFndVB8A4LCtVVOSZCNYO8E/KGCO2qW8cMKMS4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894025087884.6165314636288; Thu, 16 Jul 2020 03:07:05 -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-261-NpLG9wUmPDa-fCjq1betZQ-1; Thu, 16 Jul 2020 06:03:21 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C519E15D3B; Thu, 16 Jul 2020 10:03:08 +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 A05902DE9F; Thu, 16 Jul 2020 10:03:08 +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 6F58196244; Thu, 16 Jul 2020 10:03:08 +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 06GA30Xk016862 for ; Thu, 16 Jul 2020 06:03:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0C8F12DE7F; Thu, 16 Jul 2020 10:03:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AEB82DE9C for ; Thu, 16 Jul 2020 10:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894023; 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=09DdLOrHpS1hgisoyV17oXTo+4tROPSuZmP9vTCy15U=; b=aFAFlFXiMjjvVZu0v5TOQEnaN6wUp05smPlvrCNRiTJ8zmLR86c/lFOZXLAZyJv/g3PDh3 GbQbQSYhIXasg0vxKH9oV5TRpGL2q+KvmKGZeAY4h0uxI6RlKJQepjhadI7e4xWfaJZFvm 6Vr3Xo0K7xbQwWnsyk7sOJoNrYkHmcs= X-MC-Unique: NpLG9wUmPDa-fCjq1betZQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 099/351] meson: add storage dir build option Date: Thu, 16 Jul 2020 11:55:35 +0200 Message-Id: <2a8e800dd905c8a55c99d6b272dc6a71a9169237.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.23 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 --- configure.ac | 4 ---- m4/virt-storage-dir.m4 | 33 --------------------------------- meson.build | 12 ++++++++++++ meson_options.txt | 4 ++++ 4 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 m4/virt-storage-dir.m4 diff --git a/configure.ac b/configure.ac index 49ead1baa8e..1edec551fbe 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,6 @@ dnl dnl Storage driver checks dnl =20 -LIBVIRT_STORAGE_ARG_DIR LIBVIRT_STORAGE_ARG_FS LIBVIRT_STORAGE_ARG_LVM LIBVIRT_STORAGE_ARG_ISCSI @@ -151,7 +150,6 @@ LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then - with_storage_dir=3Dno with_storage_fs=3Dno with_storage_lvm=3Dno with_storage_iscsi=3Dno @@ -172,7 +170,6 @@ if test "$with_macos" =3D "yes"; then with_storage_fs=3Dno fi =20 -LIBVIRT_STORAGE_CHECK_DIR LIBVIRT_STORAGE_CHECK_FS LIBVIRT_STORAGE_CHECK_LVM LIBVIRT_STORAGE_CHECK_ISCSI @@ -242,7 +239,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_DIR LIBVIRT_STORAGE_RESULT_FS LIBVIRT_STORAGE_RESULT_LVM LIBVIRT_STORAGE_RESULT_ISCSI diff --git a/m4/virt-storage-dir.m4 b/m4/virt-storage-dir.m4 deleted file mode 100644 index 798bf939e0f..00000000000 --- a/m4/virt-storage-dir.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The storage dir check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_DIR], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_DIR], [directory backend for the stora= ge driver], [yes]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_DIR], [ - if test "$with_storage_dir" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend f= or storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_DIR], [ - LIBVIRT_RESULT([Dir], [$with_storage_dir]) -]) diff --git a/meson.build b/meson.build index c865d6c2cbf..1791e09bfa4 100644 --- a/meson.build +++ b/meson.build @@ -1865,6 +1865,13 @@ endif =20 use_storage =3D false =20 +if conf.has('WITH_LIBVIRTD') + if not get_option('storage_dir').disabled() + use_storage =3D true + conf.set('WITH_STORAGE_DIR', 1) + endif +endif + if use_storage conf.set('WITH_STORAGE', 1) endif @@ -1907,6 +1914,11 @@ driver_summary =3D { } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 +storagedriver_summary =3D { + 'Dir': conf.has('WITH_STORAGE_DIR'), +} +summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) + secdriver_summary =3D { 'SELinux': conf.has('WITH_SECDRIVER_SELINUX'), 'AppArmor': conf.has('WITH_SECDRIVER_APPARMOR'), diff --git a/meson_options.txt b/meson_options.txt index 1e40eb214bf..e840c68b498 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -71,3 +71,7 @@ option('driver_vz', type: 'feature', value: 'auto', descr= iption: 'Virtuozzo driv option('secdriver_apparmor', type: 'feature', value: 'auto', description: = 'use AppArmor security driver') option('apparmor_profiles', type: 'boolean', value: false, description: 'i= nstall apparmor profiles') option('secdriver_selinux', type: 'feature', value: 'auto', description: '= use SELinux security driver') + + +# storage driver options +option('storage_dir', type: 'feature', value: 'auto', description: 'direct= ory backand for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893867; cv=none; d=zohomail.com; s=zohoarc; b=cBTumNdN2phX0aYabavWResbbWjbn4iiITZSNIfGZSp69lTO089RVjdA3JGrSrAGORQY3aGUTDa/dSZ5D549nzGytyBP/3bD5PCbqHlW7e8nYSzz89tgY+6lY4A2CuEzU/fzAuZAzE3+2sye1di/lbWYK+61tQ3EQK7b/5dzYpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893867; 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=NUj5n6KlKy0BO0EUE2jGH/Ov29zcO2jQR7OZXIKV+DQ=; b=PrH3z0F/dJe6vAUost2lZk1T+4TCCS2qF/EYeXwBWlNDGLT1M8PTrkN9pV6bytX5S5giVlOpfotjLgKb4S7NkhvTmzBuKV3NOlBqI67G4Hfz2GD9eduOCjF5+3/enP7CxZ3HWj46e7wvzTL4qB3Xbj6Ev3NEpPhsGEM4DUgoDRo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159489386754512.695286530864223; Thu, 16 Jul 2020 03:04:27 -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-457-CawOBfAHPA-kfhl_QhKbQg-1; Thu, 16 Jul 2020 06:03:19 -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 ADE111014404; Thu, 16 Jul 2020 10:03:04 +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 89AF2610AF; Thu, 16 Jul 2020 10:03:04 +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 57CB01806B0B; Thu, 16 Jul 2020 10:03:04 +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 06GA3005016871 for ; Thu, 16 Jul 2020 06:03:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC83F2DE9C; Thu, 16 Jul 2020 10:03:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6330B2DE7F for ; Thu, 16 Jul 2020 10:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893866; 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=NUj5n6KlKy0BO0EUE2jGH/Ov29zcO2jQR7OZXIKV+DQ=; b=EIdiUOIo9QKIXkpYb1KyA80mwiDfvSh5ZXiMg7hKWTEeeO5Tiz7X3gKqCC7Qzaob3eeRav oErKJW+aUjLymRY+tlERFleKgkgvh+ujoyHSFh+hQIJzzCInf3GJhDXy/xT1Cd0RtT5azo MzlSW/Fyrr5Sf8q+Jjo+uqc80JgQKIo= X-MC-Unique: CawOBfAHPA-kfhl_QhKbQg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 100/351] meson: add storage disk build option Date: Thu, 16 Jul 2020 11:55:36 +0200 Message-Id: <58a6b441416eb76bef8f88d4366fbc5da635b5f7.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 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 --- configure.ac | 4 --- m4/virt-storage-disk.m4 | 58 ----------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 m4/virt-storage-disk.m4 diff --git a/configure.ac b/configure.ac index 1edec551fbe..36bcc8a39a6 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,6 @@ LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH -LIBVIRT_STORAGE_ARG_DISK LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_GLUSTER @@ -156,7 +155,6 @@ if test "$with_libvirtd" =3D "no"; then with_storage_iscsi_direct=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno - with_storage_disk=3Dno with_storage_rbd=3Dno with_storage_sheepdog=3Dno with_storage_gluster=3Dno @@ -176,7 +174,6 @@ LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH -LIBVIRT_STORAGE_CHECK_DISK LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER @@ -245,7 +242,6 @@ LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH -LIBVIRT_STORAGE_RESULT_DISK LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_GLUSTER diff --git a/m4/virt-storage-disk.m4 b/m4/virt-storage-disk.m4 deleted file mode 100644 index 7429688f4eb..00000000000 --- a/m4/virt-storage-disk.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The storage disk check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_DISK], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_DISK], [GPartd Disk backend for the st= orage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_DISK], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - AC_REQUIRE([LIBVIRT_CHECK_LIBPARTED]) - - if test "$with_storage_disk" =3D "yes" || - test "$with_storage_disk" =3D "check"; then - - if test "$with_storage_disk" =3D "yes" && - test "$with_libparted" !=3D "yes"; then - AC_MSG_ERROR([Need parted for disk storage driver]) - fi - - if test "$with_storage_disk" =3D "check"; then - with_storage_disk=3D"$with_libparted" - fi - - if test "$with_storage_disk" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, - [whether Disk backend for storage driver is enabl= ed]) - fi - fi - - if test "x$with_storage_disk" =3D "xyes"; then - if test "x$with_devmapper" =3D "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to c= ompile libvirt with disk storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" =3D "yes"= ]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_DISK], [ - LIBVIRT_RESULT([Disk], [$with_storage_disk]) -]) diff --git a/meson.build b/meson.build index 1791e09bfa4..df105176b05 100644 --- a/meson.build +++ b/meson.build @@ -1870,6 +1870,13 @@ if conf.has('WITH_LIBVIRTD') use_storage =3D true conf.set('WITH_STORAGE_DIR', 1) endif + + if not get_option('storage_disk').disabled() and devmapper_dep.found() a= nd libparted_dep.found() + use_storage =3D true + conf.set('WITH_STORAGE_DISK', 1) + elif get_option('storage_disk').enabled() + error('You must install libparted and libdevmapper to compile libvirt = with disk storage driver') + endif endif =20 if use_storage @@ -1916,6 +1923,7 @@ summary(driver_summary, section: 'Drivers', bool_yn: = true) =20 storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'Disk': conf.has('WITH_STORAGE_DISK'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index e840c68b498..9b695cf5ac1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -75,3 +75,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto= ', description: 'use SE =20 # storage driver options option('storage_dir', type: 'feature', value: 'auto', description: 'direct= ory backand for the storage driver') +option('storage_disk', type: 'feature', value: 'auto', description: 'GPart= d Disk backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893984; cv=none; d=zohomail.com; s=zohoarc; b=kSL6PTXSvtMEG/rn0uuuoB0Vt3bu+gu0aHJZu355WELKlPbM9Do/WzazKOD5hpWhnMoQQHP7Iw04NY/K5iXhA3h1a2nSp2scfDl19PkFZ14tf7uHgLc0kh2ZzRAOiN7HlsMAmNmmJy8ycejFMEtNEsB/TsXclzDVh8Bq35VLhZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893984; 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=XkKTigp+sU3u5CYUovsssvv82XVN5Ifeeqgo+4moWA0=; b=ZMLjIvpEf3u4ZTQIeSYsAfj7M8Z9F3QmL3fKoBlVp5v1D89h97AJUisGDATS00l8vdo0zkWqFucr7ObaiLuQFD22bGR5ETA+JdKUC0iIVGmAvUdX8EWSFLyCgQgu8P4pDworXh1A+rCXLrRod+uakukgceKmdwuswxrOK7rJhbM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893984790693.12922773111; Thu, 16 Jul 2020 03:06:24 -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-11-26TeLx3zO66usRE9UphS7A-1; Thu, 16 Jul 2020 06:03:21 -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 652AB1014431; Thu, 16 Jul 2020 10:03:06 +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 40D1910098AE; Thu, 16 Jul 2020 10:03:06 +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 0B8EF1806B0D; Thu, 16 Jul 2020 10:03:06 +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 06GA31bc016886 for ; Thu, 16 Jul 2020 06:03:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D56092DE71; Thu, 16 Jul 2020 10:03:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE532DE7F for ; Thu, 16 Jul 2020 10:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893983; 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=XkKTigp+sU3u5CYUovsssvv82XVN5Ifeeqgo+4moWA0=; b=YjAVW4U6me/cSHNZMuWIp+TrSDPMSEZK6ndC5ex70V0CkaPBQ9zk/dqa0sdoaRnrhquwtV gcR2AdLuppZ4vUsmniosNsVxGCNCI5Sxu2e9YuFIPIBmTpMP85m7smLEqL2wDmA/uaWA11 d0eYY8le9Ao71pxo418TAJvcXmRZcbw= X-MC-Unique: 26TeLx3zO66usRE9UphS7A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 101/351] meson: add storage fs driver build option Date: Thu, 16 Jul 2020 11:55:37 +0200 Message-Id: <97a5ec266944cd989a24ab39685368ce27296a60.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 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 --- configure.ac | 10 ----- m4/virt-storage-fs.m4 | 89 ------------------------------------------- meson.build | 45 ++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 46 insertions(+), 99 deletions(-) delete mode 100644 m4/virt-storage-fs.m4 diff --git a/configure.ac b/configure.ac index 36bcc8a39a6..dc812c73d9a 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,6 @@ dnl dnl Storage driver checks dnl =20 -LIBVIRT_STORAGE_ARG_FS LIBVIRT_STORAGE_ARG_LVM LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT @@ -149,7 +148,6 @@ LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then - with_storage_fs=3Dno with_storage_lvm=3Dno with_storage_iscsi=3Dno with_storage_iscsi_direct=3Dno @@ -162,13 +160,6 @@ if test "$with_libvirtd" =3D "no"; then with_storage_vstorage=3Dno fi =20 -dnl storage-fs does not work on macOS - -if test "$with_macos" =3D "yes"; then - with_storage_fs=3Dno -fi - -LIBVIRT_STORAGE_CHECK_FS LIBVIRT_STORAGE_CHECK_LVM LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT @@ -236,7 +227,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_FS LIBVIRT_STORAGE_RESULT_LVM LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT diff --git a/m4/virt-storage-fs.m4 b/m4/virt-storage-fs.m4 deleted file mode 100644 index 6c61e61fa77..00000000000 --- a/m4/virt-storage-fs.m4 +++ /dev/null @@ -1,89 +0,0 @@ -dnl The storage fs check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_FS], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_FS], [FileSystem backend for the stora= ge driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_FS], [ - if test "$with_storage_fs" =3D "yes" || test "$with_storage_fs" =3D "che= ck"; then - AC_CHECK_HEADER([mntent.h], , [ - if test "$with_storage_fs" =3D "check"; then - with_storage_fs=3Dno - AC_MSG_NOTICE([ is required for the FS storage driver, d= isabling it]) - else - AC_MSG_ERROR([ is required for the FS storage driver]) - fi - ]) - fi - - if test "$with_storage_fs" =3D "yes" || test "$with_storage_fs" =3D "che= ck"; then - AC_PATH_PROG([MOUNT], [mount], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([UMOUNT], [umount], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MKFS], [mkfs], [], [$LIBVIRT_SBIN_PATH]) - if test "$with_storage_fs" =3D "yes" ; then - if test -z "$MOUNT" ; then - AC_MSG_ERROR([We need mount for FS storage driver]) - fi - if test -z "$UMOUNT" ; then - AC_MSG_ERROR([We need umount for FS storage driver]) - fi - if test -z "$MKFS" ; then - AC_MSG_ERROR([We need mkfs for FS storage driver]) - fi - else - if test -z "$MOUNT" ; then - with_storage_fs=3Dno - fi - if test -z "$UMOUNT" ; then - with_storage_fs=3Dno - fi - if test -z "$MKFS" ; then - with_storage_fs=3Dno - fi - - if test "$with_storage_fs" =3D "check" ; then - with_storage_fs=3Dyes - fi - fi - - if test "$with_storage_fs" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_FS], 1, - [whether FS backend for storage driver is enabled= ]) - AC_DEFINE_UNQUOTED([MOUNT], ["$MOUNT"], - [Location or name of the mount program]) - AC_DEFINE_UNQUOTED([UMOUNT], ["$UMOUNT"], - [Location or name of the mount program]) - AC_DEFINE_UNQUOTED([MKFS], ["$MKFS"], - [Location or name of the mkfs program]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_FS], [test "$with_storage_fs" =3D "yes"]) - if test "$with_storage_fs" =3D "yes"; then - AC_PATH_PROG([SHOWMOUNT], [showmount], [], [$LIBVIRT_SBIN_PATH]) - AC_DEFINE_UNQUOTED([SHOWMOUNT], ["$SHOWMOUNT"], - [Location or name of the showmount program]) - fi -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_FS], [ - LIBVIRT_RESULT([FS], [$with_storage_fs]) - LIBVIRT_RESULT([NetFS], [$with_storage_fs]) -]) diff --git a/meson.build b/meson.build index df105176b05..68fb89d7dea 100644 --- a/meson.build +++ b/meson.build @@ -1877,6 +1877,49 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_disk').enabled() error('You must install libparted and libdevmapper to compile libvirt = with disk storage driver') endif + + if not get_option('storage_fs').disabled() + fs_enable =3D true + + # storage-fs does not work on macOS + if host_machine.system() =3D=3D 'darwin' + fs_enable =3D false + endif + + if fs_enable and not cc.has_header('mntent.h') + if get_option('storage_fs').enabled() + error(' is required for the FS storage driver') + else + fs_enable =3D false + endif + endif + + if fs_enable + mount_prog =3D find_program('mount', required: get_option('storage_f= s'), dirs: libvirt_sbin_path) + umount_prog =3D find_program('umount', required: get_option('storage= _fs'), dirs: libvirt_sbin_path) + mkfs_prog =3D find_program('mkfs', required: get_option('storage_fs'= ), dirs: libvirt_sbin_path) + + if not mount_prog.found() or not umount_prog.found() or not mkfs_pro= g.found() + fs_enable =3D false + endif + endif + + if fs_enable + use_storage =3D true + + conf.set('WITH_STORAGE_FS', 1) + conf.set_quoted('MOUNT', mount_prog.path()) + conf.set_quoted('UMOUNT', umount_prog.path()) + conf.set_quoted('MKFS', mkfs_prog.path()) + + showmount_prog =3D find_program('showmount', required: false, dirs: = libvirt_sbin_path) + showmount_path =3D '' + if showmount_prog.found() + showmount_path =3D showmount_prog.path() + endif + conf.set_quoted('SHOWMOUNT', showmount_path) + endif + endif endif =20 if use_storage @@ -1923,6 +1966,8 @@ summary(driver_summary, section: 'Drivers', bool_yn: = true) =20 storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'FS': conf.has('WITH_STORAGE_FS'), + 'NetFS': conf.has('WITH_STORAGE_FS'), 'Disk': conf.has('WITH_STORAGE_DISK'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 9b695cf5ac1..afa93b88418 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -76,3 +76,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto= ', description: 'use SE # storage driver options option('storage_dir', type: 'feature', value: 'auto', description: 'direct= ory backand for the storage driver') option('storage_disk', type: 'feature', value: 'auto', description: 'GPart= d Disk backend for the storage driver') +option('storage_fs', type: 'feature', value: 'auto', description: 'FileSys= tem backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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-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=1594893805; cv=none; d=zohomail.com; s=zohoarc; b=icWBhSQ2ktQ+QHKZFJ8wTYyhEGQlMXLm9st6xpBmPQwP+s0tBhfUxwWQf3QLw6hkLCv8sNisux97r9lI+TSw3U4bYGYhD9ZMTNkI3VhrymZ9ZCJs1V2gsKNvD+jUPIxOkEDVsVCbb1aUTL63bVGFGsY5Uf2iwLJDhaoRxPKV7uc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893805; 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=RtuY6cRZydzxLUsda+IDfshK3RJ9+0yPnRE+hH2adfc=; b=gGsUmLZ33M8pfNzhtCWruMpudUKonIxMB6AyPggq1EWUFXzMZ2WV7tPDK9DWiXf+DCqOp0Y2kKgN5MworW+rUYDoa+KSZkWdoh1eRr5z/oy1zGyptIWB3t/C6wGnHBRI5HHyiSMJcNs7ivtPqT/5Wloj4HTvSLBLPeNE7+45tR8= 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594893805810880.3050490686227; Thu, 16 Jul 2020 03:03:25 -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-1-1IxWXoxrMxeAX8KPb16QwA-1; Thu, 16 Jul 2020 06:03:22 -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 0A2321011AF8; Thu, 16 Jul 2020 10:03:09 +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 A330F7B421; Thu, 16 Jul 2020 10:03:08 +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 71B2996245; Thu, 16 Jul 2020 10:03:08 +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 06GA32bM016902 for ; Thu, 16 Jul 2020 06:03:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id C17D82DE72; Thu, 16 Jul 2020 10:03:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A8562DE71 for ; Thu, 16 Jul 2020 10:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893804; 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=RtuY6cRZydzxLUsda+IDfshK3RJ9+0yPnRE+hH2adfc=; b=KOAzQLPXaVYomg4qxPyeMLdIf4GX0YTicxBrWqqYCbJFjpWik/Ol8k8cRVWcbPi0lD9lyi 4qbcWtO5agF/lW4246sQT/N+opwhPPiV46guQ9C6WUO3Q8MHrD9wx8Kdt0kDCizEwNOcFv A/OgaA/azkksL5DRUlu/CDMMxQ7YVhI= X-MC-Unique: 1IxWXoxrMxeAX8KPb16QwA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 102/351] meson: add storage gluster build option Date: Thu, 16 Jul 2020 11:55:38 +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 --- configure.ac | 4 ---- m4/virt-storage-gluster.m4 | 43 -------------------------------------- meson.build | 8 +++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 m4/virt-storage-gluster.m4 diff --git a/configure.ac b/configure.ac index dc812c73d9a..73c0f85ac74 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG -LIBVIRT_STORAGE_ARG_GLUSTER LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 @@ -155,7 +154,6 @@ if test "$with_libvirtd" =3D "no"; then with_storage_mpath=3Dno with_storage_rbd=3Dno with_storage_sheepdog=3Dno - with_storage_gluster=3Dno with_storage_zfs=3Dno with_storage_vstorage=3Dno fi @@ -167,7 +165,6 @@ LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG -LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE =20 @@ -234,7 +231,6 @@ LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG -LIBVIRT_STORAGE_RESULT_GLUSTER LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-gluster.m4 b/m4/virt-storage-gluster.m4 deleted file mode 100644 index 0a2406f1fc5..00000000000 --- a/m4/virt-storage-gluster.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The storage Gluster check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_GLUSTER], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_GLUSTER], [Gluster backend for the sto= rage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [ - AC_REQUIRE([LIBVIRT_CHECK_GLUSTER]) - - if test "$with_storage_gluster" =3D "check"; then - with_storage_gluster=3D$with_glusterfs - fi - if test "$with_storage_gluster" =3D "yes"; then - if test "$with_glusterfs" =3D no; then - AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver]) - fi - AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1], - [whether Gluster backend for storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" =3D= "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_GLUSTER], [ - LIBVIRT_RESULT([Gluster], [$with_storage_gluster]) -]) diff --git a/meson.build b/meson.build index 68fb89d7dea..5678038c5e8 100644 --- a/meson.build +++ b/meson.build @@ -1920,6 +1920,13 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('SHOWMOUNT', showmount_path) endif endif + + if not get_option('storage_gluster').disabled() and glusterfs_dep.found() + use_storage =3D true + conf.set('WITH_STORAGE_GLUSTER', 1) + elif get_option('storage_gluster').enabled() + error('Need glusterfs (libgfapi) for gluster storage driver') + endif endif =20 if use_storage @@ -1969,6 +1976,7 @@ storagedriver_summary =3D { 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), 'Disk': conf.has('WITH_STORAGE_DISK'), + 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index afa93b88418..fe41c2671c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -77,3 +77,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto= ', description: 'use SE option('storage_dir', type: 'feature', value: 'auto', description: 'direct= ory backand for the storage driver') option('storage_disk', type: 'feature', value: 'auto', description: 'GPart= d Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSys= tem backend for the storage driver') +option('storage_gluster', type: 'feature', value: 'auto', description: 'Gl= uster backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893903; cv=none; d=zohomail.com; s=zohoarc; b=gpX1iXjEsiPStSdgArcDxEDQM3bXrBplbMWvkFdN0ZKmbsaW0vzdvvJRKE/MZ3TQ98JIonXbXBnTXqW+o8Avy9XY6NMBDNZjoXSpybSTivRocIsVnfhVOLOCLwaVxQLdINbbRpRLg1Nz3RJycygAzIEt+Xjb1Ah/qENhyao7/Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893903; 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=ZPzVDSshtWpeDJLpWEsNhB1Xz01c6zXOYsp0SZITM3I=; b=HW8UYrli32Rcu/SzpewJaJk5L7v/ceuTtBqcBD+lMUdtStn0kGcqaDyYsBGvtvodC6tmNTI+Wxz98DPoPvYhu94tOumcpRVf+2ckUwqflWB6IXPI5n3R/hQCCi5anxFLqC2TPhcD5h9YvtrIXtzCGLiaowTQFc6nlRXEv+gRKfU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948939035511019.2482413467912; Thu, 16 Jul 2020 03:05:03 -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-307--HDkPsb9NRykMBqnhz0DNA-1; Thu, 16 Jul 2020 06:03:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CD24855C73; Thu, 16 Jul 2020 10:03:11 +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 184AA6FED1; Thu, 16 Jul 2020 10:03:11 +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 D357F96248; Thu, 16 Jul 2020 10:03:10 +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 06GA33hZ016910 for ; Thu, 16 Jul 2020 06:03:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id ABDF62DE71; Thu, 16 Jul 2020 10:03:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 248502DE9C for ; Thu, 16 Jul 2020 10:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893902; 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=ZPzVDSshtWpeDJLpWEsNhB1Xz01c6zXOYsp0SZITM3I=; b=FfWhIryowAWo9S6F48s+sfAOyRN5HscIhpFGRNu/oq3j2SsxSKTSFvNcp9Nvv+d8O/WcM7 pwjM+sLPkU4PnekUo+bNu8nN3M5HYoS6JAiJ4pwIQHnyd3QRYsEM3a2vedPcbPtxy2ISLp PVYCDHO0ixl3oYCJPpj9jJGl+1oi6PA= X-MC-Unique: -HDkPsb9NRykMBqnhz0DNA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 103/351] meson: add storage iscsi build option Date: Thu, 16 Jul 2020 11:55:39 +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.11 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 --- configure.ac | 4 ---- m4/virt-storage-iscsi.m4 | 44 ---------------------------------------- meson.build | 8 ++++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-storage-iscsi.m4 diff --git a/configure.ac b/configure.ac index 73c0f85ac74..ba2b247b926 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl =20 LIBVIRT_STORAGE_ARG_LVM -LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH @@ -148,7 +147,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then with_storage_lvm=3Dno - with_storage_iscsi=3Dno with_storage_iscsi_direct=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno @@ -159,7 +157,6 @@ if test "$with_libvirtd" =3D "no"; then fi =20 LIBVIRT_STORAGE_CHECK_LVM -LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH @@ -225,7 +222,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_LVM -LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4 deleted file mode 100644 index 0e04079a1cc..00000000000 --- a/m4/virt-storage-iscsi.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl The storage iSCSI check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI], [iSCSI backend for the storage= driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ - if test "$with_storage_iscsi" =3D "yes" || test "$with_storage_iscsi" = =3D "check"; then - if test "$with_storage_iscsi" =3D "yes" ; then - if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSC= SI storage driver]) ; fi - else - if test -z "$ISCSIADM" ; then with_storage_iscsi=3Dno ; fi - - if test "$with_storage_iscsi" =3D "check" ; then with_storage_iscsi= =3Dyes ; fi - fi - - if test "$with_storage_iscsi" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend f= or storage driver is enabled]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" =3D "ye= s"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI], [ - LIBVIRT_RESULT([iSCSI], [$with_storage_iscsi]) -]) diff --git a/meson.build b/meson.build index 5678038c5e8..2066c537d73 100644 --- a/meson.build +++ b/meson.build @@ -1927,6 +1927,13 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_gluster').enabled() error('Need glusterfs (libgfapi) for gluster storage driver') endif + + if not get_option('storage_iscsi').disabled() and iscsiadm_prog.found() + use_storage =3D true + conf.set('WITH_STORAGE_ISCSI', 1) + elif get_option('storage_iscsi').enabled() + error('We need iscsiadm for iSCSI storage driver') + endif endif =20 if use_storage @@ -1975,6 +1982,7 @@ storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), + 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index fe41c2671c2..cff49277ea1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -78,3 +78,4 @@ option('storage_dir', type: 'feature', value: 'auto', des= cription: 'directory ba option('storage_disk', type: 'feature', value: 'auto', description: 'GPart= d Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSys= tem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gl= uster backend for the storage driver') +option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscs= i backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893803; cv=none; d=zohomail.com; s=zohoarc; b=cgrzGL5mlo56634e8OWta51fOXzA+cKYakRUSASgYvTYu6p6WIYtgwt+26Qoc4YrVxp5SL77Q4Y4Y9nZcX/oaaNx6zftYUWH5ii0MktRoGvO2rCjpgt1NE7mM9KU1YtGvDtldl19WFQ8qxy7JXAXkr29VBcpcmUTEW6yavM6zjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893803; 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=U7US5oMAjr7nFA0JfX7mUIAtDckJaUjQJaDwjhn4IIk=; b=WL0jpNVbCoUMWTKQ9MMWwa1BxVNE+IBhz4rp7UImV6ATMVQjCbTfjftwO3aBxFSeuRuiNm8xZQzRMxg7nUWtNVeeNonfvRzIl1W8e6+Wzfpd/b2v1ZMyy8PeW8R01stB8l4pgfaVijNlX/3OI62I/YIi91UzgBoc5iEdEMTCME0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893803504474.59040155901437; Thu, 16 Jul 2020 03:03:23 -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-298-Lzo4f0GCOqyN8-3-zfNhdg-1; Thu, 16 Jul 2020 06:03:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96936100CCDA; Thu, 16 Jul 2020 10:03:13 +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 73A827950B; Thu, 16 Jul 2020 10:03:13 +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 425159624A; Thu, 16 Jul 2020 10:03:13 +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 06GA341U016919 for ; Thu, 16 Jul 2020 06:03:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9450C2DE72; Thu, 16 Jul 2020 10:03:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EAA12DE71 for ; Thu, 16 Jul 2020 10:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893802; 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=U7US5oMAjr7nFA0JfX7mUIAtDckJaUjQJaDwjhn4IIk=; b=GWLUB9cyuksUbwyEHrfn4pXfeK5svIMQ1EAHlOKxs591/NEPuJiBOVZixEZ4Fv7+aw3a1x vYUOlt55cTWjky/wXhbC2UGUGPkk0V9McbFGjEsfeviYlenAvqUOgdqitJuE6sMyVTX+jS O2JoNFEdpI8jhNrNeW6I/iqPajnzNuA= X-MC-Unique: Lzo4f0GCOqyN8-3-zfNhdg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 104/351] meson: add storage iscsi-direct build option Date: Thu, 16 Jul 2020 11:55:40 +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.14 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 --- configure.ac | 4 --- m4/virt-storage-iscsi-direct.m4 | 44 --------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-storage-iscsi-direct.m4 diff --git a/configure.ac b/configure.ac index ba2b247b926..688425956e1 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl =20 LIBVIRT_STORAGE_ARG_LVM -LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD @@ -147,7 +146,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then with_storage_lvm=3Dno - with_storage_iscsi_direct=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno with_storage_rbd=3Dno @@ -157,7 +155,6 @@ if test "$with_libvirtd" =3D "no"; then fi =20 LIBVIRT_STORAGE_CHECK_LVM -LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD @@ -222,7 +219,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_LVM -LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD diff --git a/m4/virt-storage-iscsi-direct.m4 b/m4/virt-storage-iscsi-direct= .m4 deleted file mode 100644 index dab44141691..00000000000 --- a/m4/virt-storage-iscsi-direct.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl Iscsi-direct storage -dnl -dnl Copyright (C) 2018 Clementine Hayat. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_ISCSI_DIRECT], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI_DIRECT], - [iscsi-direct backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT], [ - AC_REQUIRE([LIBVIRT_CHECK_LIBISCSI]) - if test "$with_storage_iscsi_direct" =3D "check"; then - with_storage_iscsi_direct=3D$with_libiscsi - fi - if test "$with_storage_iscsi_direct" =3D "yes"; then - if test "$with_libiscsi" =3D "no"; then - AC_MSG_ERROR([Need libiscsi for iscsi-direct storage driver]) - fi - AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI_DIRECT], [1], - [whether iSCSI backend for storage driver is enable= d]) - fi - AM_CONDITIONAL([WITH_STORAGE_ISCSI_DIRECT], - [test "$with_storage_iscsi_direct" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT], [ - LIBVIRT_RESULT([iscsi-direct], [$with_storage_iscsi_direct]) -]) diff --git a/meson.build b/meson.build index 2066c537d73..4576f18a6e2 100644 --- a/meson.build +++ b/meson.build @@ -1934,6 +1934,13 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_iscsi').enabled() error('We need iscsiadm for iSCSI storage driver') endif + + if not get_option('storage_iscsi_direct').disabled() and libiscsi_dep.fo= und() + use_storage =3D true + conf.set('WITH_STORAGE_ISCSI_DIRECT', 1) + elif get_option('storage_iscsi_direct').enabled() + error('Need libiscsi for iscsi-direct storage driver') + endif endif =20 if use_storage @@ -1983,6 +1990,7 @@ storagedriver_summary =3D { 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), + 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index cff49277ea1..975479e7b8c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -79,3 +79,4 @@ option('storage_disk', type: 'feature', value: 'auto', de= scription: 'GPartd Disk option('storage_fs', type: 'feature', value: 'auto', description: 'FileSys= tem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gl= uster backend for the storage driver') option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscs= i backend for the storage driver') +option('storage_iscsi_direct', type: 'feature', value: 'auto', description= : 'iscsi-direct backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893882; cv=none; d=zohomail.com; s=zohoarc; b=cJLNT9jdCWI7LXNISWSqy/HQCYV5XEUZr5lSOXnIuollGKLRYpaVYpeP/ftENUwdKw6yM8LyL85PqcHWucUHs5r2ORUswy6hRjmEID/6Y7tjBCgoQTVmbArrICNbcYPkr9Y1obHfoNwK7mHO/qPwCj4TLx+vcs0fMRjIbEUm42U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893882; 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=2Xd0p9VjFosMBX9x8hm+MVZA+dBITbBnq0waVqQe0zA=; b=e//gDeSrRe5N19XgIzQv/J98WqJpGNWPgiVAIu2LvwIBXHqzygrNudCTksIejgfkTodOIESd8VrQH12L2TtHAfBIHqACX+pbFbrK81k7aJNFTu6gI8scob4B+J7jLdhIgR/TCT1pSDmBZmwXuBTTvSafb+kANjWDRsCf9CR6hJA= 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 1594893882656657.238482143961; Thu, 16 Jul 2020 03:04:42 -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-361-J833VcHfM4GVQSValznIug-1; Thu, 16 Jul 2020 06:03:24 -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 31F2A100D0E3; Thu, 16 Jul 2020 10:03:11 +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 08FBD79D1F; Thu, 16 Jul 2020 10:03:11 +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 C3F58180530D; Thu, 16 Jul 2020 10:03:10 +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 06GA35hf016936 for ; Thu, 16 Jul 2020 06:03:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D01D2DE72; Thu, 16 Jul 2020 10:03:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB16F2DE71 for ; Thu, 16 Jul 2020 10:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893881; 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=2Xd0p9VjFosMBX9x8hm+MVZA+dBITbBnq0waVqQe0zA=; b=Bdeu/dhTAT2rcoqsM1w296eznHO+6JZo3+Y1gXBQWh/+pajWEIlcjwNavTNdaZtpHhqjXq sZogFSrg00GR7zM2rrjjftgmcWOycHAAMY6E4boR0PPjlI6tf6MFjMavYTzk4ivg0bFPb+ znXt12WwifEvXFAHpmv1WN7F/Pd08Rg= X-MC-Unique: J833VcHfM4GVQSValznIug-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 105/351] meson: add storage lvm build options Date: Thu, 16 Jul 2020 11:55:41 +0200 Message-Id: <11626dd5a7057d06a253892a33ad1db207b9b104.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.13 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 --- configure.ac | 4 -- m4/virt-storage-lvm.m4 | 90 ------------------------------------------ meson.build | 29 ++++++++++++++ meson_options.txt | 1 + 4 files changed, 30 insertions(+), 94 deletions(-) delete mode 100644 m4/virt-storage-lvm.m4 diff --git a/configure.ac b/configure.ac index 688425956e1..acfad8737ee 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,6 @@ dnl dnl Storage driver checks dnl =20 -LIBVIRT_STORAGE_ARG_LVM LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD @@ -145,7 +144,6 @@ LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then - with_storage_lvm=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno with_storage_rbd=3Dno @@ -154,7 +152,6 @@ if test "$with_libvirtd" =3D "no"; then with_storage_vstorage=3Dno fi =20 -LIBVIRT_STORAGE_CHECK_LVM LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD @@ -218,7 +215,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_LVM LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD diff --git a/m4/virt-storage-lvm.m4 b/m4/virt-storage-lvm.m4 deleted file mode 100644 index a0ccca7a00a..00000000000 --- a/m4/virt-storage-lvm.m4 +++ /dev/null @@ -1,90 +0,0 @@ -dnl The storage LVM check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_LVM], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_LVM], [LVM backend for storage driver]= , [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_LVM], [ - if test "$with_storage_lvm" =3D "yes" || test "$with_storage_lvm" =3D "c= heck"; then - AC_PATH_PROG([PVCREATE], [pvcreate], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VGCREATE], [vgcreate], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([LVCREATE], [lvcreate], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([PVREMOVE], [pvremove], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VGREMOVE], [vgremove], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([LVREMOVE], [lvremove], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([LVCHANGE], [lvchange], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VGCHANGE], [vgchange], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VGSCAN], [vgscan], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([PVS], [pvs], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VGS], [vgs], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([LVS], [lvs], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_storage_lvm" =3D "yes" ; then - if test -z "$PVCREATE" ; then AC_MSG_ERROR([We need pvcreate for LVM= storage driver]) ; fi - if test -z "$VGCREATE" ; then AC_MSG_ERROR([We need vgcreate for LVM= storage driver]) ; fi - if test -z "$LVCREATE" ; then AC_MSG_ERROR([We need lvcreate for LVM= storage driver]) ; fi - if test -z "$PVREMOVE" ; then AC_MSG_ERROR([We need pvremove for LVM= storage driver]) ; fi - if test -z "$VGREMOVE" ; then AC_MSG_ERROR([We need vgremove for LVM= storage driver]) ; fi - if test -z "$LVREMOVE" ; then AC_MSG_ERROR([We need lvremove for LVM= storage driver]) ; fi - if test -z "$LVCHANGE" ; then AC_MSG_ERROR([We need lvchange for LVM= storage driver]) ; fi - if test -z "$VGCHANGE" ; then AC_MSG_ERROR([We need vgchange for LVM= storage driver]) ; fi - if test -z "$VGSCAN" ; then AC_MSG_ERROR([We need vgscan for LVM sto= rage driver]) ; fi - if test -z "$PVS" ; then AC_MSG_ERROR([We need pvs for LVM storage d= river]) ; fi - if test -z "$VGS" ; then AC_MSG_ERROR([We need vgs for LVM storage d= river]) ; fi - if test -z "$LVS" ; then AC_MSG_ERROR([We need lvs for LVM storage d= river]) ; fi - else - if test -z "$PVCREATE" ; then with_storage_lvm=3Dno ; fi - if test -z "$VGCREATE" ; then with_storage_lvm=3Dno ; fi - if test -z "$LVCREATE" ; then with_storage_lvm=3Dno ; fi - if test -z "$PVREMOVE" ; then with_storage_lvm=3Dno ; fi - if test -z "$VGREMOVE" ; then with_storage_lvm=3Dno ; fi - if test -z "$LVREMOVE" ; then with_storage_lvm=3Dno ; fi - if test -z "$LVCHANGE" ; then with_storage_lvm=3Dno ; fi - if test -z "$VGCHANGE" ; then with_storage_lvm=3Dno ; fi - if test -z "$VGSCAN" ; then with_storage_lvm=3Dno ; fi - if test -z "$PVS" ; then with_storage_lvm=3Dno ; fi - if test -z "$VGS" ; then with_storage_lvm=3Dno ; fi - if test -z "$LVS" ; then with_storage_lvm=3Dno ; fi - - if test "$with_storage_lvm" =3D "check" ; then with_storage_lvm=3Dye= s ; fi - fi - - if test "$with_storage_lvm" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_LVM], 1, [whether LVM backend for s= torage driver is enabled]) - AC_DEFINE_UNQUOTED([PVCREATE],["$PVCREATE"],[Location of pvcreate pr= ogram]) - AC_DEFINE_UNQUOTED([VGCREATE],["$VGCREATE"],[Location of vgcreate pr= ogram]) - AC_DEFINE_UNQUOTED([LVCREATE],["$LVCREATE"],[Location of lvcreate pr= ogram]) - AC_DEFINE_UNQUOTED([PVREMOVE],["$PVREMOVE"],[Location of pvremove pr= ogram]) - AC_DEFINE_UNQUOTED([VGREMOVE],["$VGREMOVE"],[Location of vgremove pr= ogram]) - AC_DEFINE_UNQUOTED([LVREMOVE],["$LVREMOVE"],[Location of lvremove pr= ogram]) - AC_DEFINE_UNQUOTED([LVCHANGE],["$LVCHANGE"],[Location of lvchange pr= ogram]) - AC_DEFINE_UNQUOTED([VGCHANGE],["$VGCHANGE"],[Location of vgchange pr= ogram]) - AC_DEFINE_UNQUOTED([VGSCAN],["$VGSCAN"],[Location of vgscan program]) - AC_DEFINE_UNQUOTED([PVS],["$PVS"],[Location of pvs program]) - AC_DEFINE_UNQUOTED([VGS],["$VGS"],[Location of vgs program]) - AC_DEFINE_UNQUOTED([LVS],["$LVS"],[Location of lvs program]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_LVM], [test "$with_storage_lvm" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_LVM], [ - LIBVIRT_RESULT([LVM], [$with_storage_lvm]) -]) diff --git a/meson.build b/meson.build index 4576f18a6e2..cecc161ed85 100644 --- a/meson.build +++ b/meson.build @@ -1941,6 +1941,34 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_iscsi_direct').enabled() error('Need libiscsi for iscsi-direct storage driver') endif + + if not get_option('storage_lvm').disabled() + lvm_enable =3D true + lvm_progs =3D [ + 'pvcreate', 'vgcreate', 'lvcreate', + 'pvremove', 'vgremove', 'lvremove', + 'lvchange', 'vgchange', 'vgscan', + 'pvs', 'vgs', 'lvs', + ] + foreach name : lvm_progs + set_variable( + '@0@_prog'.format(name), + find_program(name, required: get_option('storage_lvm'), dirs: libv= irt_sbin_path) + ) + if not get_variable('@0@_prog'.format(name)).found() + lvm_enable =3D false + endif + endforeach + + if lvm_enable + use_storage =3D true + conf.set('WITH_STORAGE_LVM', 1) + + foreach name : lvm_progs + conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) + endforeach + endif + endif endif =20 if use_storage @@ -1989,6 +2017,7 @@ storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), + 'LVM': conf.has('WITH_STORAGE_LVM'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), 'Disk': conf.has('WITH_STORAGE_DISK'), diff --git a/meson_options.txt b/meson_options.txt index 975479e7b8c..66e232f59dc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -80,3 +80,4 @@ option('storage_fs', type: 'feature', value: 'auto', desc= ription: 'FileSystem ba option('storage_gluster', type: 'feature', value: 'auto', description: 'Gl= uster backend for the storage driver') option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscs= i backend for the storage driver') option('storage_iscsi_direct', type: 'feature', value: 'auto', description= : 'iscsi-direct backend for the storage driver') +option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM ba= ckend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893964; cv=none; d=zohomail.com; s=zohoarc; b=HCEc1JoJaLSCFeUH7mXfc9MDxLK4FWWpS6Rc7rlFTVMEmFwZxUlJ5JLo2MynEr1MFE+XaPZseC45gjcT83krKteyq0U60VDtIR9jHpwHcV0+zun09fiMojoUs11ICwnDVhnbyAqxNNtAH5qLW7EFwoV86bGbSPG5LflwUMh7fzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893964; 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=RvCkc2DvH9FFIkdGKf6TTUWwury2ZdSW99R8U7cGp8k=; b=Al3iTenL7Srj8vHUQa8Sx4kh2o7Vwh3fdt1e+nfKnUo9s6cVdFP2HqIHG4Uv78y1bD/ue9GSggaR3J+yod+d3J6DTtpIFN8h2voNH+UFFNEki0w2NDYBHc5Lplw2JMJ2mLfFXNkQl0IFdsTDEwkO/8J0COIXOTZqXoOCm7eOdPg= 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 1594893964903169.73390328031144; Thu, 16 Jul 2020 03:06:04 -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-85-WeXVSMSuPXiowm0w4pNofQ-1; Thu, 16 Jul 2020 06:03:22 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E93A15D2B; Thu, 16 Jul 2020 10:03:08 +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 1395A61788; Thu, 16 Jul 2020 10:03:08 +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 CC49296242; Thu, 16 Jul 2020 10:03:07 +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 06GA36th016947 for ; Thu, 16 Jul 2020 06:03:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6519A2DE72; Thu, 16 Jul 2020 10:03:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D44152DE71 for ; Thu, 16 Jul 2020 10:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893963; 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=RvCkc2DvH9FFIkdGKf6TTUWwury2ZdSW99R8U7cGp8k=; b=E2JrRO11Ik2LkCHOJMBbdWfWLVqn5gk5D8efq/W9Nt/QaVUxA7p4Jf2awQ6Ul0tPKLVtjZ /liD3gbQla+pL5bKGw3KGBwimw0VZc4w+7DEEW+IOEDjh/gxiO4h3k4m4EZJm7PfEV1KBR oz6fG6cRkQ5vVOf1gtW6hUc6Y+4XW60= X-MC-Unique: WeXVSMSuPXiowm0w4pNofQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 106/351] meson: add storage mpath build options Date: Thu, 16 Jul 2020 11:55:42 +0200 Message-Id: <71bc871c54b4ab036dd69fc1190f8eb785b0a32b.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.16 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 --- configure.ac | 4 --- m4/virt-storage-mpath.m4 | 53 ---------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 m4/virt-storage-mpath.m4 diff --git a/configure.ac b/configure.ac index acfad8737ee..465d9974ac4 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl =20 LIBVIRT_STORAGE_ARG_SCSI -LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS @@ -145,7 +144,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then with_storage_scsi=3Dno - with_storage_mpath=3Dno with_storage_rbd=3Dno with_storage_sheepdog=3Dno with_storage_zfs=3Dno @@ -153,7 +151,6 @@ if test "$with_libvirtd" =3D "no"; then fi =20 LIBVIRT_STORAGE_CHECK_SCSI -LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS @@ -216,7 +213,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_SCSI -LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS diff --git a/m4/virt-storage-mpath.m4 b/m4/virt-storage-mpath.m4 deleted file mode 100644 index d4f8ecfb9ea..00000000000 --- a/m4/virt-storage-mpath.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl The storage mpath check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_MPATH], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_MPATH], [mpath backend for the storage= driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_MPATH], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - - if test "$with_storage_mpath" =3D "check" || test "$with_storage_mpath" = =3D "yes"; then - if test "$with_linux" =3D "yes"; then - with_storage_mpath=3Dyes - - AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1, - [whether mpath backend for storage driver is enabled]) - else - if test "$with_storage_mpath" =3D "yes"; then - AC_MSG_ERROR([mpath storage is only supported on Linux]) - fi - with_storage_mpath=3Dno - fi - fi - - if test "x$with_storage_mpath" =3D "xyes"; then - if test "x$with_devmapper" =3D "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to c= ompile libvirt with mpath storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" =3D "ye= s"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_MPATH], [ - LIBVIRT_RESULT([mpath], [$with_storage_mpath]) -]) diff --git a/meson.build b/meson.build index cecc161ed85..c30026bc696 100644 --- a/meson.build +++ b/meson.build @@ -1969,6 +1969,13 @@ if conf.has('WITH_LIBVIRTD') endforeach endif endif + + if not get_option('storage_mpath').disabled() and host_machine.system() = =3D=3D 'linux' and devmapper_dep.found() + use_storage =3D true + conf.set('WITH_STORAGE_MPATH', 1) + elif get_option('storage_mpath').enabled() + error('mpath storage driver is supported only on Linux and you must in= stall libdevmapper') + endif endif =20 if use_storage @@ -2020,6 +2027,7 @@ storagedriver_summary =3D { 'LVM': conf.has('WITH_STORAGE_LVM'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), + 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index 66e232f59dc..97e18987860 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -81,3 +81,4 @@ option('storage_gluster', type: 'feature', value: 'auto',= description: 'Gluster option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscs= i backend for the storage driver') option('storage_iscsi_direct', type: 'feature', value: 'auto', description= : 'iscsi-direct backend for the storage driver') option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM ba= ckend for the storage driver') +option('storage_mpath', type: 'feature', value: 'auto', description: 'mpat= h backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895109; cv=none; d=zohomail.com; s=zohoarc; b=LjxGFALQa8ExD5ldK9C5T3itewHbbkjX2DYMxKpNVMq1epdRu+sVOyDmUybfScwCtCFbzK/qSSY6Yty4xN7QF9maXoXOY4bEYUaoFG/5kuOfgUYo1vGr53hScEuNrpHKld3sBb6dttBAOR1RJ2rL04rC2d/pc+U7b4t8ap+0LI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895109; 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=wc5LNPdJ9mGJFlPIMBg07a1FPbFMYPw88oM9NI2/wB8=; b=R17Ofiq1FC2fU6G/fmTv9xJ0MW5Q3e1HdqmpZf2+jIqfw7hX81RqyhIWWUjEf1J8Rm6bs2iEc/wuaVGUidh6x0rAkAzBrFMj4PQV+h0woZYetOXJbM/YRnz3yBFL+tJHhQ7f2I7/hSPmsqCDPhaSiFKS0ptj5BqzpMRojQNVLRg= 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 1594895109514139.73248396760175; Thu, 16 Jul 2020 03:25: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-152-_ztFTjnLOq-rhrWnoR5lcA-1; Thu, 16 Jul 2020 06:03:25 -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 7D286193F56E; Thu, 16 Jul 2020 10:03:11 +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 5ABA174F64; Thu, 16 Jul 2020 10:03:11 +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 22E04180530F; Thu, 16 Jul 2020 10:03:11 +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 06GA37mC016966 for ; Thu, 16 Jul 2020 06:03:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 522522DE9D; Thu, 16 Jul 2020 10:03:07 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE0F82DE71 for ; Thu, 16 Jul 2020 10:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895108; 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=wc5LNPdJ9mGJFlPIMBg07a1FPbFMYPw88oM9NI2/wB8=; b=AiesHoz1Hb3pRYPT+fd0j9KbxKw0RNekb81x/vjMmD/5euDdHirlHQzc6NFHNu8vJzJGd7 gb3cJhRlkTWIvsStmqEK8+PNxdCiFOsm7+aQV+zRXJ5pvE7bkJl4gue+hie2AvEFlOfXHu xnHtUHuFWRrvi6ipG0GsU9fARy873GA= X-MC-Unique: _ztFTjnLOq-rhrWnoR5lcA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 107/351] meson: add storage rbd build option Date: Thu, 16 Jul 2020 11:55:43 +0200 Message-Id: <635bcd5fcf4c5e977096ca0e525410edd77ff840.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.13 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 --- configure.ac | 5 ----- m4/virt-storage-rbd.m4 | 50 ------------------------------------------ meson.build | 8 +++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-storage-rbd.m4 diff --git a/configure.ac b/configure.ac index 465d9974ac4..ad43de7f39e 100644 --- a/configure.ac +++ b/configure.ac @@ -137,21 +137,18 @@ dnl Storage driver checks dnl =20 LIBVIRT_STORAGE_ARG_SCSI -LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then with_storage_scsi=3Dno - with_storage_rbd=3Dno with_storage_sheepdog=3Dno with_storage_zfs=3Dno with_storage_vstorage=3Dno fi =20 LIBVIRT_STORAGE_CHECK_SCSI -LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE @@ -213,7 +210,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_SCSI -LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE @@ -226,7 +222,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS -LIBVIRT_RESULT_RBD AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4 deleted file mode 100644 index cd3b24ea2fa..00000000000 --- a/m4/virt-storage-rbd.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl The storage RBD check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_RBD], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_RBD], - [RADOS Block Device backend for the storage dri= ver], [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [ - LIBRBD_LIBS=3D - if test "$with_storage_rbd" =3D "yes" || test "$with_storage_rbd" =3D "c= heck"; then - if test "$LIBRBD_FOUND" =3D "yes"; then - with_storage_rbd=3Dyes - AC_DEFINE_UNQUOTED([WITH_STORAGE_RBD], [1], - [whether RBD backend for storage driver is enable= d]) - else - if test "$with_storage_rbd" =3D "yes"; then - AC_MSG_ERROR([You must install the librbd library & headers to com= pile libvirt]) - else - with_storage_rbd=3Dno - fi - fi - fi - AM_CONDITIONAL([WITH_STORAGE_RBD], [test "$with_storage_rbd" =3D "yes"]) - AC_SUBST([LIBRBD_LIBS]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_RBD], [ - LIBVIRT_RESULT([RBD], [$with_storage_rbd]) -]) - -AC_DEFUN([LIBVIRT_RESULT_RBD], [ - LIBVIRT_RESULT([rbd], [$with_storage_rbd], [CFLAGS=3D'' LIBS=3D'$LIBRBD_= LIBS']) -]) diff --git a/meson.build b/meson.build index c30026bc696..b31e77b81a3 100644 --- a/meson.build +++ b/meson.build @@ -1976,6 +1976,13 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_mpath').enabled() error('mpath storage driver is supported only on Linux and you must in= stall libdevmapper') endif + + if not get_option('storage_rbd').disabled() and rbd_dep.found() + use_storage =3D true + conf.set('WITH_STORAGE_RBD', 1) + elif get_option('storage_rbd').enabled() + error('You must install the librbd library & headers to compile libvir= t') + endif endif =20 if use_storage @@ -2029,6 +2036,7 @@ storagedriver_summary =3D { 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), + 'RBD': conf.has('WITH_STORAGE_RBD'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 97e18987860..0e256fb1004 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -82,3 +82,4 @@ option('storage_iscsi', type: 'feature', value: 'auto', d= escription: 'iscsi back option('storage_iscsi_direct', type: 'feature', value: 'auto', description= : 'iscsi-direct backend for the storage driver') option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM ba= ckend for the storage driver') option('storage_mpath', type: 'feature', value: 'auto', description: 'mpat= h backend for the storage driver') +option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS = Block Device backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893853; cv=none; d=zohomail.com; s=zohoarc; b=RDlURy8o54t0SnDRu5KiGp0txkTAi9VDJFs8xnxDMiSWtUXHMcFyfDACsEr1SORtPeXSiA3g1jvkmoFt87PTB4ks5YzO+OtJpJ1baxaywjlQsN9XSs70Jm7a11GMmNFC69c2zYVIDJ0JyJyyHS8jeTkcs4y9m1J0Giyk3KSFJbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893853; 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=EF0Po2AsgPZ2+cBfzmCFPU6Bin8CVf/lG5trDHiQf2s=; b=KzWwILgVW8X0CBWRlt4JPBU+rmO+z9Uye+5ijRxntebOMfFI9avny+/GrdDlxwOPzXbtJ0B8C5M6ytmlHff0C1+hIgCVpRP6Qgn11Qjv3UimSetr2SWW/u7rfOP13Kt6TnUEbt1CPUrWolBGbmMIyPktKUTnE1bCKGCzflvYPnk= 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 159489385323686.89909295381688; Thu, 16 Jul 2020 03:04:13 -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-318-7UpLEhPJNri5ggTsoHjkzw-1; Thu, 16 Jul 2020 06:03:27 -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 A2D491888AB4; Thu, 16 Jul 2020 10:03:13 +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 7ACDD6FEF6; Thu, 16 Jul 2020 10:03:13 +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 449EA1805314; Thu, 16 Jul 2020 10:03:13 +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 06GA389J016978 for ; Thu, 16 Jul 2020 06:03:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 376322DE9D; Thu, 16 Jul 2020 10:03:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A680B2DE9F for ; Thu, 16 Jul 2020 10:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893852; 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=EF0Po2AsgPZ2+cBfzmCFPU6Bin8CVf/lG5trDHiQf2s=; b=it1ViIVeaWDWXOIQCUj1YqDOY5k21npjWVIs6nYWgTk7l8o5EPXslexF4lPsf5n18e1LGe JfPTzSW3QZaLKlM38A7pR+ROrwBAMhQYhiFZna6WKKDuaAqI/SNeasnid5Ncs5OafUa4Te lFmvgUxqoVM3JkP+VE3+cGEDA2JrabA= X-MC-Unique: 7UpLEhPJNri5ggTsoHjkzw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 108/351] meson: add storage SCSI build option Date: Thu, 16 Jul 2020 11:55:44 +0200 Message-Id: <1793bd79ddc866dec7b0d4268eac771270b297a1.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 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 --- configure.ac | 6 ------ m4/virt-storage-scsi.m4 | 36 ------------------------------------ meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 m4/virt-storage-scsi.m4 diff --git a/configure.ac b/configure.ac index ad43de7f39e..5f77e47dd10 100644 --- a/configure.ac +++ b/configure.ac @@ -75,10 +75,8 @@ esac =20 if test $with_linux =3D no; then with_dtrace=3Dno - with_storage_scsi=3Dno fi =20 - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) @@ -136,19 +134,16 @@ dnl dnl Storage driver checks dnl =20 -LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then - with_storage_scsi=3Dno with_storage_sheepdog=3Dno with_storage_zfs=3Dno with_storage_vstorage=3Dno fi =20 -LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE @@ -209,7 +204,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE diff --git a/m4/virt-storage-scsi.m4 b/m4/virt-storage-scsi.m4 deleted file mode 100644 index ea4e47cbda8..00000000000 --- a/m4/virt-storage-scsi.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The storage SCSI check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_SCSI], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_SCSI], [SCSI backend for the storage d= river], [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_SCSI], [ - if test "$with_storage_scsi" =3D "check" || test "$with_storage_scsi" = =3D "yes"; then - with_storage_scsi=3Dyes - - AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1, - [whether SCSI backend for storage driver is enabled= ]) - fi - AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" =3D "yes"= ]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_SCSI], [ - LIBVIRT_RESULT([SCSI], [$with_storage_scsi]) -]) diff --git a/meson.build b/meson.build index b31e77b81a3..1caa824ad40 100644 --- a/meson.build +++ b/meson.build @@ -1983,6 +1983,11 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_rbd').enabled() error('You must install the librbd library & headers to compile libvir= t') endif + + if not get_option('storage_scsi').disabled() and host_machine.system() = =3D=3D 'linux' + use_storage =3D true + conf.set('WITH_STORAGE_SCSI', 1) + endif endif =20 if use_storage @@ -2034,6 +2039,7 @@ storagedriver_summary =3D { 'LVM': conf.has('WITH_STORAGE_LVM'), 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'iscsi-direct': conf.has('WITH_STORAGE_ISCSI_DIRECT'), + 'SCSI': conf.has('WITH_STORAGE_SCSI'), 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'RBD': conf.has('WITH_STORAGE_RBD'), diff --git a/meson_options.txt b/meson_options.txt index 0e256fb1004..5cd4a9e28fd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,3 +83,4 @@ option('storage_iscsi_direct', type: 'feature', value: 'a= uto', description: 'isc option('storage_lvm', type: 'feature', value: 'auto', description: 'LVM ba= ckend for the storage driver') option('storage_mpath', type: 'feature', value: 'auto', description: 'mpat= h backend for the storage driver') option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS = Block Device backend for the storage driver') +option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI = backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893819; cv=none; d=zohomail.com; s=zohoarc; b=UU6aSUKSxuLFL9JY4VEGMrZy0GGn8i77ru7E2jOP2n215Nock7shbdKNu1kFGiEHCMh4QCBHeovzO5CImtTxM6iHbuIFI4YgmzOm6rILuTdZmqh7vAGKg4ngIpmywJddCbIhr3IX4GD+8Bra0zesm+6wgiqiKRyhagdL99cW4Pw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893819; 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=h6HkPr0YPrr5G1rmPbQUu4VeejLp0IzlF5HvxlcfNiI=; b=WQHCbtPdi0dUtrZ3yc9Cyks3/NwQ8j81eCl49GaAQG7cZpicLqRz16WxXBKMrqaZ6ncECujpK5lO9E1+xNeXa2ohjtEise5xnjIfqVZGWeoR22dQHZhDk6KAyeIcduSafhkAunjBImczDPkAPxPqD3HEBIt4z7P4nN13Fradneo= 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 1594893819738895.8896824039283; Thu, 16 Jul 2020 03:03:39 -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-411-eQI4lQ4PPNaI-KnnyAAScg-1; Thu, 16 Jul 2020 06:03:24 -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 1FFA010A4; Thu, 16 Jul 2020 10:03:16 +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 EA34079D16; Thu, 16 Jul 2020 10:03:15 +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 B62099624B; Thu, 16 Jul 2020 10:03:15 +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 06GA39fc016993 for ; Thu, 16 Jul 2020 06:03:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F7C92E022; Thu, 16 Jul 2020 10:03:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EB492DE9E for ; Thu, 16 Jul 2020 10:03:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893818; 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=h6HkPr0YPrr5G1rmPbQUu4VeejLp0IzlF5HvxlcfNiI=; b=ChgKiG9XcxmiTzZdyGygoESKbdYsBzq+wV3uCvbc0gFeloDWVeHnYpYn52n7MdLfg5as/x ywmMUtq5i18Tt/bBaELQgEPKpnudfR6gsWuLGwkMjh3gfMH9aZ+vHCbeJ1wNvChY4mNqgn xyC1+AwjjJk1adETBMSfk1F9eL8/tvI= X-MC-Unique: eQI4lQ4PPNaI-KnnyAAScg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 109/351] meson: add storage sheepdog build option Date: Thu, 16 Jul 2020 11:55:45 +0200 Message-Id: <63b3405d8cfa15057fbb979164f59794ffb90d6a.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.13 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 --- configure.ac | 4 --- m4/virt-storage-sheepdog.m4 | 56 ------------------------------------- meson.build | 11 ++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 m4/virt-storage-sheepdog.m4 diff --git a/configure.ac b/configure.ac index 5f77e47dd10..ba15aa9bb2b 100644 --- a/configure.ac +++ b/configure.ac @@ -134,17 +134,14 @@ dnl dnl Storage driver checks dnl =20 -LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then - with_storage_sheepdog=3Dno with_storage_zfs=3Dno with_storage_vstorage=3Dno fi =20 -LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE =20 @@ -204,7 +201,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-sheepdog.m4 b/m4/virt-storage-sheepdog.m4 deleted file mode 100644 index aa5587f40f9..00000000000 --- a/m4/virt-storage-sheepdog.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl The storage Sheepdog check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_SHEEPDOG], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_SHEEPDOG], - [with Sheepdog backend for the storage driver],= [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_SHEEPDOG], [ - if test "$with_storage_sheepdog" =3D "yes" || - test "$with_storage_sheepdog" =3D "check"; then - AC_PATH_PROGS([SHEEPDOGCLI], [collie dog], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_storage_sheepdog" =3D "yes"; then - if test -z "$SHEEPDOGCLI"; then - AC_MSG_ERROR([We need sheepdog client for Sheepdog storage driver]) - fi - else - if test -z "$SHEEPDOGCLI"; then - with_storage_sheepdog=3Dno - fi - - if test "$with_storage_sheepdog" =3D "check"; then - with_storage_sheepdog=3Dyes - fi - fi - - if test "$with_storage_sheepdog" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1, - [whether Sheepdog backend for storage driver is e= nabled]) - AC_DEFINE_UNQUOTED([SHEEPDOGCLI], ["$SHEEPDOGCLI"], - [Location of sheepdog client program]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG], [test "$with_storage_sheepdog" = =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_SHEEPDOG], [ - LIBVIRT_RESULT([Sheepdog], [$with_storage_sheepdog]) -]) diff --git a/meson.build b/meson.build index 1caa824ad40..fcd4bc5e5da 100644 --- a/meson.build +++ b/meson.build @@ -1988,6 +1988,16 @@ if conf.has('WITH_LIBVIRTD') use_storage =3D true conf.set('WITH_STORAGE_SCSI', 1) endif + + if not get_option('storage_sheepdog').disabled() + sheepdogcli_prog =3D find_program(['collie', 'dog'], required: get_opt= ion('storage_sheepdog'), dirs: libvirt_sbin_path) + + if sheepdogcli_prog.found() + use_storage =3D true + conf.set('WITH_STORAGE_SHEEPDOG', 1) + conf.set_quoted('SHEEPDOGCLI', sheepdogcli_prog.path()) + endif + endif endif =20 if use_storage @@ -2043,6 +2053,7 @@ storagedriver_summary =3D { 'mpath': conf.has('WITH_STORAGE_MPATH'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'RBD': conf.has('WITH_STORAGE_RBD'), + 'Sheepdog': conf.has('WITH_STORAGE_SHEEPDOG'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 5cd4a9e28fd..eec89eacfb3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -84,3 +84,4 @@ option('storage_lvm', type: 'feature', value: 'auto', des= cription: 'LVM backend option('storage_mpath', type: 'feature', value: 'auto', description: 'mpat= h backend for the storage driver') option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS = Block Device backend for the storage driver') option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI = backend for the storage driver') +option('storage_sheepdog', type: 'feature', value: 'auto', description: 'S= heepdog backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893873; cv=none; d=zohomail.com; s=zohoarc; b=k5lK/H22A1uATaJ39SVYGwnhxaJzhGQ8pGDvZwnRgah7CgipHJ4MzBG5qu1fEDnnPZeNeDLZNzMnSxGaKkRccCrGPeSQR5Pfh4F7fWCF7UuLmGZh67BYTE31Bol/kwJljEqbODNAX8cpoKONJTwu1mLMg7X3PSXwtk++zkT1Py4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893873; 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=6vPtvT9pj0P4PtG4mEUaDS8KE1K75rvgCXcqrjuOQqI=; b=e4bkEO0MeTB2mPwnbZdbS9VpV1I6TdHt6ZqJqJLCgsOrXNB1j/M+TR/Lm+uRFGYJDjpCSlk3MgL/O+Vs2g5axev48ksjhWA43Gsu6RglzT8+oiilUqKkuJ09jxoaC0M+6mkMJfJonX38hNNi7kmnck6CJGiti7Jm/FzGdORpp4o= 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 1594893873866947.4200998379503; Thu, 16 Jul 2020 03:04:33 -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-257-eAOewXciNPGRYrZA-tM3MA-1; Thu, 16 Jul 2020 06:03:28 -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 8A25F100AA24; Thu, 16 Jul 2020 10:03:18 +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 6350674F64; Thu, 16 Jul 2020 10:03:18 +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 30CE3180531C; Thu, 16 Jul 2020 10:03:18 +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 06GA3Axh017006 for ; Thu, 16 Jul 2020 06:03:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 08A3F2E024; Thu, 16 Jul 2020 10:03:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7686B2DE9E for ; Thu, 16 Jul 2020 10:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893872; 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=6vPtvT9pj0P4PtG4mEUaDS8KE1K75rvgCXcqrjuOQqI=; b=cT46Zw2/AKHAgCjQX90P2js8rh76LsdxavdGunpLoFUsRqAp+a8X9YPia6H4qYArdFsOB/ ch/LlVL4J4Xw0ZSyZte74PymCE8YMtgQZEA+rk72kKoGvx9tPrZYY2lVHMi9eIFMDCUly7 kqTzsD0m8diP7BxAucxekNn6Ux+mmqo= X-MC-Unique: eAOewXciNPGRYrZA-tM3MA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 110/351] meson: add storage vstorage build option Date: Thu, 16 Jul 2020 11:55:46 +0200 Message-Id: <2cc14d0fca81cfa2dfb1862973397e9433f86e98.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.13 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 --- configure.ac | 4 -- m4/virt-storage-vstorage.m4 | 73 ------------------------------------- meson.build | 24 ++++++++++++ meson_options.txt | 1 + 4 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 m4/virt-storage-vstorage.m4 diff --git a/configure.ac b/configure.ac index ba15aa9bb2b..6416986c303 100644 --- a/configure.ac +++ b/configure.ac @@ -135,15 +135,12 @@ dnl Storage driver checks dnl =20 LIBVIRT_STORAGE_ARG_ZFS -LIBVIRT_STORAGE_ARG_VSTORAGE =20 if test "$with_libvirtd" =3D "no"; then with_storage_zfs=3Dno - with_storage_vstorage=3Dno fi =20 LIBVIRT_STORAGE_CHECK_ZFS -LIBVIRT_STORAGE_CHECK_VSTORAGE =20 dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 @@ -202,7 +199,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_ZFS -LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-vstorage.m4 b/m4/virt-storage-vstorage.m4 deleted file mode 100644 index e3b3bb40f0c..00000000000 --- a/m4/virt-storage-vstorage.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl The storage vstorage check -dnl -dnl Copyright (C) 2016 Parallels IP Holdings GmbH, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - - -AC_DEFUN([LIBVIRT_STORAGE_ARG_VSTORAGE], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_VSTORAGE], - [Virtuozzo Storage backend for the storage driv= er], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_VSTORAGE], [ - if test "$with_storage_vstorage" =3D "yes" || - test "$with_storage_vstorage" =3D "check"; then - AC_PATH_PROG([VSTORAGE], [vstorage], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([VSTORAGE_MOUNT], [vstorage-mount], [], [$LIBVIRT_SBIN_PA= TH]) - AC_PATH_PROG([UMOUNT], [umount], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_storage_vstorage" =3D "yes"; then - if test -z "$VSTORAGE" || test -z "$VSTORAGE_MOUNT"; then - AC_MSG_ERROR([We need vstorage and vstorage-mount tool for Vstorag= e storage driver]); - fi - if test -z "$UMOUNT" ; then - AC_MSG_ERROR([We need umount for Vstorage storage driver]); - fi - else - if test -z "$VSTORAGE" ; then - with_storage_vstorage=3Dno - fi - if test -z "$VSTORAGE_MOUNT" ; then - with_storage_vstorage=3Dno - fi - if test -z "$UMOUNT" ; then - with_storage_vstorage=3Dno - fi - - if test "$with_storage_vstorage" =3D "check" ; then - with_storage_vstorage=3Dyes - fi - fi - - if test "$with_storage_vstorage" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_VSTORAGE], 1, - [whether Vstorage backend for storage driver is e= nabled]) - AC_DEFINE_UNQUOTED([VSTORAGE], ["$VSTORAGE"], - [Location or name of the vstorage client tool]) - AC_DEFINE_UNQUOTED([VSTORAGE_MOUNT], ["$VSTORAGE_MOUNT"], - [Location or name of the vstorage mount tool]) - AC_DEFINE_UNQUOTED([UMOUNT], ["$UMOUNT"], - [Location or name of the umount programm]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_VSTORAGE], [test "$with_storage_vstorage" = =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_VSTORAGE], [ - LIBVIRT_RESULT([Virtuozzo storage], [$with_storage_vstorage]) -]) diff --git a/meson.build b/meson.build index fcd4bc5e5da..83f7710f93c 100644 --- a/meson.build +++ b/meson.build @@ -1998,6 +1998,29 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('SHEEPDOGCLI', sheepdogcli_prog.path()) endif endif + + if not get_option('storage_vstorage').disabled() + vstorage_enable =3D true + + foreach name : ['vstorage', 'vstorage-mount', 'umount'] + set_variable( + '@0@_prog'.format(name.underscorify()), + find_program(name, required: get_option('storage_vstorage'), dirs:= libvirt_sbin_path) + ) + if not get_variable('@0@_prog'.format(name.underscorify())).found() + vstorage_enable =3D false + endif + endforeach + + if vstorage_enable + use_storage =3D true + conf.set('WITH_STORAGE_VSTORAGE', 1) + foreach name : ['vstorage', 'vstorage-mount', 'umount'] + path =3D get_variable('@0@_prog'.format(name.underscorify())).path= () + conf.set_quoted(name.to_upper(), path) + endforeach + endif + endif endif =20 if use_storage @@ -2055,6 +2078,7 @@ storagedriver_summary =3D { 'RBD': conf.has('WITH_STORAGE_RBD'), 'Sheepdog': conf.has('WITH_STORAGE_SHEEPDOG'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), + 'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index eec89eacfb3..4d8cac9254a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -85,3 +85,4 @@ option('storage_mpath', type: 'feature', value: 'auto', d= escription: 'mpath back option('storage_rbd', type: 'feature', value: 'auto', description: 'RADOS = Block Device backend for the storage driver') option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI = backend for the storage driver') option('storage_sheepdog', type: 'feature', value: 'auto', description: 'S= heepdog backend for the storage driver') +option('storage_vstorage', type: 'feature', value: 'auto', description: 'V= irtuozzo storage backend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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-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=1594894084; cv=none; d=zohomail.com; s=zohoarc; b=H6aWKuo5dF5A05EReqzTwfyIRxF2q1wmz/oWvW1w6WHGq5pnM+a1JAyxxlvb07P8S5zSSf4+pdLIpfqXGGYtnAD+FMJNu+5q8tW+xAR8NuLgvrjGmT7rdeb5CXITR9eU11fNFmLQVLNprJDUFEDX3MqS9HBlSf9VDSpxJDzYzoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894084; 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=DpP0mvtIUdFIRF1tgdtHrykjWBkzj2+s3KRVuTtyExQ=; b=jVmq2MGUxMFVmqAYDo81BMzgpfUD1TXot2S88zrNEIEkikhcgn/tU1d7ed4XZDzgenqMenhg7mY42V8lDmWTT8tZLpxYL5Wc3C3nPTdq0lPYdPbih6lUpX/JV5ACVWTWZU2nZJVcIKKXRnhPVFHsnREa2oK4HGPAf2c/KFp+knY= 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894084033210.96905824262865; Thu, 16 Jul 2020 03:08:04 -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-166-w31Pr6lWMFCWSuz_MKLXvQ-1; Thu, 16 Jul 2020 06:03:27 -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 ECA351888AB5; Thu, 16 Jul 2020 10:03:13 +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 CD61D74F64; Thu, 16 Jul 2020 10:03:13 +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 9BAB41805316; Thu, 16 Jul 2020 10:03:13 +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 06GA3AeS017014 for ; Thu, 16 Jul 2020 06:03:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id E702F2E025; Thu, 16 Jul 2020 10:03:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 603EC2DE9E for ; Thu, 16 Jul 2020 10:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894082; 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=DpP0mvtIUdFIRF1tgdtHrykjWBkzj2+s3KRVuTtyExQ=; b=GlYj9ssXXyOyT7wqH/H0MHiWhXIz04NG2v8Sf2I4NPxmwq1CszoCwJAct3rGQLY4XtcoVq VVo+stKNzwzvBnz3RfCMDWxrcpq/9Fa0XpLDfWgt3K2q5F75Z06r9PwNe/3760PGiWUIzk ni/84nkrTzUYwnc4XPv8VSrALW68BT0= X-MC-Unique: w31Pr6lWMFCWSuz_MKLXvQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 111/351] meson: add storage ZFS build option Date: Thu, 16 Jul 2020 11:55:47 +0200 Message-Id: <21c49ef8f9e89204c9ff4299a7b95ec33a0b70da.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.13 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 --- configure.ac | 16 ------------ m4/virt-storage-zfs.m4 | 56 ------------------------------------------ meson.build | 22 +++++++++++++++++ meson_options.txt | 1 + 4 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 m4/virt-storage-zfs.m4 diff --git a/configure.ac b/configure.ac index 6416986c303..030313b7ed5 100644 --- a/configure.ac +++ b/configure.ac @@ -130,18 +130,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 =20 -dnl -dnl Storage driver checks -dnl - -LIBVIRT_STORAGE_ARG_ZFS - -if test "$with_libvirtd" =3D "no"; then - with_storage_zfs=3Dno -fi - -LIBVIRT_STORAGE_CHECK_ZFS - dnl Python3 < 3.7 treats the C locale as 7-bit only. dnl We must force env vars so it treats it as UTF-8 dnl regardless of the user's locale. @@ -196,10 +184,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Storage Drivers]) -AC_MSG_NOTICE([]) -LIBVIRT_STORAGE_RESULT_ZFS -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DRIVER_MODULES diff --git a/m4/virt-storage-zfs.m4 b/m4/virt-storage-zfs.m4 deleted file mode 100644 index 0c52264dbe8..00000000000 --- a/m4/virt-storage-zfs.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl The storage ZFS check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_ZFS], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_ZFS], [ZFS backend for the storage dri= ver], [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_ZFS], [ - if test "$with_storage_zfs" =3D "yes" || - test "$with_storage_zfs" =3D "check"; then - AC_PATH_PROG([ZFS], [zfs], [], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([ZPOOL], [zpool], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_storage_zfs" =3D "yes"; then - if test -z "$ZFS" || test -z "$ZPOOL"; then - AC_MSG_ERROR([We need zfs and zpool for ZFS storage driver]) - fi - else - if test -z "$ZFS" || test -z "$ZPOOL"; then - with_storage_zfs=3Dno - fi - - if test "$with_storage_zfs" =3D "check"; then - with_storage_zfs=3Dyes - fi - fi - - if test "$with_storage_zfs" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_ZFS], 1, - [whether ZFS backend for storage driver is enabled]) - AC_DEFINE_UNQUOTED([ZFS], ["$ZFS"], [Location of zfs program]) - AC_DEFINE_UNQUOTED([ZPOOL], ["$ZPOOL"], [Location of zpool program]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_ZFS], [test "$with_storage_zfs" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_ZFS], [ - LIBVIRT_RESULT([ZFS], [$with_storage_zfs]) -]) diff --git a/meson.build b/meson.build index 83f7710f93c..64583b3662a 100644 --- a/meson.build +++ b/meson.build @@ -2021,6 +2021,27 @@ if conf.has('WITH_LIBVIRTD') endforeach endif endif + + if not get_option('storage_zfs').disabled() + zfs_enable =3D true + foreach name : ['zfs', 'zpool'] + set_variable( + '@0@_prog'.format(name), + find_program(name, required: get_option('storage_zfs'), dirs: libv= irt_sbin_path) + ) + if not get_variable('@0@_prog'.format(name)).found() + zfs_enable =3D false + endif + endforeach + + if zfs_enable + use_storage =3D true + conf.set('WITH_STORAGE_ZFS', 1) + foreach name : ['zfs', 'zpool'] + conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) + endforeach + endif + endif endif =20 if use_storage @@ -2078,6 +2099,7 @@ storagedriver_summary =3D { 'RBD': conf.has('WITH_STORAGE_RBD'), 'Sheepdog': conf.has('WITH_STORAGE_SHEEPDOG'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), + 'ZFS': conf.has('WITH_STORAGE_ZFS'), 'Virtuozzo storage': conf.has('WITH_STORAGE_VSTORAGE'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 4d8cac9254a..d68712ae2be 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -86,3 +86,4 @@ option('storage_rbd', type: 'feature', value: 'auto', des= cription: 'RADOS Block option('storage_scsi', type: 'feature', value: 'auto', description: 'SCSI = backend for the storage driver') option('storage_sheepdog', type: 'feature', value: 'auto', description: 'S= heepdog backend for the storage driver') option('storage_vstorage', type: 'feature', value: 'auto', description: 'V= irtuozzo storage backend for the storage driver') +option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS ba= ckend for the storage driver') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895248; cv=none; d=zohomail.com; s=zohoarc; b=C4uyNrfaeHPwUbmQEiV1Zz6a4OFnytAbIH7xqm1whcmNYgdSCL/UBYswwd3eAoS3bH4BmhbUX7mUraQelzHGkxrq8zPAPaKeONSvDPSbvGVw++9E1xWt55xy8T+9zB6Ws+twNifbFbsCyYUBFJJwqs/wpg28jFOyEohjJrVxZLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895248; 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=LB0/s8gNEEKdAHnEUrWUO5mHRZmtciTGfBSVDfhqIsI=; b=M+gESwgn8FHatHf0xyazc3F4bJN7gETIem6sM5pZdzuYAFmtPLfGEtsTnU3Nba7F+Xn/IDo4Cjasz95k74l3ruoohz5zfzjb0Deo8kUfKxNG3W3itwnoSdEsNgKyCCE4x7vbZSStagOPm1cRXTjGF1PBmy4OMC85d2IIibYgVNQ= 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 1594895248726369.8137641929844; Thu, 16 Jul 2020 03:27:28 -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-486-yZ7Oogg1P_i7bfXBVoXMHg-1; Thu, 16 Jul 2020 06:03:25 -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 C9B17100AA48; Thu, 16 Jul 2020 10:03:16 +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 A74876FEFC; Thu, 16 Jul 2020 10:03:16 +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 7387B1805319; Thu, 16 Jul 2020 10:03:16 +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 06GA3BnA017022 for ; Thu, 16 Jul 2020 06:03:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id CDAB72DE71; Thu, 16 Jul 2020 10:03:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 488E32E024 for ; Thu, 16 Jul 2020 10:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895247; 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=LB0/s8gNEEKdAHnEUrWUO5mHRZmtciTGfBSVDfhqIsI=; b=L6noci5C4XxCChMhaW8I1BMDH/9IK+I92JIDeimtNZlw2ikbRYqr8VRXg6a+RdZexRlDcx FHf/nRquMnZOI+wKTURqVMciWJgGRQa+VnTZwvlsJtDfX12BE5QHR1Zx310W4EImEhn8uB LAiUtpVpFRcrhlHOTQ4V1IoAQuVMkeA= X-MC-Unique: yZ7Oogg1P_i7bfXBVoXMHg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 112/351] meson: add chrdev_lock_files build option Date: Thu, 16 Jul 2020 11:55:48 +0200 Message-Id: <59c9bc02ab17c260c29849f0bf30c76c7799042e.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 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 --- configure.ac | 3 --- m4/virt-chrdev-lock-files.m4 | 52 ------------------------------------ meson.build | 12 +++++++++ meson_options.txt | 4 +++ 4 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-chrdev-lock-files.m4 diff --git a/configure.ac b/configure.ac index 030313b7ed5..3a4d98f1dd9 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,6 @@ LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT -LIBVIRT_ARG_CHRDEV_LOCK_FILES LIBVIRT_ARG_DEFAULT_EDITOR LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE @@ -117,7 +116,6 @@ LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT -LIBVIRT_CHECK_CHRDEV_LOCK_FILES LIBVIRT_CHECK_DEFAULT_EDITOR LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE @@ -203,7 +201,6 @@ LIBVIRT_RESULT_DEBUG LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT -LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE diff --git a/m4/virt-chrdev-lock-files.m4 b/m4/virt-chrdev-lock-files.m4 deleted file mode 100644 index 5802136b9f4..00000000000 --- a/m4/virt-chrdev-lock-files.m4 +++ /dev/null @@ -1,52 +0,0 @@ -dnl The locaton of UUCP style lock files -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_CHRDEV_LOCK_FILES], [ - LIBVIRT_ARG_WITH([CHRDEV_LOCK_FILES], - [location for UUCP style lock files for character devic= es ] - [(use auto for default paths on some platforms)], - [auto]) -]) - -AC_DEFUN([LIBVIRT_CHECK_CHRDEV_LOCK_FILES], [ - if test "$with_chrdev_lock_files" !=3D "no"; then - case $with_chrdev_lock_files in - yes | auto) - dnl Default locations for platforms, or disable if unknown - if test "$with_linux" =3D "yes"; then - with_chrdev_lock_files=3D/var/lock - elif test "$with_chrdev_lock_files" =3D "auto"; then - with_chrdev_lock_files=3Dno - fi - ;; - esac - if test "$with_chrdev_lock_files" =3D "yes"; then - AC_MSG_ERROR([You must specify path for the lock files on this platf= orm]) - fi - if test "$with_chrdev_lock_files" !=3D "no"; then - AC_DEFINE_UNQUOTED([VIR_CHRDEV_LOCK_FILE_PATH], "$with_chrdev_lock_f= iles", - [path to directory containing UUCP device lock fi= les]) - fi - fi - AM_CONDITIONAL([VIR_CHRDEV_LOCK_FILE_PATH], [test "$with_chrdev_lock_fil= es" !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_CHRDEV_LOCK_FILES], [ - LIBVIRT_RESULT([Char device locks], [$with_chrdev_lock_files]) -]) diff --git a/meson.build b/meson.build index 64583b3662a..9d80aec8fd3 100644 --- a/meson.build +++ b/meson.build @@ -2049,6 +2049,17 @@ if use_storage endif =20 =20 +# build feature options + +chrdev_lock_files =3D get_option('chrdev_lock_files') +if chrdev_lock_files =3D=3D '' and host_machine.system() =3D=3D 'linux' + chrdev_lock_files =3D '/var/lock' +endif +if chrdev_lock_files !=3D '' + conf.set_quoted('VIR_CHRDEV_LOCK_FILE_PATH', chrdev_lock_files) +endif + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -2166,6 +2177,7 @@ summary(test_summary, section: 'Test suite', bool_yn:= true) misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'Char device locks': chrdev_lock_files, } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index d68712ae2be..1f32533f0f5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -87,3 +87,7 @@ option('storage_scsi', type: 'feature', value: 'auto', de= scription: 'SCSI backen option('storage_sheepdog', type: 'feature', value: 'auto', description: 'S= heepdog backend for the storage driver') option('storage_vstorage', type: 'feature', value: 'auto', description: 'V= irtuozzo storage backend for the storage driver') option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS ba= ckend for the storage driver') + + +# build feature options +option('chrdev_lock_files', type: 'string', value: '', description: 'locat= ion for UUCP style lock files for character devices (leave empty for defaul= t paths on some platforms)') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893824; cv=none; d=zohomail.com; s=zohoarc; b=aZ0GUYrl5EF5WQqnoJvkvqJ9vStPx6LmUOG20xguRQYnLuV3TEtaa9XbCqIfYB9B3vBfNvNoEXuWfBSPFe/YTaUFgdslGRN5k4MLqtSIclo8MkHvf0xrWRF6f5i3z1be+XMpoyo7hTETVq5oaelFu4PkDnuAxc0edw9HuHJRzqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893824; 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=WvcxBj8YXCfdTHyhw/MTVotRRnIKYn3jhMgit44IJSo=; b=Z4SrBja4VVVfYCxVn49mqJImgkD7z2b04+/7oJKw5op26KEBLznA/CMedb0J7cwzYS2gsUbmIMvPSfMvQJ+spfxCKoaG4qLUVIk920Rvoaoh8peKERILOON1tOMn7WC+ngZINOLrEBhWGW3bIGohQNp9SLMGFidNi44EPfsXucw= 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 1594893824278131.0121269224394; Thu, 16 Jul 2020 03:03:44 -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-362-Z3irkqrJMeG2AvFqcCtL3Q-1; Thu, 16 Jul 2020 06:03:29 -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 F22E3100CCD7; Thu, 16 Jul 2020 10:03:20 +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 CB4A374F64; Thu, 16 Jul 2020 10:03:20 +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 9A98096254; Thu, 16 Jul 2020 10:03:20 +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 06GA3Gfo017071 for ; Thu, 16 Jul 2020 06:03:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1CDAD2DE71; Thu, 16 Jul 2020 10:03:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C55D2B6E6 for ; Thu, 16 Jul 2020 10:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893822; 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=WvcxBj8YXCfdTHyhw/MTVotRRnIKYn3jhMgit44IJSo=; b=iaY8+NSZk00aRu7H4vtmKnrMtXxnPOuc3nh5lu6bt6De0F3gcYFBMg2EFfACFNU8UYaqqC FCJM3H/A2uJ0z42PcTUlyEO1Yc8gzHoVg1UKfVb9WO30upEOK2ESuyOwR9ON4VI+Oq+hbw u2OCcwcX397Q9yvRxlrQx2opQ2VBYSQ= X-MC-Unique: Z3irkqrJMeG2AvFqcCtL3Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 113/351] meson: add debug_logs build option Date: Thu, 16 Jul 2020 11:55:49 +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 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 --- configure.ac | 3 --- m4/virt-debug.m4 | 33 --------------------------------- meson.build | 5 +++++ meson_options.txt | 1 + 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 m4/virt-debug.m4 diff --git a/configure.ac b/configure.ac index 3a4d98f1dd9..2ecdd30d48f 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,6 @@ dnl dnl Miscellaneous checks dnl =20 -LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT @@ -112,7 +111,6 @@ LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 -LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT @@ -197,7 +195,6 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DEBUG LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT diff --git a/m4/virt-debug.m4 b/m4/virt-debug.m4 deleted file mode 100644 index d3ac0564f2e..00000000000 --- a/m4/virt-debug.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The debug check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_DEBUG], [ - LIBVIRT_ARG_ENABLE([DEBUG], [enable debugging output], [yes]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DEBUG], [ - AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" =3D x"yes") - if test x"$enable_debug" =3D x"yes"; then - AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_DEBUG], [ - LIBVIRT_RESULT([Debug], [$enable_debug]) -]) diff --git a/meson.build b/meson.build index 9d80aec8fd3..1a7cc483595 100644 --- a/meson.build +++ b/meson.build @@ -2059,6 +2059,10 @@ if chrdev_lock_files !=3D '' conf.set_quoted('VIR_CHRDEV_LOCK_FILE_PATH', chrdev_lock_files) endif =20 +if get_option('debug_logs') + conf.set('ENABLE_DEBUG', 1) +endif + =20 # define top include directory =20 @@ -2175,6 +2179,7 @@ test_summary =3D { summary(test_summary, section: 'Test suite', bool_yn: true) =20 misc_summary =3D { + 'Debug': conf.has('ENABLE_DEBUG'), 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'Char device locks': chrdev_lock_files, diff --git a/meson_options.txt b/meson_options.txt index 1f32533f0f5..a09dad02875 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -91,3 +91,4 @@ option('storage_zfs', type: 'feature', value: 'auto', des= cription: 'ZFS backend =20 # build feature options option('chrdev_lock_files', type: 'string', value: '', description: 'locat= ion for UUCP style lock files for character devices (leave empty for defaul= t paths on some platforms)') +option('debug_logs', type: 'boolean', value: true, description: 'enable de= bugging output') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893831; cv=none; d=zohomail.com; s=zohoarc; b=Mg6AC2aMY2HvDJ/22pXVFq/rXoLdm1Iz1IhW5J6pwQJkOS2pn6++6KcuuhLvozpGfTHoK4LcqhZkBKicZHPEkkSUT+87wzNMmkpV4ueUsxkhcCd9PCqyVvlIx6LDazaFm1jWNqpFD2QQ1wFQOAjzGAIDIJ4/tcxd69Pl5VTpnFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893831; 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=bNdcEiWYE9TYxPljko0HaxEP8/zechmuON5c9O/HuFg=; b=mzO0kIy5ZQaCOPDtWCYZIcLTcwcIIl8rQx8v3JVVVnOoVr17zsDkxpplK/af9sEMMMxRrAx3Bnwx43tlH8ipcMZJ+uMNRo59O6lpZ5xjZMHaz5ZjaPht3j2YAx+1intOZ/w/V4yppei+m+cjK0/7a7wzjTbE16q0J6MF6bc6QLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893831013406.94260020449997; Thu, 16 Jul 2020 03:03:51 -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-299-XvmkKFflNJWexpxGjIFY_g-1; Thu, 16 Jul 2020 06:03:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 51198107ACCA; Thu, 16 Jul 2020 10:03:23 +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 3182572AF0; Thu, 16 Jul 2020 10:03:23 +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 020ED96258; Thu, 16 Jul 2020 10:03:23 +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 06GA3Hge017081 for ; Thu, 16 Jul 2020 06:03:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A1132B6DB; Thu, 16 Jul 2020 10:03:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77E002E027 for ; Thu, 16 Jul 2020 10:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893829; 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=bNdcEiWYE9TYxPljko0HaxEP8/zechmuON5c9O/HuFg=; b=hHoGXNptyQHhFmAxmW5Nz7mR1GcIXM7zCYJ5XPIn+acHaUjruB5zp1gUDhO0aXPsECXYuO Mc83zGrTMPR4GnDOw3Q7etgsI5p5+Lt2QKDmTQtWNwhxl8ZG5aXzTSCxDLpgXBLZEHQJLt Y7CLx2iDuU8zW2C5BzdRGyH0NPUe6q8= X-MC-Unique: XvmkKFflNJWexpxGjIFY_g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 114/351] meson: add default_editor build option Date: Thu, 16 Jul 2020 11:55:50 +0200 Message-Id: <23415adace583b0eb4e312d42a53407600e9924a.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.15 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 --- configure.ac | 3 --- m4/virt-default-editor.m4 | 32 -------------------------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 m4/virt-default-editor.m4 diff --git a/configure.ac b/configure.ac index 2ecdd30d48f..61e830a97eb 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ dnl LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT -LIBVIRT_ARG_DEFAULT_EDITOR LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY @@ -114,7 +113,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT -LIBVIRT_CHECK_DEFAULT_EDITOR LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY @@ -198,7 +196,6 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT -LIBVIRT_RESULT_DEFAULT_EDITOR LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY diff --git a/m4/virt-default-editor.m4 b/m4/virt-default-editor.m4 deleted file mode 100644 index 4b4cad4e875..00000000000 --- a/m4/virt-default-editor.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The default editor check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_DEFAULT_EDITOR], [ - LIBVIRT_ARG_WITH([DEFAULT_EDITOR], - [Editor to use for interactive commands], [vi]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DEFAULT_EDITOR], [ - AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$with_default_editor"], - [Default editor to use]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DEFAULT_EDITOR], [ - LIBVIRT_RESULT([Default Editor], [$with_default_editor]) -]) diff --git a/meson.build b/meson.build index 1a7cc483595..d48912eedc9 100644 --- a/meson.build +++ b/meson.build @@ -2063,6 +2063,8 @@ if get_option('debug_logs') conf.set('ENABLE_DEBUG', 1) endif =20 +conf.set_quoted('DEFAULT_EDITOR', get_option('default_editor')) + =20 # define top include directory =20 @@ -2183,6 +2185,7 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'Char device locks': chrdev_lock_files, + 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index a09dad02875..476ed12a933 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -92,3 +92,4 @@ option('storage_zfs', type: 'feature', value: 'auto', des= cription: 'ZFS backend # build feature options option('chrdev_lock_files', type: 'string', value: '', description: 'locat= ion for UUCP style lock files for character devices (leave empty for defaul= t paths on some platforms)') option('debug_logs', type: 'boolean', value: true, description: 'enable de= bugging output') +option('default_editor', type: 'string', value: 'vi', description: 'Editor= to use for interactive commands') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893811; cv=none; d=zohomail.com; s=zohoarc; b=ZEOPM5aY5rVoXLWGHTV5E/Ooi4ckZyDGkGbU7yC9cr8O+1b3QXD2D9PDkncEJWcJBRmI6DDsVNOD5Cx+s+SjusDvgbGn/dpbHf730ZMpxSb6vsSrPh/LNAYQAAH2oHcD5/rzCC4prEu0fVtPv2aezpBZVBK/af0pCB+dE7jJ/TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893811; 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=Y5lwCL2CCUt092Bv6v9Qw0nDYMxeWazDpBl+ATsdLBQ=; b=IbqIerGJOlo9jRnOecIz4cboNc1XPXht0xC39t8KgWJpLxfY+x9BquxWylkZt0rGAmeNXV20aC5QYxrGAKNKqX57MsRDtDfIANURoHkETaLuiKo0V5nEqKoHOB6gKEWnaloRRr+P3W/R5SQ3TICNTRHQgxXb7VXFQ7IDcoD/eJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893811907720.5946002120323; Thu, 16 Jul 2020 03:03:31 -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-448-KEXSn3gjPPe384YthKI8PA-1; Thu, 16 Jul 2020 06:03:27 -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 C28281081; Thu, 16 Jul 2020 10:03:19 +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 9E5286FEF6; Thu, 16 Jul 2020 10:03:19 +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 6E6E9180531F; Thu, 16 Jul 2020 10:03:19 +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 06GA3Hm3017090 for ; Thu, 16 Jul 2020 06:03:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id E798B2B6E6; Thu, 16 Jul 2020 10:03:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6162A2B6DB for ; Thu, 16 Jul 2020 10:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893810; 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=Y5lwCL2CCUt092Bv6v9Qw0nDYMxeWazDpBl+ATsdLBQ=; b=WxSKQZ/mV1Ky8dBPJIyHhM4pROrWzcDlS2SvnF4qpRBz6qwBqM73EQqnutArIbFIKiuthj QREG2Xu9wTfxYwtIlfeX/UurhXHHKHqwDOtVnDuTcz8cwOQIke55ObP8welH3N8Fcg5bps LjYbkHK4E6ebx+cfyOmftvuWuRlnfX0= X-MC-Unique: KEXSn3gjPPe384YthKI8PA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 115/351] meson: add driver_modules build check Date: Thu, 16 Jul 2020 11:55:51 +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.12 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 --- configure.ac | 8 -------- m4/virt-driver-modules.m4 | 38 -------------------------------------- meson.build | 13 +++++++++++++ 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-modules.m4 diff --git a/configure.ac b/configure.ac index 61e830a97eb..d97bc702299 100644 --- a/configure.ac +++ b/configure.ac @@ -136,10 +136,6 @@ LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES =20 =20 -dnl Driver-Modules library support -LIBVIRT_CHECK_DRIVER_MODULES - - # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether # we're building shared libraries. This is the name of the directory # in which .o files will be created. @@ -178,10 +174,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Driver Loadable Modules]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DRIVER_MODULES -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NSS diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4 deleted file mode 100644 index f7902283884..00000000000 --- a/m4/virt-driver-modules.m4 +++ /dev/null @@ -1,38 +0,0 @@ -dnl The driver module support -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_DRIVER_MODULES], [ - AC_REQUIRE([LIBVIRT_CHECK_DLOPEN]) - - with_driver_modules=3D$with_libvirtd - - DRIVER_MODULES_CFLAGS=3D - if test "$with_driver_modules" =3D "yes"; then - if test "$with_dlfcn" !=3D "yes" || test "$with_dlopen" !=3D "yes"; th= en - AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driv= er modules]) - fi - - DRIVER_MODULES_LDFLAGS=3D"-export-dynamic" - fi - AC_SUBST([DRIVER_MODULES_LDFLAGS]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [ - LIBVIRT_RESULT_LIB([DRIVER_MODULES]) -]) diff --git a/meson.build b/meson.build index d48912eedc9..681874fd447 100644 --- a/meson.build +++ b/meson.build @@ -2065,6 +2065,14 @@ endif =20 conf.set_quoted('DEFAULT_EDITOR', get_option('default_editor')) =20 +driver_modules_flags =3D [] +if conf.has('WITH_LIBVIRTD') + if not conf.has('HAVE_DLFCN_H') or not dlopen_dep.found() + error('You must have dlfcn.h / dlopen() support to build driver module= s') + endif + driver_modules_flags =3D libvirt_export_dynamic +endif + =20 # define top include directory =20 @@ -2127,6 +2135,11 @@ secdriver_summary =3D { } summary(secdriver_summary, section: 'Security Drivers', bool_yn: true) =20 +drivermod_summary =3D { + 'driver_modules': driver_modules_flags.length() > 0, +} +summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: tr= ue) + libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893888; cv=none; d=zohomail.com; s=zohoarc; b=drD/I7Y4Ye1fzRkGpo3dB4R4DtDLjCEi5uBQxfX7SxILllWrbIoMX41XVWqSmVfsPzbDVuBoya8n8LRqUTcmuq5V9bASEJ/0xsfBkqO/r77qIdo9SxTR6ewnXUgMGTVv5mFJDFPYMiOq8dLdKZFs/vsEBYqYjbdrD+moI6O1CRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893888; 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=DpeVVfqdkTZmQdAWlHiNB3ogHqRRhIKYV0Lp4U0IuME=; b=mN1mwcWURdQNaOtu1LQZCOIw/IZgzpExGIF5WczwhCBXxpAonAovxojlCrs+fzrJAd8JM5eA5HBmVQnYD2DZjHtzVdXiFcM0a0mSoKdd1QOBC8upLEBGg1bi0bg9w74nGeMVBrTK2ujmAUo+ZXlgAFM9EsMxwmK/UWjJk9MQ/Ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893888279737.4689321116201; Thu, 16 Jul 2020 03:04:48 -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-467-IPKlCz-zO866kchbT8BzFA-1; Thu, 16 Jul 2020 06:03:27 -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 2F47B1888AD1; Thu, 16 Jul 2020 10:03:20 +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 0C4C574F64; Thu, 16 Jul 2020 10:03:20 +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 CFBF29624E; Thu, 16 Jul 2020 10:03:19 +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 06GA3Igj017103 for ; Thu, 16 Jul 2020 06:03:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id D06D72B6E2; Thu, 16 Jul 2020 10:03:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A17C2DE6D for ; Thu, 16 Jul 2020 10:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893886; 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=DpeVVfqdkTZmQdAWlHiNB3ogHqRRhIKYV0Lp4U0IuME=; b=V2NX0mfhO5f1Oc/URzjROa+jFqEE8WZ3QtpPKfEnq1AO2LMyzxgtCFJGtVUjaHG7b0K0V9 WYAJf1WNIyJLM8WIrrHB2/tO4JpSKGiAa6ej9cK0NAAkYp3p3+bKE//aLqPVd+SAvDZ47p k7CigGtN/kZvt/6nSMKqP/t/ambLo3o= X-MC-Unique: IPKlCz-zO866kchbT8BzFA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 116/351] meson: add dtrace build dependency Date: Thu, 16 Jul 2020 11:55:52 +0200 Message-Id: <0d61f9e3b54b419ab604b1659e1d84da17bb220d.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.13 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 --- configure.ac | 7 ------- m4/virt-dtrace.m4 | 45 --------------------------------------------- meson.build | 8 ++++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 m4/virt-dtrace.m4 diff --git a/configure.ac b/configure.ac index d97bc702299..2f486df2e23 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,6 @@ case $host in *-*-mingw* | *-*-msvc* ) with_win=3Dyes ;; esac =20 -if test $with_linux =3D no; then - with_dtrace=3Dno -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) @@ -101,7 +97,6 @@ dnl dnl Miscellaneous checks dnl =20 -LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL @@ -110,7 +105,6 @@ LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 -LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL @@ -185,7 +179,6 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL diff --git a/m4/virt-dtrace.m4 b/m4/virt-dtrace.m4 deleted file mode 100644 index 3dc20d53436..00000000000 --- a/m4/virt-dtrace.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl The DTrace static probes -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_DTRACE], [ - LIBVIRT_ARG_WITH([DTRACE], [use dtrace for static probing], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_DTRACE], [ - if test "$with_dtrace" !=3D "no" ; then - AC_PATH_PROG([DTRACE], [dtrace], [], [$LIBVIRT_SBIN_PATH]) - if test -z "$DTRACE" ; then - if test "$with_dtrace" =3D "check"; then - with_dtrace=3Dno - else - AC_MSG_ERROR([You must install the 'dtrace' binary to enable libvi= rt static probes]) - fi - else - with_dtrace=3Dyes - fi - if test "$with_dtrace" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static p= robes are available]) - fi - fi - AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_DTRACE], [ - LIBVIRT_RESULT([DTrace], [$with_dtrace]) -]) diff --git a/meson.build b/meson.build index 681874fd447..c7c5cdd3b40 100644 --- a/meson.build +++ b/meson.build @@ -2073,6 +2073,13 @@ if conf.has('WITH_LIBVIRTD') driver_modules_flags =3D libvirt_export_dynamic endif =20 +if host_machine.system() =3D=3D 'linux' + dtrace_prog =3D find_program('dtrace', required: get_option('dtrace'), d= irs: libvirt_sbin_path) + if dtrace_prog.found() + conf.set('WITH_DTRACE_PROBES', 1) + endif +endif + =20 # define top include directory =20 @@ -2197,6 +2204,7 @@ misc_summary =3D { 'Debug': conf.has('ENABLE_DEBUG'), 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), } diff --git a/meson_options.txt b/meson_options.txt index 476ed12a933..b12d0aa3d7b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -93,3 +93,4 @@ option('storage_zfs', type: 'feature', value: 'auto', des= cription: 'ZFS backend option('chrdev_lock_files', type: 'string', value: '', description: 'locat= ion for UUCP style lock files for character devices (leave empty for defaul= t paths on some platforms)') option('debug_logs', type: 'boolean', value: true, description: 'enable de= bugging output') option('default_editor', type: 'string', value: 'vi', description: 'Editor= to use for interactive commands') +option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893882; cv=none; d=zohomail.com; s=zohoarc; b=iktZOLLC1v4ui6P/aqqRT4C37OsFbh2PuidGIbgBNLk5wLng+0YvAeSaWX+AUC7s8C1hkFL9EnuEjAkIQgjndMVKexvbcMUA0QkFvdw/Rkk0829qH7g2oDHItI/XYtULWpH155lHyFxXmUvPgZqZQMgnyOi2dIjLis6VWOY2rvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893882; 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=kolGCK//skPtL0TZM5SgquExKDpZExAWKwJNY5/7u6o=; b=akWlL9ATP/RNuOOLYnkxT2n/ORHBWAfDwm3Rc0Efz+thcgQvq9dHGA6O889MynNfoJq8M0dprvbN5nFfigSvsNAdGKlep+rhXufgHBBCp0jTDXf4zcH+1gmQgDHogRE3owyZZbRJ7ZA8epquE4dy9aXU+ubGi1cxTjV8zEtL+3M= 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 1594893882704314.8738256990248; Thu, 16 Jul 2020 03:04:42 -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-228-LJ7GF9DDPW60U9eEInAmzg-1; Thu, 16 Jul 2020 06:03:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4ABA280183C; Thu, 16 Jul 2020 10:03:22 +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 2511F2B6E6; Thu, 16 Jul 2020 10:03:22 +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 E3E991804759; Thu, 16 Jul 2020 10:03:21 +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 06GA3JfB017110 for ; Thu, 16 Jul 2020 06:03:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA2DA2B6E2; Thu, 16 Jul 2020 10:03:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 353202B6DB for ; Thu, 16 Jul 2020 10:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893881; 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=kolGCK//skPtL0TZM5SgquExKDpZExAWKwJNY5/7u6o=; b=hGxAwaaG508Oy4LZmnhGeC9t1mU399zmAJGCsda5RVx9aVVUJfJetHos6L4ZBGjJpsrIKk eDAj+deE22o4O+bnQIXeYMxZQHQwBtzTDX7E9DsUBmREoJZ8IpU3PE1kPf8QkTt/tIugCG kCbG4bwtGiraXwQAahf2Tpg2a+rF/0s= X-MC-Unique: LJ7GF9DDPW60U9eEInAmzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 117/351] meson: add host_validate build option Date: Thu, 16 Jul 2020 11:55:53 +0200 Message-Id: <30be4d387fdf56c8af179bf0299e6598c644f579.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.23 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 --- configure.ac | 3 --- m4/virt-host-validate.m4 | 43 ---------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-host-validate.m4 diff --git a/configure.ac b/configure.ac index 2f486df2e23..eaa7b57380e 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,6 @@ dnl LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL -LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 @@ -108,7 +107,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL -LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -182,6 +180,5 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL -LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-host-validate.m4 b/m4/virt-host-validate.m4 deleted file mode 100644 index e43cec53665..00000000000 --- a/m4/virt-host-validate.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (C) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . - -AC_DEFUN([LIBVIRT_ARG_HOST_VALIDATE], [ - LIBVIRT_ARG_WITH([HOST_VALIDATE], [build virt-host-validate], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [ - if test "x$with_host_validate" !=3D "xno"; then - if test "x$with_win" =3D "xyes"; then - if test "x$with_host_validate" =3D "xyes"; then - AC_MSG_ERROR([virt-host-validate is not supported on Windows]) - else - with_host_validate=3Dno; - fi - else - with_host_validate=3Dyes; - fi - fi - - if test "x$with_host_validate" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_HOST_VALIDATE], 1, [whether virt-host-valid= ate is built]) - fi - AM_CONDITIONAL([WITH_HOST_VALIDATE], [test "x$with_host_validate" =3D "x= yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_HOST_VALIDATE], [ - LIBVIRT_RESULT([virt-host-validate], [$with_host_validate]) -]) diff --git a/meson.build b/meson.build index c7c5cdd3b40..ece7c90e26d 100644 --- a/meson.build +++ b/meson.build @@ -2080,6 +2080,12 @@ if host_machine.system() =3D=3D 'linux' endif endif =20 +if not get_option('host_validate').disabled() and host_machine.system() != =3D 'windows' + conf.set('WITH_HOST_VALIDATE', 1) +elif get_option('host_validate').enabled() + error('virt-host-validate is not supported on Windows') +endif + =20 # define top include directory =20 @@ -2207,6 +2213,7 @@ misc_summary =3D { 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), + 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index b12d0aa3d7b..80a11df4679 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -94,3 +94,4 @@ option('chrdev_lock_files', type: 'string', value: '', de= scription: 'location fo option('debug_logs', type: 'boolean', value: true, description: 'enable de= bugging output') option('default_editor', type: 'string', value: 'vi', description: 'Editor= to use for interactive commands') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') +option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594893850; cv=none; d=zohomail.com; s=zohoarc; b=bLT5gDTsJ2nLEhuRBZ8yFbHN5G35hL6DV75Fi3ukin5rP4mYwaLOIOMz+UrttDYcekbzDkW32BR4pmivoVoRyoThHTESq1npqegosPhsWqAEiWntfPwmv4jwXOn5zxX3C9SYCw21RQPDvcx/SmCSXdONFbaY7XG7UGlt2qd+EmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893850; 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=uodoYsZsAzN+Yua2AP2KlYK+CE7OOfdnlukf2yEI2P8=; b=QZgYL97noeW3IGo9+D6J58XKF/xrHFalIga3PSDUo3MHXdAlxxktr/fvRs2r/nIL2SlzmTS3ekO4JKDlhfeVk9L8kp3pskJWEfNfKgcpZtSGBV939oD9CE333vOkFU61H68SpHVxPWSitBxqshBVX69nMQPJ19lBORmyNunMOuw= 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 1594893850756623.5315276743005; Thu, 16 Jul 2020 03:04:10 -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-333-FNvXxmiTNQuurkvBI_KZhw-1; Thu, 16 Jul 2020 06:03:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5450855C48; Thu, 16 Jul 2020 10:03:24 +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 84E9172AF4; Thu, 16 Jul 2020 10:03:24 +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 5236E180476A; Thu, 16 Jul 2020 10:03:24 +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 06GA3KLr017126 for ; Thu, 16 Jul 2020 06:03:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id A36512B6E2; Thu, 16 Jul 2020 10:03:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E3A52B6DB for ; Thu, 16 Jul 2020 10:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893849; 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=uodoYsZsAzN+Yua2AP2KlYK+CE7OOfdnlukf2yEI2P8=; b=DCfkcmtTANHeNIMjTiU3y9451kmcgcqq2iErjR1pY0gZYi51wnFBiSd1VrXL7kh5+HPOcJ e+1ydIqNazxKliWqhhV8/ud9Y13yP76Z62Itmg+60fPJl3LUrW7IoQeON9YVWDSqnm9xBJ VdZf6weIyGtCRortCfBoNRTlBEg8N9k= X-MC-Unique: FNvXxmiTNQuurkvBI_KZhw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 118/351] meson: add init_script build option Date: Thu, 16 Jul 2020 11:55:54 +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.15 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 --- configure.ac | 3 --- m4/virt-init-script.m4 | 61 ------------------------------------------ meson.build | 15 +++++++++++ meson_options.txt | 1 + 4 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 m4/virt-init-script.m4 diff --git a/configure.ac b/configure.ac index eaa7b57380e..e73b3f617ca 100644 --- a/configure.ac +++ b/configure.ac @@ -98,14 +98,12 @@ dnl Miscellaneous checks dnl =20 LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG @@ -178,7 +176,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-init-script.m4 b/m4/virt-init-script.m4 deleted file mode 100644 index 676135866f9..00000000000 --- a/m4/virt-init-script.m4 +++ /dev/null @@ -1,61 +0,0 @@ -dnl Init script type -dnl -dnl Copyright (C) 2005-2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_INIT_SCRIPT],[ - LIBVIRT_ARG_WITH([INIT_SCRIPT], - [Style of init script to install: systemd, openrc, ch= eck, none], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_INIT_SCRIPT],[ - AC_MSG_CHECKING([for init script type]) - - if test "$with_init_script" =3D check && test "$cross_compiling" =3D y= es; then - with_init_script=3Dnone - fi - if test "$with_init_script" =3D check && type systemctl >/dev/null 2>&= 1; then - with_init_script=3Dsystemd - fi - if test "$with_init_script" =3D check && type openrc >/dev/null 2>&1; = then - with_init_script=3Dopenrc - fi - if test "$with_init_script" =3D check; then - with_init_script=3Dnone - fi - - AS_CASE([$with_init_script], - [systemd],[], - [openrc],[], - [none],[], - [*],[ - AC_MSG_ERROR([Unknown initscript flavour $with_init_script]) - ] - ) - - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_SYSTEMD], - [test "$with_init_script" =3D "systemd"]) - AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_OPENRC], - [test "$with_init_script" =3D "openrc"]) - - AC_MSG_RESULT($with_init_script) -]) - -AC_DEFUN([LIBVIRT_RESULT_INIT_SCRIPT],[ - LIBVIRT_RESULT([Init script], [$with_init_script]) -]) diff --git a/meson.build b/meson.build index ece7c90e26d..e9186e38cfd 100644 --- a/meson.build +++ b/meson.build @@ -2086,6 +2086,20 @@ elif get_option('host_validate').enabled() error('virt-host-validate is not supported on Windows') endif =20 +if get_option('init_script') =3D=3D 'check' + if meson.is_cross_build() + init_script =3D 'none' + elif find_program('systemctl', required: false).found() + init_script =3D 'systemd' + elif find_program('openrc', required: false).found() + init_script =3D 'openrc' + else + init_script =3D 'none' + endif +else + init_script =3D get_option('init_script') +endif + =20 # define top include directory =20 @@ -2211,6 +2225,7 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), diff --git a/meson_options.txt b/meson_options.txt index 80a11df4679..0e7b6659e2f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -95,3 +95,4 @@ option('debug_logs', type: 'boolean', value: true, descri= ption: 'enable debuggin option('default_editor', type: 'string', value: 'vi', description: 'Editor= to use for interactive commands') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') +option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894059; cv=none; d=zohomail.com; s=zohoarc; b=McL1Sc+7wOu4cPSxVJzS3wjt9K/zrtta8Hw+XBUtiN8o/yVjwwJz6nvmMrIXINL5VBT4tXIQgBHo+sM2gS81bCQc1oUzjv24uJvcHom0lRBC3KSY8HTZegAGdZdC4saAb8I2hUlEqf+BWkWVzaaWGBXd3NZ2rmuSWZwXA7lRA8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894059; 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=XHSwaW3QgpuU9L/0VnZ8bjGMQzGIpPl22D434Fde0YA=; b=n7SI3KVQjHyl9K6m2wt6owNSXqyQOxI4UmnWH95CT2TlCQGCOfIscUAAGwUw3FVcfPxgULnVB4Lxt6dW3fst7TCIDl2kyZPWvzcvftIsnAo/1sQwlaph23V2HHsaghnPczQwqKqRiYcwJkuuxaOCk4Zn0g0upjqlOGG8sYvgE9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894059619268.87838817241106; Thu, 16 Jul 2020 03:07:39 -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-65-jcmnYoBNMsy21vgzJoW8zQ-1; Thu, 16 Jul 2020 06:03:31 -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 C741F10A6; Thu, 16 Jul 2020 10:03:24 +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 A655374F64; Thu, 16 Jul 2020 10:03:24 +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 55F7E180476B; Thu, 16 Jul 2020 10:03:24 +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 06GA3L7V017141 for ; Thu, 16 Jul 2020 06:03:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EE872B6E2; Thu, 16 Jul 2020 10:03:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09C982B6DB for ; Thu, 16 Jul 2020 10:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894058; 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=XHSwaW3QgpuU9L/0VnZ8bjGMQzGIpPl22D434Fde0YA=; b=OBBYfDxjaBedefQQF90yV6OterKgO6PeLZRkdh1+I3t3l7X+jbiSxHn8hW0cquhCk5Z0f7 ZGF0j6XRKMAJBN2lqPNlmXu+NUamTNI72Aw05JpkcpkwzULF40hYxEIZmWs1pga1+m/SuD 0Gk2+RwXOe54s8DRsPH5MmgrVVnIUCM= X-MC-Unique: jcmnYoBNMsy21vgzJoW8zQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 119/351] meson: add login_shell build option Date: Thu, 16 Jul 2020 11:55:55 +0200 Message-Id: <25796d3ffdc65e8425221aee2ae9050d10c247f3.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.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 --- configure.ac | 3 --- m4/virt-login-shell.m4 | 43 ------------------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-login-shell.m4 diff --git a/configure.ac b/configure.ac index e73b3f617ca..cfe0545685f 100644 --- a/configure.ac +++ b/configure.ac @@ -98,13 +98,11 @@ dnl Miscellaneous checks dnl =20 LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -176,6 +174,5 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4 deleted file mode 100644 index 713c488599e..00000000000 --- a/m4/virt-login-shell.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . - -AC_DEFUN([LIBVIRT_ARG_LOGIN_SHELL], [ - LIBVIRT_ARG_WITH([LOGIN_SHELL], [build virt-login-shell], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ - if test "x$with_login_shell" !=3D "xno"; then - if test "x$with_linux" !=3D "xyes"; then - if test "x$with_login_shell" =3D "xyes"; then - AC_MSG_ERROR([virt-login-shell is supported on Linux only]) - else - with_login_shell=3Dno; - fi - else - with_login_shell=3Dyes; - fi - fi - - if test "x$with_login_shell" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell = is built]) - fi - AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LOGIN_SHELL], [ - LIBVIRT_RESULT([virt-login-shell], [$with_login_shell]) -]) diff --git a/meson.build b/meson.build index e9186e38cfd..4c7345c81e3 100644 --- a/meson.build +++ b/meson.build @@ -2100,6 +2100,12 @@ else init_script =3D get_option('init_script') endif =20 +if not get_option('login_shell').disabled() and host_machine.system() =3D= =3D 'linux' + conf.set('WITH_LOGIN_SHELL', 1) +elif get_option('login_shell').enabled() + error('virt-login-shell is supported on Linux only') +endif + =20 # define top include directory =20 @@ -2228,6 +2234,7 @@ misc_summary =3D { 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), + 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') diff --git a/meson_options.txt b/meson_options.txt index 0e7b6659e2f..6a3c98fc697 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -96,3 +96,4 @@ option('default_editor', type: 'string', value: 'vi', des= cription: 'Editor to us option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') +option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594893930; cv=none; d=zohomail.com; s=zohoarc; b=Y3Qu1y92nW0OgfBkSb+ZmYk5gH9u0sO4LsaAI5N6oadxk6gdfPFT0JhPoo6RtTfu1z7NtC0Nf/T8JNXJXQ2yyY9o+q6Swmhq+co2+l4MPq5MUrjkIAi8kffMr5QOv/+nggbd1l6dWUTd+o4pikVx44mV4oPGP783ocN1/2Bv6qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893930; 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=mEHO+tSsjYN0BV+Q+r/sjuwl+UwV0iN+nHSfDPMcS2I=; b=S7iQVXI7jLEPuGnEloW8/uRLpDQKUG/0S83DNmvUsmiHRJ76F7zGCr7jUnYJf27gCqFUJFNOnDz+PHj32DfIdwUjpMWCQTmIRqat89QOO49u4G1ucDVlHFWnjB2OG6zkVdi4yP5KkfqZVnzSZwBnNJlNF6LQd6/8pQ2kajt26rM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893930881687.6825195727746; Thu, 16 Jul 2020 03:05:30 -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-425-RgWH77TnMGiPBTJ7otwF6A-1; Thu, 16 Jul 2020 06:03:32 -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 42336108C; Thu, 16 Jul 2020 10:03:26 +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 1C641610AF; Thu, 16 Jul 2020 10:03:26 +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 DBE109625A; Thu, 16 Jul 2020 10:03:25 +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 06GA3MQh017153 for ; Thu, 16 Jul 2020 06:03:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77E272B6E2; Thu, 16 Jul 2020 10:03:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E67622B6DB for ; Thu, 16 Jul 2020 10:03:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893929; 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=mEHO+tSsjYN0BV+Q+r/sjuwl+UwV0iN+nHSfDPMcS2I=; b=hhKP2cnU+Mkrgy9IXVvcQh7HxApYCVvBP6RW5QDLXtvLp0sEUOlEdvGurDJxkttI6qiCKy po9yyNL3lxoV9ABmSrvYvo6mFCfnuIxa8v/+caA+mRngr0+vplSrSj6LQ3B/NYfr6RiGkP TXkeJjNgJ39RzAMQxt5aqmfYmJZ+PN0= X-MC-Unique: RgWH77TnMGiPBTJ7otwF6A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 120/351] meson: add nss build option Date: Thu, 16 Jul 2020 11:55:56 +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.12 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 --- configure.ac | 3 -- m4/virt-nss.m4 | 86 ----------------------------------------------- meson.build | 41 ++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 42 insertions(+), 89 deletions(-) delete mode 100644 m4/virt-nss.m4 diff --git a/configure.ac b/configure.ac index cfe0545685f..b1faa47f81c 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes= "]) =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_NSS LIBVIRT_ARG_PM_UTILS =20 LIBVIRT_CHECK_NWFILTER @@ -105,7 +104,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG -LIBVIRT_CHECK_NSS =20 =20 dnl Need to test if pkg-config exists @@ -164,7 +162,6 @@ AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 deleted file mode 100644 index b519c36e859..00000000000 --- a/m4/virt-nss.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl The libvirt nsswitch plugin -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NSS],[ - LIBVIRT_ARG_WITH([NSS_PLUGIN], - [enable Name Service Switch plugin for resolving guest - IP addresses], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NSS],[ - bsd_nss=3Dno - fail=3D0 - if test "x$with_nss_plugin" !=3D "xno" ; then - if test "x$with_yajl" !=3D "xyes" ; then - if test "x$with_nss_plugin" =3D "xyes" ; then - AC_MSG_ERROR([Can't build nss plugin without yajl]) - else - with_nss_plugin=3Dno - fi - fi - - if test "x$with_network" !=3D "xyes" ; then - if test "x$with_nss_plugin" =3D "xyes" ; then - AC_MSG_ERROR([Can't build nss plugin without network]) - else - with_nss_plugin=3Dno - fi - fi - - if test "x$with_nss_plugin" !=3D "xno" ; then - AC_CHECK_HEADERS([nss.h], [ - with_nss_plugin=3Dyes - ],[ - if test "x$with_nss_plugin" =3D "xyes" ; then - fail =3D 1 - fi - ]) - - if test $fail =3D 1 ; then - AC_MSG_ERROR([Can't build nss plugin without nss.h]) - fi - fi - - if test "x$with_nss_plugin" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_NSS], 1, [whether nss plugin is enabled]) - - AC_CHECK_TYPE([struct gaih_addrtuple], - [AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1], - [Defined if struct gaih_addrtuple exists in nss.h])], - [], [[#include - ]]) - - AC_CHECK_TYPES([ns_mtab, nss_module_unregister_fn], - [AC_DEFINE([HAVE_BSD_NSS], - [1], - [whether using BSD style NSS]) - bsd_nss=3Dyes - ], - [], - [#include ]) - fi - fi - - AM_CONDITIONAL(WITH_NSS, [test "x$with_nss_plugin" =3D "xyes"]) - AM_CONDITIONAL(WITH_BSD_NSS, [test "x$bsd_nss" =3D "xyes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NSS],[ - LIBVIRT_RESULT([nss], [$with_nss_plugin]) -]) diff --git a/meson.build b/meson.build index 4c7345c81e3..b1bbd0f4351 100644 --- a/meson.build +++ b/meson.build @@ -2106,6 +2106,46 @@ elif get_option('login_shell').enabled() error('virt-login-shell is supported on Linux only') endif =20 +if not get_option('nss').disabled() + use_nss =3D true + if not yajl_dep.found() + if get_option('nss').enabled() + error('Can\'t build nss plugin without yajl') + else + use_nss =3D false + endif + endif + + if use_nss and not conf.has('WITH_NETWORK') + if get_option('nss').enabled() + error('Can\'t build nss plugin without network') + else + use_nss =3D false + endif + endif + + if use_nss and not cc.has_header('nss.h') + if get_option('nss').enabled() + error('Can\'t build nss plugin without nss.h') + else + use_nss =3D false + endif + endif + + if use_nss + conf.set('WITH_NSS', 1) + + if cc.has_type('struct gaih_addrtuple', prefix: '#include ') + conf.set('HAVE_STRUCT_GAIH_ADDRTUPLE', 1) + endif + + if (cc.has_type('ns_mtab', prefix: '#include ') and + cc.has_type('nss_module_unregister_fn', prefix: '#include ')) + conf.set('WITH_BSD_NSS', 1) + endif + endif +endif + =20 # define top include directory =20 @@ -2200,6 +2240,7 @@ libs_summary =3D { 'macvtap': conf.has('WITH_MACVTAP'), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, + 'nss': conf.has('WITH_NSS'), 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index 6a3c98fc697..b7a4fddb8a2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -97,3 +97,4 @@ option('dtrace', type: 'feature', value: 'auto', descript= ion: 'use dtrace for st option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') +option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893994; cv=none; d=zohomail.com; s=zohoarc; b=IEKvvnrlAb+9VDsuLblfgrFkNm9QeaW35wYmsTwUwuIHi3SzBXAMiGbARJKkYVeIy509gDYySZNAWjFb29f2AkIs0qIAPwPz1LVRtSaZoFULLW/IsQvti4lXYMqkLgRDwtVC1inviEyiRcKeNXy8lbxxV+8dXGn0dKDgoy7u3e4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893994; 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=C7W4cxxAsNpbtpBpUn3cVUSPXNIGd4sSHzOJmiyBPOg=; b=B93VKWx87XlDZQuzIpwaOpadlC0i9l8/XhuW5JBzX31qoOAYDEZjNZMctKrjsnIDhk5ACnllaRfmC8elYLQn6ruEAadK1On4OgtbMt4zYdesM3i4LMvgULa58nKCp3wuAFFD3qKEDDcXfEc4kdYcl9NjJDZ6ZtRSgb1mafoENPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893994224528.1143352931791; Thu, 16 Jul 2020 03:06:34 -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-176-zBOqh11HMYiRjSWSvXI8sw-1; Thu, 16 Jul 2020 06:03:34 -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 87019855C58; Thu, 16 Jul 2020 10:03:28 +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 65111610AF; Thu, 16 Jul 2020 10:03:28 +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 366919625D; Thu, 16 Jul 2020 10:03:28 +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 06GA3NjI017161 for ; Thu, 16 Jul 2020 06:03:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 620A42B6DB; Thu, 16 Jul 2020 10:03:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF7642B6E2 for ; Thu, 16 Jul 2020 10:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893993; 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=C7W4cxxAsNpbtpBpUn3cVUSPXNIGd4sSHzOJmiyBPOg=; b=Z7rk/G42e9mBDjmByNzBqOZz+TYmEgcE4pKD1iyv34daNI/ATESMshWlAumLSqVimGq5Ag 6qDoupcQ5SPLQjZ47ZY/vAlhmnjOW/N5VQ2+ampkJdEmBwCIX7c6gmgVQIrK0Zvpde48Ye FG89Ox6nUSjeKS9lmUTEkyAq/vbEjZg= X-MC-Unique: zBOqh11HMYiRjSWSvXI8sw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 121/351] meson: add numad build option Date: Thu, 16 Jul 2020 11:55:57 +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.12 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 --- configure.ac | 3 --- m4/virt-numad.m4 | 58 ----------------------------------------------- meson.build | 11 +++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 m4/virt-numad.m4 diff --git a/configure.ac b/configure.ac index b1faa47f81c..82c166b760d 100644 --- a/configure.ac +++ b/configure.ac @@ -96,12 +96,10 @@ dnl dnl Miscellaneous checks dnl =20 -LIBVIRT_ARG_NUMAD LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 -LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG =20 @@ -170,6 +168,5 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-numad.m4 b/m4/virt-numad.m4 deleted file mode 100644 index 378eba3c97d..00000000000 --- a/m4/virt-numad.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The numad binary check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NUMAD], [ - LIBVIRT_ARG_WITH([NUMAD], [use numad to manage CPU placement dynamically= ], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NUMAD], [ - AC_REQUIRE([LIBVIRT_CHECK_NUMACTL]) - - if test "$with_numad" !=3D "no" ; then - fail=3D0 - - AC_PATH_PROG([NUMAD], [numad], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_numad" =3D "check"; then - test "$with_numactl" =3D "yes" || fail=3D1 - if test -z "$NUMAD" || test $fail =3D 1; then - with_numad=3D"no" - else - with_numad=3D"yes" - fi - else - test -z "$NUMAD" && - AC_MSG_ERROR([You must install numad package to manage CPU and mem= ory placement dynamically]) - - test "$with_numactl" =3D "yes" || fail=3D1 - test $fail =3D 1 && - AC_MSG_ERROR([You must install the numactl development package in = order to compile and run libvirt]) - fi - fi - if test "$with_numad" =3D "yes"; then - AC_DEFINE_UNQUOTED([HAVE_NUMAD], 1, [whether numad is available]) - AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad = program]) - fi - AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NUMAD], [ - LIBVIRT_RESULT([numad], [$with_numad]) -]) diff --git a/meson.build b/meson.build index b1bbd0f4351..f09538bdf13 100644 --- a/meson.build +++ b/meson.build @@ -2146,6 +2146,16 @@ if not get_option('nss').disabled() endif endif =20 +if not get_option('numad').disabled() and numactl_dep.found() + numad_prog =3D find_program('numad', required: get_option('numad'), dirs= : libvirt_sbin_path) + if numad_prog.found() + conf.set('HAVE_NUMAD', 1) + conf.set_quoted('NUMAD', numad_prog.path()) + endif +elif get_option('numad').enabled() + error('You must have numactl enabled for numad support.') +endif + =20 # define top include directory =20 @@ -2272,6 +2282,7 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'numad': conf.has('HAVE_NUMAD'), 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), diff --git a/meson_options.txt b/meson_options.txt index b7a4fddb8a2..16acb4f3c50 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -98,3 +98,4 @@ option('host_validate', type: 'feature', value: 'auto', d= escription: 'build virt option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') +option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894044; cv=none; d=zohomail.com; s=zohoarc; b=CvYGf856PrffspdojFfPvblSUTUKKXaIyEUm9S3TPYdTf750fd+rpQxYeObhQO0fEvZFZcqmWToBZZ9T//6T9Il8RCcVZS23wY7c6Z4XGovWi4ctbn0j/KSqQm8u87+6TzD8tLLq+MiALHEfLfUcJaJ6C4+U4AmgLt25oLxXqno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894044; 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=3hHr2czbrSOyJgZXAMWRTOvSe1us/l0lqFNY4Dfx0uc=; b=WsyN3jfYBqojU9StAt6IDy0w6xr9/uI/9q7AHLdr6ZSn8sl+yu9Sw4QnbVovNofZK93Bk2FPqbFB16EeZMaKSCSUD9fI+dEqMiTnc+d8eJqWqPIzaClEuUGVlb4m+LK2NeLb3KKqD9DbLv0F6q4drmrFH+RAlXpAPN1S40LGbV0= 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 1594894044515718.1868839610627; Thu, 16 Jul 2020 03:07:24 -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-435-XHX6_KsQPjuajE2A9D1KwA-1; Thu, 16 Jul 2020 06:07:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57BE81800D42; Thu, 16 Jul 2020 10:07:14 +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 CB68D2DE86; Thu, 16 Jul 2020 10:07:13 +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 5D36A96232; Thu, 16 Jul 2020 10:07:11 +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 06GA3OXU017175 for ; Thu, 16 Jul 2020 06:03:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CACD2B6DB; Thu, 16 Jul 2020 10:03:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAB4B2E023 for ; Thu, 16 Jul 2020 10:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894043; 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=3hHr2czbrSOyJgZXAMWRTOvSe1us/l0lqFNY4Dfx0uc=; b=VJx5nwf/eaxxx8l7+Iv/1gGIyU38kbq7RlAHFz3Ds2UqBh4fg/vT8AtKuP6bQ9WQw+VY4H 974G/PYej3BPdp2JQAmy9WfmKFueRhYYAwV2iH4CBhy9hK9RQ+OsAqW8OCWDqZZT6Ioc8M sct+GS14RK9cSYP+BcNUhUasTm9a9b0= X-MC-Unique: XHX6_KsQPjuajE2A9D1KwA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 122/351] meson: add nwfilter build check Date: Thu, 16 Jul 2020 11:55:58 +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.84 on 10.5.11.23 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 --- configure.ac | 1 - m4/virt-nwfilter.m4 | 32 -------------------------------- meson.build | 6 ++++++ 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-nwfilter.m4 diff --git a/configure.ac b/configure.ac index 82c166b760d..90868fdb351 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes= "]) =20 LIBVIRT_ARG_PM_UTILS =20 -LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS =20 =20 diff --git a/m4/virt-nwfilter.m4 b/m4/virt-nwfilter.m4 deleted file mode 100644 index 759059cc8f2..00000000000 --- a/m4/virt-nwfilter.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The nwfilter support -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_NWFILTER], [ - dnl nwfilter should only be compiled for linux, and only if the - dnl libvirt daemon is also being compiled - - with_nwfilter=3Dyes - if test "$with_libvirtd" =3D "no" || test "$with_linux" !=3D "yes"; then - with_nwfilter=3Dno - fi - if test "$with_nwfilter" =3D "yes" ; then - AC_DEFINE([WITH_NWFILTER], 1, [whether local network filter management= driver is available]) - fi - AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" =3D "yes"]) -]) diff --git a/meson.build b/meson.build index f09538bdf13..24e42b0c421 100644 --- a/meson.build +++ b/meson.build @@ -2156,6 +2156,12 @@ elif get_option('numad').enabled() error('You must have numactl enabled for numad support.') endif =20 +# nwfilter should only be compiled for linux, and only if the +# libvirt daemon is also being compiled +if conf.has('WITH_LIBVIRTD') and host_machine.system() =3D=3D 'linux' + conf.set('WITH_NWFILTER', 1) +endif + =20 # define top include directory =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894048; cv=none; d=zohomail.com; s=zohoarc; b=TndQPzxe7YhMprc1H3/rndnJtTdDSnNAUH7Ok5bMnRbRainojsDvO+FCCIzdPjpJr09xNOKhwU1boAYg+brXVUqV51lbfc2srAqAYR5fqhYERMGkcHdOvdy9k3K/ShORw5ShiwKrov8i6Cq9bgF0o2Wo+beyresVggWVAVDHEns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894048; 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=Ir36anVKOmireI+l5cNVyGElfBizIMMbymxwrgRX5RA=; b=bsJOzPnVxxvmA1sTB60XW5UJIF+BX0PquDVuhjmMB7/ZpHth5+dwByA5OosmlYI0abEBLYXSMzxvAlN1GJhbhy6U+WA+CFoMHzzvCEHxYABqdS5QCjZO8MDrokrEFDLiaoA+kDXn61kIIgJK0tzyq2/6vCRt1WlE1o9xCsI/nWg= 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 1594894048649916.767134581634; Thu, 16 Jul 2020 03:07:28 -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-435-1wnaHNPHNPiCKmEvYNWrvQ-1; Thu, 16 Jul 2020 06:07:21 -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 7D030800400; Thu, 16 Jul 2020 10:07:15 +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 5A4A060C47; Thu, 16 Jul 2020 10:07:15 +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 0BE191809554; Thu, 16 Jul 2020 10:07:15 +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 06GA3PIr017186 for ; Thu, 16 Jul 2020 06:03:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 357482B6DB; Thu, 16 Jul 2020 10:03:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A45992DE6B for ; Thu, 16 Jul 2020 10:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894046; 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=Ir36anVKOmireI+l5cNVyGElfBizIMMbymxwrgRX5RA=; b=i0DtGpdVmaHsJD82cv8JSgHUTM47eBsLauPn99p05WYHlyFn7IbmYNofxJw2oERNT6t+HZ FuC1lq7sFyA5SYSdKm+k+WvSZdlgbwmUn8e34B8olML7iTGFoY8c9nXrh4BPaRPjMuilwV SatFh4PKCeQgARibpS7cWd+4PpiKASE= X-MC-Unique: 1wnaHNPHNPiCKmEvYNWrvQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 123/351] meson: add pm_utils build option Date: Thu, 16 Jul 2020 11:55:59 +0200 Message-Id: <3d33789e93281c6fa2602a9420cb0ab1e7ee2953.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 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 --- configure.ac | 10 ---------- m4/virt-pm-utils.m4 | 45 --------------------------------------------- meson.build | 12 ++++++++++++ meson_options.txt | 1 + 4 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-pm-utils.m4 diff --git a/configure.ac b/configure.ac index 90868fdb351..f5b567806e3 100644 --- a/configure.ac +++ b/configure.ac @@ -77,12 +77,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "ye= s"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) =20 -# Check for compiler and library settings. - -LIBVIRT_ARG_PM_UTILS - -LIBVIRT_CHECK_PM_UTILS - =20 dnl dnl in case someone want to build static binaries @@ -157,10 +151,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Libraries]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_PM_UTILS -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) LIBVIRT_WIN_RESULT_WINDRES diff --git a/m4/virt-pm-utils.m4 b/m4/virt-pm-utils.m4 deleted file mode 100644 index 02bf41e627b..00000000000 --- a/m4/virt-pm-utils.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl The pm-utils support check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_PM_UTILS], [ - LIBVIRT_ARG_WITH([PM_UTILS], [use pm-utils for power management], [check= ]) -]) - -AC_DEFUN([LIBVIRT_CHECK_PM_UTILS], [ - AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - AC_REQUIRE([LIBVIRT_CHECK_INIT_SCRIPT]) - - if test "$with_pm_utils" =3D "check"; then - with_pm_utils=3Dyes - if test "$with_dbus" =3D "yes"; then - if test "$init_systemd" =3D "yes"; then - with_pm_utils=3Dno - fi - fi - fi - - if test "$with_pm_utils" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) - fi - AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_PM_UTILS], [ - LIBVIRT_RESULT_LIB([PM_UTILS]) -]) diff --git a/meson.build b/meson.build index 24e42b0c421..e7efcb82b9b 100644 --- a/meson.build +++ b/meson.build @@ -2162,6 +2162,17 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system= () =3D=3D 'linux' conf.set('WITH_NWFILTER', 1) endif =20 +if not get_option('pm_utils').disabled() + use_pm_utils =3D true + if dbus_dep.found() and init_script =3D=3D 'systemd' + use_pm_utils =3D false + endif + + if use_pm_utils + conf.set('WITH_PM_UTILS', 1) + endif +endif + =20 # define top include directory =20 @@ -2260,6 +2271,7 @@ libs_summary =3D { 'numaclt': numactl_dep.found(), 'openwsman': openwsman_dep.found(), 'pciaccess': pciaccess_dep.found(), + 'pm_utils': conf.has('WITH_PM_UTILS'), 'polkit': conf.has('WITH_POLKIT'), 'rbd': rbd_dep.found(), 'readline': readline_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index 16acb4f3c50..7d18f80d61f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -99,3 +99,4 @@ option('init_script', type: 'combo', choices: ['systemd',= 'openrc', 'check', 'no option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') +option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-ut= ils for power management') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894637; cv=none; d=zohomail.com; s=zohoarc; b=Kfj/N16vha2psYtjueuQevD/rtZ6nthnEDQpRckbuZ/Nql12pq1skWSVCE4/pw5nA26bVoAiYQdgx6+Heaj3Gl7vftF4nHaDYRiC62gPw31j0dsHSencX6CYWrCh08Xe601z7vC8DBzXIH8gZaFc9rivxLL09Pq7NKJNGU89tJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894637; 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=uTivqm6AsLwA94ubfgtQSvX6doWYkTd+XlzE4hyNbxE=; b=LSSncM7KoEVXYaqxd36DKAwGvP6uY6Bm/vvpSmc8DlsOR7b3dr3qDKda4t1lEUjPPLpt+a8qFrV3QW0tJy40AFVdwE9P2dAjSbzzckDAKWOCvUBtWyOZCI9hUEsfUy1pKhoXm1bGs2rb6//eE9w+gKgl/aoJyqOnATYs/I/wyBw= 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 1594894637809485.5962676264878; Thu, 16 Jul 2020 03:17:17 -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-498-Apu3JXulOoy034w3_S7pVg-1; Thu, 16 Jul 2020 06:08:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7C0D8015FB; Thu, 16 Jul 2020 10:08:11 +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 C8DC172E4A; Thu, 16 Jul 2020 10:08:11 +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 95E9096243; Thu, 16 Jul 2020 10:08:11 +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 06GA3QeI017196 for ; Thu, 16 Jul 2020 06:03:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E6982B6E2; Thu, 16 Jul 2020 10:03:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D8882B6DB for ; Thu, 16 Jul 2020 10:03:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894636; 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=uTivqm6AsLwA94ubfgtQSvX6doWYkTd+XlzE4hyNbxE=; b=ARLPCT+QILPVfUc7U+Iwb1GAvBMaA2nmYf3L9tGxx2wofGa9ndsjq1lHEoYsJg4mArD3Kj LTHM4i1hY8AvmBrpymc5QFciuR4EIN592E8d5giMYk/bKqduzE+86+WA7EAOyxxygX0bvi GkmnVShFxlMzPMZyVAImogvRCW4rmUY= X-MC-Unique: Apu3JXulOoy034w3_S7pVg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 124/351] meson: add sysctl_config build option Date: Thu, 16 Jul 2020 11:56:00 +0200 Message-Id: <6b35283fd1ca20ef3efa5dbb109c025e83dedf9c.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.11 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 --- configure.ac | 2 -- m4/virt-sysctl.m4 | 43 ------------------------------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-sysctl.m4 diff --git a/configure.ac b/configure.ac index f5b567806e3..00b547b1a75 100644 --- a/configure.ac +++ b/configure.ac @@ -90,11 +90,9 @@ dnl Miscellaneous checks dnl =20 LIBVIRT_ARG_TLS_PRIORITY -LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 LIBVIRT_CHECK_TLS_PRIORITY -LIBVIRT_CHECK_SYSCTL_CONFIG =20 =20 dnl Need to test if pkg-config exists diff --git a/m4/virt-sysctl.m4 b/m4/virt-sysctl.m4 deleted file mode 100644 index 3a59e3e6e66..00000000000 --- a/m4/virt-sysctl.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl sysctl config check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_SYSCTL_CONFIG], [ - LIBVIRT_ARG_WITH([SYSCTL], [Whether to install sysctl configs], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SYSCTL_CONFIG], [ - AC_MSG_CHECKING([for whether to install sysctl config]) - if test "$with_sysctl" =3D "yes" || test "$with_sysctl" =3D "check" - then - case $host in - *-*-linux*) - with_sysctl=3Dyes - ;; - *) - if test "$with_sysctl" =3D "yes"; then - AC_MSG_ERROR([No sysctl configuration supported for $host]) - else - with_sysctl=3Dno - fi - ;; - esac - fi - AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" =3D "yes") - AC_MSG_RESULT($with_sysctl) -]) diff --git a/meson.build b/meson.build index e7efcb82b9b..7de11d8bf38 100644 --- a/meson.build +++ b/meson.build @@ -2173,6 +2173,12 @@ if not get_option('pm_utils').disabled() endif endif =20 +if not get_option('sysctl_config').disabled() and host_machine.system() = =3D=3D 'linux' + conf.set('WITH_SYSCTL', 1) +elif get_option('sysctl_config').enabled() + error('sysctl configuration is supported only on linux') +endif + =20 # define top include directory =20 diff --git a/meson_options.txt b/meson_options.txt index 7d18f80d61f..9da3455e788 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -100,3 +100,4 @@ option('login_shell', type: 'feature', value: 'auto', d= escription: 'build virt-l option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-ut= ils for power management') +option('sysctl_config', type: 'feature', value: 'auto', description: 'Whet= her to install sysctl configs') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894051; cv=none; d=zohomail.com; s=zohoarc; b=C475KSkquhq1ld7bJ4788TwmW81tsGQz0rGkWi8S7yuuLwerl0fr/z5jijZ1akzS3DYbIK8QNuEtj/e1RJPNkSp+NDk07UYs5DstfwmBM2K16RV8sPhrsE9xh/Yg3iP4OIGSUEBOhwYyMb7G1oLNK9bTBrfK2xrmVv2QMw8OXlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894051; 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=pjtNBFGj5KvYL8pGjroJ1DpPaQN4ypAVC36RLJE3HFM=; b=Tdrtuci27VMmE/dEP4C0AMmzrQvVzst11iHiyaE1Nv6Tie49PEr8FcP5h6RjSh4eqP+95Hm9X7UrX05AypB6QmstZC4tp9xX6iClwLqOwK0fe8C9mBCrLu0Irqc3t41Jg76cBi+9zlzxI1jA8VOHcJzzS+qF5hpnEcdmlKqAZ+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894051083623.976688560532; Thu, 16 Jul 2020 03:07:31 -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-124-XVwP266XOrOjGHLeBTUgdg-1; Thu, 16 Jul 2020 06:07:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2773A801E6A; Thu, 16 Jul 2020 10:07:22 +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 0980F72ADA; Thu, 16 Jul 2020 10:07:22 +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 CD1C51809563; Thu, 16 Jul 2020 10:07:21 +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 06GA3R3c017209 for ; Thu, 16 Jul 2020 06:03:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07DC52B6E2; Thu, 16 Jul 2020 10:03:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76C882B6DB for ; Thu, 16 Jul 2020 10:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894049; 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=pjtNBFGj5KvYL8pGjroJ1DpPaQN4ypAVC36RLJE3HFM=; b=AOBuz6NXrmzy159/wNAMJSRCzQAOQoWYc9k51uIHuTa98qQTN4F/L7c0qCQQawgHVlDLgS x7ZU5wCqqa/MwizRScnM+6nvOK//ScdAxvElmqwz+Ge8z05iucEfUmk49Rhiv29RCufSnE Q/ySSlak0GNxa3ZQkVrJIcSR9Qjn0cA= X-MC-Unique: XVwP266XOrOjGHLeBTUgdg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 125/351] meson: add tls_priority option Date: Thu, 16 Jul 2020 11:56:01 +0200 Message-Id: <192a3191feb7e2f5592ab7e1831e8de228dd75dd.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.15 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 --- configure.ac | 13 ------------- m4/virt-tls-priority.m4 | 33 --------------------------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-tls-priority.m4 diff --git a/configure.ac b/configure.ac index 00b547b1a75..5f931071b06 100644 --- a/configure.ac +++ b/configure.ac @@ -85,15 +85,6 @@ dnl STATIC_BINARIES=3D AC_SUBST([STATIC_BINARIES]) =20 -dnl -dnl Miscellaneous checks -dnl - -LIBVIRT_ARG_TLS_PRIORITY - - -LIBVIRT_CHECK_TLS_PRIORITY - =20 dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG @@ -153,7 +144,3 @@ AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Miscellaneous]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_TLS_PRIORITY -AC_MSG_NOTICE([]) diff --git a/m4/virt-tls-priority.m4 b/m4/virt-tls-priority.m4 deleted file mode 100644 index 44d9f68f426..00000000000 --- a/m4/virt-tls-priority.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The TLS priority check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_TLS_PRIORITY], [ - LIBVIRT_ARG_WITH([TLS_PRIORITY], - [set the default TLS session priority string], - [NORMAL]) -]) - -AC_DEFUN([LIBVIRT_CHECK_TLS_PRIORITY], [ - AC_DEFINE_UNQUOTED([TLS_PRIORITY], ["$with_tls_priority"], - [TLS default priority string]) -]) - -AC_DEFUN([LIBVIRT_RESULT_TLS_PRIORITY], [ - LIBVIRT_RESULT([ TLS priority], [$with_tls_priority]) -]) diff --git a/meson.build b/meson.build index 7de11d8bf38..9e0cbbad6d7 100644 --- a/meson.build +++ b/meson.build @@ -2179,6 +2179,8 @@ elif get_option('sysctl_config').enabled() error('sysctl configuration is supported only on linux') endif =20 +conf.set_quoted('TLS_PRIORITY', get_option('tls_priority')) + =20 # define top include directory =20 @@ -2312,6 +2314,7 @@ misc_summary =3D { 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), + 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index 9da3455e788..dbbacf7e8ff 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -101,3 +101,4 @@ option('nss', type: 'feature', value: 'auto', descripti= on: 'enable Name Service option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-ut= ils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whet= her to install sysctl configs') +option('tls_priority', type: 'string', value: 'NORMAL', description: 'set = the default TLS session priority string') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894054; cv=none; d=zohomail.com; s=zohoarc; b=QktPjrgmUfTlflPZIwaOECvUCUPIhqa3kei0U3Tgf1mauNcXcfotQiK1NyIrkHJbQplTbn1dgizHKIYU21ChiJLQrnvelI3PDILhl8kzkVQb3M9nU41FlG+RmSliMA4wB42uJG+AzALTRchGGAFrLmK8nMSbDPLxg56XY5rIONQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894054; 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=hL9ISwDFJVKS9HRaGhIwKWTUf3HWnhbbnRrKIZ5bFxs=; b=hHfaqgHdNM/bbAZ0ILkqxVwsISBDjgoAKju//gmtfrqnDWiJK7u3L2JbOX8JA1rfcrrHxfQJV2I5uJsQdbn9RjxWnfdD0H2dlEKYk5ZraPOXnvh3xnMsk4cGwfDVHiGynYEfujos9FiIctCGtxE3da213MES9X1ZyS2xtLAETS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894054912907.0055111609449; Thu, 16 Jul 2020 03:07:34 -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-448-1vffusSaPnaeDpFawPjtxg-1; Thu, 16 Jul 2020 06:07:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4793800400; Thu, 16 Jul 2020 10:07:25 +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 6D91272ADF; Thu, 16 Jul 2020 10:07:24 +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 3F4729623C; Thu, 16 Jul 2020 10:07:24 +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 06GA3RPs017223 for ; Thu, 16 Jul 2020 06:03:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id E57CB2DE6B; Thu, 16 Jul 2020 10:03:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F9312B6DB for ; Thu, 16 Jul 2020 10:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894053; 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=hL9ISwDFJVKS9HRaGhIwKWTUf3HWnhbbnRrKIZ5bFxs=; b=OOTj0vQ7+szGRvRmLePqFgqawb3X7zBqgCzPlKNmwHvLvAH4ppbrVibT+scTKMvlMZAG7G EtJaYIaNsu5u+8SAyENvXFjUWGdZMJ35NuW+JhFYSc9SXzeVdBQDkie3A6Y2pTwqL3HDxG yi1EK1bnYmSs9FnZV1WYoWjuWRjT7DI= X-MC-Unique: 1vffusSaPnaeDpFawPjtxg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 126/351] meson: add runutf8 env vars and meson-python.sh script Date: Thu, 16 Jul 2020 11:56:02 +0200 Message-Id: <15f31fad6b6b565b963d3cc85f191e77140f1944.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.15 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" With meson we have to use both env vars and wrapper script to run python with correct LANG settings. run_command() and test() have 'env' attribute so we can use it, but custom_target() doesn't support that attribute. Environment variables cannot by configured using 'command' because meson checks if the first item in the list is executable so we have to use a wrapper. Signed-off-by: Pavel Hrdina --- configure.ac | 7 ------- meson.build | 7 +++++++ scripts/meson-python.sh | 3 +++ scripts/meson.build | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100755 scripts/meson-python.sh diff --git a/configure.ac b/configure.ac index 5f931071b06..e6c7e50bb14 100644 --- a/configure.ac +++ b/configure.ac @@ -90,13 +90,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 =20 -dnl Python3 < 3.7 treats the C locale as 7-bit only. -dnl We must force env vars so it treats it as UTF-8 -dnl regardless of the user's locale. -RUNUTF8=3D"LC_ALL=3D LANG=3DC LC_CTYPE=3Den_US.UTF-8" -AC_SUBST(RUNUTF8) - - dnl MinGW checks LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES diff --git a/meson.build b/meson.build index 9e0cbbad6d7..48db9aa0d0a 100644 --- a/meson.build +++ b/meson.build @@ -2182,6 +2182,13 @@ endif conf.set_quoted('TLS_PRIORITY', get_option('tls_priority')) =20 =20 +# Various definitions + +# Python3 < 3.7 treats the C locale as 7-bit only. We must force env vars = so +# it treats it as UTF-8 regardless of the user's locale. +runutf8 =3D [ 'LC_ALL=3D', 'LANG=3DC', 'LC_CTYPE=3Den_US.UTF-8' ] + + # define top include directory =20 top_inc_dir =3D include_directories('.') diff --git a/scripts/meson-python.sh b/scripts/meson-python.sh new file mode 100755 index 00000000000..9ba670fc1a5 --- /dev/null +++ b/scripts/meson-python.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +LC_ALL=3D LANG=3DC LC_CTYPE=3Den_US.UTF-8 "$@" diff --git a/scripts/meson.build b/scripts/meson.build index 941e40a0917..5d3f0af4793 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -18,6 +18,7 @@ scripts =3D [ 'header-ifdef.py', 'hvsupport.py', 'hyperv_wmi_generator.py', + 'meson-python.sh', 'mock-noinline.py', 'prohibit-duplicate-header.py', 'test-wrap-argv.py', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894052; cv=none; d=zohomail.com; s=zohoarc; b=AALulHZki0mQ6+7JH67/UIlHg2TS5JsythKXwYOwjdaJU/SOATwWxNlDJ560pYLgmVkLmhcNJrYTlDOIElKywK8I+PmBumLHcn1VueFgHw0pxvc1UIqcs+1bxTGn+OkzfL9nkIwlenY6BtkqLa+LTDDHIfif+6s9UK62eMp2xDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894052; 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=xQTppeqJMmdDBalIjzhKii9b6zyvjPAOqK1SHU3Lz+4=; b=gY0yac2TGI1w4YkkOzcbo6hc3OZ43zi8ZnAMr8ifJcceMpbEWzbe4YtqrAUZFFWxLfXphRiGs5WKHuNavSBuWHIJR/JanndEgHmZSE3vzu7SiCgFMesuXVwYEBdL0BTbAqdA1AhkuDZDA3K/AaMAkOqBTMY6dpNRJjpwmjSDxlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894052410412.7598348043997; Thu, 16 Jul 2020 03:07:32 -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-4DzX1o6jNHG4tRh0o-O1-g-1; Thu, 16 Jul 2020 06:07:28 -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 42F121091; Thu, 16 Jul 2020 10:07:23 +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 1E2921001B07; Thu, 16 Jul 2020 10:07:23 +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 CEE9596237; Thu, 16 Jul 2020 10:07:21 +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 06GA3SE4017228 for ; Thu, 16 Jul 2020 06:03:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0B4A2B6DB; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A5562DE72 for ; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894051; 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=xQTppeqJMmdDBalIjzhKii9b6zyvjPAOqK1SHU3Lz+4=; b=SHx5dO/2tYi1k64f6JXAK2kD7iHAg59KrNG7DiomzD2V6XRY7I/BF//mknpLHWHaoffQaO YszV+EIWT+EMnSLq29+X3lafRX5ybfLmQctZo3RQgEym5PCKT7v4AAZmV/OL9N9Spb06fM N44uzkiqZ84WlC1mQ30ryjv4bXs7MNk= X-MC-Unique: 4DzX1o6jNHG4tRh0o-O1-g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 127/351] meson: introduce src directory Date: Thu, 16 Jul 2020 11:56:03 +0200 Message-Id: <3fdc10cdc95032455a177050d6b89ed7b703b066.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 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" WARN_FLAGS are not relevant for meson as all warning flags are set to the whole project using add_project_arguments(). Signed-off-by: Pavel Hrdina --- meson.build | 2 ++ src/Makefile.am | 19 +------------------ src/meson.build | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 src/meson.build diff --git a/meson.build b/meson.build index 48db9aa0d0a..457d752ffb5 100644 --- a/meson.build +++ b/meson.build @@ -2200,6 +2200,8 @@ subdir('scripts') =20 subdir('include') =20 +subdir('src') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/src/Makefile.am b/src/Makefile.am index 6cf23bb0bdf..7d0e7b2e96c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,28 +19,11 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. -AM_CPPFLAGS =3D -I$(top_srcdir) \ - -I../include \ - -I$(top_srcdir)/include \ +AM_CPPFLAGS =3D \ -I$(srcdir)/util \ -I./util \ - -DIN_LIBVIRT \ - -Dabs_top_builddir=3D"\"$(abs_top_builddir)\"" \ - -Dabs_top_srcdir=3D"\"$(abs_top_srcdir)\"" \ $(NULL) =20 -AM_CFLAGS =3D $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(WARN_CFLAGS) \ - $(WIN32_EXTRA_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) -AM_LDFLAGS =3D $(DRIVER_MODULES_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(RELRO_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(MINGW_EXTRA_LDFLAGS) \ - $(NULL) AM_LDFLAGS_MOD =3D \ -module \ -avoid-version \ diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 00000000000..0f5b83744fd --- /dev/null +++ b/src/meson.build @@ -0,0 +1,19 @@ +src_inc_dir =3D include_directories('.') + +src_dep =3D declare_dependency( + compile_args: [ + '-DIN_LIBVIRT', + '-Dabs_top_builddir=3D"@0@"'.format(meson.build_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + ] + coverage_flags + win32_flags, + dependencies: [ + glib_dep, + libxml_dep, + ], + include_directories: [ + libvirt_inc, + src_inc_dir, + top_inc_dir, + ], + link_args: libvirt_relro + libvirt_no_indirect + coverage_flags + driver= _modules_flags + win32_link_flags, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894879; cv=none; d=zohomail.com; s=zohoarc; b=fTPyiZIj7JvKRmgBdou52Y4WTRx8m6p4OJPsWkDuzWqKOKScWbCncGPF7i8GU6Mg3EeytYOPv/yiRsmYmgvWBA6rD9FjyEu2f8HxM+y4kFkkIapEJw3ecwOYxyIDitMc/dGmaIJaDxJLW3v1TZIl+p8hOt4KvvNMPIffxO2A8yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894879; 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=KPMzK62+qazegot34ABs07DyGoTzQAlNSeLFOtAhMV4=; b=WEnsR75NwENiUFUMefBOgx2umL7pZwCiY8WbJvdH0rMyP18h7ph3CeDzNtx2mNEXVU19gkKhtLsTQp7ZNgsbf7uiOW1dGUZksY1ENvinlllm36WjZzRbgZOaEhxTVFyrqfPXYubpXGEFB19o8aVfLf5OQw23OkmHNPtuNBtQeKw= 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 1594894879150368.8356805396585; Thu, 16 Jul 2020 03:21:19 -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-272-QCX4KZzFNkCTyfMmEdIE4Q-1; Thu, 16 Jul 2020 06:07:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93F881888AA2; Thu, 16 Jul 2020 10:07:25 +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 6137C72AEC; Thu, 16 Jul 2020 10:07:25 +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 2ED451800CAF; Thu, 16 Jul 2020 10:07:25 +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 06GA3Tqm017233 for ; Thu, 16 Jul 2020 06:03:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id B935B2B6DC; Thu, 16 Jul 2020 10:03:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33A2F2B6DB for ; Thu, 16 Jul 2020 10:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894878; 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=KPMzK62+qazegot34ABs07DyGoTzQAlNSeLFOtAhMV4=; b=TEIlKLw85OK2J1bNRY9C0fhWWzIb6wu8P83hwlhnsS1gULJVTu17tHZQzaiT5dHtqIm4rA xSZfVpTza2v3lXGkoCJL++zVhmcvfC06+e4FQR6383fB3NufPm40onROrWDCNVqnwHww14 P9OYJfzb+bL6WCoTaMYaw2NCfj1rTDY= X-MC-Unique: QCX4KZzFNkCTyfMmEdIE4Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 128/351] meson: src: define secdriver_dep Date: Thu, 16 Jul 2020 11:56:04 +0200 Message-Id: <351fadef45fdaefaa8061d5381efbf032f46191b.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.15 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/Makefile.am | 12 ------------ src/meson.build | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7d0e7b2e96c..4eed047926d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,18 +105,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am =20 =20 -SECDRIVER_CFLAGS =3D -SECDRIVER_LIBS =3D -if WITH_SECDRIVER_SELINUX -SECDRIVER_CFLAGS +=3D $(SELINUX_CFLAGS) -SECDRIVER_LIBS +=3D $(SELINUX_LIBS) -endif WITH_SECDRIVER_SELINUX -if WITH_SECDRIVER_APPARMOR -SECDRIVER_CFLAGS +=3D $(APPARMOR_CFLAGS) -SECDRIVER_LIBS +=3D $(APPARMOR_LIBS) -endif WITH_SECDRIVER_APPARMOR - - moddir =3D $(libdir)/libvirt/connection-driver =20 confdir =3D $(sysconfdir)/libvirt diff --git a/src/meson.build b/src/meson.build index 0f5b83744fd..453691dc902 100644 --- a/src/meson.build +++ b/src/meson.build @@ -17,3 +17,14 @@ src_dep =3D declare_dependency( ], link_args: libvirt_relro + libvirt_no_indirect + coverage_flags + driver= _modules_flags + win32_link_flags, ) + + +# define secdriver_dep + +secdriver_dep =3D [] +if conf.has('WITH_SECDRIVER_SELINUX') + secdriver_dep +=3D selinux_dep +endif +if conf.has('WITH_SECDRIVER_APPARMOR') + secdriver_dep +=3D apparmor_dep +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894104; cv=none; d=zohomail.com; s=zohoarc; b=O71VKu4SDVUt7wisT3Lg+D6HTZ12tC67XOQTCoHem3c9bWTHvdVsSf/hmNVkfTm2ZB8tkhU9eHjseHAVhq3O4iR98sP3SeHYpj2TOtr7TD8aRsIKrOMBJOCcu6n/gB3QLXZ5eH0+Xm3VbCG7j8DzVvxDtIok3HS0zqSrQPDpPZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894104; 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=mjlT9sOw+4OE3ACe+3TtoNlYvGW2FSRLpzGxVhmBdMo=; b=DHtFUrz4XkMl+Qnp42hmqyYomOT3kLHHP4vM+gFtvaq4Z7nL3PwEuFblQxDIl7ocbguZoo8smeKSLaxb3PgWdKJvpkkUVvy8/b5XRgzumROqFK6K0e0qK8l2iiBrso6jDaxvfjGf9Qtt4q8MCkr6Hqfqul4R/UhK8W2lZ3kr3a0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894104220659.9088004635563; Thu, 16 Jul 2020 03:08:24 -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-494-Qg3m1nBdO7iTWjWeHizz7g-1; Thu, 16 Jul 2020 06:08:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4795D100AA22; Thu, 16 Jul 2020 10:08:14 +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 28FA1724A9; Thu, 16 Jul 2020 10:08:14 +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 EC56E730C3; Thu, 16 Jul 2020 10:08:13 +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 06GA3UtW017243 for ; Thu, 16 Jul 2020 06:03:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id A2E1E2B6DC; Thu, 16 Jul 2020 10:03:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DD122B6DB for ; Thu, 16 Jul 2020 10:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894103; 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=mjlT9sOw+4OE3ACe+3TtoNlYvGW2FSRLpzGxVhmBdMo=; b=Wy7zUnAhnoqjVYdCKKk30NB/sYhDwV36sZi/Sem3nwdJKLH4Gz8v/+aBdPG2ba3pKeFlcC TrOg8rK+9yJYicg5zK3cPRjkSweNehfusM7fv3POa/7l21qbQUwGne6mlVfAmEAC08butZ UsYHTOl95aTu/Lk/jI45eFRXXiAY5To= X-MC-Unique: Qg3m1nBdO7iTWjWeHizz7g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 129/351] meson: src: build dtrace files Date: Thu, 16 Jul 2020 11:56:05 +0200 Message-Id: <3c277412c1bdf27d3f25f96d8693299cdaa2effb.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.11 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/Makefile.am | 24 +----------------------- src/meson.build | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4eed047926d..4c0ef6283a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -400,24 +400,7 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_probes.lo libvirt_la_DEPENDENCIES +=3D libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES =3D libvirt_probes.h =20 -tapsetdir =3D $(datadir)/systemtap/tapset -tapset_DATA +=3D libvirt_probes.stp libvirt_functions.stp - -%_probes.h: %_probes.d - $(AM_V_GEN)$(DTRACE) -o $@ -h -s $< - -.PRECIOUS: %_probes.o -%_probes.o: %_probes.d - $(AM_V_GEN)$(DTRACE) -o $@ -G -s $< - -%_probes.lo: %_probes.o - $(AM_V_GEN)printf %s\\n \ - '# $@ - a libtool object file' \ - '# Generated by libtool (GNU libtool) 2.4' \ - '# Actually generated by Makefile.am, in order to shut up libtool' \ - "pic_object=3D'$<'" \ - "non_pic_object=3D'$<'" \ - > $@ +tapset_DATA +=3D libvirt_functions.stp =20 # Keep this list synced with PROTOCOL_STRUCTS RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ @@ -431,11 +414,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/gensystemtap.py \ $(RPC_PROBE_FILES) > $@ =20 -%_probes.stp: %_probes.d $(top_srcdir)/scripts/dtrace2systemtap.py \ - $(top_builddir)/config.status - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/dtrace2systemtap.py= \ - $(bindir) $(sbindir) $(libdir) $< > $@ - endif WITH_DTRACE_PROBES =20 libvirt_qemu_la_SOURCES =3D libvirt-qemu.c diff --git a/src/meson.build b/src/meson.build index 453691dc902..9796d344b4a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -28,3 +28,42 @@ endif if conf.has('WITH_SECDRIVER_APPARMOR') secdriver_dep +=3D apparmor_dep endif + + +# generate systemtap files + +systemtap_dir =3D datadir / 'systemtap' / 'tapset' + +dtrace_gen_headers =3D [] +dtrace_gen_objects =3D [] + +if conf.has('WITH_DTRACE_PROBES') + infile =3D 'libvirt_probes.d' + out_h =3D 'libvirt_probes.h' + out_o =3D 'libvirt_probes.o' + out_stp =3D 'libvirt_probes.stp' + + dtrace_gen_headers +=3D custom_target( + out_h, + input: infile, + output: out_h, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], + ) + + dtrace_gen_objects +=3D custom_target( + out_o, + input: infile, + output: out_o, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], + ) + + custom_target( + out_stp, + input: infile, + output: out_stp, + command: [ meson_python_prog, dtrace2systemtap_prog, bindir, sbindir, = libdir, '@INPUT@' ], + capture: true, + install: true, + install_dir: systemtap_dir, + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895127; cv=none; d=zohomail.com; s=zohoarc; b=P5AA7U+wUgJ0pj+RNQvmun0HH1P3mNZX30l0GfXTqETmm4px8R5hBH78mADU9Ige97wN2NGg//vF+KAhRUDqWanPJ0MimQWgjlcC8ajx1ibzKdqzSrifdsx9x7MM47y27wDP4jl9aLwoH3eZSzBEx8YLwsfA56USdj1Zmc12F3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895127; 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=rWDuEVkYhX1ht+EsPwMQVUzD734oXUykikUXLENnyNI=; b=mG9hHHRdOEG4b79QkAm6/s9E55/vS7mmQE4stfv2LaTQn6aB2SYwa17KSNJAIZwV5sMxrJXI5nLvaWfHNtgJsrLWWWsUsW0rgZV7jhS05xU1YfbAaOMDBm8ox5c2x2JcpYZSqDU+udWeEl/PNYWOFtvDsRYq4tSXOC8zpXu2LqU= 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 1594895127712955.7086731286355; Thu, 16 Jul 2020 03:25:27 -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-511-KMTh8uUOMfOMIW1E2_DW_A-1; Thu, 16 Jul 2020 06:07:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8FF880183C; Thu, 16 Jul 2020 10:07:27 +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 C7EB172E4A; Thu, 16 Jul 2020 10:07:27 +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 96A479623A; Thu, 16 Jul 2020 10:07:27 +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 06GA3acW017285 for ; Thu, 16 Jul 2020 06:03:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id A55622B6DB; Thu, 16 Jul 2020 10:03:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EF262DE71 for ; Thu, 16 Jul 2020 10:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895126; 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=rWDuEVkYhX1ht+EsPwMQVUzD734oXUykikUXLENnyNI=; b=gQL0x0THd65Vwh1ZndObtmojuuyzZ6WuaSbEb78n4DW0BhBdoKd+GVslUeD2wwvhKQfBHC xlAJzUoB51Qx0TQwS/7XVODsSpFuFPdLzDuqrEqADls82c84uCPhWS+bt484Nu7PG4IOxX +MB82m3uhnvzxHv6KzVvNmcG5uNnX0U= X-MC-Unique: KMTh8uUOMfOMIW1E2_DW_A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 130/351] meson: src: build libvirt_util.a static lib Date: Thu, 16 Jul 2020 11:56:06 +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.11 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/Makefile.am | 5 - src/meson.build | 10 ++ src/util/Makefile.inc.am | 307 --------------------------------------- src/util/meson.build | 196 +++++++++++++++++++++++++ 4 files changed, 206 insertions(+), 312 deletions(-) create mode 100644 src/util/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 4c0ef6283a0..e533e27b344 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,11 +19,6 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. -AM_CPPFLAGS =3D \ - -I$(srcdir)/util \ - -I./util \ - $(NULL) - AM_LDFLAGS_MOD =3D \ -module \ -avoid-version \ diff --git a/src/meson.build b/src/meson.build index 9796d344b4a..9f3dd9fca8f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -67,3 +67,13 @@ if conf.has('WITH_DTRACE_PROBES') install_dir: systemtap_dir, ) endif + + +# list subdirectories + +subdir('util') + +src_dep =3D declare_dependency( + dependencies: [ src_dep ], + include_directories: [ util_inc_dir ], +) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index ca25f983090..879b3d9e398 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -1,310 +1,3 @@ # vim: filetype=3Dautomake =20 -# These files are not related to driver APIs. Simply generic -# helper APIs for various purposes -UTIL_SOURCES =3D \ - util/glibcompat.c \ - util/glibcompat.h \ - util/viralloc.c \ - util/viralloc.h \ - util/virarch.c \ - util/virarch.h \ - util/virarptable.c \ - util/virarptable.h \ - util/viraudit.c \ - util/viraudit.h \ - util/virauth.c \ - util/virauth.h \ - util/virauthconfig.c \ - util/virauthconfig.h \ - util/virbitmap.c \ - util/virbitmap.h \ - util/virbpf.c \ - util/virbpf.h \ - util/virbuffer.c \ - util/virbuffer.h \ - util/virperf.c \ - util/virperf.h \ - util/vircgroup.c \ - util/vircgroup.h util/vircgrouppriv.h \ - util/vircgroupbackend.c \ - util/vircgroupbackend.h \ - util/vircgroupv1.c \ - util/vircgroupv1.h \ - util/vircgroupv2.c \ - util/vircgroupv2.h \ - util/vircgroupv2devices.c \ - util/vircgroupv2devices.h \ - util/vircommand.c \ - util/vircommand.h \ - util/vircommandpriv.h \ - util/virconf.c \ - util/virconf.h \ - util/vircrypto.c \ - util/vircrypto.h \ - util/virdaemon.c \ - util/virdaemon.h \ - util/virdbus.c \ - util/virdbus.h \ - util/virdbuspriv.h \ - util/virdevmapper.c \ - util/virdevmapper.h \ - util/virdnsmasq.c \ - util/virdnsmasq.h \ - util/virebtables.c \ - util/virebtables.h \ - util/virendian.h \ - util/virenum.h \ - util/virenum.c \ - util/virerror.c \ - util/virerror.h \ - util/virerrorpriv.h \ - util/virevent.c \ - util/virevent.h \ - util/vireventglib.c \ - util/vireventglib.h \ - util/vireventglibwatch.c \ - util/vireventglibwatch.h \ - util/vireventthread.c \ - util/vireventthread.h \ - util/virfcp.c \ - util/virfcp.h \ - util/virfdstream.c \ - util/virfdstream.h \ - util/virfile.c \ - util/virfile.h \ - util/virfirewall.c \ - util/virfirewall.h \ - util/virfirewallpriv.h \ - util/virfirewalld.c \ - util/virfirewalld.h \ - util/virfirewalldpriv.h \ - util/virfirmware.c \ - util/virfirmware.h \ - util/virgettext.c \ - util/virgettext.h \ - util/virgic.c \ - util/virgic.h \ - util/virhash.c \ - util/virhash.h \ - util/virhashcode.c \ - util/virhashcode.h \ - util/virhook.c \ - util/virhook.h \ - util/virhostcpu.c \ - util/virhostcpu.h \ - util/virhostcpupriv.h \ - util/virhostmem.c \ - util/virhostmem.h \ - util/virhostuptime.c \ - util/virhostuptime.h \ - util/viridentity.c \ - util/viridentity.h \ - util/virinitctl.c \ - util/virinitctl.h \ - util/viriptables.c \ - util/viriptables.h \ - util/viriscsi.c \ - util/viriscsi.h \ - util/virjson.c \ - util/virjson.h \ - util/virkeycode.c \ - util/virkeycode.h \ - util/virlease.c \ - util/virlease.h \ - util/virlockspace.c \ - util/virlockspace.h \ - util/virlog.c \ - util/virlog.h \ - util/virmacaddr.c \ - util/virmacaddr.h \ - util/virmacmap.c \ - util/virmacmap.h \ - util/virmodule.c \ - util/virmodule.h \ - util/virnetdev.c \ - util/virnetdev.h \ - util/virnetdevbandwidth.c \ - util/virnetdevbandwidth.h \ - util/virnetdevbridge.c \ - util/virnetdevbridge.h \ - util/virnetdevip.c \ - util/virnetdevip.h \ - util/virnetdevmacvlan.c \ - util/virnetdevmacvlan.h \ - util/virnetdevmidonet.c \ - util/virnetdevmidonet.h \ - util/virnetdevopenvswitch.c \ - util/virnetdevopenvswitch.h \ - util/virnetdevtap.c \ - util/virnetdevtap.h \ - util/virnetdevveth.c \ - util/virnetdevveth.h \ - util/virnetdevvlan.c \ - util/virnetdevvlan.h \ - util/virnetdevvportprofile.c \ - util/virnetdevvportprofile.h \ - util/virnetlink.c \ - util/virnetlink.h \ - util/virnodesuspend.c \ - util/virnodesuspend.h \ - util/virnvme.c \ - util/virnvme.h \ - util/virkmod.c \ - util/virkmod.h \ - util/virnuma.c \ - util/virnuma.h \ - util/virobject.c \ - util/virobject.h \ - util/virpci.c \ - util/virpci.h \ - util/virpidfile.c \ - util/virpidfile.h \ - util/virpolkit.c \ - util/virpolkit.h \ - util/virportallocator.c \ - util/virportallocator.h \ - util/virprobe.h \ - util/virprocess.c \ - util/virprocess.h \ - util/virqemu.c \ - util/virqemu.h \ - util/virrandom.c \ - util/virrandom.h \ - util/virresctrl.c \ - util/virresctrl.h \ - util/virresctrlpriv.h \ - util/virrotatingfile.c \ - util/virrotatingfile.h \ - util/virscsi.c \ - util/virscsi.h \ - util/virscsihost.c \ - util/virscsihost.h \ - util/virscsivhost.c \ - util/virscsivhost.h \ - util/virseclabel.c \ - util/virseclabel.h \ - util/virsecret.c \ - util/virsecret.h \ - util/virsocket.c \ - util/virsocket.h \ - util/virsocketaddr.c \ - util/virsocketaddr.h \ - util/virstorageencryption.c \ - util/virstorageencryption.h \ - util/virstoragefile.c \ - util/virstoragefile.h \ - util/virstoragefilebackend.c \ - util/virstoragefilebackend.h \ - util/virstring.c \ - util/virstring.h \ - util/virsysinfo.c \ - util/virsysinfo.h \ - util/virsysinfopriv.h \ - util/virsystemd.c \ - util/virsystemd.h \ - util/virsystemdpriv.h \ - util/virthread.c \ - util/virthread.h \ - util/virthreadjob.c \ - util/virthreadjob.h \ - util/virthreadpool.c \ - util/virthreadpool.h \ - util/virtime.c \ - util/virtime.h \ - util/virtpm.c \ - util/virtpm.h \ - util/virtypedparam-public.c \ - util/virtypedparam.c \ - util/virtypedparam.h \ - util/virusb.c \ - util/virusb.h \ - util/viruri.c \ - util/viruri.h \ - util/virutil.c \ - util/virutil.h \ - util/viruuid.c \ - util/viruuid.h \ - util/virvhba.c \ - util/virvhba.h \ - util/virvsock.c \ - util/virvsock.h \ - util/virxdrdefs.h \ - util/virxml.c \ - util/virxml.h \ - util/virmdev.c \ - util/virmdev.h \ - util/virfilecache.c \ - util/virfilecache.h \ - $(NULL) - - -# Sync with docs/ -KEYCODES =3D linux osx atset1 atset2 atset3 xtkbd usb win32 qnum -KEYNAMES =3D linux osx win32 - -KEYTABLES =3D \ - $(KEYCODES:%=3Dutil/virkeycodetable_%.h) \ - $(KEYNAMES:%=3Dutil/virkeynametable_%.h) \ - $(NULL) - UTIL_IO_HELPER_SOURCES =3D util/iohelper.c - -noinst_LTLIBRARIES +=3D libvirt_util.la -libvirt_la_LIBADD =3D $(libvirt_la_BUILT_LIBADD) -libvirt_la_BUILT_LIBADD +=3D libvirt_util.la -libvirt_util_la_SOURCES =3D \ - $(UTIL_SOURCES) \ - $(NULL) -nodist_libvirt_util_la_SOURCES =3D \ - $(KEYTABLES) \ - $(NULL) -libvirt_util_la_CFLAGS =3D \ - $(CAPNG_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) \ - $(AUDIT_CFLAGS) \ - $(DEVMAPPER_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(NUMACTL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(ACL_CFLAGS) \ - $(NULL) -libvirt_util_la_LIBADD =3D \ - -lm \ - $(CAPNG_LIBS) \ - $(YAJL_LIBS) \ - $(LIBNL_LIBS) \ - $(THREAD_LIBS) \ - $(AUDIT_LIBS) \ - $(DEVMAPPER_LIBS) \ - $(DBUS_LIBS) \ - $(WIN32_EXTRA_LIBS) \ - $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) \ - $(NUMACTL_LIBS) \ - $(ACL_LIBS) \ - $(GNUTLS_LIBS) \ - $(NULL) - - -util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=3D`echo $@ | sed -e 's,util/virkeycodetable_,,' \ - -e 's,\.h,,'` && \ - $(MKDIR_P) util/ && \ - $(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - code-table --lang stdc --varname virKeyCodeTable_$$NAME \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ - mv $@-tmp $@ || rm -f $@-tmp - -util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=3D`echo $@ | sed -e 's,util/virkeynametable_,,' \ - -e 's,\.h,,'` && \ - $(MKDIR_P) util/ && \ - $(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ - name-table --lang stdc --varname virKeyNameTable_$$NAME \ - $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ - mv $@-tmp $@ || rm -f $@-tmp diff --git a/src/util/meson.build b/src/util/meson.build new file mode 100644 index 00000000000..59a531f6af1 --- /dev/null +++ b/src/util/meson.build @@ -0,0 +1,196 @@ +util_sources =3D [ + 'glibcompat.c', + 'viralloc.c', + 'virarch.c', + 'virarptable.c', + 'viraudit.c', + 'virauth.c', + 'virauthconfig.c', + 'virbitmap.c', + 'virbpf.c', + 'virbuffer.c', + 'vircgroup.c', + 'vircgroupbackend.c', + 'vircgroupv1.c', + 'vircgroupv2.c', + 'vircgroupv2devices.c', + 'vircommand.c', + 'virconf.c', + 'vircrypto.c', + 'virdaemon.c', + 'virdbus.c', + 'virdevmapper.c', + 'virdnsmasq.c', + 'virebtables.c', + 'virenum.c', + 'vireventglib.c', + 'vireventglibwatch.c', + 'vireventthread.c', + 'virfcp.c', + 'virfdstream.c', + 'virfile.c', + 'virfilecache.c', + 'virfirewall.c', + 'virfirewalld.c', + 'virfirmware.c', + 'virgettext.c', + 'virgic.c', + 'virhash.c', + 'virhashcode.c', + 'virhook.c', + 'virhostcpu.c', + 'virhostmem.c', + 'virhostuptime.c', + 'viridentity.c', + 'virinitctl.c', + 'viriptables.c', + 'viriscsi.c', + 'virjson.c', + 'virkeycode.c', + 'virkmod.c', + 'virlease.c', + 'virlockspace.c', + 'virlog.c', + 'virmacaddr.c', + 'virmacmap.c', + 'virmdev.c', + 'virmodule.c', + 'virnetdev.c', + 'virnetdevbandwidth.c', + 'virnetdevbridge.c', + 'virnetdevip.c', + 'virnetdevmacvlan.c', + 'virnetdevmidonet.c', + 'virnetdevopenvswitch.c', + 'virnetdevtap.c', + 'virnetdevveth.c', + 'virnetdevvlan.c', + 'virnetdevvportprofile.c', + 'virnetlink.c', + 'virnodesuspend.c', + 'virnuma.c', + 'virnvme.c', + 'virobject.c', + 'virpci.c', + 'virperf.c', + 'virpidfile.c', + 'virpolkit.c', + 'virportallocator.c', + 'virprocess.c', + 'virqemu.c', + 'virrandom.c', + 'virresctrl.c', + 'virrotatingfile.c', + 'virscsi.c', + 'virscsihost.c', + 'virscsivhost.c', + 'virseclabel.c', + 'virsecret.c', + 'virsocket.c', + 'virsocketaddr.c', + 'virstorageencryption.c', + 'virstoragefile.c', + 'virstoragefilebackend.c', + 'virstring.c', + 'virsysinfo.c', + 'virsystemd.c', + 'virthread.c', + 'virthreadjob.c', + 'virthreadpool.c', + 'virtime.c', + 'virtpm.c', + 'virtypedparam.c', + 'viruri.c', + 'virusb.c', + 'virutil.c', + 'viruuid.c', + 'virvhba.c', + 'virvsock.c', + 'virxml.c', +] + +util_public_sources =3D files( + 'virerror.c', + 'virevent.c', + 'virtypedparam-public.c', +) + +keycode_gen_sources =3D [] + +keycode_list =3D [ + 'atset1', + 'atset2', + 'atset3', + 'linux', + 'osx', + 'qnum', + 'usb', + 'win32', + 'xtkbd', +] + +keyname_list =3D [ + 'linux', + 'osx', + 'win32', +] + +keymap_gen_prog =3D find_program('@0@/src/keycodemapdb/tools/keymap-gen'.f= ormat(meson.source_root())) +keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.s= ource_root()) + +foreach name : keycode_list + keycode_gen_sources +=3D custom_target( + 'virt_keycode_@0@'.format(name), + input: keymap_src_file, + output: 'virkeycodetable_@0@.h'.format(name), + command: [ + meson_python_prog, python3_prog, keymap_gen_prog, 'code-table', + '--lang', 'stdc', + '--varname', 'virKeyCodeTable_@0@'.format(name), + '@INPUT@', name, + ], + capture: true, + ) +endforeach + +foreach name : keyname_list + keycode_gen_sources +=3D custom_target( + 'keyname_@0@'.format(name), + input: keymap_src_file, + output: 'virkeynametable_@0@.h'.format(name), + command: [ + meson_python_prog, python3_prog, keymap_gen_prog, 'name-table', + '--lang', 'stdc', + '--varname', 'virKeyNameTable_@0@'.format(name), + '@INPUT@', name, + ], + capture: true, + ) +endforeach + +virt_util_lib =3D static_library( + 'virt_util', + [ + util_sources, + util_public_sources, + keycode_gen_sources, + dtrace_gen_headers, + ], + dependencies: [ + acl_dep, + audit_dep, + capng_dep, + dbus_dep, + devmapper_dep, + gnutls_dep, + libnl_dep, + numactl_dep, + secdriver_dep, + src_dep, + thread_dep, + win32_dep, + yajl_dep, + ], +) + +util_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894712; cv=none; d=zohomail.com; s=zohoarc; b=f3a25d0A0FWKkLeM6RH8zaoFRQx8wB7tEo/un13dXWB20dfVDAF9ZpHd7knroQGT6Xaji2QWDBNy+Msw8pU4s8Gnuoojs0/TS3+12UvWemHJR1H7xshsus56ZECBAIbwSF3ii18OJ/UFgwIcJYsMWWKMdFkYrTNUuW9Q7kdiOFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894712; 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=Cn4J8xm3630sfwFuu+dXKlezxnz+ZhPjrmatMFlzb3Q=; b=agpafXXtfEAyN91UwuKnq66ZA3ZJ1y5EyaTK6EW8YZ/sH6ZiuMRoVROyp4urqzJ5KdtdqN3U4Vhhrq0Xw/aSO30/KLCJgpRaT69vG9OTrLTjJ+vBmOvwGOGBryh5u5zUL5+aGTCQe0YXRiR2QhcCC7pZjIWVdnRasEKJnhNSqcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894712000225.07434924786958; Thu, 16 Jul 2020 03:18:32 -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-503-STBhuI1CMxq_tnyC3DNlWw-1; Thu, 16 Jul 2020 06:07:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD480100AA34; Thu, 16 Jul 2020 10:07:27 +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 475486146F; Thu, 16 Jul 2020 10:07:27 +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 1819496232; Thu, 16 Jul 2020 10:07:27 +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 06GA3bkE017300 for ; Thu, 16 Jul 2020 06:03:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D8862DE69; Thu, 16 Jul 2020 10:03:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 088D92B6DB for ; Thu, 16 Jul 2020 10:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894710; 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=Cn4J8xm3630sfwFuu+dXKlezxnz+ZhPjrmatMFlzb3Q=; b=Jpfwro6XxIpRaBej7EgoCFByhDgzvXkPNSKMDK+5kGJdWHctqj0MmE6NQ+CqS9zCsR+3CV nnYHpt6ZOtSgW+z02MSaDycSZf3nTTHSIcY1aCVHPhDEB/5OZ711e1ihW8t1k4wJE/uS9M Bi/9SjIgBSXVtPEoX7QEkXsedLX8yQ8= X-MC-Unique: STBhuI1CMxq_tnyC3DNlWw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 131/351] meson: src: build libvirt_conf.a static lib Date: Thu, 16 Jul 2020 11:56:07 +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.16 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/Makefile.am | 1 - src/conf/Makefile.inc.am | 191 --------------------------------------- src/conf/meson.build | 108 ++++++++++++++++++++++ src/meson.build | 2 + 4 files changed, 110 insertions(+), 192 deletions(-) delete mode 100644 src/conf/Makefile.inc.am create mode 100644 src/conf/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index e533e27b344..01ae2596c31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,7 +69,6 @@ COMMON_UNIT_VARS =3D \ lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am -include conf/Makefile.inc.am include cpu/Makefile.inc.am include cpu_map/Makefile.inc.am include security/Makefile.inc.am diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am deleted file mode 100644 index debc6f4eef0..00000000000 --- a/src/conf/Makefile.inc.am +++ /dev/null @@ -1,191 +0,0 @@ -# vim: filetype=3Dautomake - -NETDEV_CONF_SOURCES =3D \ - conf/netdev_bandwidth_conf.h \ - conf/netdev_bandwidth_conf.c \ - conf/netdev_vport_profile_conf.h \ - conf/netdev_vport_profile_conf.c \ - conf/netdev_vlan_conf.h \ - conf/netdev_vlan_conf.c \ - conf/virnetworkportdef.h \ - conf/virnetworkportdef.c \ - $(NULL) - -DOMAIN_CONF_SOURCES =3D \ - conf/backup_conf.c \ - conf/backup_conf.h \ - conf/capabilities.c \ - conf/capabilities.h \ - conf/checkpoint_conf.c \ - conf/checkpoint_conf.h \ - conf/domain_addr.c \ - conf/domain_addr.h \ - conf/domain_capabilities.c \ - conf/domain_capabilities.h \ - conf/domain_conf.c \ - conf/domain_conf.h \ - conf/domain_audit.c \ - conf/domain_audit.h \ - conf/domain_nwfilter.c \ - conf/domain_nwfilter.h \ - conf/virsavecookie.c \ - conf/virsavecookie.h \ - conf/moment_conf.c \ - conf/moment_conf.h \ - conf/snapshot_conf.c \ - conf/snapshot_conf.h \ - conf/snapshot_conf_priv.h \ - conf/numa_conf.c \ - conf/numa_conf.h \ - conf/virconftypes.h \ - conf/virdomaincheckpointobjlist.c \ - conf/virdomaincheckpointobjlist.h \ - conf/virdomainobjlist.c \ - conf/virdomainobjlist.h \ - conf/virdomainmomentobjlist.c \ - conf/virdomainmomentobjlist.h \ - conf/virdomainsnapshotobjlist.c \ - conf/virdomainsnapshotobjlist.h \ - $(NULL) - -OBJECT_EVENT_SOURCES =3D \ - conf/object_event.c \ - conf/object_event.h \ - conf/object_event_private.h \ - $(NULL) - -DOMAIN_EVENT_SOURCES =3D \ - conf/domain_event.c \ - conf/domain_event.h \ - $(NULL) - -NETWORK_EVENT_SOURCES =3D \ - conf/network_event.c \ - conf/network_event.h \ - $(NULL) - -STORAGE_EVENT_SOURCES =3D \ - conf/storage_event.c \ - conf/storage_event.h \ - $(NULL) - -NODE_DEVICE_EVENT_SOURCES =3D \ - conf/node_device_event.c \ - conf/node_device_event.h \ - $(NULL) - -SECRET_EVENT_SOURCES =3D \ - conf/secret_event.c \ - conf/secret_event.h \ - $(NULL) - -NETWORK_CONF_SOURCES =3D \ - conf/network_conf.c \ - conf/network_conf.h \ - conf/virnetworkobj.c \ - conf/virnetworkobj.h \ - conf/networkcommon_conf.c \ - conf/networkcommon_conf.h \ - $(NULL) - -NWFILTER_PARAM_CONF_SOURCES =3D \ - conf/nwfilter_params.c \ - conf/nwfilter_params.h \ - conf/nwfilter_ipaddrmap.c \ - conf/nwfilter_ipaddrmap.h \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.h \ - $(NULL) - -NWFILTER_CONF_SOURCES =3D \ - $(NWFILTER_PARAM_CONF_SOURCES) \ - conf/nwfilter_conf.c \ - conf/nwfilter_conf.h \ - conf/virnwfilterobj.c \ - conf/virnwfilterobj.h \ - conf/virnwfilterbindingdef.c \ - conf/virnwfilterbindingdef.h \ - conf/virnwfilterbindingobj.c \ - conf/virnwfilterbindingobj.h \ - conf/virnwfilterbindingobjlist.c \ - conf/virnwfilterbindingobjlist.h \ - $(NULL) - -STORAGE_CONF_SOURCES =3D \ - conf/storage_adapter_conf.h \ - conf/storage_adapter_conf.c \ - conf/storage_capabilities.h \ - conf/storage_capabilities.c \ - conf/storage_conf.h \ - conf/storage_conf.c \ - conf/virstorageobj.h \ - conf/virstorageobj.c \ - $(NULL) - -INTERFACE_CONF_SOURCES =3D \ - conf/interface_conf.c \ - conf/interface_conf.h \ - conf/virinterfaceobj.c \ - conf/virinterfaceobj.h \ - $(NULL) - -SECRET_CONF_SOURCES =3D \ - conf/secret_conf.h \ - conf/secret_conf.c \ - conf/virsecretobj.h \ - conf/virsecretobj.c \ - $(NULL) - -NODE_DEVICE_CONF_SOURCES =3D \ - conf/node_device_conf.c \ - conf/node_device_conf.h \ - conf/node_device_util.c \ - conf/node_device_util.h \ - conf/virnodedeviceobj.c \ - conf/virnodedeviceobj.h \ - $(NULL) - -CPU_CONF_SOURCES =3D \ - conf/cpu_conf.c \ - conf/cpu_conf.h \ - $(NULL) - -CHRDEV_CONF_SOURCES =3D \ - conf/virchrdev.c \ - conf/virchrdev.h \ - $(NULL) - -DEVICE_CONF_SOURCES =3D \ - conf/device_conf.c \ - conf/device_conf.h \ - $(NULL) - -CONF_SOURCES =3D \ - $(NETDEV_CONF_SOURCES) \ - $(DOMAIN_CONF_SOURCES) \ - $(OBJECT_EVENT_SOURCES) \ - $(DOMAIN_EVENT_SOURCES) \ - $(NETWORK_EVENT_SOURCES) \ - $(STORAGE_EVENT_SOURCES) \ - $(NODE_DEVICE_EVENT_SOURCES) \ - $(SECRET_EVENT_SOURCES) \ - $(NETWORK_CONF_SOURCES) \ - $(NWFILTER_CONF_SOURCES) \ - $(NODE_DEVICE_CONF_SOURCES) \ - $(STORAGE_CONF_SOURCES) \ - $(INTERFACE_CONF_SOURCES) \ - $(SECRET_CONF_SOURCES) \ - $(CPU_CONF_SOURCES) \ - $(CHRDEV_CONF_SOURCES) \ - $(DEVICE_CONF_SOURCES) \ - $(NULL) - -noinst_LTLIBRARIES +=3D libvirt_conf.la -libvirt_la_BUILT_LIBADD +=3D libvirt_conf.la -libvirt_conf_la_SOURCES =3D $(CONF_SOURCES) -libvirt_conf_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_conf_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_conf_la_LIBADD =3D $(LIBXML_LIBS) diff --git a/src/conf/meson.build b/src/conf/meson.build new file mode 100644 index 00000000000..394cca4e6a1 --- /dev/null +++ b/src/conf/meson.build @@ -0,0 +1,108 @@ +netdev_conf_sources =3D [ + 'netdev_bandwidth_conf.c', + 'netdev_vlan_conf.c', + 'netdev_vport_profile_conf.c', + 'virnetworkportdef.c', +] + +domain_conf_sources =3D [ + 'backup_conf.c', + 'capabilities.c', + 'checkpoint_conf.c', + 'domain_addr.c', + 'domain_audit.c', + 'domain_capabilities.c', + 'domain_conf.c', + 'domain_nwfilter.c', + 'moment_conf.c', + 'numa_conf.c', + 'snapshot_conf.c', + 'virdomaincheckpointobjlist.c', + 'virdomainmomentobjlist.c', + 'virdomainobjlist.c', + 'virdomainsnapshotobjlist.c', + 'virsavecookie.c', +] + +event_conf_sources =3D [ + 'domain_event.c', + 'network_event.c', + 'node_device_event.c', + 'object_event.c', + 'secret_event.c', + 'storage_event.c', +] + +network_conf_sources =3D [ + 'network_conf.c', + 'networkcommon_conf.c', + 'virnetworkobj.c', +] + +nwfilter_conf_sources =3D [ + 'nwfilter_conf.c', + 'nwfilter_ipaddrmap.c', + 'nwfilter_params.c', + 'virnwfilterbindingdef.c', + 'virnwfilterbindingobj.c', + 'virnwfilterbindingobjlist.c', + 'virnwfilterobj.c', +] + +storage_conf_sources =3D [ + 'storage_adapter_conf.c', + 'storage_capabilities.c', + 'storage_conf.c', + 'virstorageobj.c', +] + +interface_conf_sources =3D [ + 'interface_conf.c', + 'virinterfaceobj.c', +] + +secret_conf_sources =3D [ + 'secret_conf.c', + 'virsecretobj.c', +] + +node_device_conf_sources =3D [ + 'node_device_conf.c', + 'node_device_util.c', + 'virnodedeviceobj.c', +] + +cpu_conf_sources =3D [ + 'cpu_conf.c', +] + +chrdev_conf_sources =3D [ + 'virchrdev.c', +] + +device_conf_sources =3D [ + 'device_conf.c', +] + +virt_conf_lib =3D static_library( + 'virt_conf', + [ + chrdev_conf_sources, + cpu_conf_sources, + device_conf_sources, + domain_conf_sources, + event_conf_sources, + interface_conf_sources, + netdev_conf_sources, + network_conf_sources, + node_device_conf_sources, + nwfilter_conf_sources, + secret_conf_sources, + storage_conf_sources, + ], + dependencies: [ + src_dep, + ], +) + +conf_inc_dir =3D include_directories('.') diff --git a/src/meson.build b/src/meson.build index 9f3dd9fca8f..34babecd9b0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -77,3 +77,5 @@ src_dep =3D declare_dependency( dependencies: [ src_dep ], include_directories: [ util_inc_dir ], ) + +subdir('conf') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894273; cv=none; d=zohomail.com; s=zohoarc; b=cgQj0oelTyLN/rSE6uajuHHp1W9Ar0+gMs49bCX6V4JP3tPCe0CC9QpG+HVGUmS7gHeII52Kel/Em1v22f2Mw5zeNQRBeZ3JYZ7peSU4/go1Jdicd7kHzjHh2djWc6o5Qp5wM0uM1g/sC59kT1WlGFV7MEa6Qc0oCe/rwgxxQoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894273; 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=HoittmQaC2jQd2nOWMrCj++bLNR5YCx663Z7w+5rrUA=; b=CMcEMdGuBCnzoZGQE1+qwez4W5D45HwVH96svwFGb5QWZKSrIwtFFrN4J96xVVCC/7ltzBHCd2h8m9XMJ08r3mXElyVDO1gPXN12O1aadyM9Bfw+Bun/fLZDq+ATZMYfl6EZ9l5Hxy0JK0XeQYC6bVXBgwrM4rPSJ1uN4XTmOpQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894273429202.65153855586084; Thu, 16 Jul 2020 03:11:13 -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-256-0fg7HdHPO-y3clHQDqqjSQ-1; Thu, 16 Jul 2020 06:08:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 909D71093; Thu, 16 Jul 2020 10:08:16 +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 6FFB919C4F; Thu, 16 Jul 2020 10:08:16 +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 3EC83730C8; Thu, 16 Jul 2020 10:08:16 +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 06GA3cwf017322 for ; Thu, 16 Jul 2020 06:03:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77CEF2DE69; Thu, 16 Jul 2020 10:03:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E44902B6DB for ; Thu, 16 Jul 2020 10:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894272; 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=HoittmQaC2jQd2nOWMrCj++bLNR5YCx663Z7w+5rrUA=; b=gnmO5wA1KMrler3OR5ucW+5WDrvSj7Idija8TbCleT5gTXjoKZCqiGfE5dk6YqQR9aKi0R DmhJO5CR2l8nQuofGhav7oyRh0XSj7e6rt7nUJAN65pgmErY/Ssfr5F3XG7TTmW4jZGI7N M8VNRAlP1JMTyVLTgfx55v6RBk8BU10= X-MC-Unique: 0fg7HdHPO-y3clHQDqqjSQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 132/351] meson: src: build libvirt_rpc static libs Date: Thu, 16 Jul 2020 11:56:08 +0200 Message-Id: <8134f24179216b6e20cea3060bfe29a2dbe9f9ae.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.23 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/Makefile.am | 10 ---- src/meson.build | 1 + src/rpc/Makefile.inc.am | 119 ---------------------------------------- src/rpc/meson.build | 108 ++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 129 deletions(-) delete mode 100644 src/rpc/Makefile.inc.am create mode 100644 src/rpc/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 01ae2596c31..ecc757c455a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am -include rpc/Makefile.inc.am include test/Makefile.inc.am include hypervisor/Makefile.inc.am include esx/Makefile.inc.am @@ -272,15 +271,6 @@ GENERATED_SYM_FILES +=3D \ $(NULL) =20 =20 - -%protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $(subst $(srcdir)/,,$@) - -%protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $(subst $(srcdir)/,,$@) - check-local: check-augeas =20 check-augeas: $(augeas_DATA) $(augeastest_DATA) diff --git a/src/meson.build b/src/meson.build index 34babecd9b0..4a2998f4bfc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -79,3 +79,4 @@ src_dep =3D declare_dependency( ) =20 subdir('conf') +subdir('rpc') diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am deleted file mode 100644 index fe23b17a62b..00000000000 --- a/src/rpc/Makefile.inc.am +++ /dev/null @@ -1,119 +0,0 @@ -# vim: filetype=3Dautomake - -VIR_NET_RPC_GENERATED =3D \ - rpc/virnetprotocol.h \ - rpc/virnetprotocol.c \ - rpc/virkeepaliveprotocol.h \ - rpc/virkeepaliveprotocol.c \ - $(NULL) - -noinst_LTLIBRARIES +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la \ - $(NULL) - -libvirt_la_BUILT_LIBADD +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la \ - $(NULL) - -libvirt_net_rpc_la_SOURCES =3D \ - rpc/virnetmessage.h \ - rpc/virnetmessage.c \ - rpc/virnettlscontext.h \ - rpc/virnettlscontext.c \ - rpc/virnetsocket.h \ - rpc/virnetsocket.c \ - rpc/virkeepalive.h \ - rpc/virkeepalive.c \ - $(NULL) - -nodist_libvirt_net_rpc_la_SOURCES =3D \ - $(VIR_NET_RPC_GENERATED) \ - $(NULL) - -if WITH_SSH2 -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsshsession.h \ - rpc/virnetsshsession.c \ - $(NULL) -endif ! WITH_SSH2 - -if WITH_SASL -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsaslcontext.h \ - rpc/virnetsaslcontext.c \ - $(NULL) -endif ! WITH_SASL - -if WITH_LIBSSH -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetlibsshsession.h \ - rpc/virnetlibsshsession.c \ - $(NULL) -endif ! WITH_LIBSSH - -libvirt_net_rpc_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(LIBSSH_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_net_rpc_la_LDFLAGS =3D \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(SSH2_LIBS)\ - $(LIBSSH_LIBS) \ - $(SECDRIVER_LIBS) \ - $(AM_LDFLAGS) \ - $(NULL) - -libvirt_net_rpc_server_la_SOURCES =3D \ - rpc/virnetserverprogram.h \ - rpc/virnetserverprogram.c \ - rpc/virnetserverservice.h \ - rpc/virnetserverservice.c \ - rpc/virnetserverclient.h \ - rpc/virnetserverclient.c \ - rpc/virnetdaemon.h \ - rpc/virnetdaemon.c \ - rpc/virnetserver.h \ - rpc/virnetserver.c \ - $(NULL) -libvirt_net_rpc_server_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(SASL_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_net_rpc_server_la_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(DBUS_LIBS) \ - $(NULL) - -libvirt_net_rpc_client_la_SOURCES =3D \ - rpc/virnetclientprogram.h \ - rpc/virnetclientprogram.c \ - rpc/virnetclientstream.h \ - rpc/virnetclientstream.c \ - rpc/virnetclient.h \ - rpc/virnetclient.c \ - $(NULL) -libvirt_net_rpc_client_la_CFLAGS =3D \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) - -if WITH_SASL -libvirt_net_rpc_client_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL diff --git a/src/rpc/meson.build b/src/rpc/meson.build new file mode 100644 index 00000000000..b26939db9cc --- /dev/null +++ b/src/rpc/meson.build @@ -0,0 +1,108 @@ +genprotocol_prog =3D find_program('genprotocol.pl') + +rpc_sources =3D [ + 'virnetmessage.c', + 'virnettlscontext.c', + 'virnetsocket.c', + 'virkeepalive.c', +] + +if libssh_dep.found() + rpc_sources +=3D 'virnetlibsshsession.c' +endif + +if libssh2_dep.found() + rpc_sources +=3D 'virnetsshsession.c' +endif + +if sasl_dep.found() + rpc_sources +=3D 'virnetsaslcontext.c' +endif + +rpc_gen_headers =3D [] +rpc_gen_sources =3D [] + +foreach name : [ 'virnet', 'virkeepalive' ] + protocol_file =3D files('@0@protocol.x'.format(name)) + header_file =3D '@0@protocol.h'.format(name) + source_file =3D '@0@protocol.c'.format(name) + + rpc_gen_headers +=3D custom_target( + header_file, + input: protocol_file, + output: header_file, + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], + ) + + rpc_gen_sources +=3D custom_target( + source_file, + input: protocol_file, + output: source_file, + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], + ) +endforeach + +rpc_server_sources =3D [ + 'virnetserverprogram.c', + 'virnetserverservice.c', + 'virnetserverclient.c', + 'virnetdaemon.c', + 'virnetserver.c', +] + +rpc_client_sources =3D [ + 'virnetclientprogram.c', + 'virnetclientstream.c', + 'virnetclient.c', +] + +virt_rpc_lib =3D static_library( + 'virt_net_rpc', + [ + rpc_sources, + rpc_gen_headers, + rpc_gen_sources, + ], + dependencies: [ + gnutls_dep, + libssh2_dep, + libssh_dep, + sasl_dep, + secdriver_dep, + src_dep, + xdr_dep, + ], +) + +virt_rpc_server_lib =3D static_library( + 'virt_net_rpc_server', + [ + rpc_server_sources, + rpc_gen_headers, + ], + dependencies: [ + dbus_dep, + sasl_dep, + src_dep, + xdr_dep, + ], +) + +virt_rpc_client_lib =3D static_library( + 'virt_net_rpc_client', + [ + rpc_client_sources, + rpc_gen_headers, + ], + dependencies: [ + sasl_dep, + src_dep, + xdr_dep, + ], +) + +rpc_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894058; cv=none; d=zohomail.com; s=zohoarc; b=Idhal0feySYIaqOAqqbdiG4IqSJDt5h608mnrtIj31gzJKY6KRgdNQlfOS7pP8vD6YrgnmQEQc/2t0SjVwWUbePdZVqXCL8Z8bQ+Jh0Wdz0XLbxLc2b/ZasVnzu0dPmclvHahnbxGRA85W5Q1MB7lLdQcwk3Bq8ZH0CtSS6R/Tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894058; 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=CEtuJPiN70cVlA23ZVLqpj51PxDVhjB3lTCCuyeJNeE=; b=MLPCVGxgyPEMRieAZ4xQXoy8txMpfYNfuq2IouItTcRlmAsVQzQN+o4/xXjIp9WHt1oWOD4+7uBmW+RQfAoIh871Viv8A3zsbp5Kd8n6jumWF0hDtzVHNdsXFOoIARVYuWOAtMWzrDzQmvJ1MLB1QKwrsr1RyxIblzH2LJNGfac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894058846302.38921326611046; Thu, 16 Jul 2020 03:07:38 -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-46-BdXU7lhYPx2pVhEF09zeJA-1; Thu, 16 Jul 2020 06:07:35 -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 ACAED108C; Thu, 16 Jul 2020 10:07:29 +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 8911B6FEF9; Thu, 16 Jul 2020 10:07:29 +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 5B17E1806B0B; Thu, 16 Jul 2020 10:07:29 +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 06GA3df5017334 for ; Thu, 16 Jul 2020 06:03:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 626472DE69; Thu, 16 Jul 2020 10:03:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEF322B6DB for ; Thu, 16 Jul 2020 10:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894057; 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=CEtuJPiN70cVlA23ZVLqpj51PxDVhjB3lTCCuyeJNeE=; b=QAYsQ10e9xI924QK2yoa92EPNM9zJlolMLebZk5bBgw7Apv2iFDpphCi/pHY/iBuQ5rtbw yEY+F6NsapcBy/awBCIplUZKcRJ6B7iS5xjDRQ7Gqd042R6f2I/E3I0uOHaOC42oSCkkAX 0nK2mB0AmSa3EZJY4HB8XpP7SgM1Emo= X-MC-Unique: BdXU7lhYPx2pVhEF09zeJA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 133/351] meson: src: build libvirt_access.a static library Date: Thu, 16 Jul 2020 11:56:09 +0200 Message-Id: <93a911d0bb89bb20515980609920a08368bdb263.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/access/Makefile.inc.am | 75 -------------------------------------- src/access/meson.build | 72 ++++++++++++++++++++++++++++++++++++ src/meson.build | 1 + src/rpc/meson.build | 1 + 4 files changed, 74 insertions(+), 75 deletions(-) create mode 100644 src/access/meson.build diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index d58d5166bef..da9b5ef31b3 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -1,14 +1,5 @@ # vim: filetype=3Dautomake =20 -ACCESS_DRIVER_GENERATED =3D \ - access/viraccessapicheck.h \ - access/viraccessapicheck.c \ - access/viraccessapicheckqemu.h \ - access/viraccessapicheckqemu.c \ - access/viraccessapichecklxc.h \ - access/viraccessapichecklxc.c \ - $(NULL) - ACCESS_DRIVER_SYM_FILES =3D \ libvirt_access.syms \ libvirt_access_qemu.syms \ @@ -21,44 +12,11 @@ ACCESS_DRIVER_API_FILES =3D \ libvirt_access_lxc.xml \ $(NULL) =20 -ACCESS_DRIVER_SOURCES =3D \ - access/viraccessperm.h \ - access/viraccessperm.c \ - access/viraccessmanager.h \ - access/viraccessmanager.c \ - access/viraccessdriver.h \ - access/viraccessdrivernop.h \ - access/viraccessdrivernop.c \ - access/viraccessdriverstack.h \ - access/viraccessdriverstack.c \ - $(NULL) - -ACCESS_DRIVER_POLKIT_SOURCES =3D \ - access/viraccessdriverpolkit.h \ - access/viraccessdriverpolkit.c \ - $(NULL) - ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy =20 GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 -libvirt_driver_access_la_SOURCES =3D \ - $(ACCESS_DRIVER_SOURCES) \ - $(NULL) -nodist_libvirt_driver_access_la_SOURCES =3D \ - $(ACCESS_DRIVER_GENERATED) \ - $(NULL) -noinst_LTLIBRARIES +=3D libvirt_driver_access.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_access.la -libvirt_driver_access_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_access_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_access_la_LIBADD =3D \ - $(GLIB_LIBS) \ - $(NULL) - =20 $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ $(top_srcdir)/scripts/genpolkit.py Makefile.am @@ -66,7 +24,6 @@ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viracces= sperm.h \ $(top_srcdir)/scripts/genpolkit.py $< > $@ || rm -f $@ =20 if WITH_POLKIT -libvirt_driver_access_la_SOURCES +=3D $(ACCESS_DRIVER_POLKIT_SOURCES) =20 polkitactiondir =3D $(datadir)/polkit-1/actions if WITH_LIBVIRTD @@ -101,35 +58,3 @@ libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ lxc LXC $(LXC_PROTOCOL) > $@ =20 -access/viraccessapicheck.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - remote REMOTE $(REMOTE_PROTOCOL) \ - > access/viraccessapicheck.h -access/viraccessapicheck.c: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - remote REMOTE $(REMOTE_PROTOCOL) access/viraccessapicheck.h \ - > access/viraccessapicheck.c - -access/viraccessapicheckqemu.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - qemu QEMU $(QEMU_PROTOCOL) \ - > access/viraccessapicheckqemu.h -access/viraccessapicheckqemu.c: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - qemu QEMU $(QEMU_PROTOCOL) access/viraccessapicheckqemu.h \ - > access/viraccessapicheckqemu.c - -access/viraccessapichecklxc.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclheader \ - lxc LXC $(LXC_PROTOCOL) \ - > access/viraccessapichecklxc.h -access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclbody \ - lxc LXC $(LXC_PROTOCOL) access/viraccessapichecklxc.h \ - > access/viraccessapichecklxc.c diff --git a/src/access/meson.build b/src/access/meson.build new file mode 100644 index 00000000000..c5784fa4a98 --- /dev/null +++ b/src/access/meson.build @@ -0,0 +1,72 @@ +access_sources =3D [ + 'viraccessperm.c', + 'viraccessmanager.c', + 'viraccessdrivernop.c', + 'viraccessdriverstack.c', +] + +access_polkit_sources =3D [ + 'viraccessdriverpolkit.c', +] + +remote_path =3D meson.source_root() / 'src' / 'remote' + +access_gen_headers =3D [] +access_gen_sources =3D [] + +foreach name : [ 'remote', 'qemu', 'lxc' ] + if name =3D=3D 'remote' + header_file =3D 'viraccessapicheck.h' + source_file =3D 'viraccessapicheck.c' + else + header_file =3D 'viraccessapicheck@0@.h'.format(name) + source_file =3D 'viraccessapicheck@0@.c'.format(name) + endif + protocol_file =3D remote_path / '@0@_protocol.x'.format(name) + + access_gen_headers +=3D custom_target( + header_file, + output: header_file, + command: [ + gendispatch_prog, '--mode=3Daclheader', name, name.to_upper(), proto= col_file, + ], + capture: true, + ) + + access_gen_sources +=3D custom_target( + source_file, + output: source_file, + command: [ + gendispatch_prog, '--mode=3Daclbody', name, name.to_upper(), + protocol_file, header_file, + ], + capture: true, + ) +endforeach + +if conf.has('WITH_POLKIT') + access_sources +=3D access_polkit_sources +endif + +virt_access_lib =3D static_library( + 'virt_access', + [ + access_sources, + access_gen_headers, + access_gen_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ] +) + +access_inc_dir =3D include_directories('.') + +# Used by others where generated headers are required +access_dep =3D declare_dependency( + include_directories: access_inc_dir, + sources: access_gen_headers, +) diff --git a/src/meson.build b/src/meson.build index 4a2998f4bfc..c7993517760 100644 --- a/src/meson.build +++ b/src/meson.build @@ -80,3 +80,4 @@ src_dep =3D declare_dependency( =20 subdir('conf') subdir('rpc') +subdir('access') diff --git a/src/rpc/meson.build b/src/rpc/meson.build index b26939db9cc..f6e8c7adba5 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -1,4 +1,5 @@ genprotocol_prog =3D find_program('genprotocol.pl') +gendispatch_prog =3D find_program('gendispatch.pl') =20 rpc_sources =3D [ 'virnetmessage.c', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894061; cv=none; d=zohomail.com; s=zohoarc; b=Hm5yMFEdGtPlHFiLHbHYkeR6UnuGCfmsHPmHScgup9MgFxtUNa97aVqdwcWSXY/8OFMA+V+aQ4578Sus7uwKURaF80kyNgVdgK9bMZNEBbMDw5OM601fTzj2+StxP/3/6y9egUMzRp4ayb19ImUrzLHhvwW0QbORoT6oaTFUZ2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894061; 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=q6EMCgrguKOQsw1Js5YYRLWnoNDGy+C8epfZJPOAxPA=; b=S0JMIOsdPoblCdxHaT1edr1wgTi+1LzdV/4zJQQcBGyU1BHLHsoEb+Slg01K+i4XASoCefzpeXGeB3ckFAh1eX5LRBckDr6E6iwmDtpGrUiyttj3lYskNLapdGFAcXoRrMuYkYIIkpldob/NY0NqeDYQ9NhIq+RX66pbn6AmGD4= 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 1594894061654260.6821443308337; Thu, 16 Jul 2020 03:07:41 -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-199-Ax4skof3P5a6aSdY6aUj3w-1; Thu, 16 Jul 2020 06:07:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A5FD10059BF; Thu, 16 Jul 2020 10:07:30 +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 5B6E5724A9; Thu, 16 Jul 2020 10:07:30 +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 2DF4996236; Thu, 16 Jul 2020 10:07:30 +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 06GA3eD0017343 for ; Thu, 16 Jul 2020 06:03:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C72F2B6DB; Thu, 16 Jul 2020 10:03:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA6F12DE6F for ; Thu, 16 Jul 2020 10:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894060; 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=q6EMCgrguKOQsw1Js5YYRLWnoNDGy+C8epfZJPOAxPA=; b=QJwx7BSjYLXYUgdI3nofEx8TTgQRrpGazwgvIhKmNE/Z2P3734ZFW3KCVhs2d0kQFAzBui zgFq9Qamfc64ztRCCQLFmNDfcEmR/csKUDBvBnQrHNpJgmF7VqH+/lqPwbikIxSPpzXpAq tbcjO6fHBbqNPGkr5I/Ll3B6MpQK7jk= X-MC-Unique: Ax4skof3P5a6aSdY6aUj3w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 134/351] meson: src: build libvirt_driver_admin.a static lib Date: Thu, 16 Jul 2020 11:56:10 +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.11 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/admin/Makefile.inc.am | 36 ---------------------------- src/admin/meson.build | 50 +++++++++++++++++++++++++++++++++++++++ src/meson.build | 2 ++ src/rpc/meson.build | 5 ++++ 4 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 src/admin/meson.build diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 2d94ead73e1..afe44437b74 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -3,39 +3,9 @@ ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x =20 ADMIN_PROTOCOL_GENERATED =3D \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ admin/admin_client.h \ - admin/admin_server_dispatch_stubs.h \ $(NULL) =20 -admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h - -noinst_LTLIBRARIES +=3D libvirt_driver_admin.la -libvirt_driver_admin_la_SOURCES =3D \ - admin/admin_server.c \ - admin/admin_server.h \ - admin/admin_server_dispatch.c \ - admin/admin_server_dispatch.h \ - $(NULL) -nodist_libvirt_driver_admin_la_SOURCES =3D \ - $(ADMIN_PROTOCOL_GENERATED) -libvirt_driver_admin_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/admin \ - -I$(top_builddir)/src/admin \ - -I$(top_srcdir)/src/util \ - -I$(top_builddir)/src/rpc \ - $(NULL) -libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) - -if WITH_SASL -libvirt_driver_admin_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - GENERATED_SYM_FILES +=3D admin/libvirt_admin.syms admin/libvirt_admin.def =20 ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms @@ -114,12 +84,6 @@ admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ admin ADMIN $(ADMIN_PROTOCOL) \ > admin/admin_client.h =20 -admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > admin/admin_server_dispatch_stubs.h - admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-tmp $@ ; \ diff --git a/src/admin/meson.build b/src/admin/meson.build new file mode 100644 index 00000000000..cf2f206e34a --- /dev/null +++ b/src/admin/meson.build @@ -0,0 +1,50 @@ +admin_driver_sources =3D [ + 'admin_server.c', + 'admin_server_dispatch.c', +] + +admin_driver_protocol =3D files('admin_protocol.x') + +admin_driver_generated =3D [] + +admin_driver_generated +=3D custom_target( + 'admin_protocol.h', + input: admin_driver_protocol, + output: 'admin_protocol.h', + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], +) + +admin_driver_generated +=3D custom_target( + 'admin_protocol.c', + input: admin_driver_protocol, + output: 'admin_protocol.c', + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], +) + +admin_driver_generated +=3D custom_target( + 'admin_server_dispatch_stubs.h', + input: admin_driver_protocol, + output: 'admin_server_dispatch_stubs.h', + command: [ + gendispatch_prog, '--mode=3Dserver', 'admin', 'ADMIN', '@INPUT@', + ], + capture: true, +) + +admin_driver_lib =3D static_library( + 'virt_admin_driver', + [ + admin_driver_sources, + admin_driver_generated, + ], + dependencies: [ + rpc_dep, + sasl_dep, + src_dep, + xdr_dep, + ], +) diff --git a/src/meson.build b/src/meson.build index c7993517760..c2a4ccb17fd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -81,3 +81,5 @@ src_dep =3D declare_dependency( subdir('conf') subdir('rpc') subdir('access') + +subdir('admin') diff --git a/src/rpc/meson.build b/src/rpc/meson.build index f6e8c7adba5..b8fbe0c38b1 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -107,3 +107,8 @@ virt_rpc_client_lib =3D static_library( ) =20 rpc_inc_dir =3D include_directories('.') + +rpc_dep =3D declare_dependency( + include_directories: [ rpc_inc_dir ], + sources: [ rpc_gen_headers ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894326; cv=none; d=zohomail.com; s=zohoarc; b=IboQZaw1yD2pSGzL85YqKaU/Ft+Cu+fV20cM+7J9j5UUD6jK22rwTkRa2XEo57tzLiAIvZfYBNmqVKzBd1Bd0QjT14lNbzLvqMwbsJdsf2J5S8k6CTNUP0+A+82buyxM/N3oTXJzJhIX0F+wMdmHZJHKXC3/wxjsg0k+sXFbtjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894326; 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=8rtYcPa6mvOErXUnqu0NQnbFDp64EiOikGlTiq9s5b4=; b=flDxE7adjmnWH0/dC/Q7SfSkM8rV7UEd/hzMse9CE05kIuxju/jKmyEXziKL+y/2n4+5aypqb28Kqmfdv8JUsRHLWiUDqyqtt08G0fkTb9wZxv+kvRh4fViYVc0ZqULyMZcch/JbK7xhxEkdEuZneDLpJGQYwTu6Fc4u2zl+c30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894326676512.5042512159007; Thu, 16 Jul 2020 03:12:06 -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-53-1SFUmwwNPi6F5r-R14FvNQ-1; Thu, 16 Jul 2020 06:07:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3A0E8064AA; Thu, 16 Jul 2020 10:07:32 +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 B536479500; Thu, 16 Jul 2020 10:07:32 +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 84A311809547; Thu, 16 Jul 2020 10:07:32 +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 06GA3fU9017361 for ; Thu, 16 Jul 2020 06:03:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 390AD2DE69; Thu, 16 Jul 2020 10:03:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3A992B6DB for ; Thu, 16 Jul 2020 10:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894325; 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=8rtYcPa6mvOErXUnqu0NQnbFDp64EiOikGlTiq9s5b4=; b=OteH1qgLCsy6uCRYMC+1yBrNI4vp1lMFcervbfzC9kj1HWKhon3DYbaNp7X3pmMNajywPs IiKCJfl8HPmpcrYXKHdL4/kAiciWnaGwnNlR765ReDp+UJXmkUZ8GPdozDyJIyITw1EAkG Q7ex83hhqzPLTrl5CQXoEa6ZEexvR8w= X-MC-Unique: 1SFUmwwNPi6F5r-R14FvNQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 135/351] meson: src: build libvirt_cpu.a static library Date: Thu, 16 Jul 2020 11:56:11 +0200 Message-Id: <1c684d50fdd547ee024476c727abd081141ad854.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.14 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/Makefile.am | 1 - src/cpu/Makefile.inc.am | 27 --------------------------- src/cpu/meson.build | 19 +++++++++++++++++++ src/meson.build | 1 + 4 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 src/cpu/Makefile.inc.am create mode 100644 src/cpu/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index ecc757c455a..24c4a7cb194 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,7 +69,6 @@ COMMON_UNIT_VARS =3D \ lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am -include cpu/Makefile.inc.am include cpu_map/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am deleted file mode 100644 index 228112a3c6c..00000000000 --- a/src/cpu/Makefile.inc.am +++ /dev/null @@ -1,27 +0,0 @@ -# vim: filetype=3Dautomake - -CPU_SOURCES =3D \ - cpu/cpu.h \ - cpu/cpu.c \ - cpu/cpu_x86.h \ - cpu/cpu_x86.c \ - cpu/cpu_x86_data.h \ - cpu/cpu_s390.h \ - cpu/cpu_s390.c \ - cpu/cpu_arm.h \ - cpu/cpu_arm_data.h \ - cpu/cpu_arm.c \ - cpu/cpu_ppc64.h \ - cpu/cpu_ppc64.c \ - cpu/cpu_ppc64_data.h \ - cpu/cpu_map.h \ - cpu/cpu_map.c \ - $(NULL) - -noinst_LTLIBRARIES +=3D libvirt_cpu.la -libvirt_la_BUILT_LIBADD +=3D libvirt_cpu.la -libvirt_cpu_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_cpu_la_SOURCES =3D $(CPU_SOURCES) diff --git a/src/cpu/meson.build b/src/cpu/meson.build new file mode 100644 index 00000000000..2404dc6b76f --- /dev/null +++ b/src/cpu/meson.build @@ -0,0 +1,19 @@ +cpu_sources =3D [ + 'cpu.c', + 'cpu_arm.c', + 'cpu_map.c', + 'cpu_ppc64.c', + 'cpu_s390.c', + 'cpu_x86.c', +] + +cpu_lib =3D static_library( + 'virt_cpu', + cpu_sources, + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) diff --git a/src/meson.build b/src/meson.build index c2a4ccb17fd..866763e08d4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -81,5 +81,6 @@ src_dep =3D declare_dependency( subdir('conf') subdir('rpc') subdir('access') +subdir('cpu') =20 subdir('admin') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894063; cv=none; d=zohomail.com; s=zohoarc; b=NbE/6aS50hkmS2azOSJ8gm0nKnLnTV2wglWQr60CaEnd1CGsbndCoKdAH2B5WcGwZaIZ9s7KgMxuIDsPQprK38qQW6tOYVxSjbId3RyqLIZwdQLOSDfCpjmSh77iE7NxVxt4BmAyjOHx//rsocHRzj2Zc4Qj00qyhcq3exbGkxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894063; 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=hAK4pqMTOwF9isOrX1cDdkdNDY06tuYzZ1w39PIsL9I=; b=GrNoPnihIpiWQwWRmi8iBMOnhLcZCPZaHwNdo87i7K/Lpb6MWw/Pvzp4Nmbo2LWbGkvlOmcHvqP3f2xDh7xbeM/C1QQo2/ZC/BTQsUougqFWx/kEIDN4H3xO1MfJE0vA/NqfJbPoAdtbvawUzF37bMGH3PCe2W+tDMK9nuzhw14= 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 1594894063654999.9473828254971; Thu, 16 Jul 2020 03:07:43 -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-95-B54vxFmQOEKHq4k7ys8Cqw-1; Thu, 16 Jul 2020 06:07:40 -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 2DADA1888AA0; Thu, 16 Jul 2020 10:07:35 +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 09F8F10098A1; Thu, 16 Jul 2020 10:07:35 +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 CEFA096247; Thu, 16 Jul 2020 10:07:34 +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 06GA3gA9017372 for ; Thu, 16 Jul 2020 06:03:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D37E2B6DB; Thu, 16 Jul 2020 10:03:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6582DE6F for ; Thu, 16 Jul 2020 10:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894062; 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=hAK4pqMTOwF9isOrX1cDdkdNDY06tuYzZ1w39PIsL9I=; b=GlPb6uqA/sPEgXIINPeqPY01XoEFmMWD9DC+ak+D2piWnmryxj3WfpZVaWKJ9kA9RZEfkC qXcBm/4LAbFtcaA3KbI6CJDpXs6jw1LhIp6mzFZdPDZSFF+dBqmnXn3XblRLKd6ArMLxgb dU9voTDejAfLVNM2fgCCpfr5QiQviVk= X-MC-Unique: B54vxFmQOEKHq4k7ys8Cqw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 136/351] meson: src: build libvirt_vmx.a static library Date: Thu, 16 Jul 2020 11:56:12 +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.84 on 10.5.11.22 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 | 2 ++ src/vmx/Makefile.inc.am | 15 --------------- src/vmx/meson.build | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 src/vmx/meson.build diff --git a/src/meson.build b/src/meson.build index 866763e08d4..59ddae341f7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -83,4 +83,6 @@ subdir('rpc') subdir('access') subdir('cpu') =20 +subdir('vmx') + subdir('admin') diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am index 88df423fed5..8912f6ee21c 100644 --- a/src/vmx/Makefile.inc.am +++ b/src/vmx/Makefile.inc.am @@ -1,20 +1,5 @@ # vim: filetype=3Dautomake =20 -VMX_SOURCES =3D \ - vmx/vmx.c \ - vmx/vmx.h \ - $(NULL) - -if WITH_VMX -noinst_LTLIBRARIES +=3D libvirt_vmx.la -libvirt_la_BUILT_LIBADD +=3D libvirt_vmx.la -libvirt_vmx_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_vmx_la_SOURCES =3D $(VMX_SOURCES) -endif WITH_VMX - if WITH_VMX USED_SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms else ! WITH_VMX diff --git a/src/vmx/meson.build b/src/vmx/meson.build new file mode 100644 index 00000000000..b09225cab68 --- /dev/null +++ b/src/vmx/meson.build @@ -0,0 +1,18 @@ +vmx_sources =3D [ + 'vmx.c', +] + +if conf.has('WITH_VMX') + vmx_lib =3D static_library( + 'virt_vmx', + [ + vmx_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894088; cv=none; d=zohomail.com; s=zohoarc; b=KBp5cI59HjQOt8DYiQEnhUV1Hqc95afD+lPSpRnFMX2V9vptwuBo7u5ZeIqmKyfXdCTsAOqC9mvt4ZY1FRWAB9tOrVO2RynIJpZNBvxkYF2hC0zUT9PgE2iFWARgWpAi8AGJXuunWOnkRK3mNbA4rbTTa2vZHbMqRbhCjGp2MAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894088; 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=P5B5Fwm/Q5Ua5GuPPSv6K9BZRxErwzEQLjBfSZW9i8o=; b=nNUIvremd+CarMipMdEbkEgXavbWhyYz4cCpc0Bf1yvuS98cdZcW8vij5ZEWB13GUmLvQXJelFq3b9iuh9AN2sV1WeWl8yIexrO4f5H2gim1NYo8U1uETe/8m1llJ584/kB5ZxmJKMGSBx6xSlJtcJTLo+celpZviWbbMVfN+CQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894088417788.223268611595; Thu, 16 Jul 2020 03:08:08 -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-231-QIWOAYdQPJqEKP_6_lwBhA-1; Thu, 16 Jul 2020 06:07:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CCF48015F4; Thu, 16 Jul 2020 10:07:37 +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 4EBFD72AEB; Thu, 16 Jul 2020 10:07:37 +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 1B3F4180CB27; Thu, 16 Jul 2020 10:07:37 +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 06GA3hbe017386 for ; Thu, 16 Jul 2020 06:03:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 060312DE69; Thu, 16 Jul 2020 10:03:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7515D2B6DB for ; Thu, 16 Jul 2020 10:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894086; 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=P5B5Fwm/Q5Ua5GuPPSv6K9BZRxErwzEQLjBfSZW9i8o=; b=P4/wV718RzOpPHlmzxjiGSGnCbzL5EqaTOOYybF6FUTFHNUHPQfWd+aVnivKl7d3Jfxe/d C2Z4NxcrGjlYGrFpMGaghjCHt/Py9BG8UJK+WGCORuCKAt0YUMzqxT4x2rpxs48A4sXjIm jk9tgefvLF+Z5kFYjC0aatSxL0tUaM0= X-MC-Unique: QIWOAYdQPJqEKP_6_lwBhA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 137/351] meson: src: build libvirt_vmware.a static library Date: Thu, 16 Jul 2020 11:56:13 +0200 Message-Id: <874922aedb8bc51430b20974f7fcc74a95ebe93e.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.15 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 | 2 ++ src/vmware/Makefile.inc.am | 20 -------------------- src/vmware/meson.build | 18 ++++++++++++++++++ src/vmx/meson.build | 2 ++ 4 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 src/vmware/meson.build diff --git a/src/meson.build b/src/meson.build index 59ddae341f7..84e810edfd2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -86,3 +86,5 @@ subdir('cpu') subdir('vmx') =20 subdir('admin') + +subdir('vmware') diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 3caa6340daf..125e0304618 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -1,25 +1,5 @@ # vim: filetype=3Dautomake =20 -VMWARE_DRIVER_SOURCES =3D \ - vmware/vmware_driver.c \ - vmware/vmware_driver.h \ - vmware/vmware_conf.c \ - vmware/vmware_conf.h \ - $(NULL) - -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES)) - -if WITH_VMWARE -noinst_LTLIBRARIES +=3D libvirt_driver_vmware.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_vmware.la -libvirt_driver_vmware_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/vmx \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_vmware_la_SOURCES =3D $(VMWARE_DRIVER_SOURCES) -endif WITH_VMWARE - if WITH_VMWARE USED_SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms else ! WITH_VMWARE diff --git a/src/vmware/meson.build b/src/vmware/meson.build new file mode 100644 index 00000000000..285cc5eb9a3 --- /dev/null +++ b/src/vmware/meson.build @@ -0,0 +1,18 @@ +vmware_sources =3D [ + 'vmware_conf.c', + 'vmware_driver.c', +] + +if conf.has('WITH_VMWARE') + vmware_lib =3D static_library( + 'virt_vmware', + vmware_sources, + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + vmx_inc_dir, + ], + ) +endif diff --git a/src/vmx/meson.build b/src/vmx/meson.build index b09225cab68..8bed1fac9fa 100644 --- a/src/vmx/meson.build +++ b/src/vmx/meson.build @@ -16,3 +16,5 @@ if conf.has('WITH_VMX') ], ) endif + +vmx_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894068; cv=none; d=zohomail.com; s=zohoarc; b=QO5a7qujOrnnAXPpRAkVx4q/5q5kXxMVZMwj78pHl8/XGTu64G4hTRIbbQuvha4nl6VQB5nwujDpIJBdlNxg6xj0hznRLfq+bTL80Zf8J+9GfNRk8HVaMDUfmI/eMA0pd2vjGg8+NxNtvRqgmFv/5QzKYrZAIQEzGs6CkRlKrKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894068; 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=DCV5nDwZGRDsfBw/8EBaLUsimNCWwQUl8uCgV1OyJsk=; b=CZ4H0kzXWTIyx8FTz2mDXazpVYYR2Hi27kfRDedIRPYK7zDgQbWwTvtXM+biBkK1UtzxwLPnseBe9Az8BBB4uTJk1IXFYzaXVmH9FGFLuf/4DTbVHOtyuHGHWqXW1RvzwCCKLnzB7VTViRSkO9ADhDl1q4h/8voG/2xi/s/o0Vc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894068745487.49594352647296; Thu, 16 Jul 2020 03:07:48 -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-266-JODXuqP2PMK8eklUZtKR5Q-1; Thu, 16 Jul 2020 06:07:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFBBF109D; Thu, 16 Jul 2020 10:07:39 +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 A10D778479; Thu, 16 Jul 2020 10:07:39 +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 731319624D; Thu, 16 Jul 2020 10:07:39 +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 06GA3hMi017394 for ; Thu, 16 Jul 2020 06:03:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id E42A92DE69; Thu, 16 Jul 2020 10:03:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CBC22B6DB for ; Thu, 16 Jul 2020 10:03:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894067; 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=DCV5nDwZGRDsfBw/8EBaLUsimNCWwQUl8uCgV1OyJsk=; b=fqDu/9nHkYzkvuLH5Fs3f4Cr7DTULinxeQbM43mBJG/nIxcLOXg/Wm3aLPPHOA5Xio/J4X Dl7nUeE9bgVlIGyM73X4ynh3X1S8AFl/StWdkyW0iHnOG04hiRviVv7msHf61RbrPe34kR 4/PaVgoY/QuJTJM7NYzVVSZT6GGBKvQ= X-MC-Unique: JODXuqP2PMK8eklUZtKR5Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 138/351] meson: src: build libvirt_driver_esx.a static library Date: Thu, 16 Jul 2020 11:56:14 +0200 Message-Id: <2d96840bb2811716dc4dadd4d0d0fe96b3f67e43.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.11 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/esx/Makefile.inc.am | 70 ----------------------------------------- src/esx/meson.build | 57 +++++++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 58 insertions(+), 70 deletions(-) create mode 100644 src/esx/meson.build diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 89e7b18d344..2e776d1ebec 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -1,77 +1,7 @@ # vim: filetype=3Dautomake =20 -ESX_DRIVER_SOURCES =3D \ - esx/esx_private.h \ - esx/esx_driver.c \ - esx/esx_driver.h \ - esx/esx_interface_driver.c \ - esx/esx_interface_driver.h \ - esx/esx_network_driver.c \ - esx/esx_network_driver.h \ - esx/esx_storage_driver.c \ - esx/esx_storage_driver.h \ - esx/esx_storage_backend_vmfs.c \ - esx/esx_storage_backend_vmfs.h \ - esx/esx_storage_backend_iscsi.c \ - esx/esx_storage_backend_iscsi.h \ - esx/esx_stream.c \ - esx/esx_stream.h \ - esx/esx_util.c \ - esx/esx_util.h \ - esx/esx_vi.c \ - esx/esx_vi.h \ - esx/esx_vi_methods.c \ - esx/esx_vi_methods.h \ - esx/esx_vi_types.c \ - esx/esx_vi_types.h \ - $(NULL) - -ESX_DRIVER_GENERATED =3D \ - esx/esx_vi_methods.generated.c \ - esx/esx_vi_methods.generated.h \ - esx/esx_vi_methods.generated.macro \ - esx/esx_vi_types.generated.c \ - esx/esx_vi_types.generated.h \ - esx/esx_vi_types.generated.typedef \ - esx/esx_vi_types.generated.typeenum \ - esx/esx_vi_types.generated.typetostring \ - esx/esx_vi_types.generated.typefromstring \ - esx/esx_vi.generated.c \ - esx/esx_vi.generated.h \ - $(NULL) - -ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp - -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(ESX_DRIVER_SOURCES)) - -$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) - -$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ - $(top_srcdir)/scripts/esx_vi_generator.py - $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ - $(top_srcdir)/scripts/esx_vi_generator.py \ - $(srcdir) $(builddir) && touch $@ - if WITH_ESX USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms else ! WITH_ESX SYM_FILES +=3D $(srcdir)/libvirt_esx.syms endif ! WITH_ESX - - -if WITH_ESX -noinst_LTLIBRARIES +=3D libvirt_driver_esx.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_esx.la -libvirt_driver_esx_la_CFLAGS =3D \ - $(CURL_CFLAGS) \ - -I$(srcdir)/conf \ - -I$(builddir)/esx \ - -I$(srcdir)/vmx \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_esx_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_esx_la_LIBADD =3D $(CURL_LIBS) -libvirt_driver_esx_la_SOURCES =3D $(ESX_DRIVER_SOURCES) -libvirt_driver_esx_la_DEPENDENCIES =3D $(ESX_DRIVER_GENERATED) - -endif WITH_ESX diff --git a/src/esx/meson.build b/src/esx/meson.build new file mode 100644 index 00000000000..6d7e2311bff --- /dev/null +++ b/src/esx/meson.build @@ -0,0 +1,57 @@ +esx_sources =3D [ + 'esx_driver.c', + 'esx_interface_driver.c', + 'esx_network_driver.c', + 'esx_storage_driver.c', + 'esx_storage_backend_vmfs.c', + 'esx_storage_backend_iscsi.c', + 'esx_stream.c', + 'esx_util.c', + 'esx_vi.c', + 'esx_vi_methods.c', + 'esx_vi_types.c', +] + +esx_gen_sources =3D custom_target( + 'virtesxgen', + input: [ + 'esx_vi_generator.input', + ], + output: [ + 'esx_vi.generated.c', + 'esx_vi.generated.h', + 'esx_vi_methods.generated.c', + 'esx_vi_methods.generated.h', + 'esx_vi_methods.generated.macro', + 'esx_vi_types.generated.c', + 'esx_vi_types.generated.h', + 'esx_vi_types.generated.typedef', + 'esx_vi_types.generated.typeenum', + 'esx_vi_types.generated.typefromstring', + 'esx_vi_types.generated.typetostring', + ], + command: [ + meson_python_prog, + esx_vi_generator_prog, + meson.source_root() / 'src', + meson.build_root() / 'src', + ], +) + +if conf.has('WITH_ESX') + esx_lib =3D static_library( + 'virt_driver_esx', + [ + esx_sources, + esx_gen_sources[1], + ], + dependencies: [ + curl_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + vmx_inc_dir, + ], + ) +endif diff --git a/src/meson.build b/src/meson.build index 84e810edfd2..794c717f136 100644 --- a/src/meson.build +++ b/src/meson.build @@ -87,4 +87,5 @@ subdir('vmx') =20 subdir('admin') =20 +subdir('esx') subdir('vmware') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894068; cv=none; d=zohomail.com; s=zohoarc; b=KKMWtQRbJwXtHuXc9nh1xs+iwsSG/ENyNm16i3fNjg3s3Rx3FXN56rHKALWh0dMgqtnzUaRsVs/7uGCS410e1ZAf3Mwl9PERRDJ02Y2DxaIQsBTqAIb2gdHyCN8yKp0IVu3cow0+E9OcEfXlyDJakaL9LZ5X7KRGp7Ew7kaPQXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894068; 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=gGGz12qIDIHC/hARkdVj9ixDIwzncpSxuHOqbp8ZHmk=; b=jM4wPtMNoiXYFmYveEqSG0+2meenYZw04r3JbTYbo8d0b4vQXsQRcRW0u4oB7ljSDzTNRwTEd4/p18CAryB2ZdOEKhKDPqrpXwf7ogt/eKBQH3ZoU0ZEGCfcdUcOX4Dn2wkBdIY82VQeTiHn1Dmi+7Up9zi0JiSubU1uSsGrsfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894068736742.1596008272146; Thu, 16 Jul 2020 03:07:48 -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-1-iEMoZ-D5PWyoFwLOKbUtHQ-1; Thu, 16 Jul 2020 06:07:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 246F11888AA2; Thu, 16 Jul 2020 10:07:32 +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 046906146F; Thu, 16 Jul 2020 10:07:32 +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 C7B5096241; Thu, 16 Jul 2020 10:07:31 +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 06GA3iCh017399 for ; Thu, 16 Jul 2020 06:03:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id CD20F2B6DB; Thu, 16 Jul 2020 10:03:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46FE42DE6F for ; Thu, 16 Jul 2020 10:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894067; 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=gGGz12qIDIHC/hARkdVj9ixDIwzncpSxuHOqbp8ZHmk=; b=M/hOYL8MLQUYnw90s8XGJAHlYuFfdkY3HIAnkPheRw5B5ik+niRtkS9ZwWMvSOMxTtPB9m ZrYKaMlfpsNwV3vHSt1Nx6/dUfdxfMs2YzeluY0Xxks1WdPU1zVkZYxn1uDWzV58VwYZXz NLIpQ8gEjN+KZUudincsw0oYxanZdgA= X-MC-Unique: iEMoZ-D5PWyoFwLOKbUtHQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 139/351] meson: src: build libvirt_driver_hyperv.a static library Date: Thu, 16 Jul 2020 11:56:15 +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.16 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/Makefile.am | 1 - src/hyperv/Makefile.inc.am | 46 -------------------------------------- src/hyperv/meson.build | 41 +++++++++++++++++++++++++++++++++ src/meson.build | 1 + 4 files changed, 42 insertions(+), 47 deletions(-) delete mode 100644 src/hyperv/Makefile.inc.am create mode 100644 src/hyperv/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index 24c4a7cb194..daab843febd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,7 +78,6 @@ include admin/Makefile.inc.am include test/Makefile.inc.am include hypervisor/Makefile.inc.am include esx/Makefile.inc.am -include hyperv/Makefile.inc.am include vmx/Makefile.inc.am include vmware/Makefile.inc.am include vbox/Makefile.inc.am diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am deleted file mode 100644 index 6e15f0682d9..00000000000 --- a/src/hyperv/Makefile.inc.am +++ /dev/null @@ -1,46 +0,0 @@ -# vim: filetype=3Dautomake - -HYPERV_DRIVER_SOURCES =3D \ - hyperv/hyperv_private.h \ - hyperv/hyperv_driver.c \ - hyperv/hyperv_driver.h \ - hyperv/hyperv_util.c \ - hyperv/hyperv_util.h \ - hyperv/hyperv_wmi.c \ - hyperv/hyperv_wmi.h \ - hyperv/hyperv_wmi_classes.c \ - hyperv/hyperv_wmi_classes.h \ - hyperv/openwsman.h \ - $(NULL) - -HYPERV_DRIVER_GENERATED =3D \ - hyperv/hyperv_wmi_classes.generated.c \ - hyperv/hyperv_wmi_classes.generated.h \ - hyperv/hyperv_wmi_classes.generated.typedef \ - $(NULL) - -HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp - -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(HYPERV_DRIVER_SOURCES)) - -$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) - -$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ - $(top_srcdir)/scripts/hyperv_wmi_generator.py - $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ - $(top_srcdir)/scripts/hyperv_wmi_generator.py $(srcdir) $(builddir) \ - && touch $@ - -if WITH_HYPERV -noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_hyperv.la -libvirt_driver_hyperv_la_CFLAGS =3D \ - $(OPENWSMAN_CFLAGS) \ - -I$(srcdir)/conf \ - -I$(builddir)/hyperv \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_hyperv_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_hyperv_la_LIBADD =3D $(OPENWSMAN_LIBS) -libvirt_driver_hyperv_la_SOURCES =3D $(HYPERV_DRIVER_SOURCES) -endif WITH_HYPERV diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build new file mode 100644 index 00000000000..71382e3db0e --- /dev/null +++ b/src/hyperv/meson.build @@ -0,0 +1,41 @@ +hyperv_sources =3D [ + 'hyperv_driver.c', + 'hyperv_util.c', + 'hyperv_wmi.c', + 'hyperv_wmi_classes.c', +] + +hyperv_gen_sources =3D custom_target( + 'virthypervgen', + input: [ + 'hyperv_wmi_generator.input', + ], + output: [ + 'hyperv_wmi_classes.generated.c', + 'hyperv_wmi_classes.generated.h', + 'hyperv_wmi_classes.generated.typedef', + ], + command: [ + meson_python_prog, + hyperv_wmi_generator_prog, + meson.source_root() / 'src', + meson.build_root() / 'src', + ], +) + +if conf.has('WITH_HYPERV') + hyperv_lib =3D static_library( + 'virt_driver_hyperv', + [ + hyperv_sources, + hyperv_gen_sources[1], + ], + dependencies: [ + openwsman_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ] + ) +endif diff --git a/src/meson.build b/src/meson.build index 794c717f136..3186f1c13e3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -88,4 +88,5 @@ subdir('vmx') subdir('admin') =20 subdir('esx') +subdir('hyperv') subdir('vmware') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894899; cv=none; d=zohomail.com; s=zohoarc; b=AAAMmVFr+K+vz1FqODOysEiG6sxsMEp9Bx6Do7HEj5jtwJGq4nC7BhuwfagUwgsUvgY6I4bTRGbr6GLN3gyeNzznYJDeRwSTTavu3iDUlQ67FoFcLBhrm7SniYDQbNEQ2Yg2YfFHhdo0vh6UNjA4bekPNYsat9YxCBgb38pKWAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894899; 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=Ep2RhTOcOZYrCDfLODsMpHaj6/4ZYo/vrOhSe9M7aYc=; b=PZxVlDcGaOAsOSjXaKmKwt2rnza4LeNH+JW3me3sxQWzlX1MyNVn0C/nhAlAKPOz27+K7VdxHXT3BDccIy3xGwjbfHuAA6DXyiSEwMTJ/usHHlABb7z5FaNbjYDiKjm2w15xh7gmtt1rxsmschM2QNBpEACVBK7iQfb7ExXZpKA= 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 1594894899108755.2943344515955; Thu, 16 Jul 2020 03:21:39 -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-99-j883lCixOqWPZHj48haDBw-1; Thu, 16 Jul 2020 06:07:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28E711888AA4; Thu, 16 Jul 2020 10:07:42 +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 08E9178487; Thu, 16 Jul 2020 10:07:42 +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 CB5D0180530D; Thu, 16 Jul 2020 10:07:41 +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 06GA3j8p017408 for ; Thu, 16 Jul 2020 06:03:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id B62012DE69; Thu, 16 Jul 2020 10:03:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 303132B6DB for ; Thu, 16 Jul 2020 10:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894897; 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=Ep2RhTOcOZYrCDfLODsMpHaj6/4ZYo/vrOhSe9M7aYc=; b=I+uG4P6p6KwsVyR1Nwdcr7xpqlzBnGAb/LI5HBh5loaZ48/upyI3aABH/q35H51ddIgUwp 7fsB+kF45GElYwgsw61IHn6pVKyqgTfy6iFZT2tI7orAk3MBu7u+fj3wlvR1/Utk36MeHB ekskgETG7Bebc70EmUNHDewUAMsuy68= X-MC-Unique: j883lCixOqWPZHj48haDBw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 140/351] meson: src: build libvirt_hypervisor.a static library Date: Thu, 16 Jul 2020 11:56:16 +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.11 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/Makefile.am | 1 - src/hypervisor/Makefile.inc.am | 20 -------------------- src/hypervisor/meson.build | 21 +++++++++++++++++++++ src/meson.build | 1 + 4 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 src/hypervisor/Makefile.inc.am create mode 100644 src/hypervisor/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index daab843febd..b7fd239d0fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include test/Makefile.inc.am -include hypervisor/Makefile.inc.am include esx/Makefile.inc.am include vmx/Makefile.inc.am include vmware/Makefile.inc.am diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am deleted file mode 100644 index bc48ab12661..00000000000 --- a/src/hypervisor/Makefile.inc.am +++ /dev/null @@ -1,20 +0,0 @@ -# vim: filetype=3Dautomake - -HYPERVISOR_SOURCES =3D \ - hypervisor/domain_cgroup.h \ - hypervisor/domain_cgroup.c \ - hypervisor/domain_driver.h \ - hypervisor/domain_driver.c \ - hypervisor/virclosecallbacks.h \ - hypervisor/virclosecallbacks.c \ - hypervisor/virhostdev.h \ - hypervisor/virhostdev.c \ - $(NULL) - -noinst_LTLIBRARIES +=3D libvirt_hypervisor.la -libvirt_la_BUILT_LIBADD +=3D libvirt_hypervisor.la -libvirt_hypervisor_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_hypervisor_la_SOURCES =3D $(HYPERVISOR_SOURCES) diff --git a/src/hypervisor/meson.build b/src/hypervisor/meson.build new file mode 100644 index 00000000000..ea1dddfe983 --- /dev/null +++ b/src/hypervisor/meson.build @@ -0,0 +1,21 @@ +hypervisor_sources =3D [ + 'domain_cgroup.c', + 'domain_driver.c', + 'virclosecallbacks.c', + 'virhostdev.c', +] + +hypervisor_lib =3D static_library( + 'virt_hypervisor', + [ + hypervisor_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) + +hypervisor_inc_dir =3D include_directories('.') diff --git a/src/meson.build b/src/meson.build index 3186f1c13e3..bf918d91ffe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -83,6 +83,7 @@ subdir('rpc') subdir('access') subdir('cpu') =20 +subdir('hypervisor') subdir('vmx') =20 subdir('admin') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894932; cv=none; d=zohomail.com; s=zohoarc; b=m1JjpUXPhwU4S2BkDF8ktDBgO+K5flhhLc5UlEGqWquFfFswO836DR/ZfY8VtEGarr1H+doptubI4gFX4TmFKnzOMJ8I/FzVaDAmmqfZaTCSmYXaoi9xldvPCtz0oCQlZabUbGfhI2XJ4Was/btG7EAbXOFmHeyAnOxPbCLv1xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894932; 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=usO2JoQGI+o9zGlrsA6xXUk4hHAFVM0x58uXueBY98g=; b=gz5p5IgEuxtFf7i0Qt7Z1X44lepFiMuKcPmqiwfhttvQ3h/giiG8oSX0YjD3IytQcEBqePCfG+rZjDEUOM6hP56lHgx4jRH7Tj+PnwYWRHNvGbNusxcPD+34ZcOm360bHoUhIYWDpvu++sV/GM1AQ5BZR/0yslLgF2jvqai0y94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894932808909.4015061175016; Thu, 16 Jul 2020 03:22: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-180-qcORUS8aN4mMd9dIPwMdJw-1; Thu, 16 Jul 2020 06:08:25 -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 656F710059DF; Thu, 16 Jul 2020 10:08:19 +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 280B71053B19; Thu, 16 Jul 2020 10:08:19 +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 DCA641803C24; Thu, 16 Jul 2020 10:08:18 +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 06GA3kgL017427 for ; Thu, 16 Jul 2020 06:03:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D9DE2DE69; Thu, 16 Jul 2020 10:03:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18BE72B6DB for ; Thu, 16 Jul 2020 10:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894931; 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=usO2JoQGI+o9zGlrsA6xXUk4hHAFVM0x58uXueBY98g=; b=a1zft7QSDBi71q1gt7tkbJ0Nlwjz7+CSrK4rw6OlRO82SddOcMXLApUqzF8H3ZJQpfv03U lv4m8RMTvlqzukGHtIqX54/YeFQAYl30AJrDLyP8VBteqC7wETZMcRj+Y1A5UjuYw0H2kH 3aby7rCglNc2LoBnxsUQpcpPw4EV210= X-MC-Unique: qcORUS8aN4mMd9dIPwMdJw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 141/351] meson: src: build libvirt_openvz.a static library Date: Thu, 16 Jul 2020 11:56:17 +0200 Message-Id: <7488f6e4207fa2f36739a8248ca8dc19286eedbc.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/meson.build | 1 + src/openvz/Makefile.inc.am | 21 --------------------- src/openvz/meson.build | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 src/openvz/meson.build diff --git a/src/meson.build b/src/meson.build index bf918d91ffe..61be43904e8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -90,4 +90,5 @@ subdir('admin') =20 subdir('esx') subdir('hyperv') +subdir('openvz') subdir('vmware') diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am index 65b750b35af..c01e33124ac 100644 --- a/src/openvz/Makefile.inc.am +++ b/src/openvz/Makefile.inc.am @@ -1,26 +1,5 @@ # vim: filetype=3Dautomake =20 -OPENVZ_DRIVER_SOURCES =3D \ - openvz/openvz_conf.c \ - openvz/openvz_conf.h \ - openvz/openvz_driver.c \ - openvz/openvz_driver.h \ - openvz/openvz_util.c \ - openvz/openvz_util.h \ - $(NULL) - -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES)) - -if WITH_OPENVZ -noinst_LTLIBRARIES +=3D libvirt_driver_openvz.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_openvz.la -libvirt_driver_openvz_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_openvz_la_SOURCES =3D $(OPENVZ_DRIVER_SOURCES) -endif WITH_OPENVZ - if WITH_OPENVZ USED_SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms else ! WITH_OPENVZ diff --git a/src/openvz/meson.build b/src/openvz/meson.build new file mode 100644 index 00000000000..b4e3befccb5 --- /dev/null +++ b/src/openvz/meson.build @@ -0,0 +1,20 @@ +openvz_sources =3D [ + 'openvz_conf.c', + 'openvz_driver.c', + 'openvz_util.c', +] + +if conf.has('WITH_OPENVZ') + openvz_lib =3D static_library( + 'virt_openvz', + [ + openvz_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894075; cv=none; d=zohomail.com; s=zohoarc; b=KqQ226VVuEXB96C7N2HMgLlV2bj22XZ06i6X0y1QsnzyyWMkZEi8H0h6NuelPa5ioHz2pEDSCVI92fsXP1bKd043B155MCLr5OPMXYHbBgjLOJdzbPce2py0Ouum/XC7xN3zq74W3KWq6hDSh6h3f5RX66rKQ8x1Rop4GzSpURU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894075; 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=Z8PL+SRtBfAB5hHO9+m/1cQkpIzC4qWuVGs07Lijo6A=; b=ldLA5dLJ6Bji9aOrWkmHH8/aLiT9kpUpJP/aqU09IMSiGCByXAK6/QpjaxmCP5UYYDi3wG0gbTm6HlWAXk04mJhEJdhQ3y0nRKkvOSk0mL+mPTvqMeOtVRRwqVAizEv6pxWTv81WZeQQBskAArQhMCoaoi4GjEziNys/4jtelUs= 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 1594894074798866.4523833396099; Thu, 16 Jul 2020 03:07:54 -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-61-qq72-mmPMXOGDOonPwp3vg-1; Thu, 16 Jul 2020 06:07:51 -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 993158005B0; Thu, 16 Jul 2020 10:07:45 +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 758981053B01; Thu, 16 Jul 2020 10:07:45 +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 3D5D596236; Thu, 16 Jul 2020 10:07:44 +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 06GA3luK017440 for ; Thu, 16 Jul 2020 06:03:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 871EA2DE69; Thu, 16 Jul 2020 10:03:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 005EA2B6DB for ; Thu, 16 Jul 2020 10:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894073; 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=Z8PL+SRtBfAB5hHO9+m/1cQkpIzC4qWuVGs07Lijo6A=; b=SPoinU049piBqo2aNEMxdrcGVb0NHIaSOENfrEIdcXm6JPHv4lLgS6ZN3mOy8atIxtc5gC AtH6NIb1XfLlMKjcewmLIUG+lJyLvAd6tuJ1iglPMTyoENNKBszeWK00KIPFfKONGBvzyn sZbrW7g1XpggK2gGLxMQbsEkWVI1SCc= X-MC-Unique: qq72-mmPMXOGDOonPwp3vg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 142/351] meson: src: build libvirt_test.a static library Date: Thu, 16 Jul 2020 11:56:18 +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.84 on 10.5.11.22 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/Makefile.am | 1 - src/meson.build | 1 + src/test/Makefile.inc.am | 23 ----------------------- src/test/meson.build | 24 ++++++++++++++++++++++++ 4 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 src/test/Makefile.inc.am create mode 100644 src/test/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index b7fd239d0fb..555c677c615 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,7 +75,6 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am -include test/Makefile.inc.am include esx/Makefile.inc.am include vmx/Makefile.inc.am include vmware/Makefile.inc.am diff --git a/src/meson.build b/src/meson.build index 61be43904e8..af9dcfbb5f5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -91,4 +91,5 @@ subdir('admin') subdir('esx') subdir('hyperv') subdir('openvz') +subdir('test') subdir('vmware') diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am deleted file mode 100644 index c209414745e..00000000000 --- a/src/test/Makefile.inc.am +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=3Dautomake - -TEST_DRIVER_SOURCES =3D \ - test/test_driver.c \ - test/test_driver.h \ - $(NULL) -TEST_DRIVER_ASSETS =3D test/test-screenshot.png - -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES)) - -if WITH_TEST - -driver_test_asset_DATA =3D $(TEST_DRIVER_ASSETS) -driver_test_assetdir =3D $(pkgdatadir) - -noinst_LTLIBRARIES +=3D libvirt_driver_test.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_test.la -libvirt_driver_test_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_test_la_SOURCES =3D $(TEST_DRIVER_SOURCES) -endif WITH_TEST diff --git a/src/test/meson.build b/src/test/meson.build new file mode 100644 index 00000000000..ec7b12304ec --- /dev/null +++ b/src/test/meson.build @@ -0,0 +1,24 @@ +test_driver_sources =3D [ + 'test_driver.c', +] + +test_driver_assets =3D [ + 'test-screenshot.png', +] + +if conf.has('WITH_TEST') + test_lib =3D static_library( + 'virt_test', + [ + test_driver_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) + + install_data(test_driver_assets, install_dir: pkgdatadir) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894063; cv=none; d=zohomail.com; s=zohoarc; b=cbhSZwt9YPnMoJ3m/xdQrAnN3l7lArBb3tGm8EkkSGuTElbKixkp3xg4EPxhZTuOx5fTB81wpJ9wv/lSGUPLVJqYAENuC53RCf7VFs+EYhTr4eAXW4YxAls9h2JW2kjMP3a9iHUwkgJdCF6tUDeiuZ+jUInF32LRiZo8tn08hL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894063; 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=IkgHINqi0MJBTgMAyuF2SvkFCsTikDvGXBVDJA0r7v4=; b=SO0IaRKm9BJ6tdxKiD0AJQxO48ZPhZWB0tXQ3UWHYceU294wuSbcnewsDNXua1owmBexb1yjXCr1u8A3CseEzZPL+2lYA01P0udlU/oimNMusT9WptdH4ivMfXeaIgpBpJEKNhZwN+tmWInOhO8LDzFKHCxCT6ksaScELi/7vAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894063934769.5881195636805; Thu, 16 Jul 2020 03:07:43 -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-494-Tzu7bIgvPcK5O9Tb6XlKrw-1; Thu, 16 Jul 2020 06:07:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5ED62100AA27; Thu, 16 Jul 2020 10:07:34 +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 3EDF779504; Thu, 16 Jul 2020 10:07:34 +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 0E12196245; Thu, 16 Jul 2020 10:07:34 +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 06GA3m8W017453 for ; Thu, 16 Jul 2020 06:03:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F5BD2DE69; Thu, 16 Jul 2020 10:03:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE5522B6DB for ; Thu, 16 Jul 2020 10:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894062; 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=IkgHINqi0MJBTgMAyuF2SvkFCsTikDvGXBVDJA0r7v4=; b=QBVx4GBJmYZOkkdrA2wjLGqW/aZkBGxI+Wy2ZFKbMHZi2sRvldvhacJImf3Xcm1lcLpRDA a69vzbdIR1cegk40BMV1UBCJz2uffwaSaI5yMfza6OWqSONc4Ed/4XpGvW3Xa1MwRGRg0A L14GU5JgDf1Nz+NT3YEOom8WVbhmr18= X-MC-Unique: Tzu7bIgvPcK5O9Tb6XlKrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 143/351] meson: src: build libvirt_driver_lock.a static library Date: Thu, 16 Jul 2020 11:56:19 +0200 Message-Id: <29226edcdd9fba9fccbce9cf370e80f5a7468341.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.14 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/locking/Makefile.inc.am | 21 --------------------- src/locking/meson.build | 18 ++++++++++++++++++ src/meson.build | 1 + 3 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 src/locking/meson.build diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b75588f9fce..3afc9803ce0 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,15 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SOURCES =3D \ - locking/lock_manager.c \ - locking/lock_manager.h \ - locking/lock_driver.h \ - locking/lock_driver_nop.h \ - locking/lock_driver_nop.c \ - locking/domain_lock.h \ - locking/domain_lock.c \ - $(NULL) - LOCK_DRIVER_SANLOCK_SOURCES =3D \ locking/lock_driver_sanlock.c =20 @@ -60,17 +50,6 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -noinst_LTLIBRARIES +=3D libvirt_driver_lock.la - -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_lock.la -libvirt_driver_lock_la_SOURCES =3D \ - $(LOCK_DRIVER_SOURCES) \ - $(NULL) -libvirt_driver_lock_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(srcdir)/conf \ - $(NULL) - lockdriverdir =3D $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES =3D =20 diff --git a/src/locking/meson.build b/src/locking/meson.build new file mode 100644 index 00000000000..67822486253 --- /dev/null +++ b/src/locking/meson.build @@ -0,0 +1,18 @@ +lock_driver_sources =3D [ + 'lock_manager.c', + 'lock_driver_nop.c', + 'domain_lock.c', +] + +lock_driver_lib =3D static_library( + 'virt_lock_driver', + [ + lock_driver_sources, + ], + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) diff --git a/src/meson.build b/src/meson.build index af9dcfbb5f5..96e49f2059c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -87,6 +87,7 @@ subdir('hypervisor') subdir('vmx') =20 subdir('admin') +subdir('locking') =20 subdir('esx') subdir('hyperv') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894065; cv=none; d=zohomail.com; s=zohoarc; b=bUxNMSoXSvj+4wBb35I+mABB54iO3OjrafHI5XrIW8q6dcW+8t5IorLMx0IVZ8RV1h+lErBZR1P94hcJ0rrZrYSJ2FFqECHv8c5vdt/iH39MW90maG7UOcxm3qBsQ/coC8bIHeWSMIt9xKe88BuT2Oaf+vpPvPHGcAV+93vHJCY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894065; 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=2BDpdKrqaMt4zbaPYjmKqvxQnFbAGLiAWNwMKj+TXdw=; b=d3lGgc0aDLxAttROnJ9pdDwdbeTWnvLVuaVaWfPPxUe7ry99mfXi4GSnSGOIAt0PPIIRvO11NGzUd3e3lJI7QplM31EgmI3IYnQaLnsMjAQjSxitDJ5Nkh9s38YUpWuBTx60sDJ+DF4AFFob705akycV7JrmKFwMrmTDISkAtJo= 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 1594894065919510.3218035657743; Thu, 16 Jul 2020 03:07:45 -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-495-0vX58TLYNFKVermI6f4trw-1; Thu, 16 Jul 2020 06:07:42 -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 A0C281888AA7; Thu, 16 Jul 2020 10:07:36 +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 7E2F06FEFB; Thu, 16 Jul 2020 10:07:36 +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 4B8321800CAF; Thu, 16 Jul 2020 10:07:36 +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 06GA3nTu017465 for ; Thu, 16 Jul 2020 06:03:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 58E792B6DB; Thu, 16 Jul 2020 10:03:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C68CC2DE6F for ; Thu, 16 Jul 2020 10:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894064; 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=2BDpdKrqaMt4zbaPYjmKqvxQnFbAGLiAWNwMKj+TXdw=; b=BDgrCOx9dsA8p0zSHogtQrayVOyr4Fl/M36E3QDUCXJOn5quriu4OmimilNNoDpiOcrJQi xwY/ptfTn/Z9ece/+4fovwc3eNivzwnkgfvsONT8Fm6RFl5+Aq5xGpqMDJh3EJLcRvwjI2 WkP4paH5zTodU1qm0sddw0zkeiDZH6I= X-MC-Unique: 0vX58TLYNFKVermI6f4trw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 144/351] meson: src: build libvirt_driver_log.a static library Date: Thu, 16 Jul 2020 11:56:20 +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.12 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/logging/Makefile.inc.am | 21 -------------------- src/logging/meson.build | 38 +++++++++++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 src/logging/meson.build diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 9aa634b126b..b88e0c8766e 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -9,11 +9,6 @@ LOG_DAEMON_GENERATED =3D \ logging/log_daemon_dispatch_stubs.h $(NULL) =20 -LOG_DRIVER_SOURCES =3D \ - logging/log_manager.c \ - logging/log_manager.h \ - $(NULL) - LOG_DAEMON_SOURCES =3D \ logging/log_daemon.h \ logging/log_daemon.c \ @@ -45,22 +40,6 @@ OPENRC_INIT_FILES_IN +=3D \ logging/virtlogd.init.in \ $(NULL) =20 -noinst_LTLIBRARIES +=3D libvirt_driver_log.la - -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_log.la -libvirt_driver_log_la_SOURCES =3D \ - $(LOG_DRIVER_SOURCES) \ - $(NULL) -nodist_libvirt_driver_log_la_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ - $(NULL) -libvirt_driver_log_la_CFLAGS =3D \ - -I$(builddir)/logging \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) - if WITH_LIBVIRTD sbin_PROGRAMS +=3D virtlogd =20 diff --git a/src/logging/meson.build b/src/logging/meson.build new file mode 100644 index 00000000000..a9c30efe063 --- /dev/null +++ b/src/logging/meson.build @@ -0,0 +1,38 @@ +log_driver_sources =3D [ + 'log_manager.c', +] + +log_protocol =3D 'log_protocol.x' + +log_protocol_generated =3D [] + +log_protocol_generated +=3D custom_target( + 'log_protocol.h', + input: log_protocol, + output: 'log_protocol.h', + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@' + ], +) + +log_protocol_generated +=3D custom_target( + 'log_protocol.c', + input: log_protocol, + output: 'log_protocol.c', + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@' + ], +) + +log_driver_lib =3D static_library( + 'virt_log_driver', + [ + log_driver_sources, + log_protocol_generated, + ], + dependencies: [ + rpc_dep, + src_dep, + xdr_dep, + ], +) diff --git a/src/meson.build b/src/meson.build index 96e49f2059c..2297721e58b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -88,6 +88,7 @@ subdir('vmx') =20 subdir('admin') subdir('locking') +subdir('logging') =20 subdir('esx') subdir('hyperv') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894390; cv=none; d=zohomail.com; s=zohoarc; b=BY7JEWMcifZwrHn5H+bPHvMfAQTeZpIkOu6jjpF700tKxbBLjJ018LRGqI1cRMR6M+8mAzIqNhw5cyEWCNYXcFtPYELwnfPue8Hf+oF/nKA8Fb+Gp/WQBnYZrU6e/aRKB/I8dIqpRljYwaamJBMN9OY1KbGsTtUCDDNlyjpxyQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894390; 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=sIupH6lifEtvznaey69I6EVJ8Rv0hHE/+6YoeJN40dE=; b=Fb3NoF8IX/gxdoi/JJ/V+fS2yTCPm66g/GI8lTFV2xJgePKEbMXWrauFd6EZ0jAiz9czVkc4dQwrYDcFNBA/fNysxNRytNhChehsLThmoyNf6UFqCZz0CY1hTuWx7dUY9bYTpLwlxY542VCmhaWBM7WZBraCadShwKsA/2U6t1M= 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 159489439034961.73024357658619; Thu, 16 Jul 2020 03:13:10 -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-471-UH-8cLijNZ-3L8c8EObxaQ-1; Thu, 16 Jul 2020 06:07:54 -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 2271410059CB; Thu, 16 Jul 2020 10:07:48 +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 C62631053B01; Thu, 16 Jul 2020 10:07:47 +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 94B9796252; Thu, 16 Jul 2020 10:07:47 +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 06GA3oYQ017473 for ; Thu, 16 Jul 2020 06:03:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 430B12DE69; Thu, 16 Jul 2020 10:03:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B04992B6DB for ; Thu, 16 Jul 2020 10:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894388; 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=sIupH6lifEtvznaey69I6EVJ8Rv0hHE/+6YoeJN40dE=; b=H/XXNWMJCXD5LT9l98+yX0D6BrFpU4kf1RcNYa+OgP84VBOmXukc2nTYT/lU41DzEWJkDq /PY3QJk8f1FrzAId8jI8WOVPRovQixZ63PVvP+LaZySXmMoolvcjSntE28Y72sLqWn+kUX znKSQpcC5LDdVtdJUOlACbzK11IoCek= X-MC-Unique: UH-8cLijNZ-3L8c8EObxaQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 145/351] meson: src: build libvirt_driver_remote.a static library Date: Thu, 16 Jul 2020 11:56:21 +0200 Message-Id: <305c40ec8e6bff51b383f27ff727c39bc28a300d.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/meson.build | 2 ++ src/remote/Makefile.inc.am | 68 -------------------------------------- src/remote/meson.build | 59 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 68 deletions(-) create mode 100644 src/remote/meson.build diff --git a/src/meson.build b/src/meson.build index 2297721e58b..637f86b5ee4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -86,6 +86,8 @@ subdir('cpu') subdir('hypervisor') subdir('vmx') =20 +subdir('remote') + subdir('admin') subdir('locking') subdir('logging') diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 341f429b773..1dff8ec67e1 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,22 +1,5 @@ # vim: filetype=3Dautomake =20 -REMOTE_DRIVER_GENERATED =3D \ - remote/remote_protocol.c \ - remote/remote_protocol.h \ - remote/remote_client_bodies.h \ - remote/lxc_protocol.c \ - remote/lxc_protocol.h \ - remote/lxc_client_bodies.h \ - remote/qemu_protocol.c \ - remote/qemu_protocol.h \ - remote/qemu_client_bodies.h \ - $(NULL) - -REMOTE_DRIVER_SOURCES =3D \ - remote/remote_driver.c \ - remote/remote_driver.h \ - $(NULL) - REMOTE_DAEMON_GENERATED =3D \ remote/remote_daemon_dispatch_stubs.h \ remote/lxc_daemon_dispatch_stubs.h \ @@ -144,39 +127,6 @@ REMOTE_DRIVER_PROTOCOL =3D \ $(LXC_PROTOCOL) \ $(NULL) =20 -DRIVER_SOURCE_FILES +=3D \ - $(REMOTE_DRIVER_GENERATED) \ - $(addprefix $(srcdir)/,$(REMOTE_DRIVER_SOURCES)) - -if WITH_REMOTE -noinst_LTLIBRARIES +=3D libvirt_driver_remote.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_remote.la -libvirt_driver_remote_la_CFLAGS =3D \ - $(XDR_CFLAGS) \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ - -I$(builddir)/rpc \ - -I$(builddir)/remote \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES =3D \ - $(REMOTE_DRIVER_SOURCES) -nodist_libvirt_driver_remote_la_SOURCES =3D \ - $(REMOTE_DRIVER_GENERATED) - -if WITH_DTRACE_PROBES -nodist_libvirt_driver_remote_la_SOURCES +=3D libvirt_probes.h -endif WITH_DTRACE_PROBES - -if WITH_SASL -libvirt_driver_remote_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - -endif WITH_REMOTE - if WITH_REMOTE USED_SYM_FILES +=3D $(srcdir)/libvirt_remote.syms else ! WITH_REMOTE @@ -420,24 +370,6 @@ virt-guest-shutdown.target: remote/virt-guest-shutdown= .target.in \ $(AM_V_GEN)cp $< $@ =20 =20 -remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - remote REMOTE $(REMOTE_PROTOCOL) \ - > remote/remote_client_bodies.h - -remote/lxc_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - lxc LXC $(LXC_PROTOCOL) \ - > remote/lxc_client_bodies.h - -remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - qemu QEMU $(QEMU_PROTOCOL) \ - > remote/qemu_client_bodies.h - remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ diff --git a/src/remote/meson.build b/src/remote/meson.build new file mode 100644 index 00000000000..383b265ea21 --- /dev/null +++ b/src/remote/meson.build @@ -0,0 +1,59 @@ +remote_driver_sources =3D [ + 'remote_driver.c', +] + +remote_driver_generated =3D [] + +foreach name : [ 'remote', 'qemu', 'lxc' ] + client_bodies_h =3D '@0@_client_bodies.h'.format(name) + protocol_c =3D '@0@_protocol.c'.format(name) + protocol_h =3D '@0@_protocol.h'.format(name) + protocol_x =3D '@0@_protocol.x'.format(name) + + remote_driver_generated +=3D custom_target( + client_bodies_h, + input: protocol_x, + output: client_bodies_h, + command: [ + gendispatch_prog, '--mode=3Dclient', name, name.to_upper(), '@INPUT@= ', + ], + capture: true, + ) + + remote_driver_generated +=3D custom_target( + protocol_h, + input: protocol_x, + output: protocol_h, + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], + ) + + remote_driver_generated +=3D custom_target( + protocol_c, + input: protocol_x, + output: protocol_c, + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], + ) +endforeach + +if conf.has('WITH_REMOTE') + remote_driver_lib =3D static_library( + 'virt_remote_driver', + [ + remote_driver_sources, + remote_driver_generated, + ], + dependencies: [ + rpc_dep, + sasl_dep, + src_dep, + xdr_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894768; cv=none; d=zohomail.com; s=zohoarc; b=YtgSG3kAiIaqgRcye9apeGszXQyHNIzWl0X9WvBaFc2Cl3sWXd+E/kc9DfivhtyrcD8xoRt0teTrU3kp7X8d3vRL9qt1TYIdJYUsUAAMnCy9GdEjkS9RzcXibkypYBNhLK0ugMIrC9wc/eX9YjbjuIIS+GE2dOdS8WqQOEDdrEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894768; 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=iImEMo6LW68jq8IvkeVCxpIGYajyZzj11XRF5lDmL2s=; b=amW3RBsyDvel9h7z+PBDYOSDWUNwCQhL8miAuLY3e5dmDoXPMMZNF01Wuwu8H1K5pY0oRyzouQLWp5GKkTOhhq0JdAoDw9SSmkpuPW4rKyGbIA0ukUBkQ0B/nMDkOHgxQIzBXwOz3egrNKjb84TwvgxHyN9udWyUXqcUIv9IQAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894768066880.4073891772578; Thu, 16 Jul 2020 03:19:28 -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-256-9w1cZMIhOgKjmdTbyL9TuA-1; Thu, 16 Jul 2020 06:07:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D40F1888AA5; Thu, 16 Jul 2020 10:07:39 +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 E50B178A58; Thu, 16 Jul 2020 10:07: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 B56369624B; Thu, 16 Jul 2020 10:07: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 06GA3qFo017490 for ; Thu, 16 Jul 2020 06:03:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 122802DE69; Thu, 16 Jul 2020 10:03:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80F0E2B6DB for ; Thu, 16 Jul 2020 10:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894766; 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=iImEMo6LW68jq8IvkeVCxpIGYajyZzj11XRF5lDmL2s=; b=bjhXq2k7tcDIu4kAly1v4Fa5RlBffQhOVYQL1UXRUxcNQI+Ii8S8L/y3O9FV+7GOsjptII r37quAr73EmN8KbWj08hhISfNS9McX0W42kE6Oed/1v05ykXaP8zilB95ONrCEPmbwiA7u SRuaqONoPrx2VQaQKJxP1NR+q5ObfsI= X-MC-Unique: 9w1cZMIhOgKjmdTbyL9TuA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 147/351] meson: introduce datatypes sources Date: Thu, 16 Jul 2020 11:56:23 +0200 Message-Id: <751bcef70e48e828677ba1857069fab0f175fc50.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.14 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/Makefile.am | 2 -- src/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 555c677c615..b948ac47a6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,8 +103,6 @@ augeasdir =3D $(datadir)/augeas/lenses =20 augeastestdir =3D $(datadir)/augeas/lenses/tests =20 -# Internal generic driver infrastructure -DATATYPES_SOURCES =3D datatypes.h datatypes.c DRIVER_SOURCES +=3D \ driver.c driver.h \ driver-hypervisor.h \ diff --git a/src/meson.build b/src/meson.build index d416531c12b..2c56caf5442 100644 --- a/src/meson.build +++ b/src/meson.build @@ -30,6 +30,13 @@ if conf.has('WITH_SECDRIVER_APPARMOR') endif =20 =20 +# Internal generic driver infrastructure + +datatypes_sources =3D [ + 'datatypes.c', +] + + # generate systemtap files =20 systemtap_dir =3D datadir / 'systemtap' / 'tapset' --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894144; cv=none; d=zohomail.com; s=zohoarc; b=Sn6RO0m3/+sZP6T4jh4l89V2JjH6ksd4L/kqnr+AgGpGhJKx+6vJ3I41yJDKBmQzPHqLS0W9jbeZeZYFAV+1BVxc5hPZfBlXIM4GPyiGpfouNv93pqiZfiVSadzPfbAo7hWPAB0D7+dJ/7DO0p/N4lV1huMbHHyzrumwyqSecmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894144; 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=GLVUKL4GPobO5oAu/c2zVkI1iBzegmSIjwRX4xecuqo=; b=I75zjRCPopum8Tql37/YGosLLICPMpnN37dYp3JN8xWgf22Pe8QGDTTbt47d1rKLV9rSNqm+JJfUHt9vKjdlyDQ79SJ+NDileLEssNULEpOYeHdkYJy2wbQxZf6KKxtO1HQ2ICaRfAgEIHw1Oec+TvY8v0fEYH/5RNCPKB98fRg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894144144168.19501475590175; Thu, 16 Jul 2020 03:09:04 -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-23-7chfiES5NBOOwjHZmRBALA-1; Thu, 16 Jul 2020 06:08:29 -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 145811888AB8; Thu, 16 Jul 2020 10:08:22 +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 E481E6FEF6; Thu, 16 Jul 2020 10:08:21 +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 B3A0D730D4; Thu, 16 Jul 2020 10:08:21 +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 06GA3v1v017560 for ; Thu, 16 Jul 2020 06:03:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id A3D752B6DB; Thu, 16 Jul 2020 10:03:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DAD22E026 for ; Thu, 16 Jul 2020 10:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894142; 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=GLVUKL4GPobO5oAu/c2zVkI1iBzegmSIjwRX4xecuqo=; b=g4eKiqWm7U82kSFgoWLR42L/m+BaW/SnICljiIHFfXmfugcp1Q7aUlenUWxisv29dE6fT7 KWZS5B61KWyfIyPLsYHAO0MlMgo5qkLcwGQhaVIrgq8PO2tK6S1c6RN4nyuX7qcP6d+l8N 8Y4XqmvtGybZegrP8uy4Fffo2WoBkM4= X-MC-Unique: 7chfiES5NBOOwjHZmRBALA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 148/351] meson: src: build libvirt_driver.a static library Date: Thu, 16 Jul 2020 11:56:24 +0200 Message-Id: <3cdee70c374fde812c3d880230d05ded917bff89.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/Makefile.am | 41 ----------------------------------------- src/meson.build | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b948ac47a6d..50807ee7491 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,6 @@ OPENRC_CONF_FILES =3D SYSCONF_FILES =3D sbin_PROGRAMS =3D bin_PROGRAMS =3D -DRIVER_SOURCES =3D =20 COMMON_UNIT_VARS =3D \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ @@ -103,36 +102,6 @@ augeasdir =3D $(datadir)/augeas/lenses =20 augeastestdir =3D $(datadir)/augeas/lenses/tests =20 -DRIVER_SOURCES +=3D \ - driver.c driver.h \ - driver-hypervisor.h \ - driver-interface.h \ - driver-network.h \ - driver-nodedev.h \ - driver-nwfilter.h \ - driver-secret.h \ - driver-state.h \ - driver-storage.h \ - driver-stream.h \ - internal.h \ - $(DATATYPES_SOURCES) \ - libvirt.c libvirt_internal.h \ - libvirt-domain.c \ - libvirt-domain-checkpoint.c \ - libvirt-domain-snapshot.c \ - libvirt-host.c \ - libvirt-interface.c \ - libvirt-network.c \ - libvirt-nodedev.c \ - libvirt-nwfilter.c \ - libvirt-secret.c \ - libvirt-storage.c \ - libvirt-stream.c \ - $(NULL) - - - - # .libs/libvirt.so is built by libtool as a side-effect of the Makefile # rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut if WITH_LINUX @@ -246,16 +215,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ # First deal with sources usable in non-daemon context =20 =20 -noinst_LTLIBRARIES +=3D libvirt_driver.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver.la -libvirt_driver_la_SOURCES =3D $(DRIVER_SOURCES) - -libvirt_driver_la_CFLAGS =3D \ - $(GNUTLS_CFLAGS) $(CURL_CFLAGS) $(XDR_CFLAGS) \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_la_LIBADD =3D \ - $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) - # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) diff --git a/src/meson.build b/src/meson.build index 2c56caf5442..753d93253ea 100644 --- a/src/meson.build +++ b/src/meson.build @@ -105,3 +105,38 @@ subdir('hyperv') subdir('openvz') subdir('test') subdir('vmware') + + +driver_sources =3D [ + 'driver.c', + 'libvirt.c', + 'libvirt-domain.c', + 'libvirt-domain-checkpoint.c', + 'libvirt-domain-snapshot.c', + 'libvirt-host.c', + 'libvirt-interface.c', + 'libvirt-network.c', + 'libvirt-nodedev.c', + 'libvirt-nwfilter.c', + 'libvirt-secret.c', + 'libvirt-storage.c', + 'libvirt-stream.c', +] + +driver_lib =3D static_library( + 'virt_driver', + [ + driver_sources, + datatypes_sources, + ], + dependencies: [ + curl_dep, + dlopen_dep, + gnutls_dep, + src_dep, + xdr_dep, + ], + include_directories: [ + conf_inc_dir, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894629; cv=none; d=zohomail.com; s=zohoarc; b=Cuh+WYItJo5jB6X0RppGaVz30MpVlyHkTRs0lsOqxXIcSw6nsla2Yy7nQPbaDXIXvqD95lVgiKMPwkQvIYWDfxdeSoAlQ/7swKoBo75yLkYXaDMBJP9dInepMfzcM3nEVT4XxI5tLuvvwsppsbH2lRimahlgs+sUKta666mMM20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894629; 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=jVxKJ6MYJhFkcNUgcJBATeo5TZMwSR7iAPS6Xz65PsQ=; b=bF+8loisiqH1E+gN3Hre2LEFZAf3FOtJO9alm+p2Et7vel+QU6hXx7sLOV5HA5HW2MEKcj2Un69ekNOOhgyfK1SdlcfZS1Kg1c4k0urU0Q2oVcH/nCkDqfxan3sLZV2TH076m+bdyRjURo9JnQH1kr2WtOqOhmwrNleauACdhkg= 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 1594894629558510.47340438597655; Thu, 16 Jul 2020 03:17: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-385-RtWGdKc1PwG3rWMhaV1pvw-1; Thu, 16 Jul 2020 06:08:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6BF60100AA21; Thu, 16 Jul 2020 10:08:26 +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 48CED2B6DC; Thu, 16 Jul 2020 10:08:26 +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 160AA1803501; Thu, 16 Jul 2020 10:08:26 +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 06GA3wWP017567 for ; Thu, 16 Jul 2020 06:03:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C9552B6DC; Thu, 16 Jul 2020 10:03:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 065272B6DB for ; Thu, 16 Jul 2020 10:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894628; 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=jVxKJ6MYJhFkcNUgcJBATeo5TZMwSR7iAPS6Xz65PsQ=; b=A/3eiEXqINJlEhRPcTRxcMUWryHizxeGSfux8IwefuoqQIOP3ew/hXF1cYxZEPimSF/tqw /Sbo5Ucxr5CSZNQX8uWON9LFdX4RmvA7eza0V5ojroLQzGZQbRX5Cqg+ATyMypNq4eT6lN 9VfCj6+A+rj8Cga3vaBJ94iGwfkyOX8= X-MC-Unique: RtWGdKc1PwG3rWMhaV1pvw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 149/351] meson: scripts: introduce gen-def-files.sh script Date: Thu, 16 Jul 2020 11:56:25 +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.84 on 10.5.11.23 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 --- scripts/gen-def-files.sh | 5 +++++ scripts/meson.build | 1 + src/Makefile.am | 8 -------- 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100755 scripts/gen-def-files.sh diff --git a/scripts/gen-def-files.sh b/scripts/gen-def-files.sh new file mode 100755 index 00000000000..1ec7b083802 --- /dev/null +++ b/scripts/gen-def-files.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +printf 'EXPORTS\n' +sed -e '/^$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d' \ + -e 's/[ ]*\(.*\)\;/ \1/g' $1 diff --git a/scripts/meson.build b/scripts/meson.build index 5d3f0af4793..aa8c872a814 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -11,6 +11,7 @@ scripts =3D [ 'check-symsorting.py', 'dtrace2systemtap.py', 'esx_vi_generator.py', + 'gen-def-files.sh', 'genaclperms.py', 'genpolkit.py', 'gensystemtap.py', diff --git a/src/Makefile.am b/src/Makefile.am index 50807ee7491..b98169f27e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -302,14 +302,6 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ chmod a-w $@-tmp && \ mv $@-tmp libvirt.syms =20 -%.def: %.syms - $(AM_V_GEN)rm -f -- $@-tmp $@ ; \ - printf 'EXPORTS\n' > $@-tmp && \ - sed -e '/^$$/d; /#/d; /:/d; /}/d; /\*/d; /LIBVIRT_/d' \ - -e 's/[ ]*\(.*\)\;/ \1/g' $^ >> $@-tmp && \ - chmod a-w $@-tmp && \ - mv $@-tmp $@ - # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES =3D libvirt_la_LDFLAGS =3D \ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894755; cv=none; d=zohomail.com; s=zohoarc; b=SdwOvZdJ7Por931ntOFq0AEF8sIsoii1oTbs0skFU9dgEdGUKxQp0F5x35EF6R4SPc2ZSYDueibU/mJ/SYLDRgip6tdCDCE5NtGMRLdCezsd3fH+YS9pGPCdUGebhTmjq4lgtCPk30abNrXZp7Xv6prwSO5FpeA+MExfXipLY5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894755; 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=HNMoQupiK2UIP/RcldSxME6iHSQOEtDjaDC0D6JbpLA=; b=h8r+n4gCy20A6E0gzcaJOpVmuRfVxRsOmC41xpD79NgGsfAXySLZD1fpaWeWXEy9d1zbNiLRBWTzJD3xN3qKN6arw7DVBs1b7WDYM12Fnx7/j9JeILtBQp8K8o6vief0HWwmvFVJa/hp6TCS0XhuvayOddYkh93OgRuFLnEkd0c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894755401128.34324006430643; Thu, 16 Jul 2020 03:19: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-236-WlYbRdJgNAawdCPJVeedcw-1; Thu, 16 Jul 2020 06:08:37 -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 C053E80BCAC; Thu, 16 Jul 2020 10:08:28 +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 A48EC74F64; Thu, 16 Jul 2020 10:08:28 +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 71ABE1802226; Thu, 16 Jul 2020 10:08:28 +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 06GA3xU0017579 for ; Thu, 16 Jul 2020 06:03:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 757AA2B6DC; Thu, 16 Jul 2020 10:03:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E38FD2B6DB for ; Thu, 16 Jul 2020 10:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894754; 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=HNMoQupiK2UIP/RcldSxME6iHSQOEtDjaDC0D6JbpLA=; b=BNh72M8ae8zgVeHcdGLlX5clefSJqUMumo+/3NP1hRjBWM7w8Bqvr+OSG7v+yIgBthi8wC 4tiPjPUotb21tjGGUgpAe+20yX0krBhP/y3a0n3+hRfIts4qAYAeYA4Kp8qOBLBUS7jcdU xg/zD/iv/c+G5ZERseK+DmIDIRVbXnI= X-MC-Unique: WlYbRdJgNAawdCPJVeedcw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 150/351] meson: scripts: introduce gen-sym-files.sh script Date: Thu, 16 Jul 2020 11:56:26 +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 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 --- scripts/gen-sym-files.sh | 15 +++++++++++++++ scripts/meson.build | 1 + src/Makefile.am | 14 -------------- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100755 scripts/gen-sym-files.sh diff --git a/scripts/gen-sym-files.sh b/scripts/gen-sym-files.sh new file mode 100755 index 00000000000..913a684d064 --- /dev/null +++ b/scripts/gen-sym-files.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +version=3D"$1" +shift +public=3D"$1" +shift +private=3D"$@" + +printf "# WARNING: generated from the following files:\n\n" +cat $public +printf "\n\n# Private symbols\n\n" +printf "$version {\n\n" +printf "global:\n\n" +cat $private +printf "\n\nlocal:\n*;\n\n};" diff --git a/scripts/meson.build b/scripts/meson.build index aa8c872a814..0d2e48c3a36 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -12,6 +12,7 @@ scripts =3D [ 'dtrace2systemtap.py', 'esx_vi_generator.py', 'gen-def-files.sh', + 'gen-sym-files.sh', 'genaclperms.py', 'genpolkit.py', 'gensystemtap.py', diff --git a/src/Makefile.am b/src/Makefile.am index b98169f27e7..b0990e94ec1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -288,20 +288,6 @@ else ! WITH_LIBSSH SYM_FILES +=3D $(srcdir)/libvirt_libssh.syms endif ! WITH_LIBSSH =20 -libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ - $(ACCESS_DRIVER_SYM_FILES) \ - $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-tmp $@ ; \ - printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ - cat $(srcdir)/libvirt_public.syms >>$@-tmp && \ - printf '\n\n# Private symbols\n\n' >>$@-tmp && \ - printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ - printf 'global:\n\n' >>$@-tmp && \ - cat $(USED_SYM_FILES) $(ACCESS_DRIVER_SYM_FILES) >>$@-tmp && \ - printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ - chmod a-w $@-tmp && \ - mv $@-tmp libvirt.syms - # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES =3D libvirt_la_LDFLAGS =3D \ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894208; cv=none; d=zohomail.com; s=zohoarc; b=Ot9agdL5oFXycmTbihZ2B/a4VPXG7+/Jhl/NoYhzLvP7dmo0FqI+euZFkVnR9EKyN1d2kjC9lJONvMwe+i5NG7QSkiS4XBnVUUpsGHaJlXpCz1+Nn2qm4TPFdEU2Ftr9yia5pcFJ2K1xBpkbmV4+94xOqlruNXyh5YnHBClB/sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894208; 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=zoJAfRLapDVc4iEB4LoCCWGsruwdNpsF9kQc8effplo=; b=fMABOpxrHNHgQR4onwuyP5Hds+p1mHaMqo92U9kV4JRLjJ55bGJxL9JLGxYBIcal7q5qV/NjtwvRz/qrlJjvGSl8vOydXo7DF0uvluJ3Hrm7UFTgpE/Eyqt88VIdGR+lKmGNsECB8IPkEWKfKqEmHsd9Dqa6CKWKVovQ6vqokmk= 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 159489420854916.44414140509093; Thu, 16 Jul 2020 03:10:08 -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-249-1Ijk6ZHlNLqnUmkPYlvK3Q-1; Thu, 16 Jul 2020 06:07:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A21B68015F7; Thu, 16 Jul 2020 10:07:52 +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 832FD78A5C; Thu, 16 Jul 2020 10:07:52 +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 50CB7180531E; Thu, 16 Jul 2020 10:07:52 +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 06GA40W6017591 for ; Thu, 16 Jul 2020 06:04:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5E39E2B6DB; Thu, 16 Jul 2020 10:04:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC4012DE6B for ; Thu, 16 Jul 2020 10:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894207; 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=zoJAfRLapDVc4iEB4LoCCWGsruwdNpsF9kQc8effplo=; b=O9lnaTadsfx+xeHPxH+WLuei0MDJG9VtJzwQzhKLBagmgbVBjDsVYAp/TuVlYW9C3cg5HN F7HUlwW7GDnHpEyTOlB27WzkLaOMmfofatLJWjrBX10VOVfs4wW6pjLlH0lCz+2JPpefWd tSfgE/VAhjvOFW3O4IhhGSb1jdRwyTY= X-MC-Unique: 1Ijk6ZHlNLqnUmkPYlvK3Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 151/351] meson: src: build libvirt.syms and libvirt.def symbol files Date: Thu, 16 Jul 2020 11:56:27 +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.14 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 --- m4/virt-win-symbols.m4 | 3 -- src/Makefile.am | 53 +-------------------------- src/access/Makefile.inc.am | 22 ----------- src/access/meson.build | 14 +++++++ src/esx/Makefile.inc.am | 7 ---- src/esx/meson.build | 6 +++ src/meson.build | 75 ++++++++++++++++++++++++++++++++++++++ src/openvz/Makefile.inc.am | 7 ---- src/openvz/meson.build | 6 +++ src/remote/Makefile.inc.am | 6 --- src/remote/meson.build | 6 +++ src/vmware/Makefile.inc.am | 7 ---- src/vmware/meson.build | 6 +++ src/vmx/Makefile.inc.am | 7 ---- src/vmx/meson.build | 6 +++ 15 files changed, 120 insertions(+), 111 deletions(-) delete mode 100644 src/esx/Makefile.inc.am delete mode 100644 src/openvz/Makefile.inc.am delete mode 100644 src/vmware/Makefile.inc.am delete mode 100644 src/vmx/Makefile.inc.am diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index eba5596e4b4..f7b8e612a8d 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -18,7 +18,6 @@ dnl . dnl =20 AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ - LIBVIRT_SYMBOL_FILE=3Dlibvirt.syms LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' LIBVIRT_QEMU_SYMBOL_FILE=3D'$(srcdir)/libvirt_qemu.syms' @@ -27,13 +26,11 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ # Also set the symbol file to .def, so src/Makefile generates libvir= t.def # from libvirt.syms and passes libvirt.def instead of libvirt.syms t= o the # linker - LIBVIRT_SYMBOL_FILE=3Dlibvirt.def LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def LIBVIRT_QEMU_SYMBOL_FILE=3Dlibvirt_qemu.def ;; esac - AC_SUBST([LIBVIRT_SYMBOL_FILE]) AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE]) AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE]) AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE]) diff --git a/src/Makefile.am b/src/Makefile.am index b0990e94ec1..3ad565f7775 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,11 +74,7 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am -include esx/Makefile.inc.am -include vmx/Makefile.inc.am -include vmware/Makefile.inc.am include vbox/Makefile.inc.am -include openvz/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include libxl/Makefile.inc.am @@ -218,9 +214,8 @@ check-local: check-protocol check-symfile check-symsort= ing \ # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) -USED_SYM_FILES +=3D $(srcdir)/libvirt_private.syms GENERATED_SYM_FILES +=3D \ - libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ + libvirt_qemu.def libvirt_lxc.def \ $(NULL) =20 =20 @@ -242,52 +237,6 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA) AUG_GENTEST_SCRIPT =3D $(top_srcdir)/scripts/augeas-gentest.py AUG_GENTEST =3D $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT) =20 - -# -# Build our version script. This is composed of three parts: -# -# 1. libvirt_public.syms - public API. These functions are always -# present in the library and should never change incompatibly. -# -# 2. libvirt_private.syms - private API. These symbols are private and -# semantics may change on every release, hence the version number is -# spliced in at build time. This ensures that if libvirtd, virsh, or a -# driver module was built against one libvirt release, it will refuse to -# load with another where symbols may have same names but different -# semantics. Such symbols should never be visible in an (installed) -# public header file. -# -# 3. libvirt_*.syms - dynamic private API. Like libvirt_private.syms, -# except that build options (such as --enable-debug) can mean these -# symbols aren't present at all. -# - -USED_SYM_FILES +=3D $(srcdir)/libvirt_driver_modules.syms - -if WITH_LINUX -USED_SYM_FILES +=3D $(srcdir)/libvirt_linux.syms -else ! WITH_LINUX -SYM_FILES +=3D $(srcdir)/libvirt_linux.syms -endif ! WITH_LINUX - -if WITH_SASL -USED_SYM_FILES +=3D $(srcdir)/libvirt_sasl.syms -else ! WITH_SASL -SYM_FILES +=3D $(srcdir)/libvirt_sasl.syms -endif ! WITH_SASL - -if WITH_SSH2 -USED_SYM_FILES +=3D $(srcdir)/libvirt_libssh2.syms -else ! WITH_SSH2 -SYM_FILES +=3D $(srcdir)/libvirt_libssh2.syms -endif ! WITH_SSH2 - -if WITH_LIBSSH -USED_SYM_FILES +=3D $(srcdir)/libvirt_libssh.syms -else ! WITH_LIBSSH -SYM_FILES +=3D $(srcdir)/libvirt_libssh.syms -endif ! WITH_LIBSSH - # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES =3D libvirt_la_LDFLAGS =3D \ diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index da9b5ef31b3..bd1d51dd777 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=3Dautomake =20 -ACCESS_DRIVER_SYM_FILES =3D \ - libvirt_access.syms \ - libvirt_access_qemu.syms \ - libvirt_access_lxc.syms \ - $(NULL) - ACCESS_DRIVER_API_FILES =3D \ libvirt_access.xml \ libvirt_access_qemu.xml \ @@ -14,8 +8,6 @@ ACCESS_DRIVER_API_FILES =3D \ =20 ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy =20 -GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) - libvirt_la_BUILT_LIBADD +=3D libvirt_driver_access.la =20 $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ @@ -31,20 +23,6 @@ polkitaction_DATA =3D $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD endif ! WITH_POLKIT =20 - -libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.syms: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclsym \ - lxc LXC $(LXC_PROTOCOL) > $@ - libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ diff --git a/src/access/meson.build b/src/access/meson.build index c5784fa4a98..dc962166873 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -13,14 +13,17 @@ remote_path =3D meson.source_root() / 'src' / 'remote' =20 access_gen_headers =3D [] access_gen_sources =3D [] +access_gen_sym =3D [] =20 foreach name : [ 'remote', 'qemu', 'lxc' ] if name =3D=3D 'remote' header_file =3D 'viraccessapicheck.h' source_file =3D 'viraccessapicheck.c' + syms_file =3D 'libvirt_access.syms' else header_file =3D 'viraccessapicheck@0@.h'.format(name) source_file =3D 'viraccessapicheck@0@.c'.format(name) + syms_file =3D 'libvirt_access_@0@.syms'.format(name) endif protocol_file =3D remote_path / '@0@_protocol.x'.format(name) =20 @@ -42,6 +45,15 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ], capture: true, ) + + access_gen_sym +=3D custom_target( + syms_file, + output: syms_file, + capture: true, + command: [ + gendispatch_prog, '--mode=3Daclsym', name, name.to_upper(), protocol= _file, + ] + ) endforeach =20 if conf.has('WITH_POLKIT') @@ -70,3 +82,5 @@ access_dep =3D declare_dependency( include_directories: access_inc_dir, sources: access_gen_headers, ) + +generated_sym_files +=3D access_gen_sym diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am deleted file mode 100644 index 2e776d1ebec..00000000000 --- a/src/esx/Makefile.inc.am +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_ESX -USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms -else ! WITH_ESX -SYM_FILES +=3D $(srcdir)/libvirt_esx.syms -endif ! WITH_ESX diff --git a/src/esx/meson.build b/src/esx/meson.build index 6d7e2311bff..08d8a542498 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -55,3 +55,9 @@ if conf.has('WITH_ESX') ], ) endif + +if conf.has('WITH_ESX') + used_sym_files +=3D 'libvirt_esx.syms' +else + sym_files +=3D 'libvirt_esx.syms' +endif diff --git a/src/meson.build b/src/meson.build index 753d93253ea..257cdbe4090 100644 --- a/src/meson.build +++ b/src/meson.build @@ -76,6 +76,44 @@ if conf.has('WITH_DTRACE_PROBES') endif =20 =20 +# symbol files + +public_sym_file =3D 'libvirt_public.syms' + +used_sym_files =3D [ + 'libvirt_private.syms', + 'libvirt_driver_modules.syms', +] + +generated_sym_files =3D [] + +sym_files =3D [] + +if host_machine.system() =3D=3D 'linux' + used_sym_files +=3D 'libvirt_linux.syms' +else + sym_files +=3D 'libvirt_linux.syms' +endif + +if conf.has('WITH_SASL') + used_sym_files +=3D 'libvirt_sasl.syms' +else + sym_files +=3D 'libvirt_sasl.syms' +endif + +if conf.has('WITH_LIBSSH') + used_sym_files +=3D 'libvirt_libssh.syms' +else + sym_files +=3D 'libvirt_libssh.syms' +endif + +if conf.has('WITH_SSH2') + used_sym_files +=3D 'libvirt_libssh2.syms' +else + sym_files +=3D 'libvirt_libssh2.syms' +endif + + # list subdirectories =20 subdir('util') @@ -140,3 +178,40 @@ driver_lib =3D static_library( conf_inc_dir, ], ) + + +# symbol files for libvirt.so + +# Build our version script. This is composed of three parts: +# +# 1. libvirt_public.syms - public API. These functions are always +# present in the library and should never change incompatibly. +# +# 2. libvirt_private.syms - private API. These symbols are private and +# semantics may change on every release, hence the version number is +# spliced in at build time. This ensures that if libvirtd, virsh, or a +# driver module was built against one libvirt release, it will refuse to +# load with another where symbols may have same names but different +# semantics. Such symbols should never be visible in an (installed) +# public header file. +# +# 3. libvirt_*.syms - dynamic private API. Like libvirt_private.syms, +# except that build options (such as --enable-debug) can mean these +# symbols aren't present at all. + +libvirt_syms =3D custom_target( + 'libvirt.syms', + input: [ public_sym_file ] + used_sym_files + generated_sym_files, + output: 'libvirt.syms', + command: [ gen_sym_files_prog, 'LIBVIRT_PRIVATE_' + meson.project_versio= n(), '@INPUT@' ], + capture: true, +) +if host_machine.system() =3D=3D 'windows' + libvirt_def =3D custom_target( + 'libvirt.def', + input: libvirt_syms, + output: 'libvirt.def', + command: [ gen_def_files_prog, '@INPUT@' ], + capture: true, + ) +endif diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am deleted file mode 100644 index c01e33124ac..00000000000 --- a/src/openvz/Makefile.inc.am +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_OPENVZ -USED_SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms -else ! WITH_OPENVZ -SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms -endif ! WITH_OPENVZ diff --git a/src/openvz/meson.build b/src/openvz/meson.build index b4e3befccb5..427b25fed1c 100644 --- a/src/openvz/meson.build +++ b/src/openvz/meson.build @@ -18,3 +18,9 @@ if conf.has('WITH_OPENVZ') ], ) endif + +if conf.has('WITH_OPENVZ') + used_sym_files +=3D 'libvirt_openvz.syms' +else + sym_files +=3D 'libvirt_openvz.syms' +endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 1dff8ec67e1..421f7337217 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -127,12 +127,6 @@ REMOTE_DRIVER_PROTOCOL =3D \ $(LXC_PROTOCOL) \ $(NULL) =20 -if WITH_REMOTE -USED_SYM_FILES +=3D $(srcdir)/libvirt_remote.syms -else ! WITH_REMOTE -SYM_FILES +=3D $(srcdir)/libvirt_remote.syms -endif ! WITH_REMOTE - if WITH_LIBVIRTD =20 sbin_PROGRAMS +=3D libvirtd virtproxyd diff --git a/src/remote/meson.build b/src/remote/meson.build index 383b265ea21..f029edefd7e 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -57,3 +57,9 @@ if conf.has('WITH_REMOTE') ], ) endif + +if conf.has('WITH_REMOTE') + used_sym_files +=3D 'libvirt_remote.syms' +else + sym_files +=3D 'libvirt_remote.syms' +endif diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am deleted file mode 100644 index 125e0304618..00000000000 --- a/src/vmware/Makefile.inc.am +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_VMWARE -USED_SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms -else ! WITH_VMWARE -SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms -endif ! WITH_VMWARE diff --git a/src/vmware/meson.build b/src/vmware/meson.build index 285cc5eb9a3..dc2a32a1610 100644 --- a/src/vmware/meson.build +++ b/src/vmware/meson.build @@ -16,3 +16,9 @@ if conf.has('WITH_VMWARE') ], ) endif + +if conf.has('WITH_VMWARE') + used_sym_files +=3D 'libvirt_vmware.syms' +else + sym_files +=3D 'libvirt_vmware.syms' +endif diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am deleted file mode 100644 index 8912f6ee21c..00000000000 --- a/src/vmx/Makefile.inc.am +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_VMX -USED_SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms -else ! WITH_VMX -SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms -endif ! WITH_VMX diff --git a/src/vmx/meson.build b/src/vmx/meson.build index 8bed1fac9fa..25e3d1a6fca 100644 --- a/src/vmx/meson.build +++ b/src/vmx/meson.build @@ -18,3 +18,9 @@ if conf.has('WITH_VMX') endif =20 vmx_inc_dir =3D include_directories('.') + +if conf.has('WITH_VMX') + used_sym_files +=3D 'libvirt_vmx.syms' +else + sym_files +=3D 'libvirt_vmx.syms' +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894088; cv=none; d=zohomail.com; s=zohoarc; b=KMpbYXBrvrafsUDKIXeQn6CeRaob8Gebx50tKHvyVXns98/GIxTY/Yxl3J8BzirggG+muHXRDRSX8+MQiSIESkKbHvZBIhjgScPWyY3lsv7nGamAJ+kXCF/nHtR1ph2jEqnCjXNt33D4jTfjV/tUFyI01FuT9nuVMt1htPE6/oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894088; 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=Lg4PW0PQcGmeo30uumefYsd2EdX2xLK6RD/ZTuFaZxk=; b=PjhUaz9jFHwv76Gzf5BUzbVylyzkIMPfHBPWyEmI3QujCDT/MMuMI349Tr8MF3/la5p/Z3oXXYfmIQvd+mKEQH5xp25pU/g+0nYXsM2ArPYEfmFaZHrWeILDk1CDLu7L+WCXT5nfCdiLjTg0UsokML3/cFGLiJUg3DkdnGrlCJ4= 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 1594894088682743.5957234330476; Thu, 16 Jul 2020 03:08:08 -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-81-AenMWwlTMEidR3bpwmF5Fg-1; Thu, 16 Jul 2020 06:08:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 741061888AAA; Thu, 16 Jul 2020 10:07:55 +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 57107724C2; Thu, 16 Jul 2020 10:07:55 +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 235071804748; Thu, 16 Jul 2020 10:07:55 +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 06GA419l017604 for ; Thu, 16 Jul 2020 06:04:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B9512DE69; Thu, 16 Jul 2020 10:04:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA7622B6DB for ; Thu, 16 Jul 2020 10:04:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894087; 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=Lg4PW0PQcGmeo30uumefYsd2EdX2xLK6RD/ZTuFaZxk=; b=PFAfoe7WVCfNYPV5+ePvW0pH22FLCAB4kSDB8BeiXu82f1w0JBNgHr1Z01tsg50Cff72ef c23j5R+OBYPmNF5tBlnSdENmex2+M/jUD//9onE94UXch7RkUJuxjn1fEMqXDwgsDNjLNq AhYS+FtDXwaqOS1bdoETlrm0CJ+z7g0= X-MC-Unique: AenMWwlTMEidR3bpwmF5Fg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 152/351] meson: src: build libvirt.so library Date: Thu, 16 Jul 2020 11:56:28 +0200 Message-Id: <0a8f826136b3ca467cb89ab922ebe8cafa67ed91.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.11 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/Makefile.am | 35 +-------------------------------- src/access/Makefile.inc.am | 2 -- src/access/meson.build | 2 ++ src/admin/meson.build | 2 ++ src/conf/meson.build | 2 ++ src/cpu/meson.build | 2 ++ src/esx/meson.build | 2 ++ src/hyperv/meson.build | 2 ++ src/hypervisor/meson.build | 2 ++ src/locking/meson.build | 2 ++ src/logging/meson.build | 2 ++ src/meson.build | 40 ++++++++++++++++++++++++++++++++++++++ src/openvz/meson.build | 2 ++ src/remote/meson.build | 2 ++ src/rpc/meson.build | 6 ++++++ src/security/meson.build | 2 ++ src/test/meson.build | 2 ++ src/util/meson.build | 2 ++ src/vmware/meson.build | 2 ++ src/vmx/meson.build | 2 ++ 20 files changed, 79 insertions(+), 36 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3ad565f7775..b83a087b716 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,6 @@ mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D -libvirt_la_BUILT_LIBADD =3D SYM_FILES =3D USED_SYM_FILES =3D GENERATED_SYM_FILES =3D @@ -65,7 +64,7 @@ COMMON_UNIT_VARS =3D \ =20 # Set these variables before we include any of the subdirs as libvirt-admi= n.la # has to be installed after libvirt.la. -lib_LTLIBRARIES +=3D libvirt.la libvirt-qemu.la libvirt-lxc.la +lib_LTLIBRARIES +=3D libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am include cpu_map/Makefile.inc.am @@ -204,13 +203,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 -######################### -# -# Build up list of libvirt.la source files based on configure conditions -# -# First deal with sources usable in non-daemon context - - # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) @@ -237,32 +229,7 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA) AUG_GENTEST_SCRIPT =3D $(top_srcdir)/scripts/augeas-gentest.py AUG_GENTEST =3D $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT) =20 -# Empty source list - it merely links a bunch of convenience libs together -libvirt_la_SOURCES =3D -libvirt_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(FLAT_NAMESPACE_FLAGS) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_la_LIBADD +=3D \ - $(DLOPEN_LIBS) \ - $(XDR_LIBS) \ - $(NULL) -libvirt_la_CFLAGS =3D -DIN_LIBVIRT $(AM_CFLAGS) -# Because we specify libvirt_la_DEPENDENCIES for $(LIBVIRT_SYMBOL_FILE), we -# lose automake's automatic dependencies on an appropriate subset of -# $(libvirt_la_LIBADD). But we were careful to create -# $(libvirt_la_BUILT_LIBADD) as the subset that automake would have -# picked out for us. -libvirt_la_DEPENDENCIES =3D $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FI= LE) - if WITH_DTRACE_PROBES -libvirt_la_BUILT_LIBADD +=3D libvirt_probes.lo -libvirt_la_DEPENDENCIES +=3D libvirt_probes.lo libvirt_probes.o -nodist_libvirt_la_SOURCES =3D libvirt_probes.h =20 tapset_DATA +=3D libvirt_functions.stp =20 diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index bd1d51dd777..72c62a0d2cd 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -8,8 +8,6 @@ ACCESS_DRIVER_API_FILES =3D \ =20 ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy =20 -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_access.la - $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ $(top_srcdir)/scripts/genpolkit.py Makefile.am $(AM_V_GEN)$(RUNUTF8) $(PYTHON) \ diff --git a/src/access/meson.build b/src/access/meson.build index dc962166873..f3b605f0009 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -75,6 +75,8 @@ virt_access_lib =3D static_library( ] ) =20 +libvirt_libs +=3D virt_access_lib + access_inc_dir =3D include_directories('.') =20 # Used by others where generated headers are required diff --git a/src/admin/meson.build b/src/admin/meson.build index cf2f206e34a..31d1a437fbe 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -48,3 +48,5 @@ admin_driver_lib =3D static_library( xdr_dep, ], ) + +libvirt_libs +=3D admin_driver_lib diff --git a/src/conf/meson.build b/src/conf/meson.build index 394cca4e6a1..03b90aa6f60 100644 --- a/src/conf/meson.build +++ b/src/conf/meson.build @@ -105,4 +105,6 @@ virt_conf_lib =3D static_library( ], ) =20 +libvirt_libs +=3D virt_conf_lib + conf_inc_dir =3D include_directories('.') diff --git a/src/cpu/meson.build b/src/cpu/meson.build index 2404dc6b76f..b4ad95e46d5 100644 --- a/src/cpu/meson.build +++ b/src/cpu/meson.build @@ -17,3 +17,5 @@ cpu_lib =3D static_library( conf_inc_dir, ], ) + +libvirt_libs +=3D cpu_lib diff --git a/src/esx/meson.build b/src/esx/meson.build index 08d8a542498..1718411d759 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -54,6 +54,8 @@ if conf.has('WITH_ESX') vmx_inc_dir, ], ) + + libvirt_libs +=3D esx_lib endif =20 if conf.has('WITH_ESX') diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 71382e3db0e..d499889b01b 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -38,4 +38,6 @@ if conf.has('WITH_HYPERV') conf_inc_dir, ] ) + + libvirt_libs +=3D hyperv_lib endif diff --git a/src/hypervisor/meson.build b/src/hypervisor/meson.build index ea1dddfe983..85149c683ee 100644 --- a/src/hypervisor/meson.build +++ b/src/hypervisor/meson.build @@ -18,4 +18,6 @@ hypervisor_lib =3D static_library( ], ) =20 +libvirt_libs +=3D hypervisor_lib + hypervisor_inc_dir =3D include_directories('.') diff --git a/src/locking/meson.build b/src/locking/meson.build index 67822486253..18b2e3c72a6 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -16,3 +16,5 @@ lock_driver_lib =3D static_library( conf_inc_dir, ], ) + +libvirt_libs +=3D lock_driver_lib diff --git a/src/logging/meson.build b/src/logging/meson.build index a9c30efe063..5d1f30ac08f 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -36,3 +36,5 @@ log_driver_lib =3D static_library( xdr_dep, ], ) + +libvirt_libs +=3D log_driver_lib diff --git a/src/meson.build b/src/meson.build index 257cdbe4090..b6b9da32df6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -114,6 +114,11 @@ else endif =20 =20 +# variables filled by subdirectories + +libvirt_libs =3D [] + + # list subdirectories =20 subdir('util') @@ -179,6 +184,8 @@ driver_lib =3D static_library( ], ) =20 +libvirt_libs +=3D driver_lib + =20 # symbol files for libvirt.so =20 @@ -206,6 +213,7 @@ libvirt_syms =3D custom_target( command: [ gen_sym_files_prog, 'LIBVIRT_PRIVATE_' + meson.project_versio= n(), '@INPUT@' ], capture: true, ) +libvirt_syms_file =3D libvirt_syms if host_machine.system() =3D=3D 'windows' libvirt_def =3D custom_target( 'libvirt.def', @@ -214,4 +222,36 @@ if host_machine.system() =3D=3D 'windows' command: [ gen_def_files_prog, '@INPUT@' ], capture: true, ) + libvirt_syms_file =3D libvirt_def endif + + +# libvirt.so library + +libvirt_syms_flags =3D '@0@@1@'.format( + version_script_flags, + libvirt_syms_file.full_path(), +) + +libvirt_lib =3D shared_library( + 'virt', + dtrace_gen_objects, + dependencies: [ + src_dep, + ], + link_args: [ + libvirt_flat_namespace, + libvirt_no_undefined, + libvirt_nodelete, + libvirt_syms_flags, + ], + link_whole: [ + libvirt_libs, + ], + link_depends: [ + libvirt_syms_file, + ], + install: true, + version: libvirt_lib_version, + soversion: libvirt_so_version, +) diff --git a/src/openvz/meson.build b/src/openvz/meson.build index 427b25fed1c..66048098774 100644 --- a/src/openvz/meson.build +++ b/src/openvz/meson.build @@ -17,6 +17,8 @@ if conf.has('WITH_OPENVZ') conf_inc_dir, ], ) + + libvirt_libs +=3D openvz_lib endif =20 if conf.has('WITH_OPENVZ') diff --git a/src/remote/meson.build b/src/remote/meson.build index f029edefd7e..a667f15ecf2 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -56,6 +56,8 @@ if conf.has('WITH_REMOTE') conf_inc_dir, ], ) + + libvirt_libs +=3D remote_driver_lib endif =20 if conf.has('WITH_REMOTE') diff --git a/src/rpc/meson.build b/src/rpc/meson.build index b8fbe0c38b1..8f4372bb3e2 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -112,3 +112,9 @@ rpc_dep =3D declare_dependency( include_directories: [ rpc_inc_dir ], sources: [ rpc_gen_headers ], ) + +libvirt_libs +=3D [ + virt_rpc_lib, + virt_rpc_client_lib, + virt_rpc_server_lib, +] diff --git a/src/security/meson.build b/src/security/meson.build index 3dc88c2c546..1e85d8dcf5f 100644 --- a/src/security/meson.build +++ b/src/security/meson.build @@ -29,3 +29,5 @@ security_driver_lib =3D static_library( conf_inc_dir, ], ) + +libvirt_libs +=3D security_driver_lib diff --git a/src/test/meson.build b/src/test/meson.build index ec7b12304ec..f54585adfd1 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -20,5 +20,7 @@ if conf.has('WITH_TEST') ], ) =20 + libvirt_libs +=3D test_lib + install_data(test_driver_assets, install_dir: pkgdatadir) endif diff --git a/src/util/meson.build b/src/util/meson.build index 59a531f6af1..3c728b355ee 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -193,4 +193,6 @@ virt_util_lib =3D static_library( ], ) =20 +libvirt_libs +=3D virt_util_lib + util_inc_dir =3D include_directories('.') diff --git a/src/vmware/meson.build b/src/vmware/meson.build index dc2a32a1610..2021b4ffa44 100644 --- a/src/vmware/meson.build +++ b/src/vmware/meson.build @@ -15,6 +15,8 @@ if conf.has('WITH_VMWARE') vmx_inc_dir, ], ) + + libvirt_libs +=3D vmware_lib endif =20 if conf.has('WITH_VMWARE') diff --git a/src/vmx/meson.build b/src/vmx/meson.build index 25e3d1a6fca..e599b8de39b 100644 --- a/src/vmx/meson.build +++ b/src/vmx/meson.build @@ -15,6 +15,8 @@ if conf.has('WITH_VMX') conf_inc_dir, ], ) + + libvirt_libs +=3D vmx_lib endif =20 vmx_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894087; cv=none; d=zohomail.com; s=zohoarc; b=PhVX67KkZCd3E3wwfawY+SOaF71+TWKaG4/WKiNCnjl9qTRo4vOPq/LWn2iya2jbMG/RGCkYDeRGamjB7RBZnapUnaWN9rSJjMhWM00HuOF5V9ZQRm3BTfB/DLsTe4fzWIDNh2NL67XRMTOlVcTtABkqCx0Ug/4eABv5NzU64QQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894087; 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=H0Syntd/2IlznB6qKN7UaPW0r7rYsuyAp9F128FgRT4=; b=Q05PsrFcrufvp7zt3f7VMxZXo2EDWcxV0AXjKV5mo8WhSxyyWMqBUxUffaRwhUa+OYTUUpijy8sNy/fdEJYVXNMa4/waIgwdsGxMTL8o99V2hBIpcf3h7+GYRyDsqom9oiiiad5rX8MIoL3KWl0CmrHZfZmxWYVvo4vfjuAlZfI= 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 1594894087185493.0632655345115; Thu, 16 Jul 2020 03:08:07 -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-483-Nftvg4hTNDWqdfKWvy-oCQ-1; Thu, 16 Jul 2020 06:08:03 -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 D898F1888AB7; Thu, 16 Jul 2020 10:07:57 +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 B502C61982; Thu, 16 Jul 2020 10:07:57 +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 81980180476B; Thu, 16 Jul 2020 10:07:57 +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 06GA42bo017616 for ; Thu, 16 Jul 2020 06:04:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 431852B6DB; Thu, 16 Jul 2020 10:04:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B27C32DE71 for ; Thu, 16 Jul 2020 10:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894086; 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=H0Syntd/2IlznB6qKN7UaPW0r7rYsuyAp9F128FgRT4=; b=GJaMIp59JVT+TU6FGPPTu57Qt/XGWihnNcjX8wj+et1asLZjUQ/QJgt8I03AT76daq4W4g xU7et79AUzS9khA7UJMYrTOMMivl7qV/C7bcmZeu15aAdz0YaRF9V2WLRV3MMZQDVCRCSV uBPwONncOWqXpJxQOB4xxB0SZyOrJyU= X-MC-Unique: Nftvg4hTNDWqdfKWvy-oCQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 153/351] meson: src: install cpu_map data Date: Thu, 16 Jul 2020 11:56:29 +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.12 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/Makefile.am | 1 - src/cpu_map/Makefile.inc.am | 78 ------------------------------------- src/cpu_map/meson.build | 75 +++++++++++++++++++++++++++++++++++ src/meson.build | 2 + 4 files changed, 77 insertions(+), 79 deletions(-) delete mode 100644 src/cpu_map/Makefile.inc.am create mode 100644 src/cpu_map/meson.build diff --git a/src/Makefile.am b/src/Makefile.am index b83a087b716..e727ad32944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,7 +67,6 @@ COMMON_UNIT_VARS =3D \ lib_LTLIBRARIES +=3D libvirt-qemu.la libvirt-lxc.la =20 include util/Makefile.inc.am -include cpu_map/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am deleted file mode 100644 index d3ccb880733..00000000000 --- a/src/cpu_map/Makefile.inc.am +++ /dev/null @@ -1,78 +0,0 @@ -# vim: filetype=3Dautomake - -cpumapdir =3D $(pkgdatadir)/cpu_map -cpumap_DATA =3D \ - cpu_map/arm_cortex-a53.xml \ - cpu_map/arm_cortex-a57.xml \ - cpu_map/arm_cortex-a72.xml \ - cpu_map/arm_features.xml \ - cpu_map/arm_Kunpeng-920.xml \ - cpu_map/arm_ThunderX299xx.xml \ - cpu_map/arm_Falkor.xml \ - cpu_map/arm_vendors.xml \ - cpu_map/index.xml \ - cpu_map/ppc64_vendors.xml \ - cpu_map/ppc64_POWER7.xml \ - cpu_map/ppc64_POWER9.xml \ - cpu_map/ppc64_POWERPC_e6500.xml \ - cpu_map/ppc64_POWER6.xml \ - cpu_map/ppc64_POWER8.xml \ - cpu_map/ppc64_POWERPC_e5500.xml \ - cpu_map/x86_features.xml \ - cpu_map/x86_vendors.xml \ - cpu_map/x86_486.xml \ - cpu_map/x86_athlon.xml \ - cpu_map/x86_Broadwell.xml \ - cpu_map/x86_Broadwell-IBRS.xml \ - cpu_map/x86_Broadwell-noTSX.xml \ - cpu_map/x86_Broadwell-noTSX-IBRS.xml \ - cpu_map/x86_Cascadelake-Server.xml \ - cpu_map/x86_Cascadelake-Server-noTSX.xml \ - cpu_map/x86_Conroe.xml \ - cpu_map/x86_Cooperlake.xml \ - cpu_map/x86_core2duo.xml \ - cpu_map/x86_coreduo.xml \ - cpu_map/x86_cpu64-rhel5.xml \ - cpu_map/x86_cpu64-rhel6.xml \ - cpu_map/x86_Dhyana.xml \ - cpu_map/x86_EPYC.xml \ - cpu_map/x86_EPYC-IBPB.xml \ - cpu_map/x86_Haswell.xml \ - cpu_map/x86_Haswell-IBRS.xml \ - cpu_map/x86_Haswell-noTSX.xml \ - cpu_map/x86_Haswell-noTSX-IBRS.xml \ - cpu_map/x86_Icelake-Client.xml \ - cpu_map/x86_Icelake-Client-noTSX.xml \ - cpu_map/x86_Icelake-Server.xml \ - cpu_map/x86_Icelake-Server-noTSX.xml \ - cpu_map/x86_IvyBridge.xml \ - cpu_map/x86_IvyBridge-IBRS.xml \ - cpu_map/x86_kvm32.xml \ - cpu_map/x86_kvm64.xml \ - cpu_map/x86_n270.xml \ - cpu_map/x86_Nehalem.xml \ - cpu_map/x86_Nehalem-IBRS.xml \ - cpu_map/x86_Opteron_G1.xml \ - cpu_map/x86_Opteron_G2.xml \ - cpu_map/x86_Opteron_G3.xml \ - cpu_map/x86_Opteron_G4.xml \ - cpu_map/x86_Opteron_G5.xml \ - cpu_map/x86_Penryn.xml \ - cpu_map/x86_pentium.xml \ - cpu_map/x86_pentium2.xml \ - cpu_map/x86_pentium3.xml \ - cpu_map/x86_pentiumpro.xml \ - cpu_map/x86_phenom.xml \ - cpu_map/x86_qemu32.xml \ - cpu_map/x86_qemu64.xml \ - cpu_map/x86_SandyBridge.xml \ - cpu_map/x86_SandyBridge-IBRS.xml \ - cpu_map/x86_Skylake-Client.xml \ - cpu_map/x86_Skylake-Client-IBRS.xml \ - cpu_map/x86_Skylake-Client-noTSX-IBRS.xml \ - cpu_map/x86_Skylake-Server.xml \ - cpu_map/x86_Skylake-Server-IBRS.xml \ - cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \ - cpu_map/x86_Westmere.xml \ - cpu_map/x86_Westmere-IBRS.xml \ - $(NULL) diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build new file mode 100644 index 00000000000..d89106dfcbd --- /dev/null +++ b/src/cpu_map/meson.build @@ -0,0 +1,75 @@ +cpumap_data =3D [ + 'arm_cortex-a53.xml', + 'arm_cortex-a57.xml', + 'arm_cortex-a72.xml', + 'arm_Falkor.xml', + 'arm_features.xml', + 'arm_Kunpeng-920.xml', + 'arm_ThunderX299xx.xml', + 'arm_vendors.xml', + 'index.xml', + 'ppc64_POWER6.xml', + 'ppc64_POWER7.xml', + 'ppc64_POWER8.xml', + 'ppc64_POWER9.xml', + 'ppc64_POWERPC_e5500.xml', + 'ppc64_POWERPC_e6500.xml', + 'ppc64_vendors.xml', + 'x86_486.xml', + 'x86_athlon.xml', + 'x86_Broadwell-IBRS.xml', + 'x86_Broadwell-noTSX-IBRS.xml', + 'x86_Broadwell-noTSX.xml', + 'x86_Broadwell.xml', + 'x86_Cascadelake-Server.xml', + 'x86_Conroe.xml', + 'x86_Cooperlake.xml', + 'x86_core2duo.xml', + 'x86_coreduo.xml', + 'x86_cpu64-rhel5.xml', + 'x86_cpu64-rhel6.xml', + 'x86_EPYC-IBPB.xml', + 'x86_EPYC.xml', + 'x86_features.xml', + 'x86_Haswell-IBRS.xml', + 'x86_Haswell-noTSX-IBRS.xml', + 'x86_Haswell-noTSX.xml', + 'x86_Haswell.xml', + 'x86_Icelake-Client-noTSX.xml', + 'x86_Icelake-Client.xml', + 'x86_Icelake-Server-noTSX.xml', + 'x86_Icelake-Server.xml', + 'x86_IvyBridge-IBRS.xml', + 'x86_IvyBridge.xml', + 'x86_kvm32.xml', + 'x86_kvm64.xml', + 'x86_n270.xml', + 'x86_Nehalem-IBRS.xml', + 'x86_Nehalem.xml', + 'x86_Opteron_G1.xml', + 'x86_Opteron_G2.xml', + 'x86_Opteron_G3.xml', + 'x86_Opteron_G4.xml', + 'x86_Opteron_G5.xml', + 'x86_Penryn.xml', + 'x86_pentium.xml', + 'x86_pentium2.xml', + 'x86_pentium3.xml', + 'x86_pentiumpro.xml', + 'x86_phenom.xml', + 'x86_qemu32.xml', + 'x86_qemu64.xml', + 'x86_SandyBridge-IBRS.xml', + 'x86_SandyBridge.xml', + 'x86_Skylake-Client-IBRS.xml', + 'x86_Skylake-Client-noTSX-IBRS.xml', + 'x86_Skylake-Client.xml', + 'x86_Skylake-Server-IBRS.xml', + 'x86_Skylake-Server-noTSX-IBRS.xml', + 'x86_Skylake-Server.xml', + 'x86_vendors.xml', + 'x86_Westmere-IBRS.xml', + 'x86_Westmere.xml', +] + +install_data(cpumap_data, install_dir: pkgdatadir / 'cpu_map') diff --git a/src/meson.build b/src/meson.build index b6b9da32df6..748bb7a9914 100644 --- a/src/meson.build +++ b/src/meson.build @@ -121,6 +121,8 @@ libvirt_libs =3D [] =20 # list subdirectories =20 +subdir('cpu_map') + subdir('util') =20 src_dep =3D declare_dependency( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594895137; cv=none; d=zohomail.com; s=zohoarc; b=eWCO15bQ0dd1Vvr5MyNv8m5JNgMDVmiTOZIbLyR79uqQeBNrvEbP+wpBEuqgyqZImBk9gQhlXyRYRaDFWnirRZi08OfOWJu1JbvEju2Bgt6LJPSCnJVFm+HmOgqqlkP49YDPxuYF837iJ3jQUiQtqOGByElw0LMgjB0WGM69KUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895137; 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=63zFKPyCjMflMzcExAJG+kpAwOX+wPr4Cui2Mo1cmNw=; b=MyRKG+rbhjmAT5eUVwxDNzchHdY3HvmY2qMqskPgkiCzY+gwKocn8dJXMR+y3WBvScpKtlBiXXEeCukGb5KoORSd5ql/0IRomzQd2b+XT6M3CfNUjRNcGKPJGbl+9XzFtMVIzJbXpWQJer6Ic0A5Z/wtDGCEsz/pna0vfQfn6OU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594895137726195.49402844382723; Thu, 16 Jul 2020 03:25:37 -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-404-6xTEn95SOtu_riDygXZipA-1; Thu, 16 Jul 2020 06:08:37 -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 3DFA21099; Thu, 16 Jul 2020 10:08:31 +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 16D2260E3E; Thu, 16 Jul 2020 10:08:31 +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 D78D3730E5; Thu, 16 Jul 2020 10:08:30 +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 06GA434U017629 for ; Thu, 16 Jul 2020 06:04:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C5252DE69; Thu, 16 Jul 2020 10:04:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AB592B6DB for ; Thu, 16 Jul 2020 10:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895136; 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=63zFKPyCjMflMzcExAJG+kpAwOX+wPr4Cui2Mo1cmNw=; b=PWBaAFte1RB+piEOIlCUePNfV1HadNbA5Y2EQ60yzNAd4wyUsDjsEzMd57fdMijqLj+0iM F5dFFuZIrP1LG2hZqXuvLtig0m8rMMKv1i7io1tHav6buNbQTxXTkgvrandAZNihlJgCqM Tmab0KOGoxKc4kytNR1wlDWrs9Q+V8o= X-MC-Unique: 6xTEn95SOtu_riDygXZipA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 154/351] meson: src: build libvirt-qemu.so library Date: Thu, 16 Jul 2020 11:56:30 +0200 Message-Id: <0f327b5a5c84a420fcb53b270f58dda52d41673a.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 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 --- m4/virt-win-symbols.m4 | 3 --- src/Makefile.am | 14 ++---------- src/meson.build | 48 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index f7b8e612a8d..dc5c5daa660 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -20,7 +20,6 @@ dnl AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' - LIBVIRT_QEMU_SYMBOL_FILE=3D'$(srcdir)/libvirt_qemu.syms' case "$host" in *-*-mingw* ) # Also set the symbol file to .def, so src/Makefile generates libvir= t.def @@ -28,10 +27,8 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ # linker LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def - LIBVIRT_QEMU_SYMBOL_FILE=3Dlibvirt_qemu.def ;; esac AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE]) AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE]) - AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index e727ad32944..5655655ee32 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,7 +64,7 @@ COMMON_UNIT_VARS =3D \ =20 # Set these variables before we include any of the subdirs as libvirt-admi= n.la # has to be installed after libvirt.la. -lib_LTLIBRARIES +=3D libvirt-qemu.la libvirt-lxc.la +lib_LTLIBRARIES +=3D libvirt-lxc.la =20 include util/Makefile.inc.am include security/Makefile.inc.am @@ -206,7 +206,7 @@ check-local: check-protocol check-symfile check-symsort= ing \ # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) GENERATED_SYM_FILES +=3D \ - libvirt_qemu.def libvirt_lxc.def \ + libvirt_lxc.def \ $(NULL) =20 =20 @@ -246,16 +246,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -libvirt_qemu_la_SOURCES =3D libvirt-qemu.c -libvirt_qemu_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_qemu_la_CFLAGS =3D $(AM_CFLAGS) -libvirt_qemu_la_LIBADD =3D libvirt.la - libvirt_lxc_la_SOURCES =3D libvirt-lxc.c libvirt_lxc_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \ diff --git a/src/meson.build b/src/meson.build index 748bb7a9914..a7fbff674c6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -257,3 +257,51 @@ libvirt_lib =3D shared_library( version: libvirt_lib_version, soversion: libvirt_so_version, ) + + +# libvirt-qemu.syms symbol files + +libvirt_qemu_syms =3D meson.current_source_dir() / 'libvirt_qemu.syms' +libvirt_qemu_syms_file =3D libvirt_qemu_syms +libvirt_qemu_syms_path =3D libvirt_qemu_syms +if host_machine.system() =3D=3D 'windows' + libvirt_qemu_def =3D custom_target( + 'libvirt_qemu.def', + input: libvirt_qemu_syms, + output: 'libvirt_qemu.def', + command: [ gen_def_files_prog, '@INPUT@' ], + capture: true, + ) + libvirt_qemu_syms_file =3D libvirt_qemu_def + libvirt_qemu_syms_path =3D libvirt_qemu_def.full_path() +endif + + +# libvirt-qemu.so + +libvirt_qemu_syms_flags =3D '@0@@1@'.format( + version_script_flags, + libvirt_qemu_syms_path, +) + +libvirt_qemu_lib =3D shared_library( + 'virt-qemu', + 'libvirt-qemu.c', + dependencies: [ + src_dep, + ], + link_args: [ + libvirt_nodelete, + libvirt_qemu_syms_flags, + ], + link_with: [ + libvirt_lib, + ], + link_depends: [ + libvirt_qemu_syms_file, + ], + install: true, + install_rpath: libdir, + version: libvirt_lib_version, + soversion: libvirt_so_version, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894089; cv=none; d=zohomail.com; s=zohoarc; b=GvzYMt2XIiIDRzZAqQ2dXIcMrcLNDR0g0+zesLGgo6SoTTZTD3h+AxBgyRR/iKLB4LNJyTuA/XRyWffUpm+ya931Ah8M83NruEGJP+s0m9RNgFVxlMrLggUYBuVFnnWaw5IOj5ZQmBNyFgPTrQ28lhk+iWsD/dQNQjqCG6xd2Bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894089; 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=C04rELgXN6PzbsxZmeIEU5D7Cbnzz/2gOVjNeD3kvQw=; b=D6+y6MhCQMuf7Xl5yyzNU7vHnioBRudV4gifB8XpIauOTedb68iIqdBsUrwxXusod7wvTYb9pakHf79mTTZSrgSLtG6InRRaJaI/NsJWD1Xy6nX3jTHx9dIu+I0XAD9QPK50fAFR8iSrBDuO1KbqVqqv8Ox650Vh8LO8Jyoyz2k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894089545618.234375503789; Thu, 16 Jul 2020 03:08: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-246-66WyOjSnO423CyzF8ioPbw-1; Thu, 16 Jul 2020 06:08:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38569100945A; Thu, 16 Jul 2020 10:08:00 +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 19A2861472; Thu, 16 Jul 2020 10:08:00 +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 DB9A496259; Thu, 16 Jul 2020 10:07:59 +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 06GA44fQ017639 for ; Thu, 16 Jul 2020 06:04:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 14D522DE69; Thu, 16 Jul 2020 10:04:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83BA02B6DB for ; Thu, 16 Jul 2020 10:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894088; 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=C04rELgXN6PzbsxZmeIEU5D7Cbnzz/2gOVjNeD3kvQw=; b=eznCTXyuN3FGtnRe5PJ71AqUU4KfQ0yuV0nbnwVSeLPwc1KAssW206pPhmYk2jzDFBs0HE dLvjo7HRZSeR45bcuyzQb5Nf0yEgD9cM7mfSBRSnn1rk/alc0QZE5qPiE7N/iu4ReKPTNC omnXT1ZU+BgbF6TnCtEYLHjgruXqNCk= X-MC-Unique: 66WyOjSnO423CyzF8ioPbw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 155/351] meson: src: build libvirt-lxc.so library Date: Thu, 16 Jul 2020 11:56:31 +0200 Message-Id: <91fc2ba04350c31c37d2aad3890f862596749ee1.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.16 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" There are two extra dependencies compared to automake, apparmor and selinux. It looks like libtool is doing some magic and inheriting dependencies from libvirt.la which inherits these dependencies from other libraries. Without these two dependencies in meson the compilation fails. Signed-off-by: Pavel Hrdina --- m4/virt-win-symbols.m4 | 3 --- src/Makefile.am | 18 --------------- src/meson.build | 50 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 index dc5c5daa660..5ffee491877 100644 --- a/m4/virt-win-symbols.m4 +++ b/m4/virt-win-symbols.m4 @@ -19,16 +19,13 @@ dnl =20 AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms - LIBVIRT_LXC_SYMBOL_FILE=3D'$(srcdir)/libvirt_lxc.syms' case "$host" in *-*-mingw* ) # Also set the symbol file to .def, so src/Makefile generates libvir= t.def # from libvirt.syms and passes libvirt.def instead of libvirt.syms t= o the # linker LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def - LIBVIRT_LXC_SYMBOL_FILE=3Dlibvirt_lxc.def ;; esac AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE]) - AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index 5655655ee32..45aee9bea1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,7 +37,6 @@ INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D SYM_FILES =3D USED_SYM_FILES =3D -GENERATED_SYM_FILES =3D augeas_DATA =3D augeastest_DATA =3D conf_DATA =3D @@ -62,10 +61,6 @@ COMMON_UNIT_VARS =3D \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ $(NULL) =20 -# Set these variables before we include any of the subdirs as libvirt-admi= n.la -# has to be installed after libvirt.la. -lib_LTLIBRARIES +=3D libvirt-lxc.la - include util/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am @@ -205,9 +200,6 @@ check-local: check-protocol check-symfile check-symsort= ing \ # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. SYM_FILES +=3D $(USED_SYM_FILES) -GENERATED_SYM_FILES +=3D \ - libvirt_lxc.def \ - $(NULL) =20 =20 check-local: check-augeas @@ -246,16 +238,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -libvirt_lxc_la_SOURCES =3D libvirt-lxc.c -libvirt_lxc_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_LXC_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_lxc_la_CFLAGS =3D $(AM_CFLAGS) -libvirt_lxc_la_LIBADD =3D libvirt.la - install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig for f in $(SYSCONF_FILES:%.sysconf=3D%) ; \ diff --git a/src/meson.build b/src/meson.build index a7fbff674c6..f324b165f99 100644 --- a/src/meson.build +++ b/src/meson.build @@ -305,3 +305,53 @@ libvirt_qemu_lib =3D shared_library( version: libvirt_lib_version, soversion: libvirt_so_version, ) + + +# libvirt-lxc.so symbol files + +libvirt_lxc_syms =3D meson.current_source_dir() / 'libvirt_lxc.syms' +libvirt_lxc_syms_file =3D libvirt_lxc_syms +libvirt_lxc_syms_path =3D libvirt_lxc_syms +if host_machine.system() =3D=3D 'windows' + libvirt_lxc_def =3D custom_target( + 'libvirt_lxc.def', + input: libvirt_lxc_syms, + output: 'libvirt_lxc.def', + command: [ gen_def_files_prog, '@INPUT@' ], + capture: true, + ) + libvirt_lxc_syms_file =3D libvirt_lxc_def + libvirt_lxc_syms_path =3D libvirt_lxc_def.full_path() +endif + + +# libvirt-lxc.so + +libvirt_lxc_syms_flags =3D '@0@@1@'.format( + version_script_flags, + libvirt_lxc_syms_path, +) + +libvirt_lxc_lib =3D shared_library( + 'virt-lxc', + 'libvirt-lxc.c', + dependencies: [ + apparmor_dep, + selinux_dep, + src_dep, + ], + link_args: [ + libvirt_nodelete, + libvirt_lxc_syms_flags, + ], + link_with: [ + libvirt_lib, + ], + link_depends: [ + libvirt_lxc_syms_file, + ], + install: true, + install_rpath: libdir, + version: libvirt_lib_version, + soversion: libvirt_so_version, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894125; cv=none; d=zohomail.com; s=zohoarc; b=edoQurx6bS1y/TiLdXKxcNeuzz6sW08nD1LG4bpPtDKdiNnUd5vw8vrYVklv5yYFGxIkP06QbziPvJr3vTxGsxCGf5kXrUufbJhxldPyjqp8nB17VSSKG0yRmEttLcuGZLsXahWb5/65H1b7uLq12I9DC/SuYidsdISl50FdYfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894125; 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=qYfvu1hjaGC8kKH+9iF8HXOiiQkia2M45VbjeKakZXs=; b=HP1MvJbGLdbtVblmh1yPeluGU5VPY1FH9xcN4DsGZma4y3JsPODBtIUEcWTwQhOloCVPmg20dw8OOb807mPNgMmRlUpQrOhK+SUNISU3JmsIGUyclHhOWprxyGTUu0N/RF8DkvPK+pXFz++U40zgrCUPuxET5mRHfPlWInR7vs0= 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 1594894125519228.01809635813686; Thu, 16 Jul 2020 03:08:45 -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-405-ghQUy4FZNwCwr9TEBXaR-w-1; Thu, 16 Jul 2020 06:08:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90F271093; Thu, 16 Jul 2020 10:08:33 +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 729985FC2C; Thu, 16 Jul 2020 10:08:33 +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 3C08E180BACF; Thu, 16 Jul 2020 10:08:33 +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 06GA44kp017649 for ; Thu, 16 Jul 2020 06:04:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id F11512DE69; Thu, 16 Jul 2020 10:04:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CDAE2B6DB for ; Thu, 16 Jul 2020 10:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894124; 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=qYfvu1hjaGC8kKH+9iF8HXOiiQkia2M45VbjeKakZXs=; b=XgC7u5ifEqjQij5G9MYFXW4bcWKh5kaBphXI4nxyrk/k/U+6egcqOvaNsalquEStaiS3Fl U+VbvnmTZ/vhXj1R4UhdkwbR76vPPBnlxPAwsY44wE3s8bQg7cF4GNIeq/dyOOBvhLlRVP Kgxm2Tt/PMchixbPbSJoC2yJRAeRZDk= X-MC-Unique: ghQUy4FZNwCwr9TEBXaR-w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 156/351] meson: src: build libvirt-admin.so library Date: Thu, 16 Jul 2020 11:56:32 +0200 Message-Id: <98d652b93ff731bd6ae8ddd65a221d35e1021824.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.16 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" We have to compile the libvirt-admin.so outside of src/admin directory because it depends on libvirt.so. Signed-off-by: Pavel Hrdina --- configure.ac | 1 - m4/virt-win-symbols.m4 | 31 ---------------- src/Makefile.am | 1 - src/admin/Makefile.inc.am | 75 --------------------------------------- src/admin/meson.build | 43 ++++++++++++++++++++++ src/meson.build | 44 +++++++++++++++++++++++ src/remote/meson.build | 2 ++ 7 files changed, 89 insertions(+), 108 deletions(-) delete mode 100644 m4/virt-win-symbols.m4 diff --git a/configure.ac b/configure.ac index e6c7e50bb14..af52f957cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ PKG_PROG_PKG_CONFIG =20 =20 dnl MinGW checks -LIBVIRT_WIN_CHECK_SYMBOLS LIBVIRT_WIN_CHECK_WINDRES =20 =20 diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4 deleted file mode 100644 index 5ffee491877..00000000000 --- a/m4/virt-win-symbols.m4 +++ /dev/null @@ -1,31 +0,0 @@ -dnl The MinGW symbols checks -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [ - LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.syms - case "$host" in - *-*-mingw* ) - # Also set the symbol file to .def, so src/Makefile generates libvir= t.def - # from libvirt.syms and passes libvirt.def instead of libvirt.syms t= o the - # linker - LIBVIRT_ADMIN_SYMBOL_FILE=3Dadmin/libvirt_admin.def - ;; - esac - AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE]) -]) diff --git a/src/Makefile.am b/src/Makefile.am index 45aee9bea1d..71a55e235f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,6 @@ AM_LDFLAGS_MOD_NOUNDEF =3D $(AM_LDFLAGS_MOD) $(NO_UNDEFIN= ED_LDFLAGS) nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -lib_LTLIBRARIES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index afe44437b74..bdaed14cd19 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -1,65 +1,9 @@ # vim: filetype=3Dautomake =20 -ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x - -ADMIN_PROTOCOL_GENERATED =3D \ - admin/admin_client.h \ - $(NULL) - -GENERATED_SYM_FILES +=3D admin/libvirt_admin.syms admin/libvirt_admin.def - ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms =20 conf_DATA +=3D admin/libvirt-admin.conf =20 -lib_LTLIBRARIES +=3D libvirt-admin.la - -libvirt_admin_la_SOURCES =3D \ - admin/libvirt-admin.c \ - $(DATATYPES_SOURCES) - -nodist_libvirt_admin_la_SOURCES =3D \ - $(ADMIN_PROTOCOL_GENERATED) - -libvirt_admin_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) \ - $(NULL) - -libvirt_admin_la_LIBADD =3D \ - libvirt.la \ - $(XDR_LIBS) \ - $(CAPNG_LIBS) \ - $(YAJL_LIBS) \ - $(DEVMAPPER_LIBS) \ - $(LIBXML_LIBS) \ - $(GLIB_LIBS) \ - $(SSH2_LIBS) \ - $(SASL_LIBS) \ - $(GNUTLS_LIBS) \ - $(LIBSSH_LIBS) - -if WITH_DTRACE_PROBES -libvirt_admin_la_LIBADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_admin_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(builddir)/admin \ - -I$(builddir)/access \ - -I$(srcdir)/remote \ - -I$(srcdir)/rpc \ - -I$(builddir)/rpc \ - $(XDR_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(SASL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(LIBSSH_CFLAGS) - if WITH_LINUX check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \ @@ -77,22 +21,3 @@ check-admin-drivername: $(srcdir)/admin/libvirt_admin_public.syms =20 check-admin: check-admin-symfile check-admin-symsorting check-admin-driver= name - -admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > admin/admin_client.h - -admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ - $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-tmp $@ ; \ - printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp && \ - cat $(srcdir)/admin/libvirt_admin_public.syms >>$@-tmp && \ - printf '\n\n# Private symbols\n\n' >>$@-tmp && \ - printf 'LIBVIRT_ADMIN_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ - printf 'global:\n\n' >>$@-tmp && \ - cat $(ADMIN_SYM_FILES) >>$@-tmp && \ - printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ - chmod a-w $@-tmp && \ - mv $@-tmp admin/libvirt_admin.syms diff --git a/src/admin/meson.build b/src/admin/meson.build index 31d1a437fbe..3522d789a00 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -35,6 +35,47 @@ admin_driver_generated +=3D custom_target( capture: true, ) =20 +admin_sources =3D files( + 'libvirt-admin.c', +) + +admin_client_generated =3D custom_target( + 'admin_client.h', + input: admin_driver_protocol, + output: 'admin_client.h', + command: [ + gendispatch_prog, '--mode=3Dclient', 'admin', 'ADMIN', '@INPUT@', + ], + capture: true, +) + +libvirt_admin_syms =3D custom_target( + 'libvirt_admin.syms', + input: [ + 'libvirt_admin_public.syms', + 'libvirt_admin_private.syms', + ], + output: 'libvirt_admin.syms', + command: [ gen_sym_files_prog, 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_= version(), '@INPUT@' ], + capture: true, +) +libvirt_admin_syms_file =3D libvirt_admin_syms +if host_machine.system() =3D=3D 'windows' + libvirt_admin_def =3D custom_target( + 'libvirt_admin.def', + input: libvirt_admin_syms, + output: 'libvirt_admin.def', + command: [ gen_def_files_prog, '@INPUT@' ], + capture: true, + ) + libvirt_admin_syms_file =3D libvirt_admin_def +endif + +libvirt_admin_syms_flags =3D '@0@@1@'.format( + version_script_flags, + libvirt_admin_syms_file.full_path(), +) + admin_driver_lib =3D static_library( 'virt_admin_driver', [ @@ -50,3 +91,5 @@ admin_driver_lib =3D static_library( ) =20 libvirt_libs +=3D admin_driver_lib + +admin_inc_dir =3D include_directories('.') diff --git a/src/meson.build b/src/meson.build index f324b165f99..9c088014415 100644 --- a/src/meson.build +++ b/src/meson.build @@ -355,3 +355,47 @@ libvirt_lxc_lib =3D shared_library( version: libvirt_lib_version, soversion: libvirt_so_version, ) + + +# libvirt-admin.so + +libvirt_admin_lib =3D shared_library( + 'virt-admin', + [ + admin_sources, + admin_client_generated, + admin_driver_generated, + datatypes_sources, + dtrace_gen_objects, + ], + dependencies: [ + capng_dep, + devmapper_dep, + gnutls_dep, + libssh2_dep, + libssh_dep, + sasl_dep, + src_dep, + rpc_dep, + xdr_dep, + yajl_dep, + ], + include_directories: [ + admin_inc_dir, + remote_inc_dir, + ], + link_args: [ + libvirt_admin_syms_flags, + libvirt_nodelete, + ], + link_with: [ + libvirt_lib, + ], + link_depends: [ + libvirt_admin_syms_file, + ], + install: true, + install_rpath: libdir, + version: libvirt_lib_version, + soversion: libvirt_so_version, +) diff --git a/src/remote/meson.build b/src/remote/meson.build index a667f15ecf2..3de6c5ee1f4 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -65,3 +65,5 @@ if conf.has('WITH_REMOTE') else sym_files +=3D 'libvirt_remote.syms' endif + +remote_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894926; cv=none; d=zohomail.com; s=zohoarc; b=KjbaGQw2gq2DyUQ4Q+wwKLoM91dU+jpps8rMJ0t1tKOBPN6CTpBvydqR5x0xlOk9zxLLKrnpmwH/THocOaNNmx+8bDt7MXHm4VFjFgKazHdK4euEF9FI/GViNJlY+bf6DqAP4zUm0a6QF6DMxSp2W8rC8+MJxo5dToGkPuaJ2vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894926; 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=Xu6O9Wq42yawpV7NuAn0YlGUq3qx7UO0ZgOjRzJ0MzU=; b=USLSN6eXJHlCheQw2TpgXFGy8hj2m3lJZvAT6f/S5fFwEaeHXWPTx7K4LgaxAwrapjP+IUULhVfG4KN3L5kYUzYAbUV6CkcofwCEXmQJTnH7/XqfuozwwJkI9GzuArSGqf/pq15cKYaB5WWX/L6kxqw0OqrOrk3ZP8mdgfD0TYU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894926328710.6274934917843; Thu, 16 Jul 2020 03:22:06 -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-426--O_-f4XgOZGUnE_pB_A5Zg-1; Thu, 16 Jul 2020 06:08:43 -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 E43C91888AAA; Thu, 16 Jul 2020 10:08:35 +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 C45F074F64; Thu, 16 Jul 2020 10:08:35 +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 9691E730EB; Thu, 16 Jul 2020 10:08:35 +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 06GA45bl017655 for ; Thu, 16 Jul 2020 06:04:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA8922DE69; Thu, 16 Jul 2020 10:04:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 548C32B6DB for ; Thu, 16 Jul 2020 10:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894925; 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=Xu6O9Wq42yawpV7NuAn0YlGUq3qx7UO0ZgOjRzJ0MzU=; b=C/e2+L3Q45J0DLbGPfGSe0GVI5oPOZgnHlOA+Xk4a11jM1QLo5y1sVavvnFbQUUvHzPlTL SsV1ww+zdjgiMXg6m80qe1k62t3lR1sOdAFQ5FL/jFOEXNX1E/a30Xjg9tAninh62l300E 0Nbo0z42nhJ5dWQZchJJRCWDGipf1KA= X-MC-Unique: -O_-f4XgOZGUnE_pB_A5Zg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 157/351] meson: src: build libvirt_driver_bhyve_impl.a static library Date: Thu, 16 Jul 2020 11:56:33 +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 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/bhyve/Makefile.inc.am | 34 ---------------------------------- src/bhyve/meson.build | 28 ++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 29 insertions(+), 34 deletions(-) create mode 100644 src/bhyve/meson.build diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index f75194fd3c8..3433e6a3dab 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -1,33 +1,9 @@ # vim: filetype=3Dautomake =20 -BHYVE_DRIVER_SOURCES =3D \ - bhyve/bhyve_capabilities.c \ - bhyve/bhyve_capabilities.h \ - bhyve/bhyve_command.c \ - bhyve/bhyve_command.h \ - bhyve/bhyve_conf.c \ - bhyve/bhyve_conf.h \ - bhyve/bhyve_parse_command.c \ - bhyve/bhyve_parse_command.h \ - bhyve/bhyve_device.c \ - bhyve/bhyve_device.h \ - bhyve/bhyve_domain.c \ - bhyve/bhyve_domain.h \ - bhyve/bhyve_driver.h \ - bhyve/bhyve_driver.c \ - bhyve/bhyve_monitor.c \ - bhyve/bhyve_monitor.h \ - bhyve/bhyve_process.c \ - bhyve/bhyve_process.h \ - bhyve/bhyve_utils.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) =20 - if WITH_BHYVE -noinst_LTLIBRARIES +=3D libvirt_driver_bhyve_impl.la libvirt_driver_bhyve_la_SOURCES =3D libvirt_driver_bhyve_la_LIBADD =3D \ libvirt_driver_bhyve_impl.la \ @@ -37,16 +13,6 @@ libvirt_driver_bhyve_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_bhyve.la libvirt_driver_bhyve_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_bhyve_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_bhyve_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER_SOURCES) - sbin_PROGRAMS +=3D virtbhyved =20 nodist_conf_DATA +=3D bhyve/virtbhyved.conf diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build new file mode 100644 index 00000000000..a9af677440b --- /dev/null +++ b/src/bhyve/meson.build @@ -0,0 +1,28 @@ +bhyve_sources =3D files( + 'bhyve_capabilities.c', + 'bhyve_command.c', + 'bhyve_conf.c', + 'bhyve_parse_command.c', + 'bhyve_device.c', + 'bhyve_domain.c', + 'bhyve_driver.c', + 'bhyve_monitor.c', + 'bhyve_process.c', +) + +if conf.has('WITH_BHYVE') + bhyve_driver_impl =3D static_library( + 'virt_driver_bhyve_impl', + [ + bhyve_sources, + ], + dependencies: [ + access_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + hypervisor_inc_dir, + ], + ) +endif diff --git a/src/meson.build b/src/meson.build index 9c088014415..ca94fe64bd9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -145,6 +145,7 @@ subdir('locking') subdir('logging') subdir('security') =20 +subdir('bhyve') subdir('esx') subdir('hyperv') subdir('openvz') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894385; cv=none; d=zohomail.com; s=zohoarc; b=VQd78Sh/FEa/T2fBO/oMzlc12TGhQ5IwI/5vjJ9lTEUDX2cSPp6Aucl2hoi0fFd1RHW4/U+cqrUJw0HqNHsq7Y3Ho3r0i0I8AhyWCor7sKPuYjQZzw/uhXiWR3ApXmlS4/i19bf7+GjlsylQ7zhv3+ZK9QQDPzkrpH1P7qWk+J0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894385; 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=6VNgdlac04vtUpuJ204eNUOdU8t8A1V/JwomwcGQj9k=; b=K65zMH4Qnysgeuc8KeFMfMAS5DHc7L3ahpt7CfXAHAjojkkmOpW5OYFIS3F77KfCQvvo4wQv7jmT4zXaCyKEif8IaOXh5LYX7NUyDw2Go9Ri50afUfqMOM3vO0dJmwEl8mL852Fn64MsFHOhfHKgjsjdKsolmOQNixGLqV34NV0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894385772495.04151549682217; Thu, 16 Jul 2020 03:13:05 -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-283-q9RCaXd0PaiFv5z_e-Ov5g-1; Thu, 16 Jul 2020 06:07:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 757B0100AA22; Thu, 16 Jul 2020 10:07:41 +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 502E52DE9D; Thu, 16 Jul 2020 10:07:41 +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 199B41805309; Thu, 16 Jul 2020 10:07:41 +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 06GA46RA017667 for ; Thu, 16 Jul 2020 06:04:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id C32FC2DE69; Thu, 16 Jul 2020 10:04:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D63D2B6DB for ; Thu, 16 Jul 2020 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894384; 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=6VNgdlac04vtUpuJ204eNUOdU8t8A1V/JwomwcGQj9k=; b=TzjZ+AdWaVRohdEfZBrsjQ4TyZ7bqyuYjL8jUL4vmeFYQsVBlkhzrbG2vpDb5n5ydohnAB GZVyNQ/71GgzbZhbuHiILdpb1bHSge8tSuQWxED/Un6tUsmlZXsusCXJ2J9X6yBwq5wnXi eo7JbvU9xTgPEo+MvhhxZufFLW1Se9E= X-MC-Unique: q9RCaXd0PaiFv5z_e-Ov5g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 158/351] meson: src: build libvirt_driver_libxl_impl.a static library Date: Thu, 16 Jul 2020 11:56:34 +0200 Message-Id: <154c8264363e4c0df8a7653f33169b9ce6f312d8.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.23 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/libxl/Makefile.inc.am | 39 --------------------------------------- src/libxl/meson.build | 29 +++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 30 insertions(+), 39 deletions(-) create mode 100644 src/libxl/meson.build diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index db1f51e3ef8..c7ac93a75b7 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -1,32 +1,9 @@ # vim: filetype=3Dautomake =20 -LIBXL_DRIVER_SOURCES =3D \ - libxl/xenxs_private.h \ - libxl/xen_common.c \ - libxl/xen_common.h \ - libxl/xen_xl.c \ - libxl/xen_xl.h \ - libxl/xen_xm.c \ - libxl/xen_xm.h \ - libxl/libxl_conf.c \ - libxl/libxl_conf.h \ - libxl/libxl_capabilities.c \ - libxl/libxl_capabilities.h \ - libxl/libxl_domain.c \ - libxl/libxl_domain.h \ - libxl/libxl_driver.c \ - libxl/libxl_driver.h \ - libxl/libxl_logger.c \ - libxl/libxl_logger.h \ - libxl/libxl_migration.c \ - libxl/libxl_migration.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) =20 if WITH_LIBXL -noinst_LTLIBRARIES +=3D libvirt_driver_libxl_impl.la libvirt_driver_libxl_la_SOURCES =3D libvirt_driver_libxl_la_LIBADD =3D \ libvirt_driver_libxl_impl.la \ @@ -36,22 +13,6 @@ libvirt_driver_libxl_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_libxl.la libvirt_driver_libxl_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_libxl_impl_la_CFLAGS =3D \ - $(LIBXL_CFLAGS) \ - $(LIBXML_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_libxl_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_libxl_impl_la_LIBADD =3D \ - $(LIBXL_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES) - sbin_PROGRAMS +=3D virtxend =20 nodist_conf_DATA +=3D libxl/virtxend.conf diff --git a/src/libxl/meson.build b/src/libxl/meson.build new file mode 100644 index 00000000000..7747bb61a75 --- /dev/null +++ b/src/libxl/meson.build @@ -0,0 +1,29 @@ +libxl_driver_sources =3D [ + 'libxl_capabilities.c', + 'libxl_conf.c', + 'libxl_domain.c', + 'libxl_driver.c', + 'libxl_logger.c', + 'libxl_migration.c', + 'xen_common.c', + 'xen_xl.c', + 'xen_xm.c', +] + +if conf.has('WITH_LIBXL') + libxl_driver_imp =3D static_library( + 'virt_driver_libxl_impl', + [ + libxl_driver_sources, + ], + dependencies: [ + access_dep, + libxl_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + hypervisor_inc_dir, + ], + ) +endif diff --git a/src/meson.build b/src/meson.build index ca94fe64bd9..44992fac02b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -148,6 +148,7 @@ subdir('security') subdir('bhyve') subdir('esx') subdir('hyperv') +subdir('libxl') subdir('openvz') subdir('test') subdir('vmware') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894150; cv=none; d=zohomail.com; s=zohoarc; b=INhyUH3rOlgF53ZG1mBqPi5WIfL8R+xGH/u+N/PIqQo7hgk5qpeAn2TooYh9nbzFFnbms6wqXvjEfKfJVHN6wYXkIRYBgkROtw++a/sTm/+w+ghUVEI4pJG7tqTAgrNjUn4duQ6CLqzaP/ta8nhLsJfKOuIbAwwVmUNK0DR6bmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894150; 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=0lbOcL+/TKXnwEksJrJqah3adjlmAd7h1yw023SynZo=; b=R/YCHZzQrPxmpTu5rlA9KcT+5/FqlDT+6xF1B7lfAZ4zRcaA9OdC2nkKxSFOZpv2ZxSWlJJrtl2oGlkgjgU3Hb05mqWYps4W8W9teMcAc+IVLjn3ns+PtFHPYQtVq5U2Yd+Ag0atvIquDG48Fr8y7DD/r3DWiD4GdfBC2j7OPSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894150960567.3912270371128; Thu, 16 Jul 2020 03:09:10 -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-510-FaTLTu-dNQWdaSph5TFWHA-1; Thu, 16 Jul 2020 06:08:45 -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 41204108D; Thu, 16 Jul 2020 10:08:38 +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 1DE596FEFB; Thu, 16 Jul 2020 10:08: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 E0A2D180530F; Thu, 16 Jul 2020 10:08:37 +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 06GA47fF017678 for ; Thu, 16 Jul 2020 06:04:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC0FD2DE69; Thu, 16 Jul 2020 10:04:07 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 262FC2B6DB for ; Thu, 16 Jul 2020 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894149; 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=0lbOcL+/TKXnwEksJrJqah3adjlmAd7h1yw023SynZo=; b=TR3RzMgQtNwWjaoBTnKgM54Jq1zPQgLb3VK+4kH0HEyOptp3z1qOGguqCXfzTSftpCHjq7 XqxUNtOFoUlXPylzitaqI6KoC8xlG4jOJS9483alP51du65iLWf6KmHbgocTo4msbXJ+bt rDfbPVQSaUqH6yf3P6lVgl7tqOZYgOg= X-MC-Unique: FaTLTu-dNQWdaSph5TFWHA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 159/351] meson: src: build liblockd_impl.a static library Date: Thu, 16 Jul 2020 11:56:35 +0200 Message-Id: <1a15540e5726393854a369deb4f03e5a85d979f0.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 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" This introduces intermediate static library that is required for following remote protocol check. Signed-off-by: Pavel Hrdina --- src/locking/Makefile.inc.am | 34 ++-------------------------- src/locking/meson.build | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 3afc9803ce0..b8eac29d242 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -6,22 +6,10 @@ LOCK_DRIVER_SANLOCK_SOURCES =3D \ LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 -LOCK_PROTOCOL_GENERATED =3D \ - locking/lock_protocol.h \ - locking/lock_protocol.c \ - $(NULL) - LOCK_DAEMON_GENERATED =3D \ locking/lock_daemon_dispatch_stubs.h $(NULL) =20 -LOCK_PROTOCOL =3D $(srcdir)/locking/lock_protocol.x - -LOCK_DRIVER_LOCKD_SOURCES =3D \ - locking/lock_driver_lockd.c \ - locking/lock_driver_lockd.h \ - $(NULL) - LOCK_DAEMON_SOURCES =3D \ locking/lock_daemon.h \ locking/lock_daemon.c \ @@ -55,23 +43,11 @@ lockdriver_LTLIBRARIES =3D =20 if WITH_LIBVIRTD lockdriver_LTLIBRARIES +=3D lockd.la -lockd_la_SOURCES =3D \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(NULL) -nodist_lockd_la_SOURCES =3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(NULL) -lockd_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/locking \ - -I$(builddir)/locking \ - -I$(builddir)/rpc \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) +lockd_la_SOURCES =3D lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) lockd_la_LIBADD =3D \ libvirt.la \ + libvirt_lockd_impl.la \ $(GLIB_LIBS) \ $(XDR_LIBS) \ $(NULL) @@ -80,12 +56,6 @@ if WITH_DTRACE_PROBES lockd_la_LIBADD +=3D libvirt_probes.lo endif WITH_DTRACE_PROBES =20 -if WITH_SASL -lockd_la_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_lockd.aug nodist_conf_DATA +=3D locking/qemu-lockd.conf diff --git a/src/locking/meson.build b/src/locking/meson.build index 18b2e3c72a6..d8255d00f64 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -1,9 +1,35 @@ +lock_protocol =3D 'lock_protocol.x' + lock_driver_sources =3D [ 'lock_manager.c', 'lock_driver_nop.c', 'domain_lock.c', ] =20 +lock_driver_lockd_sources =3D [ + 'lock_driver_lockd.c', +] + +lock_protocol_generated =3D [] + +lock_protocol_generated +=3D custom_target( + 'lock_protocol.h', + input: lock_protocol, + output: 'lock_protocol.h', + command: [ + genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@', + ], +) + +lock_protocol_generated +=3D custom_target( + 'lock_protocol.c', + input: lock_protocol, + output: 'lock_protocol.c', + command: [ + genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', + ], +) + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -18,3 +44,22 @@ lock_driver_lib =3D static_library( ) =20 libvirt_libs +=3D lock_driver_lib + +if conf.has('WITH_LIBVIRTD') + lockd_lib_impl =3D static_library( + 'lockd_impl', + [ + files(lock_driver_lockd_sources), + lock_protocol_generated, + ], + include_directories: [ + conf_inc_dir, + ], + dependencies: [ + rpc_dep, + sasl_dep, + src_dep, + xdr_dep, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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 From nobody Thu May 2 00:12:15 2024 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=1594894699; cv=none; d=zohomail.com; s=zohoarc; b=eNY6fVJRMuSxnu2XfQZExhPQDDEPYGBHAcNb4sK8KfXeiNH4BCtb4d7GFnAHm9+SaqK056dLTuEzPttvxPMoPK46+HzqOyBgqy5Qt2pwp/k1K5VYs44/Pae7uAutQKaN3Kd81zTLWenkBrr9TbnDZ+KbAhfuLsG4vFG2NOyBLW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894699; 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=IN+Blyemn8WpJGHiy2PsjrbExmFOGhaskLSKV24rzM0=; b=RDj2cjnaS5ekDz9Q3bi9WfTAIVPB/WRVZxuI16VPYNF8NIak8MfQjIt3W/R2uYLAFhFLLF1ZYklHekCLlPY8+d8+U9dEZoqtrG7ylojwJb2wGHOhncH1j8gr48/tQHCZGRhUiOL9ncRtKnwuXsCw2taMme2sqcL824GHljk6Hek= 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 159489469957667.12521040901402; Thu, 16 Jul 2020 03:18:19 -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-143-YmAfH1UmPDuPpoVURCKwRQ-1; Thu, 16 Jul 2020 06:08:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EA2310AF; Thu, 16 Jul 2020 10:08:40 +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 6FDE2710D7; Thu, 16 Jul 2020 10:08:40 +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 3DBF81805317; Thu, 16 Jul 2020 10:08:40 +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 06GA49vp017703 for ; Thu, 16 Jul 2020 06:04:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E2182DE69; Thu, 16 Jul 2020 10:04:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBAE22B6DB for ; Thu, 16 Jul 2020 10:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894698; 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=IN+Blyemn8WpJGHiy2PsjrbExmFOGhaskLSKV24rzM0=; b=RLdmGEdO+Oda/urUV+OlE8j5VfdDlhVH6aDYNwwHNMV1uWwxI2Vj9qR6yM/kezY8hdyk+W 5a5qdJ5gr/zBgUPLGFt0BC/uNgH/NKYEjdku8HWXxYFrPt3DuMT/Ie6jml6PxkbOA7pvBc /P3pQItkutPqRcg8w5VlUOkcg/lqcYg= X-MC-Unique: YmAfH1UmPDuPpoVURCKwRQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 161/351] meson: src: build libvirt_driver_network_impl.a static library Date: Thu, 16 Jul 2020 11:56:37 +0200 Message-Id: <9a486381828ddc520493317992937012f0ee9c45.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.15 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/network/Makefile.inc.am | 23 ----------------------- src/network/meson.build | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/network/meson.build diff --git a/src/meson.build b/src/meson.build index 217ceb2d6ef..aab85399948 100644 --- a/src/meson.build +++ b/src/meson.build @@ -143,6 +143,7 @@ subdir('remote') subdir('admin') subdir('locking') subdir('logging') +subdir('network') subdir('security') =20 subdir('bhyve') diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 5a5d1630a08..c93b2e693d0 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,17 +1,5 @@ # vim: filetype=3Dautomake =20 -NETWORK_DRIVER_SOURCES =3D \ - network/bridge_driver.h \ - network/bridge_driver.c \ - network/bridge_driver_platform.h \ - network/bridge_driver_platform.c \ - $(NULL) - -NETWORK_DRIVER_PLATFORM_INC =3D \ - network/bridge_driver_linux.c \ - network/bridge_driver_nop.c \ - $(NULL) - NETWORK_LEASES_HELPER_SOURCES =3D \ network/leaseshelper.c \ $(NULL) @@ -35,17 +23,6 @@ libvirt_driver_network_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_network.la libvirt_driver_network_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_network_impl_la_CFLAGS =3D \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_network_impl_la_SOURCES =3D $(NETWORK_DRIVER_SOURCES) -libvirt_driver_network_impl_la_LIBADD =3D $(DBUS_LIBS) $(LIBXML_LIBS) - sbin_PROGRAMS +=3D virtnetworkd =20 nodist_conf_DATA +=3D network/virtnetworkd.conf diff --git a/src/network/meson.build b/src/network/meson.build new file mode 100644 index 00000000000..2b05544fd22 --- /dev/null +++ b/src/network/meson.build @@ -0,0 +1,22 @@ +network_driver_sources =3D [ + 'bridge_driver.c', + 'bridge_driver_platform.c', +] + +if conf.has('WITH_NETWORK') + network_driver_impl =3D static_library( + 'virt_driver_network_impl', + [ + network_driver_sources, + ], + dependencies: [ + access_dep, + dbus_dep, + libnl_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894807; cv=none; d=zohomail.com; s=zohoarc; b=USCtvJM4B+P/XxR2L9zbZLDTAIE1XNBaQsVpo5102MxKkCr/77U6ecXRP0dnp5t0dExRasX/PdP4LwIJULUmRG2O8Fx+Mlr6H6NK4Xd/91s+vq4+Dr/bGkSaETk05GoH6HAxHbW6PUG4YGruDdJAlWU6m76bRjjJc0FDE0BBcyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894807; 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=PAimc8UbfCuoTowkz8U/GPYxGpejp1LVFQjgnv0XaAU=; b=WrfdU7x17G+TxFOTbYM/W4j+6rmNAaIF1jwmgvDy4KGPkHQkOv+ySKXTvjnM5u+rx1baRXJLHtVWqZiI245/4U09Jr28cPuUvXhd/dY7bO0Ieqw68WABt8zrf4sdoPug+ttVx4coJaWMf0vqIeTnmTd4HElO3Do9U39u42eTi/g= 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 1594894807727790.656639707595; Thu, 16 Jul 2020 03:20:07 -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-215-mmlPwHHZMmWp3X3WbJSnBw-1; Thu, 16 Jul 2020 06:08:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7123E1888AB1; Thu, 16 Jul 2020 10:08:05 +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 500A378A5B; Thu, 16 Jul 2020 10:08:05 +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 1E74D9625E; Thu, 16 Jul 2020 10:08:05 +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 06GA4A7C017714 for ; Thu, 16 Jul 2020 06:04:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 668C12DE73; Thu, 16 Jul 2020 10:04:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4B1C2DE69 for ; Thu, 16 Jul 2020 10:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894806; 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=PAimc8UbfCuoTowkz8U/GPYxGpejp1LVFQjgnv0XaAU=; b=fXaHsTu7/CkbjGoztWkhi1SNq6n7OuIrR5u9XW0oLDtu8QqxCrSKvWBWl0gLufigOhCBu2 fLxgBbAMiPMUQ0YSubFxHQ67anD+Y5oSXImdK6L3SwTnF/EjHGaodYiRmW4tT0UpVap2Bs lua3eLw10Eja3t7QgejuXmMUNlJsgEM= X-MC-Unique: mmlPwHHZMmWp3X3WbJSnBw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 162/351] meson: src: build libvirt_driver_nodedev_impl.a static library Date: Thu, 16 Jul 2020 11:56:38 +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.14 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/node_device/Makefile.inc.am | 47 --------------------------------- src/node_device/meson.build | 31 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 47 deletions(-) create mode 100644 src/node_device/meson.build diff --git a/src/meson.build b/src/meson.build index aab85399948..12dea398679 100644 --- a/src/meson.build +++ b/src/meson.build @@ -144,6 +144,7 @@ subdir('admin') subdir('locking') subdir('logging') subdir('network') +subdir('node_device') subdir('security') =20 subdir('bhyve') diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 8a8bbea01e9..d3261cb15c4 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -1,20 +1,5 @@ # vim: filetype=3Dautomake =20 -NODE_DEVICE_DRIVER_SOURCES =3D \ - node_device/node_device_driver.c \ - node_device/node_device_driver.h \ - $(NULL) - -NODE_DEVICE_DRIVER_HAL_SOURCES =3D \ - node_device/node_device_hal.c \ - node_device/node_device_hal.h \ - $(NULL) - -NODE_DEVICE_DRIVER_UDEV_SOURCES =3D \ - node_device/node_device_udev.c \ - node_device/node_device_udev.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \ @@ -27,42 +12,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NODE_DEVICES -# Needed to keep automake quiet about conditionals -noinst_LTLIBRARIES +=3D libvirt_driver_nodedev_impl.la libvirt_driver_nodedev_la_SOURCES =3D libvirt_driver_nodedev_la_LIBADD =3D libvirt_driver_nodedev_impl.la libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) mod_LTLIBRARIES +=3D libvirt_driver_nodedev.la -libvirt_driver_nodedev_impl_la_SOURCES =3D $(NODE_DEVICE_DRIVER_SOURCES) - -libvirt_driver_nodedev_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(NULL) -libvirt_driver_nodedev_impl_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - -if WITH_HAL -libvirt_driver_nodedev_impl_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_HAL_SOURC= ES) -libvirt_driver_nodedev_impl_la_CFLAGS +=3D $(HAL_CFLAGS) -libvirt_driver_nodedev_impl_la_LIBADD +=3D $(HAL_LIBS) -endif WITH_HAL -if WITH_UDEV -libvirt_driver_nodedev_impl_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_UDEV_SOUR= CES) -libvirt_driver_nodedev_impl_la_CFLAGS +=3D \ - $(UDEV_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - $(NULL) -libvirt_driver_nodedev_impl_la_LIBADD +=3D \ - $(UDEV_LIBS) \ - $(PCIACCESS_LIBS) \ - $(NULL) -endif WITH_UDEV =20 sbin_PROGRAMS +=3D virtnodedevd =20 diff --git a/src/node_device/meson.build b/src/node_device/meson.build new file mode 100644 index 00000000000..4ee64f56433 --- /dev/null +++ b/src/node_device/meson.build @@ -0,0 +1,31 @@ +node_device_driver_sources =3D [ + 'node_device_driver.c', +] + +if conf.has('WITH_HAL') + node_device_driver_sources +=3D 'node_device_hal.c' +endif + +if conf.has('WITH_UDEV') + node_device_driver_sources +=3D 'node_device_udev.c' +endif + +if conf.has('WITH_NODE_DEVICES') + node_device_driver_impl =3D static_library( + 'virt_driver_nodedev_impl', + [ + node_device_driver_sources, + ], + dependencies: [ + access_dep, + hal_dep, + libnl_dep, + pciaccess_dep, + src_dep, + udev_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894941; cv=none; d=zohomail.com; s=zohoarc; b=DxackBz+P1HvzGt4G4fQV/IXE1unL9rqvfI4qot+0nUINwekQDPry9uvW3e/nnre70bHPA3HZnc+shy3iBmHwuQGHmlPLiT1AJBBgTnQVBZ3RVLF74gJ9B/3Jd+AumjPh1NNIdUCMgugTajD04HSNoAKAVzsPrAaDBzAwer03GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894941; 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=HtsR9AC32jW8gaV5WDHr0LgdVy2rRLh8cXzKKHezNVk=; b=FPrwu64pQAg+urv/VhiMl3pRElh8hJLzBsE97a1Y7YUCOw/jpzSbbGdl0AXS6FP/Amd9m/Fp0mLgsSpnAoEv+N1Vu314BvG+o7CSJRPPuWGy9IxZ0bjANfcub9O9MGROlS7U5T3XhN9tPy5/g4Sfh83HzqIckfHyevZwn1wYVq8= 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 159489494190262.337520401598226; Thu, 16 Jul 2020 03:22:21 -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-301-1qOxawquPmaOr46G6qwRlA-1; Thu, 16 Jul 2020 06:08:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 805C58027F6; Thu, 16 Jul 2020 10:08:43 +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 5F86C710D7; Thu, 16 Jul 2020 10:08:43 +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 3282F730F8; Thu, 16 Jul 2020 10:08:43 +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 06GA4B4U017733 for ; Thu, 16 Jul 2020 06:04:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 504A12DE73; Thu, 16 Jul 2020 10:04:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDD2A2DE69 for ; Thu, 16 Jul 2020 10:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894940; 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=HtsR9AC32jW8gaV5WDHr0LgdVy2rRLh8cXzKKHezNVk=; b=WFyJP9z1aekFv0Kz1m1GTlREMH+kHF0BSdUKPmaomvP4cF9Y3nfZkH4y5q9d3pAPrae40X 5kBpqHkhMUoF1qFTHKERpewArBsKOzWZtP5dcQRR/rUEWGoqNUpYo3x1rI92kWdkrRTHa5 bKB8aDBMNvFIvOt2Aaz0FxRvcrUuShM= X-MC-Unique: 1qOxawquPmaOr46G6qwRlA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 163/351] meson: src: build libvirt_driver_nwfilter_impl.a static library Date: Thu, 16 Jul 2020 11:56:39 +0200 Message-Id: <205bb0b0acf16977d6527033f7b92d35fa1495eb.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.15 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/nwfilter/Makefile.inc.am | 37 +++--------------------------------- src/nwfilter/meson.build | 26 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 src/nwfilter/meson.build diff --git a/src/meson.build b/src/meson.build index 12dea398679..66af0e3051c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -145,6 +145,7 @@ subdir('locking') subdir('logging') subdir('network') subdir('node_device') +subdir('nwfilter') subdir('security') =20 subdir('bhyve') diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 758370e1a74..ba07992027c 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -2,20 +2,6 @@ =20 NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) =20 -NWFILTER_DRIVER_SOURCES =3D \ - nwfilter/nwfilter_driver.h \ - nwfilter/nwfilter_driver.c \ - nwfilter/nwfilter_tech_driver.h \ - nwfilter/nwfilter_gentech_driver.c \ - nwfilter/nwfilter_gentech_driver.h \ - nwfilter/nwfilter_dhcpsnoop.c \ - nwfilter/nwfilter_dhcpsnoop.h \ - nwfilter/nwfilter_ebiptables_driver.c \ - nwfilter/nwfilter_ebiptables_driver.h \ - nwfilter/nwfilter_learnipaddr.c \ - nwfilter/nwfilter_learnipaddr.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) @@ -25,29 +11,12 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.la libvirt_driver_nwfilter_la_SOURCES =3D -libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la +libvirt_driver_nwfilter_la_LIBADD =3D \ + libvirt_driver_nwfilter_impl.la \ + libvirt.la mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ - $(LIBPCAP_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(DBUS_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_nwfilter_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_nwfilter_impl_la_LIBADD =3D \ - libvirt.la \ - $(LIBPCAP_LIBS) \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) =20 sbin_PROGRAMS +=3D virtnwfilterd =20 diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build new file mode 100644 index 00000000000..fe792058b94 --- /dev/null +++ b/src/nwfilter/meson.build @@ -0,0 +1,26 @@ +nwfilter_driver_sources =3D [ + 'nwfilter_driver.c', + 'nwfilter_gentech_driver.c', + 'nwfilter_dhcpsnoop.c', + 'nwfilter_ebiptables_driver.c', + 'nwfilter_learnipaddr.c', +] + +if conf.has('WITH_NWFILTER') + nwfilter_driver_impl =3D static_library( + 'virt_driver_nwfilter_impl', + [ + nwfilter_driver_sources, + ], + dependencies: [ + access_dep, + dbus_dep, + libnl_dep, + libpcap_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895046; cv=none; d=zohomail.com; s=zohoarc; b=Zs9xEKSbJWUGhoIEwodN/OzTnlvAbicWJoawvNLKb/yTBQYlJUW9zd6Tt/lsffoVYAVtVX6Gi9+fo4IEHMNaFbA+CebAc77x2stwxgdOkYzLEaE/TyfdNj2c6GfVrD1O93D5Qk298iQjj0jYvo3AaA8dMqWrAmwH6fNN/yNIlCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895046; 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=igenClJzmENPAFxxMGtsxDgjtCZUfoeUYeAURkrGNyk=; b=EtX6ZqCVSKYlgez4W/twKbL1xvA5EeWfGRd0FPaR7+v8/y0dnGoZAtWKiFkUWwuuem6pbQzp6xF2pRRHgOPX6FLBzSBtv8+TKb+bWt0r+BenxSBL2M6498n4WUcNxx4FYrOh2Ux+jXU08OWP/quz/DatM95qjCXetKiqt9i1Rvg= 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 1594895046362632.1651122508962; Thu, 16 Jul 2020 03:24:06 -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-272-B0fYL5WHPSeD-q0XFFugAA-1; Thu, 16 Jul 2020 06:08:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA686800E23; Thu, 16 Jul 2020 10:08:07 +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 A7DF72DE6D; Thu, 16 Jul 2020 10:08:07 +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 734B71806B0A; Thu, 16 Jul 2020 10:08:07 +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 06GA4Cev017745 for ; Thu, 16 Jul 2020 06:04:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 393AE2DE73; Thu, 16 Jul 2020 10:04:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7A2A2DE69 for ; Thu, 16 Jul 2020 10:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895045; 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=igenClJzmENPAFxxMGtsxDgjtCZUfoeUYeAURkrGNyk=; b=PLuoWIZgZQPO/P2ImTjbwF858ie3yeYmnymTvI5ozOhDBRpT9BKlH1LvesNoHhSGvUn4uA PrW7anb9NgY7mjvPb2PjgO+hfxSoOXpWDUedMF2uxro3XrIPHXrYO0RcC6Kf3bQwTGrt02 nJK1YOEUVwij7qfwdU5JZXX18RjcomI= X-MC-Unique: B0fYL5WHPSeD-q0XFFugAA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 164/351] meson: src: build libvirt_driver_qemu_impl.a static library Date: Thu, 16 Jul 2020 11:56:40 +0200 Message-Id: <7b9f06b659cb7beda228fb16135ec25132256b16.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.23 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/qemu/Makefile.inc.am | 106 --------------------------- src/{ =3D> qemu}/libvirt_qemu_probes.d | 0 src/qemu/meson.build | 95 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 106 deletions(-) rename src/{ =3D> qemu}/libvirt_qemu_probes.d (100%) create mode 100644 src/qemu/meson.build diff --git a/src/meson.build b/src/meson.build index 66af0e3051c..bfc60fc967e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -154,6 +154,7 @@ subdir('hyperv') subdir('libxl') subdir('lxc') subdir('openvz') +subdir('qemu') subdir('test') subdir('vmware') =20 diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 5aee568ed90..3d703d15d33 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -1,90 +1,9 @@ # vim: filetype=3Dautomake =20 -QEMU_DRIVER_SOURCES =3D \ - qemu/qemu_agent.c \ - qemu/qemu_agent.h \ - qemu/qemu_alias.c \ - qemu/qemu_alias.h \ - qemu/qemu_block.c \ - qemu/qemu_block.h \ - qemu/qemu_blockjob.c \ - qemu/qemu_blockjob.h \ - qemu/qemu_capabilities.c \ - qemu/qemu_capabilities.h \ - qemu/qemu_command.c \ - qemu/qemu_command.h \ - qemu/qemu_dbus.c \ - qemu/qemu_dbus.h \ - qemu/qemu_domain.c \ - qemu/qemu_domain.h \ - qemu/qemu_domainjob.c \ - qemu/qemu_domainjob.h \ - qemu/qemu_domain_address.c \ - qemu/qemu_domain_address.h \ - qemu/qemu_cgroup.c \ - qemu/qemu_cgroup.h \ - qemu/qemu_extdevice.c \ - qemu/qemu_extdevice.h \ - qemu/qemu_firmware.c \ - qemu/qemu_firmware.h \ - qemu/qemu_hostdev.c \ - qemu/qemu_hostdev.h \ - qemu/qemu_hotplug.c \ - qemu/qemu_hotplug.h \ - qemu/qemu_conf.c \ - qemu/qemu_conf.h \ - qemu/qemu_interop_config.c \ - qemu/qemu_interop_config.h \ - qemu/qemu_process.c \ - qemu/qemu_process.h \ - qemu/qemu_processpriv.h \ - qemu/qemu_migration.c \ - qemu/qemu_migration.h \ - qemu/qemu_migration_cookie.c \ - qemu/qemu_migration_cookie.h \ - qemu/qemu_migration_params.c \ - qemu/qemu_migration_params.h \ - qemu/qemu_migration_paramspriv.h \ - qemu/qemu_monitor.c \ - qemu/qemu_monitor.h \ - qemu/qemu_monitor_priv.h \ - qemu/qemu_monitor_text.c \ - qemu/qemu_monitor_text.h \ - qemu/qemu_monitor_json.c \ - qemu/qemu_monitor_json.h \ - qemu/qemu_driver.c \ - qemu/qemu_driver.h \ - qemu/qemu_interface.c \ - qemu/qemu_interface.h \ - qemu/qemu_capspriv.h \ - qemu/qemu_security.c \ - qemu/qemu_security.h \ - qemu/qemu_qapi.c \ - qemu/qemu_qapi.h \ - qemu/qemu_slirp.c \ - qemu/qemu_slirp.h \ - qemu/qemu_tpm.c \ - qemu/qemu_tpm.h \ - qemu/qemu_vhost_user.c \ - qemu/qemu_vhost_user.h \ - qemu/qemu_vhost_user_gpu.c \ - qemu/qemu_vhost_user_gpu.h \ - qemu/qemu_virtiofs.c \ - qemu/qemu_virtiofs.h \ - qemu/qemu_checkpoint.c \ - qemu/qemu_checkpoint.h \ - qemu/qemu_backup.c \ - qemu/qemu_backup.h \ - qemu/qemu_validate.c \ - qemu/qemu_validate.h \ - $(NULL) - - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) =20 if WITH_QEMU -noinst_LTLIBRARIES +=3D libvirt_driver_qemu_impl.la libvirt_driver_qemu_la_SOURCES =3D libvirt_driver_qemu_la_LIBADD =3D \ libvirt_driver_qemu_impl.la \ @@ -94,33 +13,8 @@ libvirt_driver_qemu_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_qemu.la libvirt_driver_qemu_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_qemu_impl_la_CFLAGS =3D \ - $(GNUTLS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_qemu_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_qemu_impl_la_LIBADD =3D \ - $(CAPNG_LIBS) \ - $(GNUTLS_LIBS) \ - $(LIBNL_LIBS) \ - $(SELINUX_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_driver_qemu_impl_la_SOURCES =3D $(QEMU_DRIVER_SOURCES) - if WITH_DTRACE_PROBES libvirt_driver_qemu_la_LIBADD +=3D libvirt_qemu_probes.lo -nodist_libvirt_driver_qemu_la_SOURCES =3D libvirt_qemu_probes.h - -tapset_DATA +=3D libvirt_qemu_probes.stp - endif WITH_DTRACE_PROBES =20 sbin_PROGRAMS +=3D virtqemud diff --git a/src/libvirt_qemu_probes.d b/src/qemu/libvirt_qemu_probes.d similarity index 100% rename from src/libvirt_qemu_probes.d rename to src/qemu/libvirt_qemu_probes.d diff --git a/src/qemu/meson.build b/src/qemu/meson.build new file mode 100644 index 00000000000..14b700558df --- /dev/null +++ b/src/qemu/meson.build @@ -0,0 +1,95 @@ +qemu_driver_sources =3D [ + 'qemu_agent.c', + 'qemu_alias.c', + 'qemu_backup.c', + 'qemu_block.c', + 'qemu_blockjob.c', + 'qemu_capabilities.c', + 'qemu_cgroup.c', + 'qemu_checkpoint.c', + 'qemu_command.c', + 'qemu_conf.c', + 'qemu_dbus.c', + 'qemu_domain.c', + 'qemu_domain_address.c', + 'qemu_domainjob.c', + 'qemu_driver.c', + 'qemu_extdevice.c', + 'qemu_firmware.c', + 'qemu_hostdev.c', + 'qemu_hotplug.c', + 'qemu_interface.c', + 'qemu_interop_config.c', + 'qemu_migration.c', + 'qemu_migration_cookie.c', + 'qemu_migration_params.c', + 'qemu_monitor.c', + 'qemu_monitor_json.c', + 'qemu_monitor_text.c', + 'qemu_process.c', + 'qemu_qapi.c', + 'qemu_security.c', + 'qemu_slirp.c', + 'qemu_tpm.c', + 'qemu_validate.c', + 'qemu_vhost_user.c', + 'qemu_vhost_user_gpu.c', + 'qemu_virtiofs.c', +] + +qemu_dtrace_gen_headers =3D [] +qemu_dtrace_gen_objects =3D [] + +if conf.has('WITH_DTRACE_PROBES') + infile =3D 'libvirt_qemu_probes.d' + out_h =3D 'libvirt_qemu_probes.h' + out_o =3D 'libvirt_qemu_probes.o' + out_stp =3D 'libvirt_qemu_probes.stp' + + qemu_dtrace_gen_headers +=3D custom_target( + out_h, + input: infile, + output: out_h, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ], + ) + + qemu_dtrace_gen_objects +=3D custom_target( + out_o, + input: infile, + output: out_o, + command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ], + ) + + qemu_dtrace_gen_stp =3D custom_target( + out_stp, + input: infile, + output: out_stp, + command: [ meson_python_prog, dtrace2systemtap_prog, bindir, sbindir, = libdir, '@INPUT@' ], + capture: true, + install: conf.has('WITH_QEMU'), + install_dir: systemtap_dir, + ) +endif + +if conf.has('WITH_QEMU') + qemu_driver_impl =3D static_library( + 'virt_driver_qemu_impl', + [ + qemu_driver_sources, + qemu_dtrace_gen_headers, + ], + dependencies: [ + access_dep, + capng_dep, + gnutls_dep, + libnl_dep, + selinux_dep, + src_dep, + xdr_dep, + ], + include_directories: [ + conf_inc_dir, + hypervisor_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894072; cv=none; d=zohomail.com; s=zohoarc; b=UjJkE6kUXpUJpqBqcEY3iHdKuERUgEr5SCm/ikAiNZRMg6nZTpeiCCA7rpmNaW51XsyAdwyywlJtIck+8tJ3rG5ouoGFxj/HMNfWn8hrrtoVR+QkE1LKdhcpHYDbCvGrPvWCaBa7I4Q1j+0l4dyvsvOzfh3g8PA1WYABToJEgaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894072; 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=SrveE9E/E2nXN748Bzykk687xXPcHqjBcYvl7iLO+9M=; b=TJ8G4REWrjvivG3Gcd/OW5Q3MbUGCS/a5f9o0W6dvuLxLgKa/r3Jej+Tm84Fv4GaWKmrDS6zhDpOR+i+jhzy7BbA2lTMWyutiHP+5BJ2Y6HNiZ/CjZBKl29ijBo8/KHeutlMw88vt1kmvfzON0okub5C4QLSmNN36lTzQLBUIVU= 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 1594894072701494.68234142671884; Thu, 16 Jul 2020 03:07:52 -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-319-vFbm5UxGMoGVxACBZpRL3A-1; Thu, 16 Jul 2020 06:07:49 -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 DEAEB1888AA2; Thu, 16 Jul 2020 10:07:43 +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 BD6CF79D06; Thu, 16 Jul 2020 10:07:43 +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 88E131805311; Thu, 16 Jul 2020 10:07:43 +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 06GA4D0u017759 for ; Thu, 16 Jul 2020 06:04:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FD742DE73; Thu, 16 Jul 2020 10:04:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F9AF2DE69 for ; Thu, 16 Jul 2020 10:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894071; 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=SrveE9E/E2nXN748Bzykk687xXPcHqjBcYvl7iLO+9M=; b=QlftY6zxcUt2hY905pSnXD598p1eH1HEcgZcJqlS7I49+qqvXzk7afMj6SXxFpJDP5grM3 ican31ssbd4j8LBYPFJyvt5M4Fzh/MVh6fuYZfAtoN5Y24rFw3VDzkcmhCUqZZ3x1nMZCF GUgThLEVA64ePTRiCzAm8d/FWO28LuE= X-MC-Unique: vFbm5UxGMoGVxACBZpRL3A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 165/351] meson: src: build libvirt_storage_driver_impl.a static library Date: Thu, 16 Jul 2020 11:56:41 +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 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/storage/Makefile.inc.am | 30 ------------------------------ src/storage/meson.build | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 src/storage/meson.build diff --git a/src/meson.build b/src/meson.build index bfc60fc967e..aac5a256b07 100644 --- a/src/meson.build +++ b/src/meson.build @@ -147,6 +147,7 @@ subdir('network') subdir('node_device') subdir('nwfilter') subdir('security') +subdir('storage') =20 subdir('bhyve') subdir('esx') diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index e201b9938d9..87ba8c0bd16 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,18 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_BACKEND_SOURCES =3D \ - storage/storage_backend.h \ - storage/storage_backend.c \ - $(NULL) - -STORAGE_DRIVER_SOURCES =3D \ - storage/storage_driver.h \ - storage/storage_driver.c \ - $(STORAGE_DRIVER_BACKEND_SOURCES) \ - storage/storage_util.h \ - storage/storage_util.c \ - $(NULL) - STORAGE_DRIVER_FS_SOURCES =3D \ storage/storage_backend_fs.h \ storage/storage_backend_fs.c \ @@ -98,23 +85,7 @@ storagebackend_LTLIBRARIES =3D storagefiledir =3D $(libdir)/libvirt/storage-file storagefile_LTLIBRARIES =3D =20 -# Needed to keep automake quiet about conditionals -libvirt_driver_storage_impl_la_SOURCES =3D -libvirt_driver_storage_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_storage_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_storage_impl_la_LIBADD =3D $(SECDRIVER_LIBS) $(LIBXML_LIBS) -if WITH_BLKID -libvirt_driver_storage_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_driver_storage_impl_la_LIBADD +=3D $(BLKID_LIBS) -endif WITH_BLKID - if WITH_STORAGE -noinst_LTLIBRARIES +=3D libvirt_driver_storage_impl.la libvirt_driver_storage_la_SOURCES =3D libvirt_driver_storage_la_LIBADD =3D \ libvirt_driver_storage_impl.la \ @@ -123,7 +94,6 @@ libvirt_driver_storage_la_LIBADD =3D \ $(NULL) mod_LTLIBRARIES +=3D libvirt_driver_storage.la libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES) =20 sbin_PROGRAMS +=3D virtstoraged =20 diff --git a/src/storage/meson.build b/src/storage/meson.build new file mode 100644 index 00000000000..36ef45b10ab --- /dev/null +++ b/src/storage/meson.build @@ -0,0 +1,27 @@ +storage_driver_backend_sources =3D [ + 'storage_backend.c', +] + +storage_driver_sources =3D [ + 'storage_driver.c', + 'storage_util.c', + storage_driver_backend_sources, +] + +if conf.has('WITH_STORAGE') + storage_driver_impl_lib =3D static_library( + 'virt_storage_driver_impl', + [ + storage_driver_sources, + ], + dependencies: [ + access_dep, + blkid_dep, + secdriver_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594895385; cv=none; d=zohomail.com; s=zohoarc; b=HeZpGjGq0r5xyr4VIWKfGUd2M8Z/kY0bO2hopztGec8lz2iUC2aarL1RIE7cmpmKZXtMGsip12jMNYkmheD04MPAN1RHJ5jZm4KstLl0gXFtDrfVu5qGq7MyACSUMQoQkNTcvW0EP1UiyX8ZLNZ5ObsCgek5u+NgKOx9ocUgQME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895385; 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=5H0jBuK06wSJiUo8dz+CxxAA+ig+5W3NWGjsEojVkjM=; b=ecwtmdK42r3j/ZaoFLjDuJOtwwamLSpDC53tR+53BNXInss8gn24OPnvn4LeryCwileVP35BZ0hPyWFp+i6mueTzzDjNw2k0HZMhSnVS6JFt/u71sdiOawYavZQFeJCXBYhHeP2giraG9qPnlqBPZUCWPvuMWovH41kbu7/LCQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948953852741018.775267184482; Thu, 16 Jul 2020 03:29:45 -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-511-CRQodcbJNm6lAnWM1XwOIw-1; Thu, 16 Jul 2020 06:08:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 265D480BCBA; Thu, 16 Jul 2020 10:08:10 +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 05C805D9DC; Thu, 16 Jul 2020 10:08:10 +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 C6DD5180476F; Thu, 16 Jul 2020 10:08:09 +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 06GA4I65017809 for ; Thu, 16 Jul 2020 06:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A16B2DE73; Thu, 16 Jul 2020 10:04:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 792A82DE72 for ; Thu, 16 Jul 2020 10:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895384; 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=5H0jBuK06wSJiUo8dz+CxxAA+ig+5W3NWGjsEojVkjM=; b=Fgjqy6GpqAcQxXB9wt3fipe7P1mIHO2EBBjtwphWy6zho8g+vFFbHnNzHHUZxNIc8HSL/k 8c8K2P8gPA0FjRA8t3P9oS+Nia9+qwv8fFnLKuOoIRzmmmoqDAmLdX48Eqd+ekgPz3l0AF MUNQ5q7LCmKO0zFOiEkJ/uLa0ejofxs= X-MC-Unique: CRQodcbJNm6lAnWM1XwOIw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 166/351] meson: src: build libvirt_driver_vbox_impl.a static library Date: Thu, 16 Jul 2020 11:56:42 +0200 Message-Id: <4feeb46612803ee268ce3e937bb57370d03ce9d4.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.14 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/vbox/Makefile.inc.am | 34 ---------------------------------- src/vbox/meson.build | 31 +++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 src/vbox/meson.build diff --git a/src/meson.build b/src/meson.build index aac5a256b07..87d1410b218 100644 --- a/src/meson.build +++ b/src/meson.build @@ -157,6 +157,7 @@ subdir('lxc') subdir('openvz') subdir('qemu') subdir('test') +subdir('vbox') subdir('vmware') =20 =20 diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 8acbdc84609..19ffff223b1 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -1,26 +1,5 @@ # vim: filetype=3Dautomake =20 -VBOX_DRIVER_SOURCES =3D \ - vbox/vbox_driver.c \ - vbox/vbox_driver.h \ - vbox/vbox_snapshot_conf.c \ - vbox/vbox_snapshot_conf.h \ - vbox/vbox_V5_2.c \ - vbox/vbox_CAPI_v5_2.h \ - vbox/vbox_CAPI_v6_0.h \ - vbox/vbox_V6_0.c \ - vbox/vbox_CAPI_v6_1.h \ - vbox/vbox_V6_1.c \ - vbox/vbox_common.c \ - vbox/vbox_common.h \ - vbox/vbox_uniformed_api.h \ - vbox/vbox_get_driver.h \ - vbox/vbox_network.c \ - vbox/vbox_storage.c \ - vbox/vbox_XPCOMCGlue.c \ - vbox/vbox_XPCOMCGlue.h \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ @@ -37,19 +16,6 @@ libvirt_driver_vbox_la_LIBADD =3D \ mod_LTLIBRARIES +=3D libvirt_driver_vbox.la libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) =20 -libvirt_driver_vbox_impl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - -DVBOX_DRIVER \ - $(NULL) -libvirt_driver_vbox_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_vbox_impl_la_LIBADD =3D \ - $(DLOPEN_LIBS) \ - $(WIN32_EXTRA_LIBS) \ - $(LIBXML_LIBS) \ - $(NULL) -libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES) - sbin_PROGRAMS +=3D virtvboxd =20 nodist_conf_DATA +=3D vbox/virtvboxd.conf diff --git a/src/vbox/meson.build b/src/vbox/meson.build new file mode 100644 index 00000000000..c27f9418249 --- /dev/null +++ b/src/vbox/meson.build @@ -0,0 +1,31 @@ +vbox_driver_sources =3D [ + 'vbox_V5_2.c', + 'vbox_V6_0.c', + 'vbox_V6_1.c', + 'vbox_common.c', + 'vbox_driver.c', + 'vbox_network.c', + 'vbox_snapshot_conf.c', + 'vbox_storage.c', + 'vbox_XPCOMCGlue.c', +] + +if conf.has('WITH_VBOX') + vbox_driver_impl =3D static_library( + 'virt_driver_vbox_impl', + [ + vbox_driver_sources, + ], + c_args: [ + '-DVBOX_DRIVER', + ], + dependencies: [ + dlopen_dep, + src_dep, + win32_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894641; cv=none; d=zohomail.com; s=zohoarc; b=PV2MB2Z4Bx0wkxsChoJFrtPAtq+RtT8IyCUiznEU8yRklBKG6oeEB0L6gjkGaVouB6jzXA+ddHJ5w5NeZ3Hoj8TLGpijKlWLvOU0wCzjMt2sm//03wi0pg2XAxLuGk6IhAzTU/mKsfEzrB7XS4cbDUkXWALgWdLfov7QQXMQHkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894641; 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=bqW82Ldf5gwRgcVEFk5CeF8BBSqWp28J/FWM3WYQkPI=; b=FSqpbJ5p2aW9qXCTZqdK+gzE8Xu+a3es+RDG+iJIA2F0omfzFeGZQSekI619t5S0dyeM9nfx+Kt8BxWzlA1Knc3aFHx6o5iEEdRvTuB2sdbzva3u4/1EGgCzBiyinKTBmh1drUaRNEj+LNgShKqNo+svoG2xyXCPLUNVCxD5CMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894641846852.3095447912251; Thu, 16 Jul 2020 03:17:21 -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-346-5U36tx13MKW8tCHHTGRJGg-1; Thu, 16 Jul 2020 06:08:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9B511888AAF; Thu, 16 Jul 2020 10:08:45 +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 9ABDF724C2; Thu, 16 Jul 2020 10:08:45 +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 6C6F2730FF; Thu, 16 Jul 2020 10:08:45 +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 06GA4IcC017825 for ; Thu, 16 Jul 2020 06:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6E142DE86; Thu, 16 Jul 2020 10:04:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 619CA2DE72 for ; Thu, 16 Jul 2020 10:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894640; 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=bqW82Ldf5gwRgcVEFk5CeF8BBSqWp28J/FWM3WYQkPI=; b=fPCJnBjMz30SMINeVJA4gUKK4JLP/RXQkXzfSo1Nwoqv+/ux21YMceg1QPqeKammHnr4gk rQmAV7/LPS6Ljh9fhXHY2jyHJqyPVVhawbUeOqJDlqu1lOSRZ6iy6u9YlM1i2Avh2pObOD gOAw+Z7QRJ9H55Sobl2erlfGwpifeS0= X-MC-Unique: 5U36tx13MKW8tCHHTGRJGg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 167/351] meson: src: build libvirt_driver_vz_impl.a static library Date: Thu, 16 Jul 2020 11:56:43 +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.11 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/vz/Makefile.inc.am | 24 ------------------------ src/vz/meson.build | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 src/vz/meson.build diff --git a/src/meson.build b/src/meson.build index 87d1410b218..50f428da2ef 100644 --- a/src/meson.build +++ b/src/meson.build @@ -159,6 +159,7 @@ subdir('qemu') subdir('test') subdir('vbox') subdir('vmware') +subdir('vz') =20 =20 driver_sources =3D [ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 7782fd89d75..d5d19a6f2ea 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -1,21 +1,10 @@ # vim: filetype=3Dautomake =20 -VZ_DRIVER_SOURCES =3D \ - vz/vz_driver.h \ - vz/vz_driver.c \ - vz/vz_utils.c \ - vz/vz_utils.h \ - vz/vz_sdk.h \ - vz/vz_sdk.c \ - $(NULL) - - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) =20 =20 if WITH_VZ -noinst_LTLIBRARIES +=3D libvirt_driver_vz_impl.la libvirt_driver_vz_la_SOURCES =3D libvirt_driver_vz_la_LIBADD =3D \ libvirt_driver_vz_impl.la \ @@ -24,19 +13,6 @@ libvirt_driver_vz_la_LIBADD =3D \ $(NULL) mod_LTLIBRARIES +=3D libvirt_driver_vz.la libvirt_driver_vz_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_vz_impl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - $(AM_CFLAGS) \ - $(PARALLELS_SDK_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(NULL) -libvirt_driver_vz_impl_la_SOURCES =3D $(VZ_DRIVER_SOURCES) -libvirt_driver_vz_impl_la_LIBADD =3D \ - $(PARALLELS_SDK_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) =20 sbin_PROGRAMS +=3D virtvzd =20 diff --git a/src/vz/meson.build b/src/vz/meson.build new file mode 100644 index 00000000000..1f0c04bb8f2 --- /dev/null +++ b/src/vz/meson.build @@ -0,0 +1,23 @@ +vz_driver_sources =3D [ + 'vz_driver.c', + 'vz_utils.c', + 'vz_sdk.c', +] + +if conf.has('WITH_VZ') + vz_driver_impl =3D static_library( + 'virt_driver_vz_impl', + [ + vz_driver_sources, + ], + dependencies: [ + access_dep, + libnl_dep, + parallels_sdk_dep, + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894335; cv=none; d=zohomail.com; s=zohoarc; b=C7TUPxeVoh8Cm5ZRyb4iJVmhGnGXhKayDhmIAld2MBwT0xMwN6E9Nh7G9ocI2fcsnIp9L9+lAjciN7/3ZI0DkB9eI3qeGCNBl0m0GCdTmO8wOJ+So//1lR48+za4u5Nc6rZHOQXYqjmvtCICxWPrkI51lfmhs1dHNXv5KoZynPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894335; 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=JeXQjGhmTGsCQdJgbcd4igg7AbRppYehfJeJg2bZ4FY=; b=JVLYnSm3aaWvU4+Zrtj9/o0IUL5GwT2rW//chZ+qxcIpD3F2Y5Nuw41FjwDS99JCZYDCyS7RzG1ZmWDlR+Hm5Qiv54r+0MHq4bWenuDGESyJL8xSaxOmbBiVVF9EiwAxhvv0k6PJKpdt51dlLuYgSe32BVIH3eV/ntMJRLTVSmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894335850674.0836451537361; Thu, 16 Jul 2020 03:12: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-408-qi1caJfUO2Gvv2qSEg7hNg-1; Thu, 16 Jul 2020 06:08:18 -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 F28481090; Thu, 16 Jul 2020 10:08:12 +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 D00C71053B01; Thu, 16 Jul 2020 10:08:12 +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 9CDE51804774; Thu, 16 Jul 2020 10:08:12 +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 06GA4LBQ017855 for ; Thu, 16 Jul 2020 06:04:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5E0712DE72; Thu, 16 Jul 2020 10:04:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBF452DE8F for ; Thu, 16 Jul 2020 10:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894334; 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=JeXQjGhmTGsCQdJgbcd4igg7AbRppYehfJeJg2bZ4FY=; b=Hyo9NTwr72Abl55jSphGSv6rBPppNPprh7mddR0wFKeL2ywvESxjtapKzA7Uyu/ZzovkTf 7T8unPyQSu3hynAL533v6+YPfUSCAq7AUfjmZL1ZOEd0x49eI6dz1OXe0b7EEHYfB6I6DK U9/L8pQfowSiT4NdElwk6LFY6asubtI= X-MC-Unique: qi1caJfUO2Gvv2qSEg7hNg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 168/351] meson: src: add code to build shared modules Date: Thu, 16 Jul 2020 11:56:44 +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.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/Makefile.am | 8 -------- src/meson.build | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 71a55e235f2..a9fce0444ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,12 +19,6 @@ # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. -AM_LDFLAGS_MOD =3D \ - -module \ - -avoid-version \ - $(LIBVIRT_NODELETE) \ - $(AM_LDFLAGS) -AM_LDFLAGS_MOD_NOUNDEF =3D $(AM_LDFLAGS_MOD) $(NO_UNDEFINED_LDFLAGS) =20 nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D @@ -81,8 +75,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am =20 =20 -moddir =3D $(libdir)/libvirt/connection-driver - confdir =3D $(sysconfdir)/libvirt conf_DATA +=3D libvirt.conf =20 diff --git a/src/meson.build b/src/meson.build index 50f428da2ef..991991118ba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -118,6 +118,19 @@ endif =20 libvirt_libs =3D [] =20 +# virt_modules: +# each entry is a dictionary with following items: +# * name - module name (required) +# * sources - module sources (optional, default []) +# * name_prefix - resulting library prefix (optional, default 'lib') +# * include - include_directories (optional, default []) +# * deps - dependencies (optional, default []) +# * link_with - static libraries to link with (optional, default []) +# * link_whole - static libraries to include (optional, default []) +# * link_args - arguments for linker (optional, default []) +# * install_dir - installation directory (optional, default libdir / 'li= bvirt' / 'connection-driver' +virt_modules =3D [] + =20 # list subdirectories =20 @@ -409,3 +422,37 @@ libvirt_admin_lib =3D shared_library( version: libvirt_lib_version, soversion: libvirt_so_version, ) + + +# build libvirt shared modules + +foreach module : virt_modules + mod =3D shared_module( + module['name'], + module.get('sources', []), + name_prefix: module.get('name_prefix', 'lib'), + include_directories: [ + conf_inc_dir, + module.get('include', []), + ], + dependencies: [ + src_dep, + module.get('deps', []), + ], + link_with: [ + libvirt_lib, + module.get('link_with', []), + ], + link_whole: [ + module.get('link_whole', []), + ], + link_args: [ + libvirt_nodelete, + module.get('link_args', []), + ], + install: true, + install_dir: module.get('install_dir', libdir / 'libvirt' / 'connectio= n-driver'), + install_rpath: libdir, + ) + set_variable('@0@_module'.format(module['name'].underscorify()), mod) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894076; cv=none; d=zohomail.com; s=zohoarc; b=XHNZJ+UVp8Dec6UiRPSfD1PPG1YLDc5US8x9xNXFNGeD61DFQRw/LI1/BnRxrA4FeuI9G7nlAKNmU9yGlGeLEDPKTRghLZ1sLIYAHOG0OHpjqryZGqRigZ0M7kOGSS3aOFBkPVN8v1+XfxAlk/pfK2z2gvoUy6FEH8AkS7u6IPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894076; 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=XgVmK7uOBwdmP4NytyJap0Faod/tpof1ZrVHBgU0iic=; b=ZJer0lXYMDDEwGrMh55fKLK5m04WKVoUjyMYwboL3TZpU0NaBbH0PEmMkl29sX7JwMxtjxEcYWTGKanALrgAxsvlGGrjdt8CCb2u2TpF/IyNjffncH3nEV/CJoeJTfUoNuzcu3FCOAlsukuUWBWsczNTS/4HjpgMtQamQHeSVrs= 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 1594894076546547.9398272009546; Thu, 16 Jul 2020 03:07:56 -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-441-rHUsNIITOfypITM3w24Gjw-1; Thu, 16 Jul 2020 06:07:51 -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 4FC9810059B6; Thu, 16 Jul 2020 10:07:46 +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 2C9106FEFE; Thu, 16 Jul 2020 10:07:46 +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 EDCC196241; Thu, 16 Jul 2020 10:07:45 +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 06GA4M54017870 for ; Thu, 16 Jul 2020 06:04:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 496F12DE73; Thu, 16 Jul 2020 10:04:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B84122DE72 for ; Thu, 16 Jul 2020 10:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894074; 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=XgVmK7uOBwdmP4NytyJap0Faod/tpof1ZrVHBgU0iic=; b=TmVHXEHCSdL79qjdVNVDbKTM+2LKoUKwaRPTEcS+0l3t4ifi0OXnwvFV5HSSwfcbte/1DN nQc646fclAW0rHoMvOaa8CYztg1h8/JCnDA4+t567ODc43sYpRus+bRqev7X+wj0dwqQvu 7gGmPXjBG5U0dnEqbyJXHa01i1aQmuQ= X-MC-Unique: rHUsNIITOfypITM3w24Gjw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 169/351] meson: src: build libvirt_driver_bhyve.so shared module Date: Thu, 16 Jul 2020 11:56:45 +0200 Message-Id: <7bcf40d38092eb2a5f4d98e9d68e147a54cebf05.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 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/bhyve/Makefile.inc.am | 9 --------- src/bhyve/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 3433e6a3dab..40384e1c714 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -4,15 +4,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DR= IVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) =20 if WITH_BHYVE -libvirt_driver_bhyve_la_SOURCES =3D -libvirt_driver_bhyve_la_LIBADD =3D \ - libvirt_driver_bhyve_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_bhyve.la -libvirt_driver_bhyve_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtbhyved =20 nodist_conf_DATA +=3D bhyve/virtbhyved.conf diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index a9af677440b..83d8c366635 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -25,4 +25,14 @@ if conf.has('WITH_BHYVE') hypervisor_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_bhyve', + 'link_whole': [ + bhyve_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894773; cv=none; d=zohomail.com; s=zohoarc; b=LJ/9pt3uXpCoXTZSPSivCT+1CLEyt6oNoEY1iD/IUnhL4KjvkpZR/ACiy1rDtksMvfavY7+bMu7MJeRFSiIl4lQeZIhFj5JgwSOJsQRroA3dszMAeCWEHXauwc1IDIx+mjy12b3JgasoBq17c2asHNRsjcJefvPFaRLv69UgwnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894773; 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=U9MEqpZb3JlZ8TseE3zTdc/YMQp7uuCLOpb821ZSkW8=; b=Piq1MNEe4XkWFTEfi8rZtQW4P4rqNZxY77SWDY+zpgJzMAvciH65q60WcAV9N3y6te/LoN7Di568LbPA4zNzgLz+9/fV8ZfR+ZdqjCwFGHnFINOkLZ3hFVSkpfa2k4ldy3Z8uSLxDdNy9yvHxZ7Nc6shd6pWGnmq3WKBKHlMTSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894773855635.6572296530475; Thu, 16 Jul 2020 03:19:33 -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-155-kZMcrweqMhC7c_zZp_Rwhw-1; Thu, 16 Jul 2020 06:08:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C58280BCB8; Thu, 16 Jul 2020 10:08:48 +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 DEA875C1C3; Thu, 16 Jul 2020 10:08:47 +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 AC3E31802230; Thu, 16 Jul 2020 10:08:47 +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 06GA4T6F017907 for ; Thu, 16 Jul 2020 06:04:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id F24B42DE72; Thu, 16 Jul 2020 10:04:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B5252DE73 for ; Thu, 16 Jul 2020 10:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894772; 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=U9MEqpZb3JlZ8TseE3zTdc/YMQp7uuCLOpb821ZSkW8=; b=Sno/fjSBhSa01LLT9/wb38RpZ+teXZ0/Otj9JFHuJ/FCqSuCOoIUTwIz3nWW3ELhaWh95a hwf8iM8DNgJTjU1h9ig1G2wYYN2SGJ4JMaz0Td/UhF/QEGCVmkBMsI4npMF6Rs9Ulg4mRj 1OP2orYkZuMD1+M5YQi3TbTJWjBsFZ0= X-MC-Unique: kZMcrweqMhC7c_zZp_Rwhw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 170/351] meson: src: build libvirt_driver_interface.so shared module Date: Thu, 16 Jul 2020 11:56:46 +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.16 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/interface/Makefile.inc.am | 33 --------------------------------- src/interface/meson.build | 29 +++++++++++++++++++++++++++++ src/meson.build | 1 + 3 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 src/interface/meson.build diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index deff49fa65d..9a56e0b4e0f 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -1,43 +1,10 @@ # vim: filetype=3Dautomake =20 -INTERFACE_DRIVER_SOURCES =3D \ - interface/interface_driver.h \ - interface/interface_driver.c \ - $(NULL) - -INTERFACE_DRIVER_NETCF_SOURCES =3D interface/interface_backend_netcf.c -INTERFACE_DRIVER_UDEV_SOURCES =3D interface/interface_backend_udev.c - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES= )) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) =20 if WITH_INTERFACE -mod_LTLIBRARIES +=3D libvirt_driver_interface.la -libvirt_driver_interface_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(NULL) -libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_interface_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_driver_interface_la_SOURCES =3D $(INTERFACE_DRIVER_SOURCES) -if WITH_NETCF -libvirt_driver_interface_la_CFLAGS +=3D $(NETCF_CFLAGS) -libvirt_driver_interface_la_LIBADD +=3D $(NETCF_LIBS) -libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIVER_NETCF_SOURCES) -endif WITH_NETCF -if WITH_UDEV -libvirt_driver_interface_la_CFLAGS +=3D $(UDEV_CFLAGS) -libvirt_driver_interface_la_LIBADD +=3D $(UDEV_LIBS) -libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIVER_UDEV_SOURCES) -endif WITH_UDEV - sbin_PROGRAMS +=3D virtinterfaced =20 nodist_conf_DATA +=3D interface/virtinterfaced.conf diff --git a/src/interface/meson.build b/src/interface/meson.build new file mode 100644 index 00000000000..bb08706f21c --- /dev/null +++ b/src/interface/meson.build @@ -0,0 +1,29 @@ +interface_driver_sources =3D [ + 'interface_driver.c', +] + +if conf.has('WITH_NETCF') + interface_driver_sources +=3D 'interface_backend_netcf.c' +endif + +if conf.has('WITH_UDEV') + interface_driver_sources +=3D 'interface_backend_udev.c' +endif + +if conf.has('WITH_INTERFACE') + virt_modules +=3D { + 'name': 'virt_driver_interface', + 'sources': [ + files(interface_driver_sources), + ], + 'deps': [ + access_dep, + libnl_dep, + netcf_dep, + udev_dep, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } +endif diff --git a/src/meson.build b/src/meson.build index 991991118ba..92f80b5838b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -154,6 +154,7 @@ subdir('vmx') subdir('remote') =20 subdir('admin') +subdir('interface') subdir('locking') subdir('logging') subdir('network') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894210; cv=none; d=zohomail.com; s=zohoarc; b=NjewXQ3gdzyS/OlfWlfLZ4fVbwACqstuv1n1cBgRfq7IYRSVF2xdT9SiTNPG/Ez836Y8wrZlghbiNEzYvkNtxayMXcWSxHrTw2ORPX1oOpjiDVoBt8dJV2K5ulUiH/zmgfBzr/c01+uM7xoBaM9FqbdNE/QScvKRHkb0Sv6yfmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894210; 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=S6gXVd8MLNMETdcJtLehabx8aqxTUAIyr1i+D9isrmY=; b=O97FbBpTQ7WuI5WiZYPvL2zGdCifRsyWcQYe3VKEzITIEcyAiBNvA7a+L6blMd9P6sEq1jY+DjHGhpdEZiGfKoY/LPRFSVaaFEGlyd3teO80LVrpNAa78h1t5yKkXVU7w4zZutYK1CLg5oWfU4nm7PAPV/z0qTJ4dyGOgTY1eXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894210304854.2040400513054; Thu, 16 Jul 2020 03:10:10 -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-495-OuNSLwypPDyFgh2NwB16BA-1; Thu, 16 Jul 2020 06:08:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69DE28064AA; Thu, 16 Jul 2020 10:08:15 +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 499F1724A9; Thu, 16 Jul 2020 10:08:15 +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 15F341804776; Thu, 16 Jul 2020 10:08:15 +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 06GA4Tu0017912 for ; Thu, 16 Jul 2020 06:04:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id D81022DE73; Thu, 16 Jul 2020 10:04:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52ACC2DE72 for ; Thu, 16 Jul 2020 10:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894209; 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=S6gXVd8MLNMETdcJtLehabx8aqxTUAIyr1i+D9isrmY=; b=be6KCEipmhx+OdvTrbZHC6/2nfymI0YhoKJLEwxkUXuhxVBRSzZMVh1Ctux0/l2JoiQpzJ 1hvBmFnZzol/BT0wNktDtTdVCT6tCPiBchVBg4N2sK06o0ca70ET+Rd1h2kbmVhpanhaHf oGa9+EUVmyoeQ4G7LSOUWuEQY0y4ZmY= X-MC-Unique: OuNSLwypPDyFgh2NwB16BA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 171/351] meson: src: build libvirt_driver_libxl.so shared module Date: Thu, 16 Jul 2020 11:56:47 +0200 Message-Id: <2ea4f423475fb899641ffbf8fe2945e17a807412.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.11 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/libxl/Makefile.inc.am | 9 --------- src/libxl/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index c7ac93a75b7..35e6b3bbcd9 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -4,15 +4,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DR= IVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) =20 if WITH_LIBXL -libvirt_driver_libxl_la_SOURCES =3D -libvirt_driver_libxl_la_LIBADD =3D \ - libvirt_driver_libxl_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_libxl.la -libvirt_driver_libxl_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtxend =20 nodist_conf_DATA +=3D libxl/virtxend.conf diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 7747bb61a75..484f3805851 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -26,4 +26,14 @@ if conf.has('WITH_LIBXL') hypervisor_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_libxl', + 'link_whole': [ + libxl_driver_imp, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894139; cv=none; d=zohomail.com; s=zohoarc; b=T9KSGC+FI4VdMCwsFVDsYu7/UlKVhsO/0x7qVW/hBwR8dOcR8DzhOEh3amhl4/+qnukfJHH359Tq+tF0uDwJeoAwY2Rxjz/LJpvZhYt0/+xYt6CJNsCW0ovHGEkm+eBjWL51j7C8I/jiSCIq0ero1OsN3QZeeULF5jYfkMPGeHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894139; 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=p51aCt6FxPt8Kel+nr6hR6IAgOFEky+m547ft7krZRM=; b=SdxSCtMSCeS/7n9L+bFBpQUk4UFh6jgGIXWdFVe5v/xLbgM5LO2bkDhzxGU0I3r1b2vdvJX0KgkjQeypY6ya9UMV/3wI1AG65wduj2mKKh4Gw+ZYpIE8kmF2TasbBoW0otl7ABBjCUixjSue0ITX8II0SCEwcaMXSc1ReoRSZUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894139949817.9426681794266; Thu, 16 Jul 2020 03:08:59 -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-304-arXQce4lN2ymae7y7jGO8w-1; Thu, 16 Jul 2020 06:08:56 -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 B6FFE802805; Thu, 16 Jul 2020 10:08: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 46F63106F76D; Thu, 16 Jul 2020 10:08: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 05335180143C; Thu, 16 Jul 2020 10:08:50 +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 06GA4Uv9017922 for ; Thu, 16 Jul 2020 06:04:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id C0E662DE73; Thu, 16 Jul 2020 10:04:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B7142DE72 for ; Thu, 16 Jul 2020 10:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894138; 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=p51aCt6FxPt8Kel+nr6hR6IAgOFEky+m547ft7krZRM=; b=eXQgFlRhvyGYEe3fkUHJbPDpMyuBfxSnMJXTAIN7aewvBpJA2xV6xIr3n/Ky8Ui2OVDWdT PtBSGz7P3V9h/jYZcCxcluSvoKdv5uCsfyg63dfk4VRveREB2bQOAVLLRU66vLygPPB4EB 6qaXuJwBz2jskRygZ+Sk4zF5t6WbQ/A= X-MC-Unique: arXQce4lN2ymae7y7jGO8w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 172/351] meson: src: build libvirt_driver_lxc.so shared module Date: Thu, 16 Jul 2020 11:56:48 +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.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/lxc/Makefile.inc.am | 10 ---------- src/lxc/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index b0a12fdda50..3bf8d9dfb05 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -47,16 +47,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_LXC =20 -libvirt_driver_lxc_la_SOURCES =3D -libvirt_driver_lxc_la_LIBADD =3D \ - libvirt_driver_lxc_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_lxc.la -libvirt_driver_lxc_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - - sbin_PROGRAMS +=3D virtlxcd =20 nodist_conf_DATA +=3D lxc/virtlxcd.conf diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 438cedd287c..5d8a20bd9f7 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -64,4 +64,14 @@ if conf.has('WITH_LXC') hypervisor_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_lxc', + 'link_whole': [ + lxc_driver_impl_lib, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894444; cv=none; d=zohomail.com; s=zohoarc; b=NUNz7WHY6MuY3R7SiuswKBONCoMOCli+nuUYHQlozZdLO/hyPrQK5W1mmJ+oEONtBqWTF5slYVyNWQ9WCwoLquW00mEawNCT+ZXcW7jLRC6aHxMXvjtFOa+L9zeTy8/0yztCOvA7zCLgjAM5w7QvpnZe7YFcE+C8BpDzWfyN9uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894444; 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=2m3ox9jdUdO+T8wfVvEgZNyXvPpKMbLoVFk4IrfHaUo=; b=BiwZd4OqOcB3zz4nKaTrW++Bmy1RoCTR2wL/ITgi7eCVjBck3ssEfyRDNJ4k6wyg2LO/5Euk3JFuuVJuE5NYjhA0kSoLariytfxJmJHhpBqkGqZdgXdJmNv6tNv3Tbr5b4J6lSZzlvFrnXDKva8ZQFwIb1JEa6c8mwHE3WxxWm4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894444520191.3075322469674; Thu, 16 Jul 2020 03:14:04 -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-406-yuZ83PJpPKen-znmZiEg2w-1; Thu, 16 Jul 2020 06:07:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A533100AA28; Thu, 16 Jul 2020 10:07:48 +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 67DB42DE9D; Thu, 16 Jul 2020 10:07:48 +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 369911805314; Thu, 16 Jul 2020 10:07:48 +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 06GA4Vav017928 for ; Thu, 16 Jul 2020 06:04:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA6762DE72; Thu, 16 Jul 2020 10:04:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23E252DE81 for ; Thu, 16 Jul 2020 10:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894443; 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=2m3ox9jdUdO+T8wfVvEgZNyXvPpKMbLoVFk4IrfHaUo=; b=V7FGA8S3nIis8b9CEVJel7PF9eI38HA4yKXWl2ZeZ+WtOL85J2EMJeqc33nJ5SBI9jQfEk vc4RQwQCa6fZ87gVFn6ktDKke3BEEz6ztHfPcucovCMiHS247rZU6pKfautrnKp7ibjYK5 fRj8Za7Pl1IUCqsgVugaqlkausy3fyI= X-MC-Unique: yuZ83PJpPKen-znmZiEg2w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 173/351] meson: src: build libvirt_driver_network.so shared module Date: Thu, 16 Jul 2020 11:56:49 +0200 Message-Id: <03dd0ffb440ebe6ff4e82e08903ff47e5450deb3.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.23 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/network/Makefile.inc.am | 13 ------------- src/network/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c93b2e693d0..523ae453797 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -10,19 +10,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NETWORK - -noinst_LTLIBRARIES +=3D libvirt_driver_network_impl.la -libvirt_driver_network_la_SOURCES =3D -libvirt_driver_network_la_LIBADD =3D \ - libvirt_driver_network_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(LIBNL_LIBS) \ - $(DBUS_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_network.la -libvirt_driver_network_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtnetworkd =20 nodist_conf_DATA +=3D network/virtnetworkd.conf diff --git a/src/network/meson.build b/src/network/meson.build index 2b05544fd22..879a5731a6e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -19,4 +19,18 @@ if conf.has('WITH_NETWORK') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_network', + 'deps': [ + dbus_dep, + libnl_dep, + ], + 'link_whole': [ + network_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894144; cv=none; d=zohomail.com; s=zohoarc; b=mxthf5fyhgVsYj+Btlgb04x1JGMP55miVpMTlzTmnk+YUMVOCH+kWxmy+An28NyxP9Uo0LTAlls08HHfKm7N6w8aOXTCyQSuouSFWlIIclBzKIbMqzPk7zg0qcUt876Sp+neY9t7ej9hvl7YI9Snu+FzHNgWiODURzimNkFOaGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894144; 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=GPLbqz0HE7RUWZ0ALrz+69mkuD/9rYyo5EeC7TN3j9c=; b=VV1WiWMHXITGQB1pqUPCFHo1IKmJoU+Cm6QLDWzrexoDvlJAeEDB0kWNVims1psoOzaETpP+yCCGxi66ii0D5F896RnhloBBAIduCEopSqotzojftixfghjq9hHJ4zcpw8IOwFFejYckMtOwrPcropPmecPrqDUn7EorB+fnnOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894144486430.2373074392889; Thu, 16 Jul 2020 03:09:04 -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-344-0rv6peUDP9GPls2Ny-P6gQ-1; Thu, 16 Jul 2020 06:08:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D609C809881; Thu, 16 Jul 2020 10:08:52 +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 B787C5C5B7; Thu, 16 Jul 2020 10:08:52 +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 88A659623E; Thu, 16 Jul 2020 10:08:52 +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 06GA4Wce017942 for ; Thu, 16 Jul 2020 06:04:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 92D642DE73; Thu, 16 Jul 2020 10:04:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DACD2DE72 for ; Thu, 16 Jul 2020 10:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894143; 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=GPLbqz0HE7RUWZ0ALrz+69mkuD/9rYyo5EeC7TN3j9c=; b=Mt3gvzvHSHFtes4R20xbQyvkn4LAod3rLYDrXzi62juMDXxGlLYreiXC8gaZWqTpnFNgyw c7dv33XWMJjSUDfhsOd5N0wGIUqo2+zV82wZpvA2omeIQOtNaNLZ9B6pvFMWIwqbhlV7MS EuUm1giOwNLHhpv56hkY/x5IyAGrpDw= X-MC-Unique: 0rv6peUDP9GPls2Ny-P6gQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 174/351] meson: src: build libvirt_driver_nodedev.so shared module Date: Thu, 16 Jul 2020 11:56:50 +0200 Message-Id: <1d7dd7c8688cf958928283c3a6548ed24d3833d7.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.16 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/node_device/Makefile.inc.am | 5 ----- src/node_device/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index d3261cb15c4..d7d80f61fbb 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -12,11 +12,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NODE_DEVICES -libvirt_driver_nodedev_la_SOURCES =3D -libvirt_driver_nodedev_la_LIBADD =3D libvirt_driver_nodedev_impl.la -libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -mod_LTLIBRARIES +=3D libvirt_driver_nodedev.la - sbin_PROGRAMS +=3D virtnodedevd =20 nodist_conf_DATA +=3D node_device/virtnodedevd.conf diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 4ee64f56433..00fa7e0ea9c 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -28,4 +28,14 @@ if conf.has('WITH_NODE_DEVICES') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_nodedev', + 'link_whole': [ + node_device_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894145; cv=none; d=zohomail.com; s=zohoarc; b=d2oRN7cBAvVZEviGOUunbrXJlCyx22VAogXkK92NgGB5JCckIjf0BbLRrWRQJSWA+29zRkzwlambqPoxU6whC6ChEPvkvQ3M6eCVL7GUdbcfOzWqxRJXz7NezYnDH8kVH8wd3edSCDqRMZ4wpAGlyCtSGnjw2Ssqm1lPHVlJ4Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894145; 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=Lm4ku0eL/ePoH5txkVftK6pScy6DZAwR4zyZLejhNWQ=; b=mBNSzGUNht5Czzcg98qrw9iH0tgcJRylvCEWiPWmqboAdQlMhc27BN9QZNqaTfzvOoPgjYw9KMod0nujiv35+TUqAalPNYhR79fkXMVh3jEW67xtH1Tj+rnMsYKwlKavuijF1EEy5O4vMr7zPuRKciNuKxVzIKyMkIG4a5nBqYI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894145297234.53373526793837; Thu, 16 Jul 2020 03:09:05 -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-404-Hiz6W0mePZuN2xMf-NCUzg-1; Thu, 16 Jul 2020 06:09:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A249108B; Thu, 16 Jul 2020 10:08:55 +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 0D322710D7; Thu, 16 Jul 2020 10:08:55 +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 D144D9624C; Thu, 16 Jul 2020 10:08:54 +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 06GA4XNk017950 for ; Thu, 16 Jul 2020 06:04:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BEDF2B6DB; Thu, 16 Jul 2020 10:04:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA12C2DE72 for ; Thu, 16 Jul 2020 10:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894144; 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=Lm4ku0eL/ePoH5txkVftK6pScy6DZAwR4zyZLejhNWQ=; b=KSLJ0W1EcRRDX+R1gDXLA/93hq0pkQ/Brj+fQBEsSui73d/NqU9C8UD+Tls7PeNsX34V9X mPskAa5wAYe2PDtcOcqdcR1eT7X6+92TfSyVtbscS9z+Dp1mkynqoTXRH0MackAKX8o09n I0Im5yv440REn4EKj7/lo+en8bVWRes= X-MC-Unique: Hiz6W0mePZuN2xMf-NCUzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 175/351] meson: src: build libvirt_driver_nwfilter.so shared module Date: Thu, 16 Jul 2020 11:56:51 +0200 Message-Id: <09b89018379b8e3e34d7d9af8cb39bdea96a4b9f.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.15 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/nwfilter/Makefile.inc.am | 7 ------- src/nwfilter/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index ba07992027c..d853282b705 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,13 +11,6 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -libvirt_driver_nwfilter_la_SOURCES =3D -libvirt_driver_nwfilter_la_LIBADD =3D \ - libvirt_driver_nwfilter_impl.la \ - libvirt.la -mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la -libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtnwfilterd =20 nodist_conf_DATA +=3D nwfilter/virtnwfilterd.conf diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index fe792058b94..8da853c3ecb 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -23,4 +23,14 @@ if conf.has('WITH_NWFILTER') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_nwfilter', + 'link_whole': [ + nwfilter_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894205; cv=none; d=zohomail.com; s=zohoarc; b=Bz7vS4mfUhWfq2KHus1HbdCy6dcMykQGnJd64c5tmQtLWXn/24HpFsRLwQ9Vh3MgQVKOX5p83/WJnFp45rHszhp6srZPddV12YeGZ6okxkXNvd4m4bB6A+e+K/46Ipbq2fYhRYX4YNp6Wiv5j/qOEUlcRyKSQKnU3UxO2MrZ6L4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894205; 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=b5gDmY2/WH9z3HnDZngWIzXiIpFfY3d+Tjw7WQzvKWQ=; b=Zha4/VtICzkOsmQeg4xbifmS9OQFMVkCmCl+Cq2Aq23qJ6qxVZzMPdEroCtGIW+DkY4L9GjtB6tNlEZekK7dGlQvx25mKDRo1icHYGsr5HzwT0/6lR4f+ZBXfjLwpGThTByTUN5pu4Or821OgXSezSL/eCVNM0Dd086epfZhabM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894205263416.67190764895076; Thu, 16 Jul 2020 03:10:05 -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-407-jiAy51z-MeSyMtmY7jBIIA-1; Thu, 16 Jul 2020 06:09:04 -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 7E122107ACCA; Thu, 16 Jul 2020 10:08:57 +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 5ABC16FEFB; Thu, 16 Jul 2020 10:08:57 +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 2565F1819AC0; Thu, 16 Jul 2020 10:08:57 +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 06GA4eTx017986 for ; Thu, 16 Jul 2020 06:04:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 985AC2B6DB; Thu, 16 Jul 2020 10:04:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1238F2DE86 for ; Thu, 16 Jul 2020 10:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894204; 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=b5gDmY2/WH9z3HnDZngWIzXiIpFfY3d+Tjw7WQzvKWQ=; b=Urm8CfNpXBTXEK4/6ZCTBFdqIcQlSGIE267c7jZbfsGk2v+oHi9zyJjUwBVpj3JSEtGMpP 0Mhx8XVpiCFvkOYXUnifGrohjGX2Gzk8jtNLZbNTxHZjsHpctQfbPectcMkRA36gyUOVwz 4DgQpVxv7PlPbYv2uQipWWTJEFlI8pg= X-MC-Unique: jiAy51z-MeSyMtmY7jBIIA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 176/351] meson: src: build libvirt_driver_qemu.so shared module Date: Thu, 16 Jul 2020 11:56:52 +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.12 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/qemu/Makefile.inc.am | 13 ------------- src/qemu/meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 3d703d15d33..f2b5e3a77f6 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -4,19 +4,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRI= VER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) =20 if WITH_QEMU -libvirt_driver_qemu_la_SOURCES =3D -libvirt_driver_qemu_la_LIBADD =3D \ - libvirt_driver_qemu_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_qemu.la -libvirt_driver_qemu_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -if WITH_DTRACE_PROBES -libvirt_driver_qemu_la_LIBADD +=3D libvirt_qemu_probes.lo -endif WITH_DTRACE_PROBES - sbin_PROGRAMS +=3D virtqemud =20 nodist_conf_DATA +=3D qemu/virtqemud.conf diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 14b700558df..209cb5f4956 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -92,4 +92,17 @@ if conf.has('WITH_QEMU') hypervisor_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_qemu', + 'sources': [ + qemu_dtrace_gen_objects, + ], + 'link_whole': [ + qemu_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894773; cv=none; d=zohomail.com; s=zohoarc; b=klQ++cz8+Jcdc3XcmK2y3r9lutyN2tBe7r9q/CltC4VyUNZjtW0J8vZ0enQqhMtXrW2PWxQtwRWNYvRbAw/FlKTCMQwVJqaW3IkE5GaabzVJLIo62HR5utwUTFcgVMGxxSKXHCOWrn9Y4GEhWj63itvCjQOkatoPd8xaDGTsbIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894773; 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=LSezgJ6q0aoaMiw6L/t7mRsUehmHs/XDQWUGNe8q9w0=; b=OP30TyEqakdDfiUKrBd+btrtqKjPovS19KKyd6Z95N24cJdzHGmk1YW5yJVR1YEui1mE9JwdJJAilsgL9E+Hf0sBUQAFIzNc8XbRGZIyZDHQIK1QQQWpgYlpOCwgeWWzirYZjCq66upFxHMFhrc5B0EE/a//SHZzywRuHkO6JZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948947738575.906428083138394; Thu, 16 Jul 2020 03:19:33 -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-353-32fox-78PY2SISWcJaUT-g-1; Thu, 16 Jul 2020 06:07:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E33DA108F; 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 C39C6724C2; 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 903A7180531B; Thu, 16 Jul 2020 10:07:50 +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 06GA4fRA017991 for ; Thu, 16 Jul 2020 06:04:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D66D2E03A; Thu, 16 Jul 2020 10:04:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF22A2DE72 for ; Thu, 16 Jul 2020 10:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894772; 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=LSezgJ6q0aoaMiw6L/t7mRsUehmHs/XDQWUGNe8q9w0=; b=NI5TCZql5cpomrercoyxSiQ7eISUJv3fzovJWS7dRQQv8VtXp6+QwJZoQLDYvv2FLnT/y5 iuEaM41Cu+R9O0T+uq+OO1Jth+FlNVHCoxYQ+8T4tgthnTu1bbd+7R43AIEwKxR5G8XajH 8zRvqUU8KN4YskhsbTPy+h2sBVcJpqk= X-MC-Unique: 32fox-78PY2SISWcJaUT-g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 177/351] meson: src: build libvirt_driver_secret.so shared module Date: Thu, 16 Jul 2020 11:56:53 +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.11 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/secret/Makefile.inc.am | 21 --------------------- src/secret/meson.build | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 src/secret/meson.build diff --git a/src/meson.build b/src/meson.build index 92f80b5838b..13f231f4345 100644 --- a/src/meson.build +++ b/src/meson.build @@ -160,6 +160,7 @@ subdir('logging') subdir('network') subdir('node_device') subdir('nwfilter') +subdir('secret') subdir('security') subdir('storage') =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 586e6e372fd..e47aa678a6c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -1,31 +1,10 @@ # vim: filetype=3Dautomake =20 -SECRET_DRIVER_SOURCES =3D \ - secret/secret_driver.h \ - secret/secret_driver.c \ - $(NULL) - - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) =20 - if WITH_SECRETS -mod_LTLIBRARIES +=3D libvirt_driver_secret.la -libvirt_driver_secret_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_secret_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES) - sbin_PROGRAMS +=3D virtsecretd =20 nodist_conf_DATA +=3D secret/virtsecretd.conf diff --git a/src/secret/meson.build b/src/secret/meson.build new file mode 100644 index 00000000000..a6d0a321938 --- /dev/null +++ b/src/secret/meson.build @@ -0,0 +1,18 @@ +secret_driver_sources =3D [ + 'secret_driver.c', +] + +if conf.has('WITH_SECRETS') + virt_modules +=3D { + 'name': 'virt_driver_secret', + 'sources': [ + files(secret_driver_sources), + ], + 'deps': [ + access_dep, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894864; cv=none; d=zohomail.com; s=zohoarc; b=lvfjiDiqHby6MDW/GI04PimIgizv1zOi70DwHznkoSY/zchvcKcljZDZWukO5eAv4cL5n+jQk1gfwc09osXYV/J17ovCxmB7bmd8O7vMVqDhfQRgVcNEbVXvYB4n4ftLQCE0ciG43OWb2HnijfIF92e+IN+a/B/bU1G5nP1Kreo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894864; 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=hzL7sBrLH5DCpgsg9dJ60yz0q9PY7IHSmj/INDJjKAE=; b=P0p2oCc8U323Bu42OsfcocsGg1QHccR085wYLEUmcRsohQ/NevF0ITgw58cgK7+LInHA4RKaGcU9ekDGn8xths8+zDp9b28gT7FLPx5KUNwnwD2geXKohpYLrpj064SDjbQMzkk1FjyBiKHnvL27ujWmlN6fPokyNiB4d2NCJoc= 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 1594894864029164.20714733980446; Thu, 16 Jul 2020 03:21:04 -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-82-ryB3XYf4NtqhjGnNbqnwIw-1; Thu, 16 Jul 2020 06:08:25 -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 250818015F4; Thu, 16 Jul 2020 10:08:18 +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 F3C1C61982; Thu, 16 Jul 2020 10:08:17 +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 C2B82730C9; Thu, 16 Jul 2020 10:08:17 +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 06GA4gG7018008 for ; Thu, 16 Jul 2020 06:04:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B4692B6DB; Thu, 16 Jul 2020 10:04:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D90FA2DE6D for ; Thu, 16 Jul 2020 10:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894862; 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=hzL7sBrLH5DCpgsg9dJ60yz0q9PY7IHSmj/INDJjKAE=; b=cN4qg1vYIB0HV0IsEosny5qFwXo9RVVeIML76sqxrbyis7hw5pMyeIvUNXEVhLNw9DGM6A NHbb1W+AiqBsg4CN6n5w4mCd2p3buUxVk/tHWSRSxppdsW5dM7B+joyXFv135kZsMdMwOB iHldRlk5tiNIGvNddY80Mwp1caA/k4A= X-MC-Unique: ryB3XYf4NtqhjGnNbqnwIw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 178/351] meson: src: build libvirt_driver_vbox.so shared module Date: Thu, 16 Jul 2020 11:56:54 +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.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/vbox/Makefile.inc.am | 10 ---------- src/vbox/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 19ffff223b1..e61c3df40d6 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -6,16 +6,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NULL) =20 if WITH_VBOX -noinst_LTLIBRARIES +=3D libvirt_driver_vbox_impl.la -libvirt_driver_vbox_la_SOURCES =3D -libvirt_driver_vbox_la_LIBADD =3D \ - libvirt_driver_vbox_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_vbox.la -libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtvboxd =20 nodist_conf_DATA +=3D vbox/virtvboxd.conf diff --git a/src/vbox/meson.build b/src/vbox/meson.build index c27f9418249..5af671c00cb 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -28,4 +28,14 @@ if conf.has('WITH_VBOX') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_vbox', + 'link_whole': [ + vbox_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894151; cv=none; d=zohomail.com; s=zohoarc; b=QIsuZ4dVOY0h9CdFxHwjRIDtZ7EYJ3BjjBfiOx9eoHdHoiZg32Df31finmOCqwxXjNvpgJ7f6ej1CRezt+6QOxe3DgMw7J/QM3jZ/i2Wmm94z0V5Ive5ddjPMiQGtW6upjNBJ3K7j8Mjj58ABHiTH3uO3ZmNTKaW079B806P/Y8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894151; 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=jE0lyaE1deo8Cyi++ghR6a3lYwmWwE8QJrXHxyMqFd0=; b=G5KctKKFTzczLKr5HwSVQIpX7AncF+8WjKFgt94PO8I3Myk1qC12vPjHRn1ktDPcIR+jAOeBGfBKeNjYjYRzrxzw2IY16h3GkeSpFjvJx8j107ZEbjiirC3gHLmpFqDs5tr9mvloIvOEMso3Pfu4fJ6Ry/lRBgucime9hg6UMlk= 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 1594894151921859.4816062289079; Thu, 16 Jul 2020 03:09:11 -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-157-YBQRYQi-P-aZvqTgQ2IiQA-1; Thu, 16 Jul 2020 06:09:08 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD3C80BCB3; Thu, 16 Jul 2020 10:08:59 +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 B72F22E028; Thu, 16 Jul 2020 10:08:59 +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 854EE9A304; Thu, 16 Jul 2020 10:08:59 +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 06GA4hXJ018018 for ; Thu, 16 Jul 2020 06:04:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 539A22DE6D; Thu, 16 Jul 2020 10:04:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C29AA2B6DB for ; Thu, 16 Jul 2020 10:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894150; 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=jE0lyaE1deo8Cyi++ghR6a3lYwmWwE8QJrXHxyMqFd0=; b=YfJPYpC0lc1YgGIrYnzc0fYvR56qRjhVzT+ga2rjG9aSwLyAveyxh3mavVH1DPnycSl3+4 dob0viosNQYkLU2ukYJ/wZcwZl9WTQQrkiPu3YViohi/yAzOhh4Hy63et29SgXUk8KrMdB 4NWTvS3Cr4uxINlACM/20//KG0roDuU= X-MC-Unique: YBQRYQi-P-aZvqTgQ2IiQA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 179/351] meson: src: build libvirt_driver_vz.so shared module Date: Thu, 16 Jul 2020 11:56:55 +0200 Message-Id: <93d471ba242b1616450b3fd3c44f5d84af21b816.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.23 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/vz/Makefile.inc.am | 9 --------- src/vz/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index d5d19a6f2ea..f55d03d400a 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -5,15 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (VZ_DRIVER_SOURCES)) =20 =20 if WITH_VZ -libvirt_driver_vz_la_SOURCES =3D -libvirt_driver_vz_la_LIBADD =3D \ - libvirt_driver_vz_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_vz.la -libvirt_driver_vz_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtvzd =20 nodist_conf_DATA +=3D vz/virtvzd.conf diff --git a/src/vz/meson.build b/src/vz/meson.build index 1f0c04bb8f2..41cce92de2f 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -20,4 +20,14 @@ if conf.has('WITH_VZ') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_vz', + 'link_whole': [ + vz_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894773; cv=none; d=zohomail.com; s=zohoarc; b=eAEpuUh98Sop9Yt+Gg16jHKAbBEzLSF36fd1ZCyXrIpzB4h4X3Q9qXQZBn2tCH1sq0jxDzfA5cUPB5SWgItFLQ6DUkWMJi+c2+gJv/IDQ1vbbb1WKfhj0eRUo8/QcjWFV3JsqLQBoz89gkvU28QHAhQW7vV77KpTno17R5IrPoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894773; 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=Yl7x4xmi2UGc+QwtfyKxlocmBQkl8Q+YW/99YU2tatI=; b=UWcG2rIlgAFc6YQmNZrQ+UlMyBjj0D7IxBj1HW18KYgWXsfaweOiZVvRB0FYX8noDfRTBE1WHbf3H5Ch13km6EcECYcqGMw7MRh9O31trC4hlUHFOi6+AjMDPCTwfuia3D1wQml12H5nfts0uDQAkDsgmC/8TJFWs/BlAYOWL+A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894773689497.99638244958885; Thu, 16 Jul 2020 03:19:33 -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-153-H3mmiVI4PZW38nSR26nAxA-1; Thu, 16 Jul 2020 06:07:59 -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 584DF1888ABC; Thu, 16 Jul 2020 10:07:53 +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 38C767B415; Thu, 16 Jul 2020 10:07:53 +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 0A43E96253; Thu, 16 Jul 2020 10:07:53 +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 06GA4iG3018027 for ; Thu, 16 Jul 2020 06:04:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CF042DE6D; Thu, 16 Jul 2020 10:04:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB2BF2B6DB for ; Thu, 16 Jul 2020 10:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894772; 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=Yl7x4xmi2UGc+QwtfyKxlocmBQkl8Q+YW/99YU2tatI=; b=hqsJ6EFwHOq+1v1PRsAydPCHUhf4HVZeT+b/qbprJGM1y+cQwlwn8rF2ZP+NC2y/ZfEj4Q RTvsLqvzsO+PDY8M3VbVYscF+PNg0cfM06hlewmpfzPnjDh8ayIEpe3sL8Hd8L74YdjUnS Iz3LELhEr7wQ+wU+9GAz5R4x9PzPSsE= X-MC-Unique: H3mmiVI4PZW38nSR26nAxA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 180/351] meson: src: build lockd.so shared module Date: Thu, 16 Jul 2020 11:56:56 +0200 Message-Id: <17a5dd2554d19194e083b5a9a4be260924bd9561.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.13 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/locking/Makefile.inc.am | 13 ------------- src/locking/meson.build | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b8eac29d242..5b00f5a0c9e 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -38,23 +38,10 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -lockdriverdir =3D $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES =3D =20 if WITH_LIBVIRTD -lockdriver_LTLIBRARIES +=3D lockd.la -lockd_la_SOURCES =3D -lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -lockd_la_LIBADD =3D \ - libvirt.la \ - libvirt_lockd_impl.la \ - $(GLIB_LIBS) \ - $(XDR_LIBS) \ - $(NULL) augeas_DATA +=3D locking/libvirt_lockd.aug -if WITH_DTRACE_PROBES -lockd_la_LIBADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES =20 if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_lockd.aug diff --git a/src/locking/meson.build b/src/locking/meson.build index d8255d00f64..af4245ec37a 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -62,4 +62,21 @@ if conf.has('WITH_LIBVIRTD') xdr_dep, ], ) + + lockdriver_dir =3D libdir / 'libvirt' / 'lock-driver' + + virt_modules +=3D { + 'name': 'lockd', + 'name_prefix': '', + 'sources': [ + dtrace_gen_objects, + ], + 'link_whole': [ + lockd_lib_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + 'install_dir': lockdriver_dir, + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894993; cv=none; d=zohomail.com; s=zohoarc; b=IxWefPcdpumUyrYN9hZbx3wxE4AVZ+tkxwUSEEx75NfABrOlDJnXsr8mQR1i/JBGRVOIwZ/SxgEOU5W6X54k6BA/NVxEZD5u0Sczod3JnpWMdHZs2ZSORwUC5ikurQtx2jtOp47m4XP5ll9t7wy9M4qPH9woKWS8CvLmLDlE6yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894993; 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=2b/p+3LjohK2o7slEq7rFWfBhGsB2GOt0r/BTzK8lSQ=; b=RSLTbkyWAh8RiuEGjJG3881X5UQSp2U9RUMECk9eq5GwrFGUdulAyIp4iuCvTHRdr+QRMIRaeNq+PKhL44xxQoc2P64Zag5pt/Kd77rljtCAjFESqF2hvPwXnnrOPsbFctOQ5CyQS8oP3zT921FDEBiXL6HU21svpCgGqqaMOiU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894993047474.31116518465603; Thu, 16 Jul 2020 03:23:13 -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-288-UxfsfZqIMO2l5FbY9_9yMw-1; Thu, 16 Jul 2020 06:08:27 -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 6AB07100AA30; Thu, 16 Jul 2020 10:08:20 +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 476CE61982; Thu, 16 Jul 2020 10:08:20 +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 135C51803B3E; Thu, 16 Jul 2020 10:08:20 +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 06GA4jIW018039 for ; Thu, 16 Jul 2020 06:04:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 241172B6DB; Thu, 16 Jul 2020 10:04:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92D492DE73 for ; Thu, 16 Jul 2020 10:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894991; 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=2b/p+3LjohK2o7slEq7rFWfBhGsB2GOt0r/BTzK8lSQ=; b=MKfHQrlRhEh+dCX7hUlrZwMPCHhyjTaX17/2l7UXL9CG7awmp934cw4jOtljE5rifHG2bW Fr2HG9BFroj9Y9MI4Ybe2b+UgeRkfontWvtlT2Py2xaSsZiateEu1IrwxvxXKGVTOHw1tX rfJL3lKP758jrh5Xolt00mxtPjEm/7Q= X-MC-Unique: UxfsfZqIMO2l5FbY9_9yMw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 181/351] meson: src: build sanlock.so shared module Date: Thu, 16 Jul 2020 11:56:57 +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.12 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/locking/Makefile.inc.am | 15 --------------- src/locking/meson.build | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 5b00f5a0c9e..49cf0252162 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,8 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SANLOCK_SOURCES =3D \ - locking/lock_driver_sanlock.c - LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 @@ -38,8 +35,6 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -lockdriver_LTLIBRARIES =3D - if WITH_LIBVIRTD augeas_DATA +=3D locking/libvirt_lockd.aug =20 @@ -89,16 +84,6 @@ virtlockd_CFLAGS +=3D \ endif WITH_SASL =20 if WITH_SANLOCK -lockdriver_LTLIBRARIES +=3D sanlock.la -sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS =3D -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -sanlock_la_LIBADD =3D \ - -lsanlock_client \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - augeas_DATA +=3D locking/libvirt_sanlock.aug =20 if WITH_QEMU diff --git a/src/locking/meson.build b/src/locking/meson.build index af4245ec37a..4767ee9c869 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -30,6 +30,10 @@ lock_protocol_generated +=3D custom_target( ], ) =20 +sanlock_sources =3D [ + 'lock_driver_sanlock.c', +] + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -79,4 +83,21 @@ if conf.has('WITH_LIBVIRTD') ], 'install_dir': lockdriver_dir, } + + if conf.has('WITH_SANLOCK') + virt_modules +=3D { + 'name': 'sanlock', + 'name_prefix': '', + 'sources': [ + files(sanlock_sources), + ], + 'deps': [ + sanlock_dep, + ], + 'link_args': [ + libvirt_no_undefined, + ], + 'install_dir': lockdriver_dir, + } + endif endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894085; cv=none; d=zohomail.com; s=zohoarc; b=oESFp+TvPJIzFqZeubKgK2cB44rHACDOGQ7zb2Sf0GsJ/t9hRK+30j2fk6UdxHx8MMQ35ZdkvuDNG2i2fLLB2YUGVfw7F6OCKqMccUUnp+c4+OF+mKWAiJxGdNYMtrR10OuZK5aC68DFeNEQf5VteM+xdb4L16IUpxQH28hVqUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894085; 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=3aGWOP1P4qswgsnHd6mmA+uNwjnsKhfUD8wRK4R9pw4=; b=AP6p9ohhKC+DUEaR1oomNLT4fiNzV5Jjc8KU3bjghp7nohKYclU5Vp2GZQzbpaAzWyEJ4XM732S8bNluUuhz+RTD3rgI+dBpilh0vodheZn6qH3/GSD/zhBLr5xb/F93GjZTa0tzglUMqaq3hoV65sF2BKSXJRzLdfVZt4TWeX8= 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 1594894085387561.2712687354453; Thu, 16 Jul 2020 03:08:05 -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-357-n_N4hEEiNjO_Ejg5wPp8tw-1; Thu, 16 Jul 2020 06:08:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6E9D109C; Thu, 16 Jul 2020 10:07:55 +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 896FE724C2; Thu, 16 Jul 2020 10:07:55 +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 575BB1804759; Thu, 16 Jul 2020 10:07:55 +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 06GA4kHR018046 for ; Thu, 16 Jul 2020 06:04:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0B6A52DE81; Thu, 16 Jul 2020 10:04:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AA752B6DB for ; Thu, 16 Jul 2020 10:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894084; 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=3aGWOP1P4qswgsnHd6mmA+uNwjnsKhfUD8wRK4R9pw4=; b=TIiSJU2G1gVWuY+EyIx0+qK807/UbirTPeB5x9G6xxEidgQ9e6ZztmQ1aOcBUmT/Sw8JC+ 5Qigi1AKfO5LigcRjgenIUqduuKaZ1bayztp9LE0Q+yjB2OajegfAYF5nS9NOlw0iV14TN P93MEsXuyeMUaoiQM3OqcKMX13w8cfM= X-MC-Unique: n_N4hEEiNjO_Ejg5wPp8tw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 182/351] meson: src: build libvirt_storage_driver.so shared module Date: Thu, 16 Jul 2020 11:56:58 +0200 Message-Id: <661fee20f2aa863f9b47ccf2a10ec6bbc9793805.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.11 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/Makefile.am | 1 - src/storage/Makefile.inc.am | 9 --------- src/storage/meson.build | 10 ++++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a9fce0444ed..e309a96cbb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,6 @@ nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D noinst_LTLIBRARIES =3D -mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 87ba8c0bd16..c30743a1b48 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -86,15 +86,6 @@ storagefiledir =3D $(libdir)/libvirt/storage-file storagefile_LTLIBRARIES =3D =20 if WITH_STORAGE -libvirt_driver_storage_la_SOURCES =3D -libvirt_driver_storage_la_LIBADD =3D \ - libvirt_driver_storage_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES +=3D libvirt_driver_storage.la -libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS +=3D virtstoraged =20 nodist_conf_DATA +=3D storage/virtstoraged.conf diff --git a/src/storage/meson.build b/src/storage/meson.build index 36ef45b10ab..675c8a2c827 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -24,4 +24,14 @@ if conf.has('WITH_STORAGE') conf_inc_dir, ], ) + + virt_modules +=3D { + 'name': 'virt_driver_storage', + 'link_whole': [ + storage_driver_impl_lib, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894864; cv=none; d=zohomail.com; s=zohoarc; b=Z28HgzgCvS/1XxdSBG/Z+jLQZ9W7yqbYU9CSfUfCoLESOI0GDferlCxCIA9rczmuxTbMPbDg/K1+es1lbfqQYkcQmacl+kJl4DmnHLHGvJ7/IKaeAd7XPWRCYoqQy7E2IhwnquMk8z00ICKIt4Eln82iAwxF5DaWrTDEst0HbwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894864; 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=+OM5E0HbmtZrYt2F7pd27LTfNOZJT3nLjGH4xvYSFrU=; b=Kp/kTDgTaZ2VW9lR6cBkSce9Up83i+eFuBoDYTggsvJcYqXoWTcX6yQgzId1GNXXOn2iYyFM6yxOT2w29wGApqYq4R3ngszbWVLczTwP8Bkk3tiPMuWoHNvL503or4IJl+uWNizcyyhmwntIS8E6enN3NlthfCMzmx9xC3RmOPE= 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 1594894864039660.0813756256979; Thu, 16 Jul 2020 03:21:04 -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-19-QBsHs8gMNEGT9yss486XPQ-1; Thu, 16 Jul 2020 06:09:08 -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 402E510059CF; Thu, 16 Jul 2020 10:09:02 +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 236747B41E; Thu, 16 Jul 2020 10:09: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 E3C819A308; Thu, 16 Jul 2020 10:09:01 +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 06GA4k7v018054 for ; Thu, 16 Jul 2020 06:04:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id ED5CC2DE81; Thu, 16 Jul 2020 10:04:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62B4B2B6DB for ; Thu, 16 Jul 2020 10:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894862; 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=+OM5E0HbmtZrYt2F7pd27LTfNOZJT3nLjGH4xvYSFrU=; b=BW+elZZswJCt55CoKOoCMVWoLm2P+8sJcJPEot0GdTbWdLTB0bKEI+ZUIy2PNDpq2jxI1J 2dAQNuaJ9F6H5bPgzu9BKFIjx6U9wCt49Az9I4tb4OGUPVHHB9HCyBjlrx2F3tPSirbPsG udgHde54Cleiqpoubq6YPokvxNU1iuk= X-MC-Unique: QBsHs8gMNEGT9yss486XPQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 183/351] meson: src: build libvirt_storage_backedn_fs.so shared module Date: Thu, 16 Jul 2020 11:56:59 +0200 Message-Id: <27e7594d7a111040dfa99e8287efcc97776999eb.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.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/storage/Makefile.inc.am | 19 ------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index c30743a1b48..15de3311c41 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_FS_SOURCES =3D \ - storage/storage_backend_fs.h \ - storage/storage_backend_fs.c \ - $(NULL) - STORAGE_FILE_FS_SOURCES =3D \ storage/storage_file_fs.h \ storage/storage_file_fs.c \ @@ -79,7 +74,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE= _DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) =20 -storagebackenddir =3D $(libdir)/libvirt/storage-backend storagebackend_LTLIBRARIES =3D =20 storagefiledir =3D $(libdir)/libvirt/storage-file @@ -163,19 +157,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ > $@ || rm -f $@ =20 =20 -libvirt_storage_backend_fs_la_SOURCES =3D $(STORAGE_DRIVER_FS_SOURCES) -libvirt_storage_backend_fs_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_fs.la -libvirt_storage_backend_fs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_fs_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - libvirt_storage_file_fs_la_SOURCES =3D $(STORAGE_FILE_FS_SOURCES) libvirt_storage_file_fs_la_CFLAGS =3D \ -I$(srcdir)/conf \ diff --git a/src/storage/meson.build b/src/storage/meson.build index 675c8a2c827..cad3654135c 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -8,6 +8,12 @@ storage_driver_sources =3D [ storage_driver_backend_sources, ] =20 +storage_backend_fs_sources =3D [ + 'storage_backend_fs.c', +] + +storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' + if conf.has('WITH_STORAGE') storage_driver_impl_lib =3D static_library( 'virt_storage_driver_impl', @@ -34,4 +40,12 @@ if conf.has('WITH_STORAGE') libvirt_no_undefined, ], } + + virt_modules +=3D { + 'name': 'virt_storage_backend_fs', + 'sources': [ + files(storage_backend_fs_sources), + ], + 'install_dir': storage_backend_install_dir, + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894113; cv=none; d=zohomail.com; s=zohoarc; b=ljCfbfdmInCQk0c7fXVVNFfiXwiCnHXjVebwt8y6UFc/J7AlMuSFjnYrUqk02wJg79sELsUWIyIPxIAWJAYp6uMcEQ3qM2v7G9xcSb/Tg8Ld+38V+DfbvT8ldwxZHHJCdd91qo0FoDLwJlrwgOyEJCitgwrxllUZZ/MPZUGhMvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894113; 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=4NZ2elkwMUGuXXyxdy0/7yVS1Js8qYPDslOLFopFpcw=; b=Di7gxI7f5e0IIQIJBRc+98AgxzDfydiP7FksopaLLPenjMg0a4/gGtKGgTIR1fLaLmwrJPspDcLeSKUxzh3lqIxvfj+doSRCkb6oOabVQ3nNpzYgmSQPh3znVDmA3oJ3DNxqRkZNqHNQiSfBLO65gRRZs4Nnx2IWK9Bl9+W2rV4= 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 1594894113722975.2582079636112; Thu, 16 Jul 2020 03:08:33 -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-69-Wd3Bwk-9Pz-6m-0H9HDgew-1; Thu, 16 Jul 2020 06:08:30 -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 D1574802802; Thu, 16 Jul 2020 10:08:22 +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 AEE4510023A7; Thu, 16 Jul 2020 10:08:22 +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 7ED2C730D3; Thu, 16 Jul 2020 10:08:22 +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 06GA4lgj018067 for ; Thu, 16 Jul 2020 06:04:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id D50BA2DE86; Thu, 16 Jul 2020 10:04:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C6F32B6DB for ; Thu, 16 Jul 2020 10:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894112; 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=4NZ2elkwMUGuXXyxdy0/7yVS1Js8qYPDslOLFopFpcw=; b=KsSEnnKBZqjfDJ91yh6zx/0q6A1CsmLhtF+jh/J/AArvOviAONV3uc/B2Qb9a5d+pdFntj MTRQNl/EVXyuWHg2YGXmUIOWgDwIzj/bEXt9nRlYX74uNhIb7V3Wqc18fjnNbMuJie0zVn aBzy5+9YFmr+5yehTI8GYQt+08p1IIM= X-MC-Unique: Wd3Bwk-9Pz-6m-0H9HDgew-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 184/351] meson: src: build libvirt_storage_file_fs.so shared module Date: Thu, 16 Jul 2020 11:57:00 +0200 Message-Id: <8ce835a80bd8aaf662597c0bfbf5bd5fad6f85e8.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 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/storage/Makefile.inc.am | 18 ------------------ src/storage/meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 15de3311c41..404a870d357 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_FILE_FS_SOURCES =3D \ - storage/storage_file_fs.h \ - storage/storage_file_fs.c \ - $(NULL) - STORAGE_DRIVER_LVM_SOURCES =3D \ storage/storage_backend_logical.h \ storage/storage_backend_logical.c \ @@ -76,7 +71,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 storagebackend_LTLIBRARIES =3D =20 -storagefiledir =3D $(libdir)/libvirt/storage-file storagefile_LTLIBRARIES =3D =20 if WITH_STORAGE @@ -157,18 +151,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ > $@ || rm -f $@ =20 =20 -libvirt_storage_file_fs_la_SOURCES =3D $(STORAGE_FILE_FS_SOURCES) -libvirt_storage_file_fs_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagefile_LTLIBRARIES +=3D libvirt_storage_file_fs.la -libvirt_storage_file_fs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_file_fs_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) endif WITH_STORAGE =20 if WITH_STORAGE_LVM diff --git a/src/storage/meson.build b/src/storage/meson.build index cad3654135c..a44bfaabac6 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -12,7 +12,12 @@ storage_backend_fs_sources =3D [ 'storage_backend_fs.c', ] =20 +stoarge_file_fs_sources =3D [ + 'storage_file_fs.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' +storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 if conf.has('WITH_STORAGE') storage_driver_impl_lib =3D static_library( @@ -48,4 +53,12 @@ if conf.has('WITH_STORAGE') ], 'install_dir': storage_backend_install_dir, } + + virt_modules +=3D { + 'name': 'virt_storage_file_fs', + 'sources': [ + files(stoarge_file_fs_sources), + ], + 'install_dir': storage_file_install_dir, + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894324; cv=none; d=zohomail.com; s=zohoarc; b=U0Z5N2lBQia/wFvf+ZluEurAH6py4iCBcOxMaz7ShTmFORsfs3jXzXQPwPyV47jbTXtyHgemkzFY1ztVS4eMBlmcwF1RgTAxWnw5fcC5zQHjYdphHRqDt/TUbvt7hiv5n6gHP40sgbl4VCfg1bBxj7EfLqz6YMOdbdBBGhy4E+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894324; 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=C7oae3o8o7aHv+NIYZpaz8cjox0+YV2b8XFAeHQf6Ps=; b=WhSkxSWZEltTOhg0D/ekq0bn0zxmCxvB3uUtcsligwZ/Vdd86veVzDD4eX5jXMgjFrCRSnLt3MGwZ4F90qEp9wRdq6+BnWM0e3g+NGkkqsXIyTrIsFMZay8DitXJBxwDWOwxJyGZGIqxgoCMmHii/sfrReg8Paq0ex/cz30xaeE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894324112641.8842664555474; Thu, 16 Jul 2020 03:12:04 -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-315-g4JIeA34OsmmbCF9qhQ9fw-1; Thu, 16 Jul 2020 06:09:10 -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 976EE1085; Thu, 16 Jul 2020 10:09:04 +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 797FF7B41E; Thu, 16 Jul 2020 10:09:04 +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 45D2E1806B0C; Thu, 16 Jul 2020 10:09:04 +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 06GA4mSr018077 for ; Thu, 16 Jul 2020 06:04:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id D58512B6E6; Thu, 16 Jul 2020 10:04:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 365162B6DB for ; Thu, 16 Jul 2020 10:04:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894322; 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=C7oae3o8o7aHv+NIYZpaz8cjox0+YV2b8XFAeHQf6Ps=; b=J8zjb81FmDnicsxYr3Z8s+68LcPmJgZjH5AGimus8Im1x3N6WPz4XWmmvPgzl8+uTEDaod NWqA1AuA30m3KwO2MeSM4OPQ2S/x0extLsh+auJg4hqUM9sWFJmwUOhJwHKrl69LfkaeJi o0nk0c3U06p9k+ob8L8rjWd+4fWyjHU= X-MC-Unique: g4JIeA34OsmmbCF9qhQ9fw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 185/351] meson: src: build libvirt_storage_backend_logical.so shared module Date: Thu, 16 Jul 2020 11:57:01 +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 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/storage/Makefile.inc.am | 20 -------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 404a870d357..17a2d975cb5 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_LVM_SOURCES =3D \ - storage/storage_backend_logical.h \ - storage/storage_backend_logical.c \ - $(NULL) - STORAGE_DRIVER_ISCSI_SOURCES =3D \ storage/storage_backend_iscsi.h \ storage/storage_backend_iscsi.c \ @@ -153,21 +148,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_LVM -libvirt_storage_backend_logical_la_SOURCES =3D $(STORAGE_DRIVER_LVM_SOURCE= S) -libvirt_storage_backend_logical_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_logical.la -libvirt_storage_backend_logical_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_logical_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_LVM - if WITH_STORAGE_ISCSI libvirt_storage_backend_iscsi_la_SOURCES =3D $(STORAGE_DRIVER_ISCSI_SOURCE= S) libvirt_storage_backend_iscsi_la_CFLAGS =3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index a44bfaabac6..8ac52f059ed 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -16,6 +16,10 @@ stoarge_file_fs_sources =3D [ 'storage_file_fs.c', ] =20 +storage_lvm_backend_sources =3D [ + 'storage_backend_logical.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 @@ -62,3 +66,13 @@ if conf.has('WITH_STORAGE') 'install_dir': storage_file_install_dir, } endif + +if conf.has('WITH_STORAGE_LVM') + virt_modules +=3D { + 'name': 'virt_storage_backend_logical', + 'sources': [ + files(storage_lvm_backend_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894332; cv=none; d=zohomail.com; s=zohoarc; b=iCPhU74x1vxQWgwCMVBDU+JcrPdJyNn71Ps5tUlLHDOrTAC1oIdcMeLWRd+WYWJC2IG/AeAA+0twcoBh/gy0Q8NQT01jUSAjRbYCaQljwJMLxig351VBzM1kTtCOxpxlRbeCAe66npe/T93GQIVcdPEXHn0ZPH7BE0zfoHrXht0= 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=OUouJC+0P06+GnEASRKP0OjuJHQFpC/IALNXX2t/UFA=; b=C0p1aqSvrKxRmcgQ0Yza4DH/LRp1A3Csqin2BEnbXd2ShbansXkporoxpWHaHBwOSyNxDUu0KJDvlnk+D4jr0LoKGZCQfW+2eIySU5TJmsQhWhZlWabrRjoJmcK2oPhxQSP5nELvaJLsjImsa7WRrD+FuPEkrH3kZ2xyqE2xZcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894332913146.94973761767721; 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-34-nUAEL3trPHutGGztOWZgqw-1; Thu, 16 Jul 2020 06:08:05 -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 138A21085; Thu, 16 Jul 2020 10:07: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 E545661983; Thu, 16 Jul 2020 10:07:57 +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 B6ACD96255; Thu, 16 Jul 2020 10:07:57 +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 06GA4nVh018097 for ; Thu, 16 Jul 2020 06:04:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id B43FF2B6E2; Thu, 16 Jul 2020 10:04:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CABF2B6DB for ; Thu, 16 Jul 2020 10:04:48 +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=OUouJC+0P06+GnEASRKP0OjuJHQFpC/IALNXX2t/UFA=; b=TLu7pYRzAMqmHzx+bc7+pM+JG4+s80Yf5UZI+oGTjZOJoHp6bJUVsh0F6nij2GQOqp3zcc +7Moi6yGqtOhjlpGYE4BcNxsoFv3X9lLQl2n0rAVVguPdNa118LPZfKYUslTHmASTAFn5j txftHpT0MHwxCmVMIjBSb1YYkMv6wv0= X-MC-Unique: nUAEL3trPHutGGztOWZgqw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 186/351] meson: src: build libvirt_storage_backend_iscsi.so shared module Date: Thu, 16 Jul 2020 11:57:02 +0200 Message-Id: <28751c3742384d9c8274ef050b513c5264c025bd.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/storage/Makefile.inc.am | 20 -------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 17a2d975cb5..78c2e0d3bf4 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_ISCSI_SOURCES =3D \ - storage/storage_backend_iscsi.h \ - storage/storage_backend_iscsi.c \ - $(NULL) - STORAGE_DRIVER_ISCSI_DIRECT_SOURCES =3D \ storage/storage_backend_iscsi_direct.h \ storage/storage_backend_iscsi_direct.c \ @@ -148,21 +143,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_ISCSI -libvirt_storage_backend_iscsi_la_SOURCES =3D $(STORAGE_DRIVER_ISCSI_SOURCE= S) -libvirt_storage_backend_iscsi_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_iscsi.la -libvirt_storage_backend_iscsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_iscsi_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_ISCSI - if WITH_STORAGE_ISCSI_DIRECT libvirt_storage_backend_iscsi_direct_la_SOURCES =3D \ $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index 8ac52f059ed..0b0f3af3054 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -16,6 +16,10 @@ stoarge_file_fs_sources =3D [ 'storage_file_fs.c', ] =20 +storage_backend_iscsi_sources =3D [ + 'storage_backend_iscsi.c', +] + storage_lvm_backend_sources =3D [ 'storage_backend_logical.c', ] @@ -67,6 +71,16 @@ if conf.has('WITH_STORAGE') } endif =20 +if conf.has('WITH_STORAGE_ISCSI') + virt_modules +=3D { + 'name': 'virt_storage_backend_iscsi', + 'sources': [ + files(storage_backend_iscsi_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_LVM') virt_modules +=3D { 'name': 'virt_storage_backend_logical', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894397; cv=none; d=zohomail.com; s=zohoarc; b=CV/27xIeAhpnwgu5cpHeB5y8/4FO4QqloamQ6DxFHkykclZVb/sJAjKoule+69AleQ9mzJ558NgOxTPxpDKtqCwwkaZJv4b8QW65Xsx29n8EdC+YqTPXc6Gtd+VXx2x1GHcluL1PqmbS8NcVnNnDfb5Cbje1m79v+KTZ40hjbF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894397; 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=xttnKyvLLCUPDMH3C5PpRx7jW61EJMQ4l7HzZNAoX1k=; b=GT3otKXmhSVASHnU04BDbU1qNkMi0amLrnpTu+jjbimPIqB8qXs3AcriFvY+lOYMhUjXaPiXMf5A8Sc9Jg5jlbC/1Rz/pR2CcTU3GPsetZGVPSGsrQNEugyGi9+VTD8EDtpnYKlwQEfI08GiqEQ8NTsREnJ96wQUZ4NXkq7DQCg= 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 1594894397485766.6761955384039; Thu, 16 Jul 2020 03:13:17 -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-66-heldV-pLN2qNe4geGRh_MQ-1; Thu, 16 Jul 2020 06:08:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93394108A; Thu, 16 Jul 2020 10:08:25 +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 7155579500; Thu, 16 Jul 2020 10:08:25 +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 42292730DC; Thu, 16 Jul 2020 10:08:25 +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 06GA4o3x018112 for ; Thu, 16 Jul 2020 06:04:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E3062B6DB; Thu, 16 Jul 2020 10:04:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 172782DE6D for ; Thu, 16 Jul 2020 10:04:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894396; 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=xttnKyvLLCUPDMH3C5PpRx7jW61EJMQ4l7HzZNAoX1k=; b=JIZ1YQ6qMF+4oWKVK7XhASqcq3zufaXTrlsFK7V4J5Ltnuz1LRAbhdrbfvBe8w6GV7v0TY tPVdrq+OgALl8MOC7KGlHesAbSKUGxjOIuaaQO7xTyH4/+DZRelULBYUOq9IY1kjmMGLMG seintY2e9VogwqqsM4iX1rXQ61QJV1M= X-MC-Unique: heldV-pLN2qNe4geGRh_MQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 187/351] meson: src: build libvirt_storage_backend_iscsi_direct.so shared module Date: Thu, 16 Jul 2020 11:57:03 +0200 Message-Id: <3dde8335bdddb8030776a16244d4473441f36154.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.14 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/storage/Makefile.inc.am | 23 ----------------------- src/storage/meson.build | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 78c2e0d3bf4..47843cc5d48 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_ISCSI_DIRECT_SOURCES =3D \ - storage/storage_backend_iscsi_direct.h \ - storage/storage_backend_iscsi_direct.c \ - $(NULL) - STORAGE_DRIVER_SCSI_SOURCES =3D \ storage/storage_backend_scsi.h \ storage/storage_backend_scsi.c \ @@ -143,24 +138,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_ISCSI_DIRECT -libvirt_storage_backend_iscsi_direct_la_SOURCES =3D \ - $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) -libvirt_storage_backend_iscsi_direct_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(LIBISCSI_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_iscsi-direct.la -libvirt_storage_backend_iscsi_direct_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_iscsi_direct_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(LIBISCSI_LIBS) \ - $(NULL) -endif WITH_STORAGE_ISCSI_DIRECT - if WITH_STORAGE_SCSI libvirt_storage_backend_scsi_la_SOURCES =3D $(STORAGE_DRIVER_SCSI_SOURCES) libvirt_storage_backend_scsi_la_CFLAGS =3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index 0b0f3af3054..05b3131215c 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -20,6 +20,10 @@ storage_backend_iscsi_sources =3D [ 'storage_backend_iscsi.c', ] =20 +storage_backend_iscsi_direct_sources =3D [ + 'storage_backend_iscsi_direct.c', +] + storage_lvm_backend_sources =3D [ 'storage_backend_logical.c', ] @@ -81,6 +85,19 @@ if conf.has('WITH_STORAGE_ISCSI') } endif =20 +if conf.has('WITH_STORAGE_ISCSI_DIRECT') + virt_modules +=3D { + 'name': 'virt_storage_backend_iscsi-direct', + 'sources': [ + files(storage_backend_iscsi_direct_sources), + ], + 'deps': [ + libiscsi_dep + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_LVM') virt_modules +=3D { 'name': 'virt_storage_backend_logical', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894294; cv=none; d=zohomail.com; s=zohoarc; b=atNRps5MGgoruPrwDFDYwgi7LZ9pnzHjAENT+P98kNgPtlINgYSCHlhKPdqUeadWLPiN3rTNABmtOzYsB8z7eWLc2ZjsD/zVXY2FvBtv+QDIpNe7qzs5LoLYoJNN0JY1NLgxdGnGQnaB1W5DeiPPJNWGy3GcNselWZMqOwvJnUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894294; 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=xa8Y+ZSoa7qpTRnK9hqt5H41PBEA6Ie3/GSBC/F8m0c=; b=Z/tK+8HAPFuQ1nOpq4CKPuztLs7c8Kdbv2tdUWEy07h2RzmwMAk29RpN+YijKGCRj0Ss7dqwGCM6832W3SmvVU5+3tP06JIfru61n+TYkpTdNcfNlmM4ca83EdRNcXwisLRCileyJ5/LRjm70EvDR42MLvqAmgWSbttu4cLwRns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894294068294.688015494928; Thu, 16 Jul 2020 03:11:34 -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-424-OKqq1i9_NNGPe3bsctt0uA-1; Thu, 16 Jul 2020 06:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24E9080BCB6; Thu, 16 Jul 2020 10:09:07 +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 05A0917D04; Thu, 16 Jul 2020 10:09:07 +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 C51C5180531E; Thu, 16 Jul 2020 10:09:06 +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 06GA4pal018122 for ; Thu, 16 Jul 2020 06:04:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85D782DE72; Thu, 16 Jul 2020 10:04:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 004CE2B6DB for ; Thu, 16 Jul 2020 10:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894293; 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=xa8Y+ZSoa7qpTRnK9hqt5H41PBEA6Ie3/GSBC/F8m0c=; b=U25nMm3QBCaEVeTgGnIwJvaInKNyqLlomJbJOxEdthGjESMjRoctFw4+ICOLyAtEPyrsCj BUs5UNxHmsuNDxxMWc0MWCRexSQJSjnYUzRLr56FUPhe4Q2o7lHBNUs/AHRRKH88aP1/nR KgpVGa5ATx7qB8VzjDcyuP3MrKuchDg= X-MC-Unique: OKqq1i9_NNGPe3bsctt0uA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 188/351] meson: src: build libvirt_storage_backend_scsi.so shared module Date: Thu, 16 Jul 2020 11:57:04 +0200 Message-Id: <4507a77a86d849b003bf422a83bcfc29dc349dd2.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.14 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/storage/Makefile.inc.am | 20 -------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 47843cc5d48..c502f7006b2 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_SCSI_SOURCES =3D \ - storage/storage_backend_scsi.h \ - storage/storage_backend_scsi.c \ - $(NULL) - STORAGE_DRIVER_MPATH_SOURCES =3D \ storage/storage_backend_mpath.h \ storage/storage_backend_mpath.c \ @@ -138,21 +133,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_SCSI -libvirt_storage_backend_scsi_la_SOURCES =3D $(STORAGE_DRIVER_SCSI_SOURCES) -libvirt_storage_backend_scsi_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_scsi.la -libvirt_storage_backend_scsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_scsi_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_SCSI - if WITH_STORAGE_MPATH libvirt_storage_backend_mpath_la_SOURCES =3D $(STORAGE_DRIVER_MPATH_SOURCE= S) libvirt_storage_backend_mpath_la_LIBADD =3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index 05b3131215c..3ae4ab998ba 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -28,6 +28,10 @@ storage_lvm_backend_sources =3D [ 'storage_backend_logical.c', ] =20 +storage_backend_scsi_sources =3D [ + 'storage_backend_scsi.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 @@ -107,3 +111,13 @@ if conf.has('WITH_STORAGE_LVM') 'install_dir': storage_backend_install_dir, } endif + +if conf.has('WITH_STORAGE_SCSI') + virt_modules +=3D { + 'name': 'virt_storage_backend_scsi', + 'sources': [ + files(storage_backend_scsi_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894119; cv=none; d=zohomail.com; s=zohoarc; b=VXy7rcJb74iuGvmkpwFVfGs6NbdbKcGHt7JyutsMb9l5bB9lOQDkQEZe34wyc0oULaDefqnCJdbC6kdAS1ivVc3ttanfOYMPzopzKFz9qtClTTDVDq7hutPD/9ud2bCqmxziUPDkaEQ1QQ46ZxwulvlkKJEzs3acxX764dZVCCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894119; 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=68aFQOBZYeNSufDSns2rEv3Ag4766fqHDy73mCgAk40=; b=KGFTB5fKv/SPIx121e95igto8boav9Ka4aPUohECl86UVn5EkzxpY9q8haM8yelFTByscktzZ+9dndjW0cSxkue7LdLfA1ClFitwFJ2+qMH6uK+AdsKW/A7Cp+Eqn6OP5SYuG00McVCM7/K/041/FbwMBaj5qtZqtMi0E2D5M14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894119067232.6396157761668; Thu, 16 Jul 2020 03:08:39 -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-168-Vo2Yz_dsOkSntXgT0uN6TQ-1; Thu, 16 Jul 2020 06:08:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D92D110059CD; Thu, 16 Jul 2020 10:08:27 +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 BABF05FC2C; Thu, 16 Jul 2020 10:08:27 +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 8710B1803519; Thu, 16 Jul 2020 10:08:27 +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 06GA4qW2018136 for ; Thu, 16 Jul 2020 06:04:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E1E72DE72; Thu, 16 Jul 2020 10:04:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCD7D2B6DB for ; Thu, 16 Jul 2020 10:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894118; 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=68aFQOBZYeNSufDSns2rEv3Ag4766fqHDy73mCgAk40=; b=QspAj7WCBHz+WZ6mWrsSCVrE3F59aa+KI5L/7AKMQiVztQJyU0hWC0boL2G6zZyQ8Z8DIU iU7K/K7hY1MHxpKob3PXke1DFgl8B1LzrE5Ok7YJtovSEQst9AaFwljlhpxJUUFzlCHlv3 z56eXygfSk2NETeUeRxhQTuntHGptKY= X-MC-Unique: Vo2Yz_dsOkSntXgT0uN6TQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 189/351] meson: src: build libvirt_storage_backend_mpath.so shared module Date: Thu, 16 Jul 2020 11:57:05 +0200 Message-Id: <60d1fa63f2f072020d149af40acbe1a574801947.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.16 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/storage/Makefile.inc.am | 22 ---------------------- src/storage/meson.build | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index c502f7006b2..cc2d1743f83 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_MPATH_SOURCES =3D \ - storage/storage_backend_mpath.h \ - storage/storage_backend_mpath.c \ - $(NULL) - STORAGE_DRIVER_DISK_SOURCES =3D \ storage/storage_backend_disk.h \ storage/storage_backend_disk.c \ @@ -133,23 +128,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_MPATH -libvirt_storage_backend_mpath_la_SOURCES =3D $(STORAGE_DRIVER_MPATH_SOURCE= S) -libvirt_storage_backend_mpath_la_LIBADD =3D \ - libvirt.la \ - $(DEVMAPPER_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_storage_backend_mpath_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(DEVMAPPER_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_mpath.la -libvirt_storage_backend_mpath_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -endif WITH_STORAGE_MPATH - if WITH_STORAGE_DISK libvirt_storage_backend_disk_la_SOURCES =3D $(STORAGE_DRIVER_DISK_SOURCES) libvirt_storage_backend_disk_la_CFLAGS =3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index 3ae4ab998ba..67b4fd4281f 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -28,6 +28,10 @@ storage_lvm_backend_sources =3D [ 'storage_backend_logical.c', ] =20 +storage_backend_mpath_sources =3D [ + 'storage_backend_mpath.c', +] + storage_backend_scsi_sources =3D [ 'storage_backend_scsi.c', ] @@ -112,6 +116,19 @@ if conf.has('WITH_STORAGE_LVM') } endif =20 +if conf.has('WITH_STORAGE_MPATH') + virt_modules +=3D { + 'name': 'virt_storage_backend_mpath', + 'sources': [ + files(storage_backend_mpath_sources), + ], + 'deps': [ + devmapper_dep + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_SCSI') virt_modules +=3D { 'name': 'virt_storage_backend_scsi', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894831; cv=none; d=zohomail.com; s=zohoarc; b=m58GAbc1wzgMjVGtTdJkmHLCYCAunQYT96JPv3QrRdeS8JWAr3OaEj7NkXs9YBNIBzCkqzSCYr+VLUGVWo7ijYX1IClM5F3+uB5iTgdg6UD9z+w9cXu0MJRzGCsWz/tevtTucqBUQEm8m8TbrQAWUpQX86tzIxUkzHscowrpLLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894831; 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=s4AN4LTsUI7ZUVAxEazUYGuxxqqyGJDPxQQ7pdVE9G0=; b=H5tGLAeKnRU7li2TpDLCQZpJaLcwcYS/xFI5OGKXIA7IKOBpGqXh8HHEEzXNwLsmf+DYj9kXauITJASf3exoHtky2ky8y73vpdrmVgOyQWd/YwG+QHz4XVPb6gRT9z4404Kq4N+k43tJ1o0DM4uyNkTyj/i2NNv9CS4kxN3p4zA= 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 1594894831596403.1769345253068; Thu, 16 Jul 2020 03:20:31 -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-344-6BQEPK8EONu3nzHO6KWDQw-1; Thu, 16 Jul 2020 06:08:36 -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 46880108F; Thu, 16 Jul 2020 10:08:30 +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 233F560E3E; Thu, 16 Jul 2020 10:08:30 +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 E62C9180222E; Thu, 16 Jul 2020 10:08:29 +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 06GA4rWd018143 for ; Thu, 16 Jul 2020 06:04:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A3272DE8A; Thu, 16 Jul 2020 10:04:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8F552DE72 for ; Thu, 16 Jul 2020 10:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894830; 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=s4AN4LTsUI7ZUVAxEazUYGuxxqqyGJDPxQQ7pdVE9G0=; b=Gw/7V1RxnNuGBAhJf3uB0S1cxH5hWCXKHL0uxZL3U180iyLFRIQ9Pk0WpU+xNHur45xunZ eFj95lGVAY4T8UCr+qfDQz+fipO2RWgKrbOBiLT+HdvKZRYJZya1FQvRYw+BXqqU0EL9j1 oBe6etrqEkYLf9/yekyOX4hwJJoUPsc= X-MC-Unique: 6BQEPK8EONu3nzHO6KWDQw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 190/351] meson: src: build libvirt_storage_backend_disk.so shared module Date: Thu, 16 Jul 2020 11:57:06 +0200 Message-Id: <13770a7fd43837ea3698e6014926d8f204aedeed.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 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/storage/Makefile.inc.am | 20 -------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index cc2d1743f83..4c60bc7bd2f 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_DISK_SOURCES =3D \ - storage/storage_backend_disk.h \ - storage/storage_backend_disk.c \ - $(NULL) - STORAGE_DRIVER_RBD_SOURCES =3D \ storage/storage_backend_rbd.h \ storage/storage_backend_rbd.c \ @@ -128,21 +123,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_DISK -libvirt_storage_backend_disk_la_SOURCES =3D $(STORAGE_DRIVER_DISK_SOURCES) -libvirt_storage_backend_disk_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_disk.la -libvirt_storage_backend_disk_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_disk_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_DISK - if WITH_STORAGE_RBD libvirt_storage_backend_rbd_la_SOURCES =3D $(STORAGE_DRIVER_RBD_SOURCES) libvirt_storage_backend_rbd_la_LIBADD =3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index 67b4fd4281f..8087bd45648 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -16,6 +16,10 @@ stoarge_file_fs_sources =3D [ 'storage_file_fs.c', ] =20 +storage_backend_disk_sources =3D [ + 'storage_backend_disk.c', +] + storage_backend_iscsi_sources =3D [ 'storage_backend_iscsi.c', ] @@ -83,6 +87,16 @@ if conf.has('WITH_STORAGE') } endif =20 +if conf.has('WITH_STORAGE_DISK') + virt_modules +=3D { + 'name': 'virt_storage_backend_disk', + 'sources': [ + files(storage_backend_disk_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_ISCSI') virt_modules +=3D { 'name': 'virt_storage_backend_iscsi', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894089; cv=none; d=zohomail.com; s=zohoarc; b=dTmxjzON2KM9xI7tQJQm93rutvhDcKyU/+qjfCnFLTrn6WpilQluWOkWZaB8gaXCet23U17KbTjg8sSF2gWTBaBqMNWwwPT+A2cIEb4+SYCO79G8HoBnov+NdKko1zifywMv6PT/3oIuGIF33D6Kb2RVqMmk28zJDLbg9lrKm6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894089; 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=hg1IgQFK7gxiipd2lyq1HVPwQCq6M6pHNEpyHCYzE/k=; b=b4OpvmIPXCvT4zqp1VGUFv7r7seJ302Kzjx0k97SQI8QwaMSLiXmDV/UwBVAwZJMQL85a38fp8ut8m8f1hYilL/+cWYaxJ3SVbnsHbrpY6ONfj77ZpiQxeOKXI83pF6No6hGg6bd8K19mhdKYra7LsAb4NZ2UHtSzKzU7eKFh5Y= 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 1594894089751351.58843425306566; Thu, 16 Jul 2020 03:08: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-179-NuMy6KMpPWqHudKw_k_xUw-1; Thu, 16 Jul 2020 06:08:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 651F78027E2; Thu, 16 Jul 2020 10:08:00 +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 360C52E052; Thu, 16 Jul 2020 10:08:00 +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 ED6DC96258; Thu, 16 Jul 2020 10:07:59 +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 06GA4sBl018156 for ; Thu, 16 Jul 2020 06:04:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6259D2DE8A; Thu, 16 Jul 2020 10:04:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0F2E2DE72 for ; Thu, 16 Jul 2020 10:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894088; 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=hg1IgQFK7gxiipd2lyq1HVPwQCq6M6pHNEpyHCYzE/k=; b=B/C6nzCuld6ZBD7qRkZtsyqheJKm5LXk2/y1bKXdRJS2bboXF2mVn5irb8BzU96TtL67GU V4j++Wf/5gQnDB1bHGsAP45kTMRkVY8RDg4EVz0tsw/VTnbuYxD922siNz07iwIzt4HvjD 5kY+ns/loKjHYbyGdxtYDLzFROUiQGE= X-MC-Unique: NuMy6KMpPWqHudKw_k_xUw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 191/351] meson: src: build libvirt_storage_backend_rbd.so shared module Date: Thu, 16 Jul 2020 11:57:07 +0200 Message-Id: <05c3f28a5c099dc21d7cebd8a1b5d2ecc30aa415.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.23 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/storage/Makefile.inc.am | 21 --------------------- src/storage/meson.build | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 4c60bc7bd2f..b52a9e79e63 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_RBD_SOURCES =3D \ - storage/storage_backend_rbd.h \ - storage/storage_backend_rbd.c \ - $(NULL) - STORAGE_DRIVER_SHEEPDOG_SOURCES =3D \ storage/storage_backend_sheepdog.h \ storage/storage_backend_sheepdog.c \ @@ -123,22 +118,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_RBD -libvirt_storage_backend_rbd_la_SOURCES =3D $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_storage_backend_rbd_la_LIBADD =3D \ - libvirt.la \ - $(LIBRBD_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_storage_backend_rbd_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_rbd.la -libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -endif WITH_STORAGE_RBD - if WITH_STORAGE_SHEEPDOG libvirt_storage_backend_sheepdog_la_SOURCES =3D \ $(STORAGE_DRIVER_SHEEPDOG_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index 8087bd45648..3663b530d69 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -36,6 +36,10 @@ storage_backend_mpath_sources =3D [ 'storage_backend_mpath.c', ] =20 +storage_backend_rbd_sources =3D [ + 'storage_backend_rbd.c', +] + storage_backend_scsi_sources =3D [ 'storage_backend_scsi.c', ] @@ -143,6 +147,19 @@ if conf.has('WITH_STORAGE_MPATH') } endif =20 +if conf.has('WITH_STORAGE_RBD') + virt_modules +=3D { + 'name': 'virt_storage_backend_rbd', + 'sources': [ + files(storage_backend_rbd_sources), + ], + 'deps': [ + rbd_dep + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_SCSI') virt_modules +=3D { 'name': 'virt_storage_backend_scsi', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894091; cv=none; d=zohomail.com; s=zohoarc; b=gYBN72amvLPGAFU1zUf78DwINKiR/pmFGYtMIpYPK2G1s16JxBFMYxCVutMQ8vU/9bMZc5jWutAy69ZqI8iO3udo0iOKWjSLnFEi/Mh8v/TGFICxYmN6nHfXH9xlXaBuPULeCkjKTpuN38LovMxdCSJ+eP8AeXbgLOUT+Cxlbs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894091; 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=0KDOwwiOb8I0mb1urC0zp4MrXyKqyeoXAvS6PePevB4=; b=L+HjC3V7nJjGp426kWhovUF3SztNHYciFwmGAG0+hcJxcnxtabVim32OFUOdKpClpw/SX4TLXmN6mCoui/lC5EtZYVvugXxEVN2kOLwV6EoF1aExWmQTwu5ianvCyZM0PQ5wdl2Jcd8+FsuofaRwOkya6mK95lBCo87HmBSmzwY= 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 1594894091419938.4145472511943; Thu, 16 Jul 2020 03:08:11 -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-275-NsKlmepnMUC7pTskvnZO6g-1; Thu, 16 Jul 2020 06:08:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD2FF108B; Thu, 16 Jul 2020 10:08:02 +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 8D1F578492; 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 5A7BF1809547; 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 06GA4t7Q018170 for ; Thu, 16 Jul 2020 06:04:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BDD12DE9C; Thu, 16 Jul 2020 10:04:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B95802DE72 for ; Thu, 16 Jul 2020 10:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894090; 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=0KDOwwiOb8I0mb1urC0zp4MrXyKqyeoXAvS6PePevB4=; b=RF4pm6l3AegzfVA2RRDlpbMJ3La38Y2ecy4lSxnFIG3MshIe6MsOl7LQ7dZztpHvv19XPo MQusPjmUh7v1sc6kebmnF2EVCn6jg24wRZnuM0KKBmstC3ySmGE5zrG4J9CSSdId6y7oBT 95i+EwAoc44/R1AC/2FN976++osRmlI= X-MC-Unique: NsKlmepnMUC7pTskvnZO6g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 192/351] meson: src: build libvirt_storage_backend_sheepdog.so shared module Date: Thu, 16 Jul 2020 11:57:08 +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.11 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/Makefile.am | 1 - src/storage/Makefile.inc.am | 30 ------------------------------ src/storage/meson.build | 25 +++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e309a96cbb3..ec6da9a6ff5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,6 @@ nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -noinst_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index b52a9e79e63..ebb700eb160 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_SHEEPDOG_SOURCES =3D \ - storage/storage_backend_sheepdog.h \ - storage/storage_backend_sheepdog.c \ - storage/storage_backend_sheepdog_priv.h \ - $(NULL) - STORAGE_DRIVER_GLUSTER_SOURCES =3D \ storage/storage_backend_gluster.h \ storage/storage_backend_gluster.c \ @@ -118,30 +112,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -noinst_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog_priv.la - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog.la -libvirt_storage_backend_sheepdog_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_sheepdog_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_SHEEPDOG - if WITH_STORAGE_GLUSTER libvirt_storage_backend_gluster_la_SOURCES =3D \ $(STORAGE_DRIVER_GLUSTER_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index 3663b530d69..ae36f3e829e 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -44,6 +44,10 @@ storage_backend_scsi_sources =3D [ 'storage_backend_scsi.c', ] =20 +storage_backend_sheepdog_sources =3D [ + 'storage_backend_sheepdog.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 @@ -169,3 +173,24 @@ if conf.has('WITH_STORAGE_SCSI') 'install_dir': storage_backend_install_dir, } endif + +if conf.has('WITH_STORAGE_SHEEPDOG') + storage_backend_sheepdog_priv_lib =3D static_library( + 'virt_storage_backend_sheepdog_priv', + storage_backend_sheepdog_sources, + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + ], + ) + + virt_modules +=3D { + 'name': 'virt_storage_backend_sheepdog', + 'link_whole': [ + storage_backend_sheepdog_priv_lib, + ], + 'install_dir': storage_backend_install_dir, + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894764; cv=none; d=zohomail.com; s=zohoarc; b=lHh8kS7UEhey93roysA5vQQnVxdT5jYvLCfiGyZ7SmmK8bNHuKojdGFUkRobz4NWW5Us7L+yVpQZau0Y6CT2hIR7jfIsc0BFX2Mq5ykRlXDbKA7AXmKn71VZeAcl3HHG5V5QVMt/Sbev/42VCEmyfuMVzY5Go5BkQ+GYfmPm4uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894764; 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=JgfR7rlF4rZi6+P+TqjWQLkUZX63slkRL5ssRVt59hk=; b=fOow3zff0zpV+DGWRuqWam3E5c17Yatf6KM9VJaHZJxbhyVQ2Y/4uAee8vIvkQwo/j43Z0IsfK28lynC2zs4yOvZui7KPT7NLZlN4WBybnvQYqI7lQwaIM/C7/z+9nc3Q1j6VauA0MCclNpfAa7DK2WtyLIY1SyYpH+iDbqVjv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894764678640.4967910285013; Thu, 16 Jul 2020 03:19:24 -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-258-QrBZaqFiP06ErMTB84bzjQ-1; Thu, 16 Jul 2020 06:08:10 -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 1EC5B100AA31; Thu, 16 Jul 2020 10:08:05 +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 F0F157B422; Thu, 16 Jul 2020 10:08:04 +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 BD27F96247; Thu, 16 Jul 2020 10:08:04 +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 06GA4usm018185 for ; Thu, 16 Jul 2020 06:04:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 37CA52B6E6; Thu, 16 Jul 2020 10:04:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A52622B6E2 for ; Thu, 16 Jul 2020 10:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894763; 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=JgfR7rlF4rZi6+P+TqjWQLkUZX63slkRL5ssRVt59hk=; b=LM6lLDNRnQfo7ktR70Ms8MhpWO9H9ULfn0LlTUXCLXt0CxrOlK2a+jg1kuMw7qqP2avrH2 2PEjBhPvGvDQ9NTe0H4Aw1IHEgsgPYMm1VoRQkLSnPsA/nxKCkw9mtcQTUsFr/UOwgLIfA pm7qQ0mf9vjEIyowP7tuGpbpXbSgfsE= X-MC-Unique: QrBZaqFiP06ErMTB84bzjQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 193/351] meson: src: build libvirt_storage_*_gluster.so shared modules Date: Thu, 16 Jul 2020 11:57:09 +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 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/storage/Makefile.inc.am | 47 ------------------------------------- src/storage/meson.build | 32 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 47 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ebb700eb160..041a9e12122 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,15 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_GLUSTER_SOURCES =3D \ - storage/storage_backend_gluster.h \ - storage/storage_backend_gluster.c \ - $(NULL) - -STORAGE_FILE_GLUSTER_SOURCES =3D \ - storage/storage_file_gluster.h \ - storage/storage_file_gluster.c \ - $(NULL) - STORAGE_DRIVER_ZFS_SOURCES =3D \ storage/storage_backend_zfs.h \ storage/storage_backend_zfs.c \ @@ -30,8 +20,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 storagebackend_LTLIBRARIES =3D =20 -storagefile_LTLIBRARIES =3D - if WITH_STORAGE sbin_PROGRAMS +=3D virtstoraged =20 @@ -112,41 +100,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.au= g.in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_GLUSTER -libvirt_storage_backend_gluster_la_SOURCES =3D \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) -libvirt_storage_backend_gluster_la_LIBADD =3D \ - libvirt.la \ - $(GLUSTERFS_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_storage_backend_gluster_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(GLUSTERFS_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_gluster.la -libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) - - -libvirt_storage_file_gluster_la_SOURCES =3D \ - $(STORAGE_FILE_GLUSTER_SOURCES) -libvirt_storage_file_gluster_la_LIBADD =3D \ - libvirt.la \ - $(GLUSTERFS_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_storage_file_gluster_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(GLUSTERFS_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -storagefile_LTLIBRARIES +=3D libvirt_storage_file_gluster.la -libvirt_storage_file_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -endif WITH_STORAGE_GLUSTER - if WITH_STORAGE_ZFS libvirt_storage_backend_zfs_la_SOURCES =3D \ $(STORAGE_DRIVER_ZFS_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index ae36f3e829e..c97a1b86eff 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -20,6 +20,14 @@ storage_backend_disk_sources =3D [ 'storage_backend_disk.c', ] =20 +storage_backend_gluster_sources =3D [ + 'storage_backend_gluster.c', +] + +storage_file_gluster_sources =3D [ + 'storage_file_gluster.c', +] + storage_backend_iscsi_sources =3D [ 'storage_backend_iscsi.c', ] @@ -105,6 +113,30 @@ if conf.has('WITH_STORAGE_DISK') } endif =20 +if conf.has('WITH_STORAGE_GLUSTER') + virt_modules +=3D { + 'name': 'virt_storage_backend_gluster', + 'sources': [ + files(storage_backend_gluster_sources), + ], + 'deps': [ + glusterfs_dep, + ], + 'install_dir': storage_backend_install_dir, + } + + virt_modules +=3D { + 'name': 'virt_storage_file_gluster', + 'sources': [ + files(storage_file_gluster_sources), + ], + 'dependenciec': [ + glusterfs_dep, + ], + 'install_dir': storage_file_install_dir, + } +endif + if conf.has('WITH_STORAGE_ISCSI') virt_modules +=3D { 'name': 'virt_storage_backend_iscsi', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894605; cv=none; d=zohomail.com; s=zohoarc; b=Axmsbw4pXwUAhxpbrVkU/8FfmhCHaKt2VdgbtEQq1UIV6KzNsv3cC0LmB6ItHc+XJ702/szMtb+chcXjNGcd27zUEPacuyvlCL/VeTo3Em2Jjw8xYB4AQ96wXETyRMyfHkymUt/9LUESCD6ryu6sZg1ZxISCxPZiJHiG+hTwz/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894605; 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=fn3jMWtg0EbHx5uuaBtO3L3rJbLRZQuffB9s9DsGGBg=; b=ESxh/Vf8U8e+CINHOzgSpbdDX8y1PlSDjIfkMcj7c7GYfnpPmzUKhSjVckxbroDPqBbtGhE3BJ/IrIfaThGFbEz+GN5S+HAJGvS5LwsFJBTeOScHUoJxopU5cqhIN4itnSsVLf8rhMSrIpFZFo30Xv4/qkwgfQiYiHx8ZcC+V7o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894605706754.4708247197206; Thu, 16 Jul 2020 03:16:45 -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-216-4QutXmXSMVuT74DTw8rCUQ-1; Thu, 16 Jul 2020 06:09:15 -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 DB0008027ED; Thu, 16 Jul 2020 10:09:09 +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 BA5AE79D10; Thu, 16 Jul 2020 10:09:09 +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 8A90C1804759; Thu, 16 Jul 2020 10:09:09 +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 06GA5104018219 for ; Thu, 16 Jul 2020 06:05:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 180412B6E2; Thu, 16 Jul 2020 10:05:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86BCF2DE72 for ; Thu, 16 Jul 2020 10:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894604; 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=fn3jMWtg0EbHx5uuaBtO3L3rJbLRZQuffB9s9DsGGBg=; b=gTTMLPPkkYcCqVXYAtVQ+fiweTPazIjdViU1qxMiKQQbFQ5Z0nXZBPVwlQSCOXA6XPxuiL 1R3mo74f2yj85ut2BeyDYITFWrSL7zzbPEW0KPLJzGOTrlEe1DzsUX86xB71dAViffALf+ ZTq48eqkaO957gBZceuNYeynNKzARVw= X-MC-Unique: 4QutXmXSMVuT74DTw8rCUQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 194/351] meson: src: build libvirt_storage_backend_zfs.so shared module Date: Thu, 16 Jul 2020 11:57:10 +0200 Message-Id: <100acf05c0f796e18ffb8cfae5f3921c968192ca.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.13 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/storage/Makefile.inc.am | 21 --------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 041a9e12122..94a471eb0c0 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_ZFS_SOURCES =3D \ - storage/storage_backend_zfs.h \ - storage/storage_backend_zfs.c \ - $(NULL) - STORAGE_DRIVER_VSTORAGE_SOURCES =3D \ storage/storage_backend_vstorage.h \ storage/storage_backend_vstorage.c \ @@ -100,22 +95,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug= .in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_ZFS -libvirt_storage_backend_zfs_la_SOURCES =3D \ - $(STORAGE_DRIVER_ZFS_SOURCES) -libvirt_storage_backend_zfs_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_zfs.la -libvirt_storage_backend_zfs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_zfs_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_ZFS - if WITH_STORAGE_VSTORAGE libvirt_storage_backend_vstorage_la_SOURCES =3D \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) diff --git a/src/storage/meson.build b/src/storage/meson.build index c97a1b86eff..4450f1908f3 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -56,6 +56,10 @@ storage_backend_sheepdog_sources =3D [ 'storage_backend_sheepdog.c', ] =20 +storage_backend_zfs_sources =3D [ + 'storage_backend_zfs.c', +] + storage_backend_install_dir =3D libdir / 'libvirt' / 'storage-backend' storage_file_install_dir =3D libdir / 'libvirt' / 'storage-file' =20 @@ -226,3 +230,13 @@ if conf.has('WITH_STORAGE_SHEEPDOG') 'install_dir': storage_backend_install_dir, } endif + +if conf.has('WITH_STORAGE_ZFS') + virt_modules +=3D { + 'name': 'virt_storage_backend_zfs', + 'sources': [ + files(storage_backend_zfs_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894927; cv=none; d=zohomail.com; s=zohoarc; b=ZXLf7w0K/gLJn0poJlKoVaDttQk1zqCYPZw92hBA351J9exuoxI//ObfvdxO9ooTJqa15imORc0HFaomDG/wlbYzMU7LUD3RBk0HSEpbuh0Dz/UjrJ1/IcMyV8SBQF2JlQ0ah4tGkYyq8L808J+1NVUV51pi8wVK85EDYjBf55M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894927; 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=EKFUDGi7i5B6+T7mmcU8pmwFopXLAzcw4D33Sm+Bg5M=; b=nljB0eJumyYLlN5Raq7QoEa7P7u6pfn9TDZUVpFP5QYtQvaWIktaNfRgtN9p3QYOx1ZK9ZAL7T87Hai2UmyZMvxpbvJPDnJuzseQwiYSYtVvoQQ2k4OC6dAWWC7mEoTcVEUSWfYibe9+pKsmfht896X8y6MvQXxN0OMhARTuIUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894926998739.808706403625; Thu, 16 Jul 2020 03:22:06 -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-371-rjyo5C26OFSi8v3cSoATYg-1; Thu, 16 Jul 2020 06:08:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2BC08064D1; Thu, 16 Jul 2020 10:08:32 +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 A0BA82DE71; Thu, 16 Jul 2020 10:08:32 +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 6F42F180121E; Thu, 16 Jul 2020 10:08:32 +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 06GA52ds018231 for ; Thu, 16 Jul 2020 06:05:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 00C9F2DE8A; Thu, 16 Jul 2020 10:05:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F2C62DE72 for ; Thu, 16 Jul 2020 10:05:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894925; 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=EKFUDGi7i5B6+T7mmcU8pmwFopXLAzcw4D33Sm+Bg5M=; b=PDlmx250MpGq8/kF+lU54h8hhRofEL2Q11N/6v3Jux5dsW0FOEE0crgKFllyR2C8B6LNGX biuiDl/wApMKSrVdm0SHy6r6tm0/jaar6wvWbiI75ZDJdw+5I6jozdhSF3UF8UzKR2+eMt j6we5ms+JQotYCQob30r1s12eZAYJ/Q= X-MC-Unique: rjyo5C26OFSi8v3cSoATYg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 195/351] meson: src: build libvirt_storage_backend_vstorage.so shared module Date: Thu, 16 Jul 2020 11:57:11 +0200 Message-Id: <01b4534010e8bd46bcdad776747ca078043f63a2.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.23 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/storage/Makefile.inc.am | 23 ----------------------- src/storage/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 94a471eb0c0..45cbe476d22 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_DRIVER_VSTORAGE_SOURCES =3D \ - storage/storage_backend_vstorage.h \ - storage/storage_backend_vstorage.c \ - $(NULL) - STORAGE_HELPER_DISK_SOURCES =3D \ storage/parthelper.c \ $(NULL) @@ -13,8 +8,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE_= DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) =20 -storagebackend_LTLIBRARIES =3D - if WITH_STORAGE sbin_PROGRAMS +=3D virtstoraged =20 @@ -95,22 +88,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.= in \ =20 endif WITH_STORAGE =20 -if WITH_STORAGE_VSTORAGE -libvirt_storage_backend_vstorage_la_SOURCES =3D \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) -libvirt_storage_backend_vstorage_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_vstorage.la -libvirt_storage_backend_vstorage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_vstorage_la_LIBADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -endif WITH_STORAGE_VSTORAGE - if WITH_STORAGE_DISK libexec_PROGRAMS +=3D libvirt_parthelper =20 diff --git a/src/storage/meson.build b/src/storage/meson.build index 4450f1908f3..baf5ae5b2fe 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -56,6 +56,10 @@ storage_backend_sheepdog_sources =3D [ 'storage_backend_sheepdog.c', ] =20 +storage_backend_vstorage_sources =3D [ + 'storage_backend_vstorage.c', +] + storage_backend_zfs_sources =3D [ 'storage_backend_zfs.c', ] @@ -231,6 +235,16 @@ if conf.has('WITH_STORAGE_SHEEPDOG') } endif =20 +if conf.has('WITH_STORAGE_VSTORAGE') + virt_modules +=3D { + 'name': 'virt_storage_backend_vstorage', + 'sources': [ + files(storage_backend_vstorage_sources), + ], + 'install_dir': storage_backend_install_dir, + } +endif + if conf.has('WITH_STORAGE_ZFS') virt_modules +=3D { 'name': 'virt_storage_backend_zfs', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894516; cv=none; d=zohomail.com; s=zohoarc; b=JR1FGqFooXrjJeoOsPg2EqlDlJc/Y/7Y4viFCXYjP6CRAUNN84zi1kz7x/5y7zfXdhsUdVppGjWsGRW9QMaSV/6Xj1e32BfQS3VPndDDisf1wN+F9xI0ddH1mdu3m6TZbwnJtDhJtnpW4HioHbsgn5aU4LKrYS655UTllqYqtxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894516; 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=bYz/dr1xmXYLwNoPRi61NNpIKyFRhfjcTdzXvsGkvJs=; b=KQ2BAzjD7uQubUP7BO4NjvoPgBbOsQfNKmBdTB53B2WXTcmHKudIsL8JwBjFeCWsJCf8bfb/p+4+EAyRf/ZNkLkfFH1Ah1vH9xWXOGXQCH5HLgtfIWJOAKEsFv8LSSb4DZM8OyGdHj5EWQl6T7FulwgF41HSOk2mvtcgEOnosFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894516092543.865535325114; Thu, 16 Jul 2020 03:15:16 -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-488-_EE5sO5xMue6vBNz7or9Cw-1; Thu, 16 Jul 2020 06:08:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 757BE801E6A; Thu, 16 Jul 2020 10:08:07 +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 5108D2DE72; Thu, 16 Jul 2020 10:08:07 +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 1BA50104903; Thu, 16 Jul 2020 10:08:07 +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 06GA58Kl018256 for ; Thu, 16 Jul 2020 06:05:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04C972B6E6; Thu, 16 Jul 2020 10:05:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F5172DE9D for ; Thu, 16 Jul 2020 10:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894514; 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=bYz/dr1xmXYLwNoPRi61NNpIKyFRhfjcTdzXvsGkvJs=; b=CBAxFokqcE7BcIhzoLAC9mfZi8Xs+G29vgUQhlfydd6saydx1XJxTmtgVQczbQTXWWd3im cfAxBuE0oKee6viJu55LR0QIRuhAe5q3YzVtvvy7EIRAQ4XhOXjap+tSdVc6J+u1B5WmqX +5SttnhV5U0d/AZIBjQm1mxOCd5pw/g= X-MC-Unique: _EE5sO5xMue6vBNz7or9Cw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 196/351] meson: src: prepare sources for libvirt daemons Date: Thu, 16 Jul 2020 11:57:12 +0200 Message-Id: <64ab2a07ab4d5cf38432b0c0688f76ea6ff9ea79.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.23 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/remote/Makefile.inc.am | 45 -------------------------------------- src/remote/meson.build | 24 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 421f7337217..9866903847e 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,22 +1,5 @@ # vim: filetype=3Dautomake =20 -REMOTE_DAEMON_GENERATED =3D \ - remote/remote_daemon_dispatch_stubs.h \ - remote/lxc_daemon_dispatch_stubs.h \ - remote/qemu_daemon_dispatch_stubs.h \ - $(NULL) - -REMOTE_DAEMON_SOURCES =3D \ - remote/remote_daemon.c \ - remote/remote_daemon.h \ - remote/remote_daemon_config.c \ - remote/remote_daemon_config.h \ - remote/remote_daemon_dispatch.c \ - remote/remote_daemon_dispatch.h \ - remote/remote_daemon_stream.c \ - remote/remote_daemon_stream.h \ - $(NULL) - REMOTE_DAEMON_CFLAGS =3D \ $(AM_CFLAGS) \ $(GNUTLS_CFLAGS) \ @@ -118,15 +101,6 @@ OPENRC_CONF_FILES +=3D \ remote/virtproxyd.confd \ $(NULL) =20 -REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x -LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x -QEMU_PROTOCOL =3D $(srcdir)/remote/qemu_protocol.x -REMOTE_DRIVER_PROTOCOL =3D \ - $(REMOTE_PROTOCOL) \ - $(QEMU_PROTOCOL) \ - $(LXC_PROTOCOL) \ - $(NULL) - if WITH_LIBVIRTD =20 sbin_PROGRAMS +=3D libvirtd virtproxyd @@ -362,22 +336,3 @@ virtproxy%.socket: remote/libvirt%.socket.in $(top_bui= lddir)/config.status virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \ $(top_builddir)/config.status $(AM_V_GEN)cp $< $@ - - -remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ - > remote/remote_daemon_dispatch_stubs.h - -remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver lxc LXC $(LXC_PROTOCOL) \ - > remote/lxc_daemon_dispatch_stubs.h - -remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ - --mode=3Dserver qemu QEMU $(QEMU_PROTOCOL) \ - > remote/qemu_daemon_dispatch_stubs.h diff --git a/src/remote/meson.build b/src/remote/meson.build index 3de6c5ee1f4..1e3e3479c80 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -39,6 +39,30 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ) endforeach =20 +remote_daemon_sources =3D files( + 'remote_daemon.c', + 'remote_daemon_config.c', + 'remote_daemon_dispatch.c', + 'remote_daemon_stream.c', +) + +remote_daemon_generated =3D [] + +foreach name : [ 'remote', 'qemu', 'lxc' ] + protocol_x =3D '@0@_protocol.x'.format(name) + dispatch_h =3D '@0@_daemon_dispatch_stubs.h'.format(name) + + remote_daemon_generated +=3D custom_target( + dispatch_h, + input: protocol_x, + output: dispatch_h, + command: [ + gendispatch_prog, '--mode=3Dserver', name, name.to_upper(), '@INPUT@= ', + ], + capture: true, + ) +endforeach + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894331; cv=none; d=zohomail.com; s=zohoarc; b=VRd2DTim8dis1k9dq/kdMPz1UBYpHlN9EtmLExUDbDD8WVZX194k47IEj7Fm16FeA0r7O+0bS/2ufpUx4Q1aMgc6Doz06AjaxaVqMoAdRcpUOUCBt3xhzdT4NZZCGDtbWscBkgXCC71Etgb3ScWzxikPcX/1s1qxQLIGc0CppFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894331; 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=+H43HOvZTsCc6wmC38XiuiPa3+Rypcg/n0O6+pIlWoA=; b=H9BkDQ3Sd2pfeA2hMpP2SN3sKL5ZIpN/c/hiLXk4E2u0p+gnmSvTGEQ/4Yod/hF8kfESXXJKIHu6ZyJqpx+Hiz5NP0G99ez07SC4Iha0YK5bOGKSqhhNfgmg4gOz7SNgqeNyGZUSvQDFgtxXjb2aTR1sYpM2Tt1NWgQIPRT3XD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894331003122.80730637134161; Thu, 16 Jul 2020 03:12:11 -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-126--ZWayW1FMz-45VrK3ombng-1; Thu, 16 Jul 2020 06:08:21 -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 D67F510059BD; Thu, 16 Jul 2020 10:08:09 +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 B15DE1053B03; Thu, 16 Jul 2020 10:08:09 +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 603F7180531F; Thu, 16 Jul 2020 10:08:09 +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 06GA5ASi018267 for ; Thu, 16 Jul 2020 06:05:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C7D762DE8A; Thu, 16 Jul 2020 10:05:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4192B2DE72 for ; Thu, 16 Jul 2020 10:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894329; 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=+H43HOvZTsCc6wmC38XiuiPa3+Rypcg/n0O6+pIlWoA=; b=DjOwv2ebOzmTw3yKRRCXkk89Fku9Xm5o3nfAtP499WtuXFRQ57Xn+y2yt2uVCaAOfnoF6c tP9bZp+/KdyLnvQxtW8jHaZYCkpe6+D4YqaSszmbmMPJzQi3TRif+al9hrrgKbc61jyxkl drG7vJRunN7ejAPeKJr6AB0Lqdt+pnc= X-MC-Unique: -ZWayW1FMz-45VrK3ombng-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 197/351] meson: src: add support for building daemon binaries Date: Thu, 16 Jul 2020 11:57:13 +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.84 on 10.5.11.22 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 | 51 ++++++++++++++++++++++++++++++++++++++ src/remote/Makefile.inc.am | 41 ------------------------------ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/src/meson.build b/src/meson.build index 13f231f4345..3774e2bb4ba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -131,6 +131,14 @@ libvirt_libs =3D [] # * install_dir - installation directory (optional, default libdir / 'li= bvirt' / 'connection-driver' virt_modules =3D [] =20 +# virt_daemons: +# each entry is a dictionary with following items: +# * name - binary name (rquired) +# * sources - binary sources (optional, default remote_daemon_sources) +# * c_args - compile arguments (optional, default []) +# * include =3D include_directories (optional, default []) +virt_daemons =3D [] + =20 # list subdirectories =20 @@ -458,3 +466,46 @@ foreach module : virt_modules ) set_variable('@0@_module'.format(module['name'].underscorify()), mod) endforeach + + +# build libvirt daemons + +foreach daemon : virt_daemons + bin =3D executable( + daemon['name'], + [ + daemon.get('sources', [ remote_daemon_sources, remote_daemon_generat= ed ]), + dtrace_gen_objects, + ], + c_args: [ + daemon.get('c_args', []), + ], + include_directories: [ + conf_inc_dir, + remote_inc_dir, + daemon.get('include', []), + ], + dependencies: [ + access_dep, + dbus_dep, + gnutls_dep, + libnl_dep, + rpc_dep, + src_dep, + sasl_dep, + xdr_dep, + ], + link_with: [ + admin_driver_lib, + libvirt_lib, + libvirt_lxc_lib, + libvirt_qemu_lib, + ], + link_args: [ + libvirt_no_undefined, + ], + install: true, + install_dir: sbindir, + install_rpath: libdir, + ) +endforeach diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 9866903847e..eb281a4c4da 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,46 +1,5 @@ # vim: filetype=3Dautomake =20 -REMOTE_DAEMON_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(XDR_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - -I$(srcdir)/access \ - -I$(builddir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ - -I$(builddir)/rpc \ - -I$(builddir)/remote \ - $(NULL) - -REMOTE_DAEMON_LD_FLAGS =3D \ - $(AM_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - -REMOTE_DAEMON_LD_ADD =3D \ - libvirt_driver_admin.la \ - libvirt-lxc.la \ - libvirt-qemu.la \ - libvirt.la \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(XDR_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) - -if WITH_DTRACE_PROBES -REMOTE_DAEMON_LD_ADD +=3D ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -REMOTE_DAEMON_LD_ADD +=3D \ - $(GLIB_LIBS) \ - $(NULL) - LOGROTATE_FILES_IN +=3D \ remote/libvirtd.qemu.logrotate.in \ remote/libvirtd.lxc.logrotate.in \ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894102; cv=none; d=zohomail.com; s=zohoarc; b=RX6Nr2Ah0/b2Jinlddku7yK+4LED7iix73ZQ1wXI4ti1tHPCKLjUQEfha3PvUygdWdRT0501cvxvc+X2oJr/gZznRVk1+ztb7bAV1b1lHZnaWPj2zp/lq6YAA2mm/2djhs677H03n5b0tOkYvfefzToiUL+XysvopsUZAdyj5U4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894102; 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=hUsxzCQsLCALDMerSzRmRJMrpwWpSrqGAYuiBStq0qM=; b=dV+Cc7KSp2F7qmtUvK3Qnc6SbqRuZ9cwhPwSsT7fucl2sB2Cc0qCqJhI7O92ff0KUWFpb8PHzukj+XmXLwtJSU4Wn091toB9WRbKxQNU6RBRihmaQR5ZZc0IPlhmLBts56mgwdbi90X/h+aA1rxg+xeBYAsP2ujaX0Tm+1Cs7h0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159489410249493.75259600770573; Thu, 16 Jul 2020 03:08:22 -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-422-1UgrJSkBPcy7M6UjlfSJKg-1; Thu, 16 Jul 2020 06:08:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A7921888AAA; Thu, 16 Jul 2020 10:08:12 +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 1B8E65C1C3; Thu, 16 Jul 2020 10:08:12 +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 DF63E1804772; Thu, 16 Jul 2020 10:08:11 +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 06GA5Btj018272 for ; Thu, 16 Jul 2020 06:05:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id C316E2DE9D; Thu, 16 Jul 2020 10:05:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 298C72DE72 for ; Thu, 16 Jul 2020 10:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894101; 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=hUsxzCQsLCALDMerSzRmRJMrpwWpSrqGAYuiBStq0qM=; b=UVpakfLZAx8/ImoUPwqTISW1q1PtR/E5aiTKzCOo820llgJKv73nL2aH0mKP4DEArDf7mN 6Tqa1Y0qH+7rtUn3Oht+EgArvRRrtqPiX4/CDHhla5Q6CaSNQO+MmCmfaldh5akcrBBzqy urgRoZBvMO3vwPiohUSQmlxVpe3k/2U= X-MC-Unique: 1UgrJSkBPcy7M6UjlfSJKg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 198/351] meson: src: build virtbhyved daemon binary Date: Thu, 16 Jul 2020 11:57:14 +0200 Message-Id: <4904cd028acb53dbb25baaeaac04df9ce6b27524.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.16 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/bhyve/Makefile.inc.am | 12 ------------ src/bhyve/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 40384e1c714..ab681685b2b 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -4,22 +4,10 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_D= RIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) =20 if WITH_BHYVE -sbin_PROGRAMS +=3D virtbhyved - nodist_conf_DATA +=3D bhyve/virtbhyved.conf augeas_DATA +=3D bhyve/virtbhyved.aug augeastest_DATA +=3D bhyve/test_virtbhyved.aug =20 -virtbhyved_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtbhyved_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtbhyved_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtbhyved\"" \ - -DMODULE_NAME=3D"\"bhyve\"" \ - $(NULL) -virtbhyved_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtbhyved_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - bhyve/virtbhyved.conf: remote/libvirtd.conf.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 83d8c366635..5807d67591a 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -35,4 +35,12 @@ if conf.has('WITH_BHYVE') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtbhyved', + 'c_args': [ + '-DDAEMON_NAME=3D"virtbhyved"', + '-DMODULE_NAME=3D"bhyve"' + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894989; cv=none; d=zohomail.com; s=zohoarc; b=MqyJG9ZanTH+3Z7hOA1ycCf0N33ThHbKTBtAw/qCjJZzFCXZuY3Ak4j4Focc053Vthcfy74o2fqZEO6odr/3k+T0QJ7NPAUqaNYvZ+PO6bdXFh3QJCdgOdDn5JVj2aQcpjhxynBotBLpqMWtnMKTr9CvvIRWgIrH/WGW/1bQoN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894989; 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=dXJxRs3dndDSOmHPW8Smjjv/TIudkhfE7so+3yFTVhg=; b=MOYp6zUPyFs6nTtMaPgPQ+nRbM2I2Ka+ZO/vkCAapL/coKH5JeILOKbXQ0NcV+pK38obXKkwsQL6p6mNQBcJEwtSryY/OHH+ldISXbyTww9+X2GQsIienR+7IS2tdwdIep6IUlQ74ERubnvXURK+mb4Qkhm6QxQJxs+UdE5Hd8g= 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 1594894989483430.7879046774493; Thu, 16 Jul 2020 03:23: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-304-oB69xoPtOkqkt-6ZyWzZ9w-1; Thu, 16 Jul 2020 06:09:18 -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 4D6F110A0; Thu, 16 Jul 2020 10:09:12 +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 2E22579D10; Thu, 16 Jul 2020 10:09:12 +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 ED5B8181A6C7; Thu, 16 Jul 2020 10:09:11 +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 06GA5Clv018281 for ; Thu, 16 Jul 2020 06:05:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id A09732DE6F; Thu, 16 Jul 2020 10:05:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AD142E022 for ; Thu, 16 Jul 2020 10:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894988; 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=dXJxRs3dndDSOmHPW8Smjjv/TIudkhfE7so+3yFTVhg=; b=EGVAVMvdoyk9iKTLX3OS0msF75lC1IxgVlpEjV+r10NfbH64MQuIk8Ng702JsoKdvXMUek Kldq6u/aYDOqbEvjwNTFYtPXNEQZpLcJvFVoFAEz3mcG/MSwy6ISsPezqHnVpZs3IM/d26 zLOlxwUOUG6YlOUJUsBjyKBvb64rsGM= X-MC-Unique: oB69xoPtOkqkt-6ZyWzZ9w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 199/351] meson: src: build virtinterfaced daemon binary Date: Thu, 16 Jul 2020 11:57:15 +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 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/interface/Makefile.inc.am | 11 ----------- src/interface/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 9a56e0b4e0f..7d1d8ed2c4c 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -5,22 +5,11 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) =20 if WITH_INTERFACE -sbin_PROGRAMS +=3D virtinterfaced =20 nodist_conf_DATA +=3D interface/virtinterfaced.conf augeas_DATA +=3D interface/virtinterfaced.aug augeastest_DATA +=3D interface/test_virtinterfaced.aug =20 -virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtinterfaced_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtinterfaced\"" \ - -DMODULE_NAME=3D"\"interface\"" \ - $(NULL) -virtinterfaced_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtinterfaced_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D interface/virtinterfaced.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/interface/meson.build b/src/interface/meson.build index bb08706f21c..dbf1d7ff606 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -26,4 +26,12 @@ if conf.has('WITH_INTERFACE') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtinterfaced', + 'c_args': [ + '-DDAEMON_NAME=3D"virtinterfaced"', + '-DMODULE_NAME=3D"interface"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894236; cv=none; d=zohomail.com; s=zohoarc; b=SGahs6nZAM7i5SGHhsnO4BPqjLflow5qQiIy5YfGm8Bk89An9cnlH/zad/3/j/RlxXFM+D8U5wXxon0E7CrYsEmY1rMF6GreY8r8+IbAs7CF0zYkX096vr1lOqaapdStGFhpns5W/Bv9qI/HRujzLLOZYTei2imSfeKD+R9GG48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894236; 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=Oe+BZT+unIMfXt4O1DD7xafnjK0aguQMXMRQG15gtY4=; b=HreOQ7XmIfbRGIZ2Ppq4jB+7C7sEF4/v/XkXvTzQnWRzF3hku7Ue5sRZZULEE01AabZi2zr83IKw6qYeSoNougy/hX4nwH5CD/vVtXGtZssnTiMmoTw5h3R+50mkIPJd/vrMVdp1WF012Nbu59DXS5MMWv36d70Logpe202o+j0= 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 1594894236344978.8979826646048; Thu, 16 Jul 2020 03:10:36 -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-113-WASr7yJgPJqCnxLeyOX3pw-1; Thu, 16 Jul 2020 06:09:19 -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 B879C8027FC; Thu, 16 Jul 2020 10:09:14 +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 97FFE10098A1; Thu, 16 Jul 2020 10:09:14 +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 609C89A319; Thu, 16 Jul 2020 10:09:14 +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 06GA5D2J018299 for ; Thu, 16 Jul 2020 06:05:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 89B962DE72; Thu, 16 Jul 2020 10:05:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0418C2DE6F for ; Thu, 16 Jul 2020 10:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894235; 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=Oe+BZT+unIMfXt4O1DD7xafnjK0aguQMXMRQG15gtY4=; b=GQLCpGOdghooVNxJUWV7VcpbHSEhGMd70//9VGiSIrYGHjSg23Y8jGiJAVAx5xX/N81SF+ LtlgYTtn8vauIRwMCKPiJEw5K2ND9f63fVFll99sjMs9LuUU1m57oq6vTIJBaJX/dStu6X QWebWXjxvb35tLznq+gYpSyMuY1Z7pA= X-MC-Unique: WASr7yJgPJqCnxLeyOX3pw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 200/351] meson: src: build virtxend daemon binary Date: Thu, 16 Jul 2020 11:57:16 +0200 Message-Id: <6d6f9f8c32664e8bd5c93491b7adcbaca7c04f43.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 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/libxl/Makefile.inc.am | 11 ----------- src/libxl/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 35e6b3bbcd9..051b6c55bd9 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -4,22 +4,11 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_D= RIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) =20 if WITH_LIBXL -sbin_PROGRAMS +=3D virtxend =20 nodist_conf_DATA +=3D libxl/virtxend.conf augeas_DATA +=3D libxl/virtxend.aug augeastest_DATA +=3D libxl/test_virtxend.aug =20 -virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtxend_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtxend_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtxend\"" \ - -DMODULE_NAME=3D"\"libxl\"" \ - $(NULL) -virtxend_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtxend_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D libxl/virtxend.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 484f3805851..fc5864a090c 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -36,4 +36,12 @@ if conf.has('WITH_LIBXL') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtxend', + 'c_args': [ + '-DDAEMON_NAME=3D"virtxend"', + '-DMODULE_NAME=3D"libxl"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894758; cv=none; d=zohomail.com; s=zohoarc; b=f8BlD6YDe30oGcpBujbGLHWZ/d/5V4Q/+wme2kR6zQ3QAg5cBaj1jTH2FJGzoxRWViVWaepxLTydLi95M97VwDx+sohRElkogZvO5/pJnTSaSWIeMIOCgSRifvCNMJet0CaAT03NQDPEWe0BCITJvpRgdry6njZ16GmpAKqGvBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894758; 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=OG07LNo00Zg1thEf59YTmpnsabp1sSnli/QX2ZPahos=; b=D+7Dt02DbHT0m9hiwSc2pcss6rvLZsWP3rdNPtUFrhdyZxjP8ogqKo1MDTUKBlgWsssAqSlrO04mNfNAfId5OVS9ZXDe7DjZe2StlM6b5axJRzDzhHCGnh0AH+pOG3xqqtePc+4X7my71paWpwbxVRpH90CS0rLUkjmAChxqUFk= 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 1594894758346485.4179582079255; Thu, 16 Jul 2020 03:19:18 -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-95-MHlIqzNRNKySTTB6lN5HHg-1; Thu, 16 Jul 2020 06:09:22 -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 05C53100AA29; Thu, 16 Jul 2020 10:09:17 +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 DA0367B41F; Thu, 16 Jul 2020 10:09:16 +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 AACBF9A31E; Thu, 16 Jul 2020 10:09:16 +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 06GA5Epq018308 for ; Thu, 16 Jul 2020 06:05:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73B582DE72; Thu, 16 Jul 2020 10:05:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E20CD2DE6F for ; Thu, 16 Jul 2020 10:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894757; 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=OG07LNo00Zg1thEf59YTmpnsabp1sSnli/QX2ZPahos=; b=AZF1JvKHSLk21OQx6Qj++X6bQ3dEHpob+M+31uFh/c8vCU83D996ow7Kmjqm/w4bDUx7w8 Svg81vgNQE8UJxcinhkOpIFNLo/Se9mG2cQ7dBCBN3rnHUbi5isACapIQCV2aIRCp58WK9 M9sOLe4pZaj0Ulvn5KV95y4PfYZb4sw= X-MC-Unique: MHlIqzNRNKySTTB6lN5HHg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 201/351] meson: src: build virtlockd daemon binary Date: Thu, 16 Jul 2020 11:57:17 +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/locking/Makefile.inc.am | 55 ------------------------------------- src/locking/meson.build | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 55 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 49cf0252162..20974dd0461 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -3,19 +3,6 @@ LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 -LOCK_DAEMON_GENERATED =3D \ - locking/lock_daemon_dispatch_stubs.h - $(NULL) - -LOCK_DAEMON_SOURCES =3D \ - locking/lock_daemon.h \ - locking/lock_daemon.c \ - locking/lock_daemon_config.h \ - locking/lock_daemon_config.c \ - locking/lock_daemon_dispatch.c \ - locking/lock_daemon_dispatch.h \ - $(NULL) - RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 @@ -47,42 +34,6 @@ if WITH_LIBXL nodist_conf_DATA +=3D locking/libxl-lockd.conf endif WITH_LIBXL =20 -sbin_PROGRAMS +=3D virtlockd - -virtlockd_SOURCES =3D \ - $(LOCK_DAEMON_SOURCES) \ - $(NULL) -nodist_virtlockd_SOURCES =3D \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) -virtlockd_CFLAGS =3D \ - -I$(srcdir)/locking \ - -I$(builddir)/locking \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlockd_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlockd_LDADD =3D \ - libvirt.la \ - libvirt_driver_admin.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlockd_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -if WITH_SASL -virtlockd_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - if WITH_SANLOCK augeas_DATA +=3D locking/libvirt_sanlock.aug =20 @@ -169,12 +120,6 @@ locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf cp $< $@ =20 =20 -locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ - $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h - virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 diff --git a/src/locking/meson.build b/src/locking/meson.build index 4767ee9c869..cdd558779c2 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -30,6 +30,23 @@ lock_protocol_generated +=3D custom_target( ], ) =20 +lock_daemon_sources =3D files( + 'lock_daemon.c', + 'lock_daemon_config.c', + 'lock_daemon_dispatch.c', +) + +lock_daemon_generated =3D custom_target( + 'lock_daemon_dispatch_stubs.h', + input: lock_protocol, + output: 'lock_daemon_dispatch_stubs.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLockSpaceProtocol', 'VIR_LOCK_SPACE_PROTOCOL', '@INPUT@', + ], + capture: true, +) + sanlock_sources =3D [ 'lock_driver_sanlock.c', ] @@ -100,4 +117,16 @@ if conf.has('WITH_LIBVIRTD') 'install_dir': lockdriver_dir, } endif + + virt_daemons +=3D { + 'name': 'virtlockd', + 'sources': [ + lock_daemon_sources, + lock_daemon_generated, + lock_protocol_generated, + ], + 'include': [ + include_directories('.'), + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894169; cv=none; d=zohomail.com; s=zohoarc; b=Ml7tSvJ9hXewKlafvVKOrMcBjMo4cPfzVJBW6607h6wMPWq8Ynz+v8DyXZWBag6TwCmBfBYZ4F+iEgbHD6CRq1XgIrJOvDD422Dltfv+ZPVWwehXJALgoUXSD1mxVnEGi3fQOgzH+nMeL/gdNGYMH+i6SkL299OW/B4NSCEVIm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894169; 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=AKK01e4Q+ytKIeFo8glOLfwxmTGPXgE5UfjO2mDX8rI=; b=Y4NV7M8pyysVFAfkppSqKDDJu1wj6C7UE6bc4vbN5ul8+93ixjMjtxDaadTYTegDYp0yZosKtqJUEVQTd4ze9HNKnDo6yVTiqtK6hlriurShXkmAWTDOCIQmNA6BYht1JA/GUmtRGo0bnaoCHDY2PLPdq5IPCbfw6tT21BKCLc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894169361802.4525303812004; Thu, 16 Jul 2020 03:09:29 -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-234-VEX16UxXMs-riQljL-JLzg-1; Thu, 16 Jul 2020 06:09:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36E0D107ACCA; Thu, 16 Jul 2020 10:09:19 +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 1771179500; Thu, 16 Jul 2020 10:09:19 +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 DC715181A76A; Thu, 16 Jul 2020 10:09:18 +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 06GA5FKq018313 for ; Thu, 16 Jul 2020 06:05:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D8C22B6DB; Thu, 16 Jul 2020 10:05:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C96CF2DE8A for ; Thu, 16 Jul 2020 10:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894168; 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=AKK01e4Q+ytKIeFo8glOLfwxmTGPXgE5UfjO2mDX8rI=; b=K2ALnLNpAzJXhEI0sxAFRUwH3I2iAxzKdaFXrrx2UP5wwwiOokr7UhoV8D9MDNf6rW1TIz LZsgMYJ7ilCQ80O6BSeS1TH6bhP1JZh0efe7DBbVY0D8noPQUGqRiwE3dq3i0JFbKJxuuW vbQ0BHKEQFKGUHPGM0PKX4SHuWjI58s= X-MC-Unique: VEX16UxXMs-riQljL-JLzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 202/351] meson: src: build virtlogd daemon binary Date: Thu, 16 Jul 2020 11:57:18 +0200 Message-Id: <538e03ce3f17e32a04db9128a7ac577ab63223ed.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.14 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/logging/Makefile.inc.am | 64 ------------------------------------- src/logging/meson.build | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index b88e0c8766e..8adec645d36 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -1,27 +1,5 @@ # vim: filetype=3Dautomake =20 -LOG_PROTOCOL_GENERATED =3D \ - logging/log_protocol.h \ - logging/log_protocol.c \ - $(NULL) - -LOG_DAEMON_GENERATED =3D \ - logging/log_daemon_dispatch_stubs.h - $(NULL) - -LOG_DAEMON_SOURCES =3D \ - logging/log_daemon.h \ - logging/log_daemon.c \ - logging/log_daemon_config.h \ - logging/log_daemon_config.c \ - logging/log_daemon_dispatch.c \ - logging/log_daemon_dispatch.h \ - logging/log_handler.c \ - logging/log_handler.h \ - $(NULL) - -LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x - SYSCONF_FILES +=3D logging/virtlogd.sysconf =20 VIRTLOGD_UNIT_FILES_IN =3D \ @@ -41,42 +19,6 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -sbin_PROGRAMS +=3D virtlogd - - -virtlogd_SOURCES =3D \ - $(LOG_DAEMON_SOURCES) \ - $(NULL) -nodist_virtlogd_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) -virtlogd_CFLAGS =3D \ - -I$(builddir)/logging \ - -I$(builddir)/rpc \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -virtlogd_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(XDR_LIBS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) -virtlogd_LDADD =3D \ - libvirt_driver_admin.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -virtlogd_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -if WITH_SASL -virtlogd_CFLAGS +=3D \ - $(SASL_CFLAGS) \ - $(NULL) -endif WITH_SASL - conf_DATA +=3D logging/virtlogd.conf =20 augeas_DATA +=3D logging/virtlogd.aug @@ -88,12 +30,6 @@ logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ =20 endif WITH_LIBVIRTD =20 -logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \ - $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLogManagerProtocol VIR_LOG_MANAGER_PROTOCOL \ - $(LOG_PROTOCOL) > logging/log_daemon_dispatch_stubs.h - virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 diff --git a/src/logging/meson.build b/src/logging/meson.build index 5d1f30ac08f..0e58bc9e6bd 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -24,6 +24,13 @@ log_protocol_generated +=3D custom_target( ], ) =20 +log_daemon_sources =3D files( + 'log_daemon.c', + 'log_daemon_config.c', + 'log_daemon_dispatch.c', + 'log_handler.c', +) + log_driver_lib =3D static_library( 'virt_log_driver', [ @@ -38,3 +45,28 @@ log_driver_lib =3D static_library( ) =20 libvirt_libs +=3D log_driver_lib + +if conf.has('WITH_LIBVIRTD') + log_daemon_generated =3D custom_target( + 'log_daemon_dispatch_stubs.h', + input: log_protocol, + output: 'log_daemon_dispatch_stubs.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLogManagerProtocol', 'VIR_LOG_MANAGER_PROTOCOL', '@INPUT@', + ], + capture: true, + ) + + virt_daemons +=3D { + 'name': 'virtlogd', + 'sources': [ + log_daemon_sources, + log_daemon_generated, + log_protocol_generated, + ], + 'include': [ + include_directories('.'), + ], + } +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894806; cv=none; d=zohomail.com; s=zohoarc; b=T8XPfHhPvSAobG2vwm8BNHrBuVf9SQpl+nfb5Pc5GqBGCrHWnIs/d/IYvpnStu8C7kLhz7ta5PwByjyq20GXC2XnPer6mg/Q+N2svCLu+T3VpzbdcAfMhqmozKvO5GDxuavjDHAm5Rd/z19yXrQV1ZXrISjAmf+i0iD3GoftsLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894806; 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=i1mqzq61Zm4vNR4A1Pgpt+4U52Jcp+AgAvcRwU1EtFQ=; b=QkMsKPcmhBbvTFv9KfbGHWBSLn8ToYC31TRD0Yg4Qhy6GjUSA9SgNna0o0eg9hDj4GTcPMuKQ8CJmvyWQ/aFEzswLoa1u6U6QsuHJ3PzlIMUheIRH+9vlltECeZugQWF3ZsaVDH/pxsJ0L5r9Ynr4CEwOQJMoxi3AkeHDDjJddA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 15948948061351009.7714557770171; Thu, 16 Jul 2020 03:20:06 -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-452-20tV-9USOzyDVNUap27b8g-1; Thu, 16 Jul 2020 06:09:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F0DA100AA2D; Thu, 16 Jul 2020 10:09:21 +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 7D48D724A9; Thu, 16 Jul 2020 10:09:21 +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 4987A9A323; Thu, 16 Jul 2020 10:09:21 +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 06GA5GQr018327 for ; Thu, 16 Jul 2020 06:05:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 42E6E2DE69; Thu, 16 Jul 2020 10:05:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B14292DE8A for ; Thu, 16 Jul 2020 10:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894804; 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=i1mqzq61Zm4vNR4A1Pgpt+4U52Jcp+AgAvcRwU1EtFQ=; b=BoCY+KpuOAkD6lQTUa1JLR/Hf4GO2wuELFIao5lt5Ar5qUtmSAIiJ2XYgN97OZl1ZzuIs6 Mt96vK4LmGcbQYKHdhHdid+ZooeVacuWKDT6sdpxzvQsdNx0owKD092Pqg18r5zdSGIvtG k8ASGFA+mLwRm0VBnUCNhbu4PEFVjLI= X-MC-Unique: 20tV-9USOzyDVNUap27b8g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 203/351] meson: src: build virtlxcd daemon binary Date: Thu, 16 Jul 2020 11:57:19 +0200 Message-Id: <60acb35378d82bba9cb99cdfa1d02d2d8b2bc406.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.11 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 | 12 ------------ src/lxc/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 3bf8d9dfb05..19546181e51 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -47,22 +47,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_LXC =20 -sbin_PROGRAMS +=3D virtlxcd - nodist_conf_DATA +=3D lxc/virtlxcd.conf augeas_DATA +=3D lxc/virtlxcd.aug augeastest_DATA +=3D lxc/test_virtlxcd.aug =20 -virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtlxcd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtlxcd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtlxcd\"" \ - -DMODULE_NAME=3D"\"lxc\"" \ - $(NULL) -virtlxcd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtlxcd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D lxc/virtlxcd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 5d8a20bd9f7..a90083cdc3d 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -74,4 +74,12 @@ if conf.has('WITH_LXC') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtlxcd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtlxcd"', + '-DMODULE_NAME=3D"lxc"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894277; cv=none; d=zohomail.com; s=zohoarc; b=DXbZ9ZlvTt/WybC85WKl5jM8gKjM3mf+18Xqy1X9J2oCMGB4DG5818LMEIdAXs+wF/IwrTxbIfzUCqzI+TtnYcHwQ0uCYlUV0MGhz+XmVqdP+X5gaPZ7wrqNi/2yPhPDKFnmrrxVb1rl7/r33WEfE2WbtR4akv1qJwSEuXgBlhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894277; 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=uyw82stybBeehqnm5UKB/sCSheUVCcKUfFaak6ATHhE=; b=VsvqdjMLbj0XFR+Tjc2Ku6yehLiRyJvHN9ICEFFY7EDhOwju2syfwun1+sWNAP54iRuTUHVPCion9K/hTQD0VKFW2TgBh0Cgyzhm9Ru3tSTmKr8rNOXUXQNrxU0KlAYADe8sBeJFbrd5FIGd2Q+B//qpWcUZHjb24jOOjhOSpao= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894277223822.478915369884; Thu, 16 Jul 2020 03:11:17 -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-401-Lw3o_lImN9KxRwG8SxflrQ-1; Thu, 16 Jul 2020 06:08:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D7931092; Thu, 16 Jul 2020 10:08:15 +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 E2F685C1C3; Thu, 16 Jul 2020 10:08:14 +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 ABD431800FF5; Thu, 16 Jul 2020 10:08:14 +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 06GA5L5c018389 for ; Thu, 16 Jul 2020 06:05:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB1072B6E2; Thu, 16 Jul 2020 10:05:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35C3A2B6DB for ; Thu, 16 Jul 2020 10:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894275; 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=uyw82stybBeehqnm5UKB/sCSheUVCcKUfFaak6ATHhE=; b=EzMwCARZC8c25bftxhAJylTPN02yIuovLHOT6w5R5nXarEHQdWYePM75BWpldUO32DhdsR QdTcHftCQunah/YPXGVth/0WNfEXkOvnuDKDOQIW/+qQ7fCS1Jn2c09UBWfKKGmcJGQ/AH e0vXXWq3KqzkGY/HJF3A0P1RloIAeT0= X-MC-Unique: Lw3o_lImN9KxRwG8SxflrQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 204/351] meson: src: build virtnetworkd daemon binary Date: Thu, 16 Jul 2020 11:57:20 +0200 Message-Id: <3913bd2c692d0902c81150dad1f670413533e5ff.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.16 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/network/Makefile.inc.am | 12 ------------ src/network/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 523ae453797..c0c8180674d 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -10,22 +10,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NETWORK -sbin_PROGRAMS +=3D virtnetworkd - nodist_conf_DATA +=3D network/virtnetworkd.conf augeas_DATA +=3D network/virtnetworkd.aug augeastest_DATA +=3D network/test_virtnetworkd.aug =20 -virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtnetworkd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtnetworkd\"" \ - -DMODULE_NAME=3D"\"network\"" \ - $(NULL) -virtnetworkd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtnetworkd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D network/virtnetworkd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/network/meson.build b/src/network/meson.build index 879a5731a6e..d244d2f522b 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -33,4 +33,12 @@ if conf.has('WITH_NETWORK') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtnetworkd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtnetworkd"', + '-DMODULE_NAME=3D"network"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894588; cv=none; d=zohomail.com; s=zohoarc; b=KeZEy7ZZ9OjLbSofcfDtLpOVwJX3BYOZo2L/39InLXWK/15Pf6nHHZfPJ2avwiSnPgk3Ftonf2TR3eEYb99+/u3xTYaAFqWuRDO1pZTR2B2c0EvWTZQZGiaoAUC4P74M6sI51Qp6qIlqEqMnCQHk6dtc6zmmXtf4H0DdwrlwmeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894588; 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=evIBdVJ9AQoaVTiUXpfSLRjEXJe/KkpObIohjm5DXrI=; b=ibS7vVgnPXcDGN4/h/E1TVc+VD/3t21ANsFT/9gH2/LViazS+EDFrDTHvWl0e1C7RIsenHzSct9pis0Ab+D9fCPbZ3GqDpbkkXgzkNR1+KHf+QiCx0GenXT4qIjzMUT15I7QHjg8IwY9OviNp7TyvNAhQKynmrX68yBHqhDbXU4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894588415287.39635635460195; Thu, 16 Jul 2020 03:16:28 -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-117-bO8Es_PZMEamOx-o1Ynl0Q-1; Thu, 16 Jul 2020 06:09:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC76C100AA50; Thu, 16 Jul 2020 10:09:23 +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 CE80479503; Thu, 16 Jul 2020 10:09:23 +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 9A7119A329; Thu, 16 Jul 2020 10:09:23 +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 06GA5MSu018397 for ; Thu, 16 Jul 2020 06:05:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id A670F2DE6B; Thu, 16 Jul 2020 10:05:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E4DF2B6DB for ; Thu, 16 Jul 2020 10:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894586; 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=evIBdVJ9AQoaVTiUXpfSLRjEXJe/KkpObIohjm5DXrI=; b=FY7XELVQQ4dZI2H8sqb3HNceoe6o9lfKAcOoqVCbvmT8P9aplxe6PfFyvE1I0CW08UnJMh X45Hji3VX2aguQxNNn0MSzvlaLUYeAHzq+vEQE4BvDWJo7kX88qi32nasUJnQYTwN68AX0 w25FGU3pTepTVXjX4ZA4USJj/aDKU1o= X-MC-Unique: bO8Es_PZMEamOx-o1Ynl0Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 205/351] meson: src: build virtnodedevd daemon binary Date: Thu, 16 Jul 2020 11:57:21 +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.14 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/node_device/Makefile.inc.am | 12 ------------ src/node_device/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index d7d80f61fbb..731d513c980 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -12,22 +12,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NODE_DEVICES -sbin_PROGRAMS +=3D virtnodedevd - nodist_conf_DATA +=3D node_device/virtnodedevd.conf augeas_DATA +=3D node_device/virtnodedevd.aug augeastest_DATA +=3D node_device/test_virtnodedevd.aug =20 -virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtnodedevd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtnodedevd\"" \ - -DMODULE_NAME=3D"\"nodedev\"" \ - $(NULL) -virtnodedevd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtnodedevd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 00fa7e0ea9c..f85320cf85a 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -38,4 +38,12 @@ if conf.has('WITH_NODE_DEVICES') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtnodedevd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtnodedevd"', + '-DMODULE_NAME=3D"nodedev"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894106; cv=none; d=zohomail.com; s=zohoarc; b=Ko2sRAXF9hT9tchFVWf2eps0+YKFtyYo8Cny0diPZPKG48R+Whns7EkLwLeuZr+GUvTQMp9d1TthZ6wpJBIwjeOz9vsD1hlWGTc2uBNxLELiQBZryUs3gPUuOrX0J2A3rBctvL8WWUhWh1fiLoupNN9an8w1cBazmtL0MvhjQ6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894106; 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=f1oIJF5S5M2GuqHCHqBfX83TI6xAw7iMyPEZ8FzhC8k=; b=XtcTAmHzw8YXWQr37l+K3g2VXKcQnW9ns+wos2F6Wrdb1/9qSp5n82YoZEIWqdQ/DerVM6CEQJOt4y61vukuolpC2/6X1P7ezIkXfxfVe3R9eZpWU31uVsVs6DVcSiMbm8NwneibYOu8p35LGo6huRVbowSxHDbzSNDkK8gRNOg= 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 1594894106035708.2495176298373; Thu, 16 Jul 2020 03:08:26 -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-65-FS_u5D1mNiSDN3NuNGSrPQ-1; Thu, 16 Jul 2020 06:08:22 -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 8410B100AA34; Thu, 16 Jul 2020 10:08:17 +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 5F67A10098AE; Thu, 16 Jul 2020 10:08:17 +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 2B4E418045C1; Thu, 16 Jul 2020 10:08:17 +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 06GA5NdX018412 for ; Thu, 16 Jul 2020 06:05:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F64C2DE69; Thu, 16 Jul 2020 10:05:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089312B6E6 for ; Thu, 16 Jul 2020 10:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894104; 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=f1oIJF5S5M2GuqHCHqBfX83TI6xAw7iMyPEZ8FzhC8k=; b=JwCayi3U6qekqBpDtbLpmrAzR2566GztcoB8ckJvlinaQyxHMxxZBYFdhb2StIHovI1vnz MJIMUIwNVXWoB45mbAw+j0RHObaYodjf0JueEztNAho1o3CLb69uGEvMjps3bMaooFAkOk BgyvcM5tqm9oPSkvZ+PYGlcPVbFtgz4= X-MC-Unique: FS_u5D1mNiSDN3NuNGSrPQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 206/351] meson: src: build virtnwfilterd daemon binary Date: Thu, 16 Jul 2020 11:57: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.84 on 10.5.11.22 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/nwfilter/Makefile.inc.am | 12 ------------ src/nwfilter/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index d853282b705..eb5cade5b95 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,22 +11,10 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -sbin_PROGRAMS +=3D virtnwfilterd - nodist_conf_DATA +=3D nwfilter/virtnwfilterd.conf augeas_DATA +=3D nwfilter/virtnwfilterd.aug augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug =20 -virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtnwfilterd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtnwfilterd\"" \ - -DMODULE_NAME=3D"\"nwfilter\"" \ - $(NULL) -virtnwfilterd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtnwfilterd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 8da853c3ecb..b8f94c726c1 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -33,4 +33,12 @@ if conf.has('WITH_NWFILTER') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtnwfilterd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtnwfilterd"', + '-DMODULE_NAME=3D"nwfilter"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894390; cv=none; d=zohomail.com; s=zohoarc; b=oI1xUZZpIls/NPyceeQkRhEQpKEJsl572jEE/ZV7lgwX9DKVIk18iDr0lwfKe59T2rttz7yy0zGzxLr7OHJ4+I1FjortlLQPoFlTdpoIaEoRQBKweszas5RX1X6Bv4L+COJmbGmz01I9etYTZQ30h/x9Eaj88cFEUQEAnor3Fsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894390; 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=VTgIVUREnRPibdDi2rQuXtwUqrXWLVtIKXYR62+3NAg=; b=MflDV+75/KuXvv1S/n7kST9S9ENb/sRxAu343g3s51hvSYGngHdboEdhlPwFq7ENyrRacIDnN5Q96LY0BwFqbp497R2rz0A//cU81A4ilxk9I2EvTaDSac7gAIr1FdzEPtxW4sdpsuouGQcc4SCbzH3rZ3cntvzLGASqxdaSbDQ= 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 1594894390621730.5501525591379; Thu, 16 Jul 2020 03:13:10 -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-175-TxhweRp4NP2fH6BFnneEJA-1; Thu, 16 Jul 2020 06:13:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10B2A80572E; Thu, 16 Jul 2020 10:12:58 +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 75BF57950A; Thu, 16 Jul 2020 10:12:57 +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 A5AAC1809563; Thu, 16 Jul 2020 10:12:55 +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 06GA5O4T018420 for ; Thu, 16 Jul 2020 06:05:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77B242B6E6; Thu, 16 Jul 2020 10:05:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E68812DE69 for ; Thu, 16 Jul 2020 10:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894388; 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=VTgIVUREnRPibdDi2rQuXtwUqrXWLVtIKXYR62+3NAg=; b=McdxqWCclzhYL36suxTEo9fD+ZNEPbFg4PM0faMhQIcobVPkWAoI71oEcUe2SntyCxGmOE rB/kg5pr0tdhDlN8ztSfFTg9KqOdbjpq0UzO/O33s1usynD+LpTKQZBxGInfSnOAXufQtv DlJeSCkTG/sFkzdBJRIg/9/WGRnE52c= X-MC-Unique: TxhweRp4NP2fH6BFnneEJA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 207/351] meson: src: build virtqemud daemon binary Date: Thu, 16 Jul 2020 11:57:23 +0200 Message-Id: <70b7a0468a706bcf575845cbe7c47dae280e2186.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.14 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/qemu/Makefile.inc.am | 12 ------------ src/qemu/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f2b5e3a77f6..129825121c7 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -4,22 +4,10 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DR= IVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) =20 if WITH_QEMU -sbin_PROGRAMS +=3D virtqemud - nodist_conf_DATA +=3D qemu/virtqemud.conf augeas_DATA +=3D qemu/virtqemud.aug augeastest_DATA +=3D qemu/test_virtqemud.aug =20 -virtqemud_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtqemud_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtqemud_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtqemud\"" \ - -DMODULE_NAME=3D"\"qemu\"" \ - $(NULL) -virtqemud_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtqemud_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 209cb5f4956..121be3085fa 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -105,4 +105,12 @@ if conf.has('WITH_QEMU') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtqemud', + 'c_args': [ + '-DDAEMON_NAME=3D"virtqemud"', + '-DMODULE_NAME=3D"qemu"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894399; cv=none; d=zohomail.com; s=zohoarc; b=iDzfS5hxKf0HxxSDO/H5H416XNdOwZXzLH/DIzdKopcBrQ50yCOojE3bCS2g4mxIOyAkPRNzBGOVFlJ9fcMar3g1NTyWFczDUzP0hEGLEj8ZNjZ5urSC5Gf4VNfpkgwPl0RBEYRuz4y/s2gWMm5e205Dy1lklHPHEiKMAXSTd6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894399; 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=ideksKKfct36EH3M4tX2UFk+gPGIJ0tOK8SM0h7b5gA=; b=GUzoe1PVTcauqSlodzZPGOXV9Q5jtwmgXT/+dnB031119f5Zh1eoxVztu+1l1Es6atHf7ddP4E78Nanh2L65bKid4Sn5AM3l3FAhwq4XUruiGjQFVJRM1oW7izBuOswpApku9UaXcmhnPl2xUwPPyS2Dc1bkfTEKoWqRAQLaDy4= 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 1594894399044692.2823424586057; Thu, 16 Jul 2020 03:13:19 -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-509-OwFO8kvVN1aoovQ4FYEvfQ-1; Thu, 16 Jul 2020 06:09:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D214E10059BE; Thu, 16 Jul 2020 10:09:31 +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 B0C0072ACF; Thu, 16 Jul 2020 10:09:31 +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 7E59F181A88D; Thu, 16 Jul 2020 10:09:31 +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 06GA5PTC018428 for ; Thu, 16 Jul 2020 06:05:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63A3A2DE6F; Thu, 16 Jul 2020 10:05:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D326B2DE6D for ; Thu, 16 Jul 2020 10:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894398; 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=ideksKKfct36EH3M4tX2UFk+gPGIJ0tOK8SM0h7b5gA=; b=hqIslcyjg3uWFQP3f2sQSJ7hF66z67Tk2k+eAHBpT6HhoAEm5o4fcYeUe08BS7kXRZiWN1 sOSOSYYy2PiL/W5Nyl6dqyVxCz2xMuH2s1g92J6yf8uDbGv1RAPmq3TwEF1jSHZJVKWXIq rWzmBAEehZA7yVPyCVIgUObrx+545jk= X-MC-Unique: OwFO8kvVN1aoovQ4FYEvfQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 208/351] meson: src: build libvirtd daemon binary Date: Thu, 16 Jul 2020 11:57:24 +0200 Message-Id: <612ed864ac63dd6bc67b1aac80bc6d765448cd32.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.15 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/remote/Makefile.inc.am | 18 +----------------- src/remote/meson.build | 12 ++++++++++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index eb281a4c4da..f6669bd25f6 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -62,7 +62,7 @@ OPENRC_CONF_FILES +=3D \ =20 if WITH_LIBVIRTD =20 -sbin_PROGRAMS +=3D libvirtd virtproxyd +sbin_PROGRAMS +=3D virtproxyd =20 augeas_DATA +=3D \ remote/libvirtd.aug \ @@ -79,22 +79,6 @@ nodist_conf_DATA +=3D \ remote/virtproxyd.conf \ $(NULL) =20 -libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) - -nodist_libvirtd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) - -libvirtd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DSOCK_PREFIX=3D"\"libvirt\"" \ - -DDAEMON_NAME=3D"\"libvirtd\"" \ - -DWITH_IP \ - -DLIBVIRTD \ - $(NULL) - -libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) - -libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) nodist_virtproxyd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtproxyd_CFLAGS =3D \ diff --git a/src/remote/meson.build b/src/remote/meson.build index 1e3e3479c80..8cb53b2c782 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -82,6 +82,18 @@ if conf.has('WITH_REMOTE') ) =20 libvirt_libs +=3D remote_driver_lib + + if conf.has('WITH_LIBVIRTD') + virt_daemons +=3D { + 'name': 'libvirtd', + 'c_args': [ + '-DSOCK_PREFIX=3D"libvirt"', + '-DDAEMON_NAME=3D"libvirtd"', + '-DWITH_IP', + '-DLIBVIRTD', + ], + } + endif endif =20 if conf.has('WITH_REMOTE') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894824; cv=none; d=zohomail.com; s=zohoarc; b=CFgwJhBLeBHRkoRzmW5AT3hOLBGswUuXeGuA6f9QfYythVyZWLBcZpjF1xQGGedYDPwAd4UB2HU431ILgGZINsgkBCPGowB0wvCIaOy14Lfosxy7YRPcfQWnv1IxVtR2My3ywlIhBL7LoGKyY2HLeB+sMCVbf83x88lIvYuoktA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894824; 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=LnXXo7JuAvljE1I813eM8If5q5nJileowQA9KdvZrUM=; b=eEJ08Qpo8fo8rZomXpiKKeK8P/LziumPKhQUYGT2iHBwiMhYzyy5uLfkw7XpGyieBmZC/G2oSq75vjBErmavL7NysTFTG4gpXG0C0uvCHkrO6gUn9rSieQirhxBEEnLjW9d/LZSkiop6JxFixYCi2SvK5lGKGjR7B6TqYXw79v0= 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 1594894824266279.8837684014561; Thu, 16 Jul 2020 03:20:24 -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-509-Jj-zFOvjOamPdHoTKGu6kg-1; Thu, 16 Jul 2020 06:08:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCA231080; Thu, 16 Jul 2020 10:08:19 +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 B88042B6DB; Thu, 16 Jul 2020 10:08:19 +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 8AE68730CE; Thu, 16 Jul 2020 10:08:19 +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 06GA5Qq8018444 for ; Thu, 16 Jul 2020 06:05:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D3332DE6F; Thu, 16 Jul 2020 10:05:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAFA02DE6D for ; Thu, 16 Jul 2020 10:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894823; 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=LnXXo7JuAvljE1I813eM8If5q5nJileowQA9KdvZrUM=; b=IDGuN0dlL2Vt5TxI+VrkQWHDQcX1yekDR3x+qZGHxXD21NbDkPK3dmWEAVSC9xMWbeb7XZ YGDLvcScTydW0Va1Mva5tHGCNT57D2jV2+DpwujQ86OvW3EcqRkfQ4VMXTGM3n6ncImkT5 o5vE0Rs2Innx5diQZoTAZhPlkY9Usag= X-MC-Unique: Jj-zFOvjOamPdHoTKGu6kg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 209/351] meson: src: build virtproxyd daemon binary Date: Thu, 16 Jul 2020 11:57:25 +0200 Message-Id: <618d81e7a698583dba4252d872ee1321482c5b46.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.23 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/remote/Makefile.inc.am | 14 -------------- src/remote/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index f6669bd25f6..2007bdf8654 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -62,8 +62,6 @@ OPENRC_CONF_FILES +=3D \ =20 if WITH_LIBVIRTD =20 -sbin_PROGRAMS +=3D virtproxyd - augeas_DATA +=3D \ remote/libvirtd.aug \ remote/virtproxyd.aug \ @@ -79,18 +77,6 @@ nodist_conf_DATA +=3D \ remote/virtproxyd.conf \ $(NULL) =20 -virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtproxyd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtproxyd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DSOCK_PREFIX=3D"\"libvirt\"" \ - -DDAEMON_NAME=3D"\"virtproxyd\"" \ - -DWITH_IP \ - -DVIRTPROXYD \ - $(NULL) -virtproxyd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtproxyd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - remote/libvirtd.conf: remote/libvirtd.conf.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ diff --git a/src/remote/meson.build b/src/remote/meson.build index 8cb53b2c782..ee38364868e 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -93,6 +93,16 @@ if conf.has('WITH_REMOTE') '-DLIBVIRTD', ], } + + virt_daemons +=3D { + 'name': 'virtproxyd', + 'c_args': [ + '-DSOCK_PREFIX=3D"libvirt"', + '-DDAEMON_NAME=3D"virtproxyd"', + '-DWITH_IP', + '-DVIRTPROXYD', + ], + } endif endif =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894444; cv=none; d=zohomail.com; s=zohoarc; b=UKtFo6dv5FPxCdp4OrdhuPI09f29vSjxRySQgaV71HYDGBMKCp/MOVfQf9BOQiJym9WU4NeCiaMVjRdmw75F4/n0otTcCGkdxqBoh2jga17BcE5kgBHpohh1dpVK7uFArqdDOGWTSN/l/t9QYXdxzyK1eFnuLNXTBUMUR5Jbf1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894444; 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=wwbWDyreKCtWfA4anp2bdjBuXniAXrzTGQ0FDnB4seA=; b=ZIxj9kmSmRea34MBnfUj7CtfiP5l3r5FaKP5otlR4xsyC3y1loRoysJ4qU1mwB3t1efnepH3eLc+SgqDEBMnweqJfaGCuhPHvr5yTxG/+7/NdPkX3yw6v/XaFr4gXkXlPdf/cfNss1t/qeBZExgtfi9E49jQSj3iGNIZBlKgbvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894444155808.0648029075303; Thu, 16 Jul 2020 03:14:04 -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-43-WW880EscPpeYqFxHeLoXiQ-1; Thu, 16 Jul 2020 06:13:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4DD108027E2; Thu, 16 Jul 2020 10:13: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 2B42D79508; Thu, 16 Jul 2020 10:13:03 +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 E6AFA180BACF; Thu, 16 Jul 2020 10:13: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 06GA5RoP018451 for ; Thu, 16 Jul 2020 06:05:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 376B72DE6D; Thu, 16 Jul 2020 10:05:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5DA62DE72 for ; Thu, 16 Jul 2020 10:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894443; 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=wwbWDyreKCtWfA4anp2bdjBuXniAXrzTGQ0FDnB4seA=; b=dvOmjf1ZkhfGC4KhfLawaIRPoJZR50wl9fj6LXQxdo/pTPDwtlnaU6nREislpwKuzTZsDe 3wXk88YQUD8gz6yQwRK/V7DlYWVu6HzYMztNcu5fQKEKBNpIrwXN7VIY4OASbGxfXFMmr9 RdCQqNoIxzC84NQCdbc23NNOUdAt/wc= X-MC-Unique: WW880EscPpeYqFxHeLoXiQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 210/351] meson: src: build virtsecretd daemon binary Date: Thu, 16 Jul 2020 11:57:26 +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.14 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/secret/Makefile.inc.am | 12 ------------ src/secret/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index e47aa678a6c..7a03f6728ee 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -5,22 +5,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) =20 if WITH_SECRETS -sbin_PROGRAMS +=3D virtsecretd - nodist_conf_DATA +=3D secret/virtsecretd.conf augeas_DATA +=3D secret/virtsecretd.aug augeastest_DATA +=3D secret/test_virtsecretd.aug =20 -virtsecretd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtsecretd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtsecretd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtsecretd\"" \ - -DMODULE_NAME=3D"\"secret\"" \ - $(NULL) -virtsecretd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtsecretd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D secret/virtsecretd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/secret/meson.build b/src/secret/meson.build index a6d0a321938..43f1d7342d5 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -15,4 +15,12 @@ if conf.has('WITH_SECRETS') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtsecretd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtsecretd"', + '-DMODULE_NAME=3D"secret"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894816; cv=none; d=zohomail.com; s=zohoarc; b=MSQFk3cH5tCienv8Cer4I5N7wR8oyGql+/03vrNHs79ATb9h7dS9TXCRMIkvdWdD2Edq871yxtOlylAVeJebMa7wh0GfY5vg3UuFj0kXKqyj2UOAJdEZPiImjVR8mIb+KDUB8iKAvgcvl28hS0QVXPdFJkuJK69abQVwwF3ZDwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894816; 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=4qDehv4mks4btSBUzGXjOM9SYPfBGZXH3dVcG0q0plw=; b=aNkiYIygEJa9Rf+UmC2cZtL+FtmJ9TLUYtK+cg6NgktytBQODlUEkilErTX+htbvxSjNwVaX2TRNrT78h+jDAOKPrjDsNhmWmYnKTNNv4+FnXf7ceB8RF266zChIe33Aj0o04SKL24vDwQJYEMrgn9gJBboZXsFBQh5v8etEzLk= 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 1594894816585432.900628044707; Thu, 16 Jul 2020 03:20:16 -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-20-KCm-fBEMNTiHVGX3AEJGFA-1; Thu, 16 Jul 2020 06:13:15 -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 C32DD100AA21; Thu, 16 Jul 2020 10:13:06 +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 A47007B414; Thu, 16 Jul 2020 10:13:06 +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 653F79625C; Thu, 16 Jul 2020 10:13:06 +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 06GA5SCt018460 for ; Thu, 16 Jul 2020 06:05:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FBC62DE6F; Thu, 16 Jul 2020 10:05:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E9612DE6D for ; Thu, 16 Jul 2020 10:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894815; 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=4qDehv4mks4btSBUzGXjOM9SYPfBGZXH3dVcG0q0plw=; b=Z9Wk7PculxSEaLjwZ2Hp9bsZNGYBVO9zwoOFkHbCDbniJYKxHKy9DaG6ujmnFvbbTrYL0+ LgBu5BqN/oV4Ue95oSKiL2cwOyMRlhae205tAxLRKfLwtduyqsrAeiMGP2jdupUfHNY7Jl ZIFIDA0TiJ0CZNQXQG4upEzb7XkQt0M= X-MC-Unique: KCm-fBEMNTiHVGX3AEJGFA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 211/351] meson: src: build virtstoraged daemon binary Date: Thu, 16 Jul 2020 11:57:27 +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/storage/Makefile.inc.am | 12 ------------ src/storage/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 45cbe476d22..e30f82e14fe 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -9,22 +9,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) =20 if WITH_STORAGE -sbin_PROGRAMS +=3D virtstoraged - nodist_conf_DATA +=3D storage/virtstoraged.conf augeas_DATA +=3D storage/virtstoraged.aug augeastest_DATA +=3D storage/test_virtstoraged.aug =20 -virtstoraged_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtstoraged_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtstoraged_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtstoraged\"" \ - -DMODULE_NAME=3D"\"storage\"" \ - $(NULL) -virtstoraged_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtstoraged_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D storage/virtstoraged.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/storage/meson.build b/src/storage/meson.build index baf5ae5b2fe..a18da013f8c 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -109,6 +109,14 @@ if conf.has('WITH_STORAGE') ], 'install_dir': storage_file_install_dir, } + + virt_daemons +=3D { + 'name': 'virtstoraged', + 'c_args': [ + '-DDAEMON_NAME=3D"virtstoraged"', + '-DMODULE_NAME=3D"storage"', + ], + } endif =20 if conf.has('WITH_STORAGE_DISK') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894400; cv=none; d=zohomail.com; s=zohoarc; b=SoR2I8YGDQjZBwycF0EopCNdE1r5mtxTBZdEa4zBPpruWnjFix4DU+h1681JR9Ko58Noct+TnfUxq7pkt8HwHGJNcmlCpzZdw7ZbI1nq3OlmlCNDfsLPDF7SZ0NTH+rKJG+W/FjQF+HhMkuDOtaaPR0nOWcrIcY8kkeYxas0mnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894400; 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=aFHahIpAR5j4RtcURyE8ayk4peVPYZ1pyDyvuRwSJM4=; b=hz3AOW+KEt4juqzbbUPxCm1SxlyTcdl2eSUiivw5Fa59cevk/80KTOMlYEYQ7DAnwUtHKz14HbdYjjYTudr/ynEOkybvmEfrQ8B3DsWHe5YEUiSlmr3RyNP+Wasxgb7870PLPRqeeKaogIO9bgMvXA3YJN8r2Iliz6UpK9DrJqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894400196503.3361392761078; Thu, 16 Jul 2020 03:13:20 -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-134-16WMjUdiMOGvaeqFSD0PPg-1; Thu, 16 Jul 2020 06:13:14 -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 2938F1888AA9; Thu, 16 Jul 2020 10:13:09 +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 09DD179D16; Thu, 16 Jul 2020 10:13:09 +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 CB02C180222E; Thu, 16 Jul 2020 10:13:08 +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 06GA5TJA018472 for ; Thu, 16 Jul 2020 06:05:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07CC12DE69; Thu, 16 Jul 2020 10:05:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76E9E2DE6D for ; Thu, 16 Jul 2020 10:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894399; 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=aFHahIpAR5j4RtcURyE8ayk4peVPYZ1pyDyvuRwSJM4=; b=DqMe1u1w12vUQ6FccC85l9WJwPbfkk1asCuiWLC39gYMO6kgyQYO8zLlPbICh1rUvZSE72 ygk7U8IVvrgvmghvMcXXyeBohiV05OtftNunUAYSsVDplWajejGDey13qzmXi/WlYcx/6X 3L6OhsygNy4t1UfKQLBwyq+KW8CACsM= X-MC-Unique: 16WMjUdiMOGvaeqFSD0PPg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 212/351] meson: src: build virtvboxd daemon binary Date: Thu, 16 Jul 2020 11:57:28 +0200 Message-Id: <999fe357fc7b12105ab92585467065323d9fb91d.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.13 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/vbox/Makefile.inc.am | 12 ------------ src/vbox/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index e61c3df40d6..fc71301e595 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -6,22 +6,10 @@ DRIVER_SOURCE_FILES +=3D \ $(NULL) =20 if WITH_VBOX -sbin_PROGRAMS +=3D virtvboxd - nodist_conf_DATA +=3D vbox/virtvboxd.conf augeas_DATA +=3D vbox/virtvboxd.aug augeastest_DATA +=3D vbox/test_virtvboxd.aug =20 -virtvboxd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtvboxd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtvboxd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtvboxd\"" \ - -DMODULE_NAME=3D"\"vbox\"" \ - $(NULL) -virtvboxd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtvboxd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D vbox/virtvboxd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 5af671c00cb..0619834a9c8 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -38,4 +38,12 @@ if conf.has('WITH_VBOX') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtvboxd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtvboxd"', + '-DMODULE_NAME=3D"vbox"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894693; cv=none; d=zohomail.com; s=zohoarc; b=jzeZihf45WCy5lXJvsjEM9m60f1vF7NRNro0fS1l3s1p5PC8pJ7mj0Qth1dmePvLYFpf0eVozwJZ9jYOqm+QNJozVMZpJVFTIKmZyMGlmu9gNboLet/jcG+VtVZ4O58zxYjK7diPhm8NKbFYeBBLNvR3B8PxTtRJe2QMLqBfplo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894693; 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=e7YyFdjG/2IbK+D54cL2PiGlz9NffpK0MonalkX0Nd0=; b=f5yoKUZv6irN5Qs/rVnroeDWTzKeeObrqHuEPWFdI1q0fNCGtVBStVQfayjv+b04uPo1uOUvMgAWCrwljU00q7lBacNlMFQs3HX0EBFRXMJRAw1dpyDtFK+VYlew9n3LXJ3/LVhOLyo8MwH4WMIT7pZHPk9Rfw6E/f4sC5GpSX8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894693860524.7414228741937; Thu, 16 Jul 2020 03:18:13 -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-184-NfZISZOCPFe-E7p4CJJ1Kw-1; Thu, 16 Jul 2020 06:08:29 -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 A43A280BCB6; Thu, 16 Jul 2020 10:08:22 +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 810F56FEF6; Thu, 16 Jul 2020 10:08:22 +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 4DD9918034E5; Thu, 16 Jul 2020 10:08:22 +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 06GA5Toi018487 for ; Thu, 16 Jul 2020 06:05:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6A992B6DC; Thu, 16 Jul 2020 10:05:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FC8B2B6DB for ; Thu, 16 Jul 2020 10:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894692; 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=e7YyFdjG/2IbK+D54cL2PiGlz9NffpK0MonalkX0Nd0=; b=Jg5qTU1zqUQ/Wpx24g0UaD8B/bnIVVwWncDLPIM9vDci/YeVJhGuLezdZSQJnX7am0b3HV tizBINdV3f/LHmhdR7qNJQAo7EfYuEE4YDAdNbLPQePJmK+ct3wqAPK3JLcz38/cyYnmAF NFItEBchGrc8+zWcI89N/dnnSSx5hbM= X-MC-Unique: NfZISZOCPFe-E7p4CJJ1Kw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 213/351] meson: src: build virtvzd daemon binary Date: Thu, 16 Jul 2020 11:57:29 +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.12 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/Makefile.am | 1 - src/vz/Makefile.inc.am | 12 ------------ src/vz/meson.build | 8 ++++++++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ec6da9a6ff5..6a8a7ea1791 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,6 @@ OPENRC_INIT_FILES =3D OPENRC_INIT_FILES_IN =3D OPENRC_CONF_FILES =3D SYSCONF_FILES =3D -sbin_PROGRAMS =3D bin_PROGRAMS =3D =20 COMMON_UNIT_VARS =3D \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index f55d03d400a..18bb0c40c46 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -5,22 +5,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,= $(VZ_DRIVER_SOURCES)) =20 =20 if WITH_VZ -sbin_PROGRAMS +=3D virtvzd - nodist_conf_DATA +=3D vz/virtvzd.conf augeas_DATA +=3D vz/virtvzd.aug augeastest_DATA +=3D vz/test_virtvzd.aug =20 -virtvzd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) -nodist_virtvzd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) -virtvzd_CFLAGS =3D \ - $(REMOTE_DAEMON_CFLAGS) \ - -DDAEMON_NAME=3D"\"virtvzd\"" \ - -DMODULE_NAME=3D"\"vz\"" \ - $(NULL) -virtvzd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) -virtvzd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) - SYSCONF_FILES +=3D vz/virtvzd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ diff --git a/src/vz/meson.build b/src/vz/meson.build index 41cce92de2f..07ad8fc75ae 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -30,4 +30,12 @@ if conf.has('WITH_VZ') libvirt_no_undefined, ], } + + virt_daemons +=3D { + 'name': 'virtvzd', + 'c_args': [ + '-DDAEMON_NAME=3D"virtvzd"', + '-DMODULE_NAME=3D"vz"', + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894749; cv=none; d=zohomail.com; s=zohoarc; b=Jf1jUVqu0YqVFFb4YFy+xcmAhUQ/ZfRKlxvq2WunzbqM/h7YcnUNwtNODFF/KK0cK3SmSyIeeEcp2Bhpekhif0wKEtLV5DOFHA+n8xWGbzdacDE6J3IRAdeBBDBGHJP2jrf0dN8e410SdIzJX5WTwsT60MbeVJaWKzf9MP/z2wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894749; 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=ND3wBuDbVxdBu4no5livksNRRRixCYIMr7Y0/ZbEIXQ=; b=FYtxVP/H8KFHy5jsTh+HhsceZQWouC5rQgUeJ7OtPLyRTZ3oHlkVBR78MqGwMrPgX3VOBRqzJwgesmdsVK6Xvm9pweBgbodaZZm47Yt9keeAcz61bjZxo1dICKSwqJc0EJsQtaiw+5oxarEWYJimoHZ+T3nHwtJw+yhZKGSNlMc= 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 1594894749754951.9674242540484; Thu, 16 Jul 2020 03:19: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-367-2EcRdd3dPzyhQA6l6AvRDw-1; Thu, 16 Jul 2020 06:08:31 -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 1202D8027FB; Thu, 16 Jul 2020 10:08:25 +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 E3DCD1001B07; Thu, 16 Jul 2020 10:08:24 +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 B26B7730DA; Thu, 16 Jul 2020 10:08:24 +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 06GA5Uki018497 for ; Thu, 16 Jul 2020 06:05:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id CF0F62B6DC; Thu, 16 Jul 2020 10:05:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A4B42B6DB for ; Thu, 16 Jul 2020 10:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894748; 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=ND3wBuDbVxdBu4no5livksNRRRixCYIMr7Y0/ZbEIXQ=; b=RqQpH2w+vs7qQPkRWWCwlNQr4l4He8AFR6kwULAjrtVoxXbuQbXtebv8yfX0oO4FCa1cwz 6oKrubVVGOVizAH5jrfdPfWFu8lXH4Z3gaGYNszDOr+mIfX+bwXprKUr8NC9m8gehY1tzp 2v/6Q9fP/K8Xzyv7qv7vPzWhdODyPWs= X-MC-Unique: 2EcRdd3dPzyhQA6l6AvRDw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 214/351] meson: src: add support for building helpers Date: Thu, 16 Jul 2020 11:57:30 +0200 Message-Id: <4e3e110a80de90fba8de99f65c4316b2efe087eb.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/meson.build | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/meson.build b/src/meson.build index 3774e2bb4ba..bb970f10c61 100644 --- a/src/meson.build +++ b/src/meson.build @@ -139,6 +139,16 @@ virt_modules =3D [] # * include =3D include_directories (optional, default []) virt_daemons =3D [] =20 +# virt_helpers: +# each entry is a dictionary with following items: +# * name - binary name (required) +# * sources - binary sources (required) +# * c_args - compile arguments (optional, default []) +# * include - include_directories (optional, default []) +# * deps - dependencies (optional, default []) +# * install_dir - installation directory (optional, libexecdir) +virt_helpers =3D [] + =20 # list subdirectories =20 @@ -509,3 +519,31 @@ foreach daemon : virt_daemons install_rpath: libdir, ) endforeach + + +# build libvirt helpers + +foreach helper : virt_helpers + bin =3D executable( + helper['name'], + [ + helper['sources'], + ], + c_args: [ + helper.get('c_args', []), + ], + include_directories: [ + helper.get('include', []), + ], + dependencies: [ + src_dep, + helper.get('deps', []), + ], + link_with: [ + libvirt_lib, + ], + install: true, + install_dir: helper.get('install_dir', libexecdir), + install_rpath: libdir, + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894184; cv=none; d=zohomail.com; s=zohoarc; b=BRLxUHUE2DZgHKnNzvbAFogzDgRfifOz1LsKzQu7pcxsNbYt+0btaleoQho9WR9zXxoZWAD/O6WIYQUujHmBCx/eukWQm5p/plojrtwDCTYv8GRYgLVnIjvjl3gkFbtkvFz/wkes3QDeWnRsjXGTwH7BSzTu8+opB7+hh8khdfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894184; 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=qI0ZHs9bMfT7M903xePrj4ysDGJrTFi10jTiauOt9LA=; b=izpRXkNb37b1GB163tF7Pps7SMAmmlwG3Qfyh4jQOXabLoTH4YJtpTLkPShRS+Of6kGHsmhQkTaJKu59nZ9gJFfZqiW/jTQ4AKyABKyPT38ECfcRnNJ/V8Jm68+TKSUG3+uo1mZrQ4uv195AbSdNYSbo/ICH4udarxHatDlv2qA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894184149504.8729406663663; Thu, 16 Jul 2020 03:09:44 -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-198-E1x6YfFFNm-OXTjtMJ_igw-1; Thu, 16 Jul 2020 06:09:39 -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 3F7FD10059C7; Thu, 16 Jul 2020 10:09:34 +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 1E0A96FEF9; Thu, 16 Jul 2020 10:09:34 +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 E2AED9A337; Thu, 16 Jul 2020 10:09:33 +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 06GA5VAp018511 for ; Thu, 16 Jul 2020 06:05:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id B84D42B6DC; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 329AA2B6DB for ; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894183; 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=qI0ZHs9bMfT7M903xePrj4ysDGJrTFi10jTiauOt9LA=; b=Ox/HOBXvvzUMzHCovRkN33znAx3k5J6LPE6p996v8hDze5x69egdbWWRmp5W8PxZIGqAY3 j2JYg2ZiDfsYMGIdwtDyJleubNaXIpzbQksuNXGyaMyVY2LG2n5+B1c7ouEk/mD7M/LuqQ 7Q/eSJ5WpyYdKscn5Ah13tybyZK6104= X-MC-Unique: E1x6YfFFNm-OXTjtMJ_igw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 215/351] meson: src: build libvirt_sanlock_helper binary Date: Thu, 16 Jul 2020 11:57:31 +0200 Message-Id: <0c70e51de9a9244373809463250da1e32c0d6433.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 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/locking/Makefile.inc.am | 17 ----------------- src/locking/meson.build | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 20974dd0461..b4fb9387a17 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,8 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ - locking/sanlock_helper.c - RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 @@ -46,20 +43,6 @@ if WITH_LIBXL nodist_conf_DATA +=3D locking/libxl-sanlock.conf endif WITH_LIBXL =20 -libexec_PROGRAMS +=3D libvirt_sanlock_helper - -libvirt_sanlock_helper_SOURCES =3D $(LOCK_DRIVER_SANLOCK_HELPER_SOURCES) -libvirt_sanlock_helper_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_sanlock_helper_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) endif WITH_SANLOCK =20 conf_DATA +=3D locking/virtlockd.conf diff --git a/src/locking/meson.build b/src/locking/meson.build index cdd558779c2..0e48c86afc9 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -51,6 +51,10 @@ sanlock_sources =3D [ 'lock_driver_sanlock.c', ] =20 +sanlock_helper_sources =3D files( + 'sanlock_helper.c', +) + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -129,4 +133,16 @@ if conf.has('WITH_LIBVIRTD') include_directories('.'), ], } + + if conf.has('WITH_SANLOCK') + virt_helpers +=3D { + 'name': 'libvirt_sanlock_helper', + 'sources': [ + sanlock_helper_sources, + ], + 'include': [ + conf_inc_dir, + ], + } + endif endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894401; cv=none; d=zohomail.com; s=zohoarc; b=X9jsf5GXL8djSOwVXXb9Qy7ra11zQIkS9ub0Dnyby5eVxXBmqEc00ldU1O957Jvi81qLDvuDJjcLzN+ow+sX0OTbvg6Z2Rw+rYZE6lsMAEBnCj9aAPYQVgkIQW1d5EFFMf4NAUFi5fgYGAR9f2+BSYeh086n9TuNCf1PUKB6wY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894401; 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=GjcCBvkJMSYbyGxxB3FnQjFXmQ23T4W0gpp6rqxmerY=; b=akn4NyoQYlfvK+27jeWyHkt0Hz8YyUKA5EPDvXdz67Sr+nezn2NpqTEOJrQHeTmfadXcnwwbUCRdkWIS8JpFRmUXkNqdJ0p2j7TUZeduIK5j48zeGz21xsJeufvkk4k95804jeZN9a12tWOzUhvQXot6CvT8aZja3V89i7zH4dI= 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 1594894401593908.7471841796392; Thu, 16 Jul 2020 03:13:21 -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-361-x1fxWgO5NlKA-WJF8p-lag-1; Thu, 16 Jul 2020 06:13:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8365B80BCAB; Thu, 16 Jul 2020 10:13:11 +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 637015D9DC; Thu, 16 Jul 2020 10:13:11 +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 35BE29625F; Thu, 16 Jul 2020 10:13:11 +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 06GA5WaI018523 for ; Thu, 16 Jul 2020 06:05:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id A01C52B6DC; Thu, 16 Jul 2020 10:05:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B5C72B6DB for ; Thu, 16 Jul 2020 10:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894400; 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=GjcCBvkJMSYbyGxxB3FnQjFXmQ23T4W0gpp6rqxmerY=; b=f4X//mi0gAML9MRunIX6xTyds21Ng7liaOCyZzsdUNZNZW4R/r7R6TnWKS2A4BPTLhCPmD QTkJr6S1LUJvK5k8LtQrgP7vjh1yHWBZKz1dE7oTZlhRjPW8/mk1heBJ+wHQiMXyjB8T4a snxJVuRDdvAD04l1/MHiQkPrUCfPkcQ= X-MC-Unique: x1fxWgO5NlKA-WJF8p-lag-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 216/351] meson: src: build libvirt_lxc binary Date: Thu, 16 Jul 2020 11:57:32 +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.14 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 | 88 ----------------------------------------- src/lxc/meson.build | 46 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 88 deletions(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 19546181e51..03f03ba13db 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,40 +1,5 @@ # vim: filetype=3Dautomake =20 -LXC_MONITOR_PROTOCOL_GENERATED =3D \ - lxc/lxc_monitor_protocol.h \ - lxc/lxc_monitor_protocol.c \ - $(NULL) - -LXC_MONITOR_GENERATED =3D \ - lxc/lxc_monitor_dispatch.h \ - $(NULL) - -LXC_CONTROLLER_GENERATED =3D \ - lxc/lxc_controller_dispatch.h \ - $(NULL) - -LXC_GENERATED =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - $(NULL) - -LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x - -LXC_CONTROLLER_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_fuse.c \ - lxc/lxc_fuse.h \ - lxc/lxc_controller.c \ - $(NULL) - DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ @@ -44,7 +9,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_GENERATED) \ $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) =20 - if WITH_LXC =20 nodist_conf_DATA +=3D lxc/virtlxcd.conf @@ -109,52 +73,6 @@ lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \ > $@ || rm -f $@ =20 -libexec_PROGRAMS +=3D libvirt_lxc - -libvirt_lxc_SOURCES =3D \ - $(LXC_CONTROLLER_SOURCES) \ - $(DATATYPES_SOURCES) \ - $(NULL) -nodist_libvirt_lxc_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ - $(NULL) -libvirt_lxc_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(CAPNG_LIBS) \ - $(LIBXML_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_lxc_LDADD =3D \ - libvirt.la \ - $(FUSE_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES -libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) -libvirt_lxc_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(builddir)/lxc \ - -I$(builddir)/rpc \ - -I$(srcdir)/hypervisor \ - $(AM_CFLAGS) \ - $(CAPNG_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(NULL) -if WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_lxc_LDADD +=3D $(BLKID_LIBS) -endif WITH_BLKID -libvirt_lxc_CFLAGS +=3D $(SECDRIVER_CFLAGS) - - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif @@ -182,12 +100,6 @@ uninstall-data-lxc: =20 endif WITH_LXC =20 -lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \ - lxc/lxc_controller_dispatch.h - .PHONY: \ install-data-lxc \ uninstall-data-lxc \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index a90083cdc3d..cf1f976573a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -40,6 +40,26 @@ lxc_monitor_generated =3D custom_target( capture: true, ) =20 +lxc_controller_sources =3D files( + 'lxc_conf.c', + 'lxc_container.c', + 'lxc_cgroup.c', + 'lxc_domain.c', + 'lxc_fuse.c', + 'lxc_controller.c', +) + +lxc_controller_generated =3D custom_target( + 'lxc_controller_dispatch_h', + input: lxc_monitor_protocol, + output: 'lxc_controller_dispatch.h', + command: [ + gendispatch_prog, '--mode=3Dserver', + 'virLXCMonitor', 'VIR_LXC_MONITOR', '@INPUT@' + ], + capture: true, +) + if conf.has('WITH_LXC') lxc_driver_impl_lib =3D static_library( 'virt_driver_lxc_impl', @@ -82,4 +102,30 @@ if conf.has('WITH_LXC') '-DMODULE_NAME=3D"lxc"', ], } + + virt_helpers +=3D { + 'name': 'libvirt_lxc', + 'sources': [ + lxc_controller_sources, + lxc_monitor_protocol_generated, + lxc_controller_generated, + datatypes_sources, + dtrace_gen_objects, + ], + 'include': [ + conf_inc_dir, + hypervisor_inc_dir, + include_directories('.'), + ], + 'deps': [ + blkid_dep, + capng_dep, + dbus_dep, + fuse_dep, + libnl_dep, + rpc_dep, + secdriver_dep, + xdr_dep, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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-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=1594894696; cv=none; d=zohomail.com; s=zohoarc; b=bui2Cj6a+YYcpnoSqH/y0ptfDfYIiDwxlcWsbsDh5VUgZiCbNNQL477zT8jXsOM+yMdsemsq7BolxjcpKa84bBROaI1/2UFG+dKE5e28lBtawWCMRNa2wn7Rd5slnFUraqFlTxYnVHtXdqrhxXVlkaffDJ4bGEc/7rtD4kBAHVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894696; 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=Tc5RSjwWTQnPGyi4KWWFksHM34pwtPKf78VGos6PL1Y=; b=RW+d/AGFrH+IH9jr36HxdMQTqTmuDWA6OlOCQLcW6n11FfIeoCtvtVW57VRmD23AXncRDIAaD1Ttu5Vx+/dwlLx8nZdbnrgb8H2hkyKqcLmkFl16ofm8dR7mibONGeTeIovyBjanvYi/xXdF8KwoW5iHUJpavKHu/aRJzqJOW6Y= 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894696826551.1239685130147; Thu, 16 Jul 2020 03:18:16 -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-251-8cM7qBTuPCOC5QoTPIxRoA-1; Thu, 16 Jul 2020 06:13:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC4651094; Thu, 16 Jul 2020 10:13:13 +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 9D91B5C5B7; Thu, 16 Jul 2020 10:13:13 +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 6C18618034E5; Thu, 16 Jul 2020 10:13:13 +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 06GA5XEO018533 for ; Thu, 16 Jul 2020 06:05:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 889182B6DC; Thu, 16 Jul 2020 10:05:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02D4F2B6DB for ; Thu, 16 Jul 2020 10:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894695; 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=Tc5RSjwWTQnPGyi4KWWFksHM34pwtPKf78VGos6PL1Y=; b=NdR8s9t4KX6IsdOJbdbYRj4FJDdgtfx3UguKDXWs6/EJM+/tKszXf8l6gUXCrLkgjirMun G1qV/NVcK6xLDNu6+IEi/vxXhXtd3IyCIrJ31BL/qtbqU57OsGhC89+tQr8mlquidNZNYZ /wVPaGUf+e6eoU8Htbg3JPhnmv5TeNA= X-MC-Unique: 8cM7qBTuPCOC5QoTPIxRoA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 217/351] meson: src: build libvirt_leaseshelper binary Date: Thu, 16 Jul 2020 11:57:33 +0200 Message-Id: <989aea887b0630c745ba2c77b41eb20769ea29cf.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.16 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/network/Makefile.inc.am | 22 ---------------------- src/network/meson.build | 12 ++++++++++++ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c0c8180674d..fe93adc0194 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,14 +1,9 @@ # vim: filetype=3Dautomake =20 -NETWORK_LEASES_HELPER_SOURCES =3D \ - network/leaseshelper.c \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) =20 - if WITH_NETWORK nodist_conf_DATA +=3D network/virtnetworkd.conf augeas_DATA +=3D network/virtnetworkd.aug @@ -74,23 +69,6 @@ network/test_virtnetworkd.aug: remote/test_libvirtd.aug.= in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \ > $@ || rm -f $@ =20 -libexec_PROGRAMS +=3D libvirt_leaseshelper -libvirt_leaseshelper_SOURCES =3D $(NETWORK_LEASES_HELPER_SOURCES) -libvirt_leaseshelper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_leaseshelper_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_leaseshelper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_leaseshelper_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index d244d2f522b..9b59e442c9d 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -3,6 +3,10 @@ network_driver_sources =3D [ 'bridge_driver_platform.c', ] =20 +network_leases_helper_sources =3D files( + 'leaseshelper.c', +) + if conf.has('WITH_NETWORK') network_driver_impl =3D static_library( 'virt_driver_network_impl', @@ -41,4 +45,12 @@ if conf.has('WITH_NETWORK') '-DMODULE_NAME=3D"network"', ], } + + virt_helpers +=3D { + 'name': 'libvirt_leaseshelper', + 'sources': [ + network_leases_helper_sources, + dtrace_gen_objects, + ], + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894185; cv=none; d=zohomail.com; s=zohoarc; b=UbQVnxTiJgJI+h42sDGyKWeYke0FSDmBmejwXMxCjJ7Ef+31LNdF+hGdLigwbHjLSuZyakfjdDY5eFk7/V2le4cNzliQrLtdmwQ3u7oC09tUU2b3hHOWXF9knXEU5aSRhqj68uDCiYONrzxZWu0/fUrH+AQyjjLwAQLxaeTzOUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894185; 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=Ft2wYULo0yIooBh9G+I3P6UEIwzu2guiuc83k/EvULk=; b=ATgNt8xniUpCfqmsg5dBz+KszOP8bDX0vKBDZwGU/2N30JrNtgoo5NYGmbPZWCR/gmyQOTdX+YPD5NK7zYJI0BeDx3r9L89yJEDyY8EQtpb52d1vMnSwirBixFVPDon6QY9D7b3gGAQFfevVdGkxFxhHv+GKjU+qLt47yUTrrfM= 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 1594894185664174.9544441600334; Thu, 16 Jul 2020 03:09:45 -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-65-vA_Rn8-kOd2unSD5xk-Nxg-1; Thu, 16 Jul 2020 06:09:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92D488027F7; Thu, 16 Jul 2020 10:09:36 +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 6E6292B6E2; Thu, 16 Jul 2020 10:09:36 +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 39DEC1804749; Thu, 16 Jul 2020 10:09:36 +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 06GA5Yn3018544 for ; Thu, 16 Jul 2020 06:05:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 711282B6DB; Thu, 16 Jul 2020 10:05:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFDF02B6E2 for ; Thu, 16 Jul 2020 10:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894184; 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=Ft2wYULo0yIooBh9G+I3P6UEIwzu2guiuc83k/EvULk=; b=Hjgo6pY2tiVJlfBKp6VxKj9sgL8SmiFlFvuCGqAUM2R3hZAsocGT12irwHSBO0Hoj/Odk4 LHP7gMmfn5+Q/sSOWOu5kiQRttB0O297JByqpprkyAUjTHBnOGZXc3whieGxAXG2JOfTjD wPjiIBLOjLWwFg8KAe5lQ9p2awx7KMQ= X-MC-Unique: vA_Rn8-kOd2unSD5xk-Nxg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 218/351] meson: src: build virt-qemu-run binary Date: Thu, 16 Jul 2020 11:57:34 +0200 Message-Id: <4a0e0ddd3ec7ba78bd22bcba8e77c3056f380c09.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.23 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" -export-dynamic is provided by src_dep Signed-off-by: Pavel Hrdina --- src/Makefile.am | 1 - src/qemu/Makefile.inc.am | 14 -------------- src/qemu/meson.build | 12 ++++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6a8a7ea1791..8760fdf3a22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,6 @@ OPENRC_INIT_FILES =3D OPENRC_INIT_FILES_IN =3D OPENRC_CONF_FILES =3D SYSCONF_FILES =3D -bin_PROGRAMS =3D =20 COMMON_UNIT_VARS =3D \ -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 129825121c7..80555d79a40 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -101,17 +101,3 @@ endif WITH_QEMU install-data-qemu \ uninstall-data-qemu \ $(NULL) - -QEMU_SHIM_SOURCES =3D qemu/qemu_shim.c - -if WITH_QEMU -bin_PROGRAMS +=3D virt-qemu-run - -virt_qemu_run_SOURCES =3D $(QEMU_SHIM_SOURCES) - -virt_qemu_run_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -virt_qemu_run_LDFLAGS =3D -export-dynamic -endif WITH_QEMU diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 121be3085fa..fca7cf1658f 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -71,6 +71,10 @@ if conf.has('WITH_DTRACE_PROBES') ) endif =20 +qemu_shim_sources =3D files( + 'qemu_shim.c', +) + if conf.has('WITH_QEMU') qemu_driver_impl =3D static_library( 'virt_driver_qemu_impl', @@ -113,4 +117,12 @@ if conf.has('WITH_QEMU') '-DMODULE_NAME=3D"qemu"', ], } + + virt_helpers +=3D { + 'name': 'virt-qemu-run', + 'sources': [ + qemu_shim_sources + ], + 'install_dir': bindir, + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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 From nobody Thu May 2 00:12:15 2024 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=1594894931; cv=none; d=zohomail.com; s=zohoarc; b=kyLoQYVe7IM+EejxJ2OsAnkBLbV2ZAm2UO/0rQJoriKegZkJcl0CP+MIthzxWCP0rp+MH+jaGgoxAuJ3brJt7LvsLMCe8J2mmrCInvHwEZq08dpLpKrAugu4JHUf9l+/bBCsiaH40mbX59yuSCyHhfbFDHFBNHix9HjnIP1v/fo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894931; 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=dYrqtxYp3PiE1BXwwP+iF0xNqp4Dp0fNONoLxMQcs4A=; b=g0/1Ka+RHTGJhhscF9k+SCPXpedsnLmOVRvswQlz/ga3huoxvjz564j0ybu8cmoQOoFb+Kvglokx3/7k/ze1g5e4FaWmHaGA8krb9MmdeeoN7yjjQCtcasXvRGVARJ7faxmM5Fg+IOsQ3d6f9n0KpcUvOCDcVZivHgX+jZNIwwo= 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 15948949311271014.275567086709; Thu, 16 Jul 2020 03:22:11 -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-350-4VKYlO7fOhitG2MdZSkPKw-1; Thu, 16 Jul 2020 06:09:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68E431888AA2; Thu, 16 Jul 2020 10:09:41 +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 00A0E5FC2C; Thu, 16 Jul 2020 10:09:40 +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 C00AC96248; Thu, 16 Jul 2020 10:09:40 +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 06GA5a75018569 for ; Thu, 16 Jul 2020 06:05:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 42B592B6DC; Thu, 16 Jul 2020 10:05:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1C4B2B6DB for ; Thu, 16 Jul 2020 10:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894930; 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=dYrqtxYp3PiE1BXwwP+iF0xNqp4Dp0fNONoLxMQcs4A=; b=Y24sZBo6/64jGqK68dxw32yt/icQXvgmRdFv/VO2sDmHaUcQdGEngDtGvZ3DcCNdHf0xAG YDKrAHWl2M3IOwnWy2RebLdkdTkbZzoeWOVGAVKc7fnc0SO7Jt+j6+93tW0OZgFtf4JLT5 ginw377LQpr6sZUpAcA2aBOWbqWBhqo= X-MC-Unique: 4VKYlO7fOhitG2MdZSkPKw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 220/351] meson: src: build libvirt_parthelper binary Date: Thu, 16 Jul 2020 11:57:36 +0200 Message-Id: <11f8e4f20f37bf66ab48be36794dab62b5cd5274.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.16 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/storage/Makefile.inc.am | 26 -------------------------- src/storage/meson.build | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index e30f82e14fe..ee4377d94ff 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,9 +1,5 @@ # vim: filetype=3Dautomake =20 -STORAGE_HELPER_DISK_SOURCES =3D \ - storage/parthelper.c \ - $(NULL) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) @@ -75,25 +71,3 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.= in \ =20 =20 endif WITH_STORAGE - -if WITH_STORAGE_DISK -libexec_PROGRAMS +=3D libvirt_parthelper - -libvirt_parthelper_SOURCES =3D $(STORAGE_HELPER_DISK_SOURCES) -libvirt_parthelper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_parthelper_LDADD =3D \ - $(LIBPARTED_LIBS) \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_parthelper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_parthelper_CFLAGS =3D \ - $(LIBPARTED_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) -endif WITH_STORAGE_DISK diff --git a/src/storage/meson.build b/src/storage/meson.build index a18da013f8c..1996cd4c11c 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -20,6 +20,10 @@ storage_backend_disk_sources =3D [ 'storage_backend_disk.c', ] =20 +storage_helper_disk_sources =3D [ + 'parthelper.c', +] + storage_backend_gluster_sources =3D [ 'storage_backend_gluster.c', ] @@ -127,6 +131,17 @@ if conf.has('WITH_STORAGE_DISK') ], 'install_dir': storage_backend_install_dir, } + + virt_helpers +=3D { + 'name': 'libvirt_parthelper', + 'sources': [ + files(storage_helper_disk_sources), + dtrace_gen_objects, + ], + 'deps': [ + libparted_dep, + ], + } endif =20 if conf.has('WITH_STORAGE_GLUSTER') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894120; cv=none; d=zohomail.com; s=zohoarc; b=AoPhyqqZBwXnUvtUysAYz2SdjJsV2AWlYYVAIekqldprTPCVU+SXDLrW/HaP2ZOBpRYokF/ObH4eJGuVyWu16ZAWwp+kJ0KizLNQecmth9+66iQZsQi1fvW8OJEeI6s0yBAx/nruNTuhtsQ7yyViYQqveF30DPyJDsvoJaB9TsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894120; 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=hJuIaTdhqdvg58a3StlfVoAUSazIeUJoDLa5uxU2ztE=; b=nev7l4uZX9CuCcXllfB97d/lR1wBWG84fPubLzCX9sauibkdpddjUWTf0++iQBwaKWYInvNk38JpxurULS7O7/DW/tf0Gt1uhu+LlOjEQEIlfZu80Iow2VZrt9nTjmK62+I8yv74+XoZMhftZir45cz/RWoTKtK3InNQ8wRmGVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894120334461.6519991702364; Thu, 16 Jul 2020 03:08:40 -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-296-YrgthT4QNcWAmA4pqS1h0w-1; Thu, 16 Jul 2020 06:08:34 -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 AB81480BCBB; Thu, 16 Jul 2020 10:08:27 +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 3C1877BEDE; Thu, 16 Jul 2020 10:08:27 +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 020C4730E0; Thu, 16 Jul 2020 10:08:27 +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 06GA5bUg018574 for ; Thu, 16 Jul 2020 06:05:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A2372B6DC; Thu, 16 Jul 2020 10:05:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 995022B6DB for ; Thu, 16 Jul 2020 10:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894119; 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=hJuIaTdhqdvg58a3StlfVoAUSazIeUJoDLa5uxU2ztE=; b=SJMv3IFSW2+aYzAQCp2n4CJ1jifTjOt+ZltpNvs8OnShiQa6y9NgS4OOAaC8lH6IoQiKwl OgL2hiiTUPPfk42fby5jGgJiFOsATeO6/7AMv3bHbMlmFZ4DA4A6BWRL7BAMXonK6WVcDO QAUVIo0gBGsBvbyNLdsCv5iJBftl0R4= X-MC-Unique: YrgthT4QNcWAmA4pqS1h0w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 221/351] meson: src: build libvirt_iohelper binary Date: Thu, 16 Jul 2020 11:57:37 +0200 Message-Id: <36d826bd798c83c05215935fc98150095e37cde6.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.13 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/Makefile.am | 24 ------------------------ src/util/Makefile.inc.am | 3 --- src/util/meson.build | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 src/util/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 8760fdf3a22..99bb71e6a03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,7 +34,6 @@ conf_DATA =3D if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES -libexec_PROGRAMS =3D RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D SYSTEMD_UNIT_FILES =3D @@ -50,7 +49,6 @@ COMMON_UNIT_VARS =3D \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ $(NULL) =20 -include util/Makefile.inc.am include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am @@ -336,28 +334,6 @@ endif LIBVIRT_INIT_SCRIPT_OPENRC endif WITH_LIBVIRTD =20 =20 -if WITH_LIBVIRTD -libexec_PROGRAMS +=3D libvirt_iohelper -libvirt_iohelper_SOURCES =3D $(UTIL_IO_HELPER_SOURCES) -libvirt_iohelper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_iohelper_LDADD =3D \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -if WITH_DTRACE_PROBES -libvirt_iohelper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_iohelper_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - - -endif WITH_LIBVIRTD - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am deleted file mode 100644 index 879b3d9e398..00000000000 --- a/src/util/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -UTIL_IO_HELPER_SOURCES =3D util/iohelper.c diff --git a/src/util/meson.build b/src/util/meson.build index 3c728b355ee..af60283cbc7 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -168,6 +168,10 @@ foreach name : keyname_list ) endforeach =20 +io_helper_sources =3D [ + 'iohelper.c', +] + virt_util_lib =3D static_library( 'virt_util', [ @@ -195,4 +199,14 @@ virt_util_lib =3D static_library( =20 libvirt_libs +=3D virt_util_lib =20 +if conf.has('WITH_LIBVIRTD') + virt_helpers +=3D { + 'name': 'libvirt_iohelper', + 'sources': [ + files(io_helper_sources), + dtrace_gen_headers, + ], + } +endif + util_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894684; cv=none; d=zohomail.com; s=zohoarc; b=U72Zw3u19c9MsA7nAPXe1WUSsKBdaWYEtrrTP2CkLqnUKF61ErJOj1/Lf/6I0p1NnrUaY6OYFQKaEagVx0n/OJn7ZR048or1acUtnAXwfb5CBTqt73o8l9lIenR3J8qXCWrPYNBQY2bwBoN0qIfrVgyB/EZPZoAWVzA+BnbsPtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894684; 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=ligvcP2AJWw9XlvP9ACwUk2nCoPLPgQpuuxIbytrfTI=; b=hqMc9pU7Q39z9Q3TAkLkls05IZkZx/bKeLajvXj+GeONAG9n8jD7RRQpO3kaK7b3Qyp99BTxrbbOZiJyz29sC+Zgk88cf7WJ/cTzgJ2JU31bmcza60BDJnye006x2BeSAXKNch7S5tnTi4u5PhkEai++379228mHFU0Y9QLmvY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 159489468423241.189944068792215; Thu, 16 Jul 2020 03:18:04 -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-255-p9WHFHRIMYewRKB9XZ0bSQ-1; Thu, 16 Jul 2020 06:13:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1CDD5100AA23; Thu, 16 Jul 2020 10:13:16 +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 F200372ACF; Thu, 16 Jul 2020 10:13:15 +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 C30551804773; Thu, 16 Jul 2020 10:13:15 +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 06GA5eaG018608 for ; Thu, 16 Jul 2020 06:05:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id D45EB2B6DC; Thu, 16 Jul 2020 10:05:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F3B62B6E6 for ; Thu, 16 Jul 2020 10:05:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894683; 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=ligvcP2AJWw9XlvP9ACwUk2nCoPLPgQpuuxIbytrfTI=; b=MOSYd3YvwRI+M3GB2elh15URFwA0fqtvDiw58ypxjUJmjAil+ia6bb3xm84qtvbe6O4L0Y FxOxYCwxW1mpedFIwMo+YvbNJeEfCpQ80xHH1rbqwuD+6oP4iLd87BgIpyxdFT5qPgJEbA cNlDOhbaLaxQyh/eMrfRtRBy72U0fe4= X-MC-Unique: p9WHFHRIMYewRKB9XZ0bSQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 222/351] meson: src: add support for installing libvirt conf and augeas files Date: Thu, 16 Jul 2020 11:57:38 +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.15 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/Makefile.am | 5 -- src/meson.build | 103 +++++++++++++++++++++++++++++++++++++++++ src/remote/meson.build | 26 +++++++++++ 3 files changed, 129 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99bb71e6a03..471ebae2b79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,13 +69,8 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am =20 =20 -confdir =3D $(sysconfdir)/libvirt conf_DATA +=3D libvirt.conf =20 -augeasdir =3D $(datadir)/augeas/lenses - -augeastestdir =3D $(datadir)/augeas/lenses/tests - # .libs/libvirt.so is built by libtool as a side-effect of the Makefile # rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut if WITH_LINUX diff --git a/src/meson.build b/src/meson.build index bb970f10c61..3a44cd9d663 100644 --- a/src/meson.build +++ b/src/meson.build @@ -149,6 +149,32 @@ virt_daemons =3D [] # * install_dir - installation directory (optional, libexecdir) virt_helpers =3D [] =20 +# virt_conf_files: +# libvirt conf files +virt_conf_files =3D [] + +# virt_aug_files: +# libvirt aug files +virt_aug_files =3D [] + +# virt_test_aug_files: +# generate libvirt augeas test files +# * name - augeas test file name (required) +# * aug - augeas test file source (required) +# * conf - conf file (required) +virt_test_aug_files =3D [] + +# virt_daemon_confs: +# generation libvirt daemon conf files +# each entry is a dictionary with following items: +# * name - daemon name (required) +# * name_uc - daemon name with first letter uppercase (required) +# * with_ip - only for libvirtd and virtproxyd (optional, default false) +virt_daemon_confs =3D [] + +virt_aug_dir =3D datadir / 'augeas' / 'lenses' +virt_test_aug_dir =3D datadir / 'augeas' / 'lenses' / 'tests' + =20 # list subdirectories =20 @@ -547,3 +573,80 @@ foreach helper : virt_helpers install_rpath: libdir, ) endforeach + + +# Generate daemon config, augeas and augeas test files + +install_data(virt_conf_files, install_dir: confdir) +install_data(virt_aug_files, install_dir: virt_aug_dir) + +foreach data : virt_test_aug_files + custom_target( + data['name'], + input: [ data['conf'], data['aug'] ], + output: data['name'], + command: [ meson_python_prog, augeas_gentest_prog, '@INPUT@' ], + capture: true, + install: true, + install_dir: virt_test_aug_dir, + ) +endforeach + +foreach data : virt_daemon_confs + daemon_conf =3D configuration_data() + daemon_conf.set('runstatedir', runstatedir) + daemon_conf.set('sbindir', sbindir) + daemon_conf.set('sysconfdir', sysconfdir) + daemon_conf.set('DAEMON_NAME', data['name']) + daemon_conf.set('DAEMON_NAME_UC', data['name_uc']) + # to silence meson warning about missing 'CONFIG' in the configuration_d= ata + daemon_conf.set('CONFIG', '@CONFIG@') + + if data.get('with_ip', false) + conf_in =3D libvirtd_conf_tmp + else + conf_in =3D virtd_conf_tmp + endif + conf_out =3D configure_file( + input: conf_in, + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, + install_dir: confdir, + ) + + if data.get('with_ip', false) + aug_in =3D libvirtd_aug_tmp + else + aug_in =3D virtd_aug_tmp + endif + configure_file( + input: aug_in, + output: '@0@.aug'.format(data['name']), + configuration: daemon_conf, + install: true, + install_dir: virt_aug_dir, + ) + + if data.get('with_ip', false) + test_aug_in =3D test_libvirtd_aug_tmp + else + test_aug_in =3D test_virtd_aug_tmp + endif + test_aug_tmp =3D configure_file( + input: test_aug_in, + output: 'test_@0@.aug.tmp'.format(data['name']), + configuration: daemon_conf, + ) + + test_aug_out =3D 'test_@0@.aug'.format(data['name']) + custom_target( + test_aug_out, + input: [ conf_out, test_aug_tmp ], + output: test_aug_out, + command: [ meson_python_prog, augeas_gentest_prog, '@INPUT@' ], + capture: true, + install: true, + install_dir: virt_test_aug_dir, + ) +endforeach diff --git a/src/remote/meson.build b/src/remote/meson.build index ee38364868e..6635bcd4cff 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -63,6 +63,32 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ) endforeach =20 +libvirt_conf_files =3D [ + [ 'libvirtd.conf.in', 'libvirtd.conf.tmp', 'virtd.conf.tmp' ], + [ 'libvirtd.aug.in', 'libvirtd.aug.tmp', 'virtd.aug.tmp' ], + [ 'test_libvirtd.aug.in', 'test_libvirtd.aug.tmp', 'test_virtd.aug.tmp' = ], +] + +foreach name : libvirt_conf_files + tmp =3D configure_file( + input: name[0], + output: name[1], + command: [ 'sed', '-e', '/[@]CUT_ENABLE_IP[@]/d', '-e', '/[@]END[@]/d'= , '@INPUT@' ], + capture: true, + ) + set_variable(name[1].underscorify(), tmp) +endforeach + +foreach name : libvirt_conf_files + tmp =3D configure_file( + input: name[0], + output: name[2], + command: [ 'sed', '-e', '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d', '@INPUT@= ' ], + capture: true, + ) + set_variable(name[2].underscorify(), tmp) +endforeach + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894397; cv=none; d=zohomail.com; s=zohoarc; b=ki9FvYpt9xFsfI8nZZE59TE/GQuTI7BKut6ak26tGJBJQzy4/HGVyfcg0JAra+LOMPe7fZIH0DaYlJ3N/6X+w7BNxXMwWLF3hDnGEkdzhBD6V4GvVGAi45wBg/BfDr9mMZiXAWYXw3cu4R+J0/HQ/sJvFxIJgjnt008bEveWYw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894397; 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=Jp3P0xBOKPOp+Ur+TVaJRwUCR1XoK9Df2aG3JPdLzJo=; b=XV+u4J/8vulpT4wwHiy3ogYOqnid/RojPz8U42KJCkluAAIwsdfLBhlc5RIJlmEQeDb+Qv0jtSgwSw87+ZdWp9xF/JxAAH59aEZSjJuyJ/ar0kXg6zx8uRpzxn2IwwwSDvgEIKUeSsFWUwfrom9iPUWl3V4aqftVqI2MbeMTle8= 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 1594894397934647.8340114719019; Thu, 16 Jul 2020 03:13:17 -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-503-LxucRsazOq6IFu51hGSNyQ-1; Thu, 16 Jul 2020 06:09:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7BAC1888AB8; Thu, 16 Jul 2020 10:09:43 +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 9B242710D7; Thu, 16 Jul 2020 10:09:43 +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 6C8C59624A; Thu, 16 Jul 2020 10:09:43 +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 06GA5f2C018624 for ; Thu, 16 Jul 2020 06:05:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD0E62B6DC; Thu, 16 Jul 2020 10:05:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37DEC2B6DB for ; Thu, 16 Jul 2020 10:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894396; 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=Jp3P0xBOKPOp+Ur+TVaJRwUCR1XoK9Df2aG3JPdLzJo=; b=TWBjdDVpUQIgh4H8WtTvze/yFxs/CXcpEW4qDpyBfPi93RKUOpXbAwxK8Nmu+3GlFw3Hh3 E/p/UlG2R43QuxP7E9P3lPisNviVM7CeXM6nOx1XuCRZ5VvTSzSy/reQeQZDqdSaPri1ff aZtQehdb3DFNwNcSNQWMkM/UKMU/HQ0= X-MC-Unique: LxucRsazOq6IFu51hGSNyQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 223/351] meson: src: install libvirt daemon conf and augeas files Date: Thu, 16 Jul 2020 11:57:39 +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.15 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/Makefile.am | 2 -- src/admin/Makefile.inc.am | 2 -- src/admin/meson.build | 2 ++ src/bhyve/Makefile.inc.am | 2 -- src/bhyve/meson.build | 3 +++ src/libxl/Makefile.inc.am | 2 -- src/libxl/meson.build | 3 +++ src/locking/Makefile.inc.am | 27 ---------------------- src/locking/meson.build | 45 +++++++++++++++++++++++++++++++++++++ src/logging/Makefile.inc.am | 3 --- src/logging/meson.build | 3 +++ src/lxc/Makefile.inc.am | 3 --- src/lxc/meson.build | 3 +++ src/meson.build | 2 ++ src/qemu/Makefile.inc.am | 3 --- src/qemu/meson.build | 3 +++ 16 files changed, 64 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 471ebae2b79..9693a2e1aea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,8 +69,6 @@ include storage/Makefile.inc.am include remote/Makefile.inc.am =20 =20 -conf_DATA +=3D libvirt.conf - # .libs/libvirt.so is built by libtool as a side-effect of the Makefile # rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut if WITH_LINUX diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bdaed14cd19..ec084299b85 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -2,8 +2,6 @@ =20 ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms =20 -conf_DATA +=3D admin/libvirt-admin.conf - if WITH_LINUX check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \ diff --git a/src/admin/meson.build b/src/admin/meson.build index 3522d789a00..c9dff4d92a0 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -92,4 +92,6 @@ admin_driver_lib =3D static_library( =20 libvirt_libs +=3D admin_driver_lib =20 +virt_conf_files +=3D files('libvirt-admin.conf') + admin_inc_dir =3D include_directories('.') diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index ab681685b2b..9583580ab02 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -31,8 +31,6 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D bhyve/bhyve.conf -augeas_DATA +=3D bhyve/libvirtd_bhyve.aug augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug =20 bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 5807d67591a..9380ec3313f 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -43,4 +43,7 @@ if conf.has('WITH_BHYVE') '-DMODULE_NAME=3D"bhyve"' ], } + + virt_conf_files +=3D files('bhyve.conf') + virt_aug_files +=3D files('libvirtd_bhyve.aug') endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 051b6c55bd9..021bf4b8d51 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -71,8 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D libxl/libxl.conf -augeas_DATA +=3D libxl/libvirtd_libxl.aug augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug =20 libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ diff --git a/src/libxl/meson.build b/src/libxl/meson.build index fc5864a090c..0415a0c4a71 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -44,4 +44,7 @@ if conf.has('WITH_LIBXL') '-DMODULE_NAME=3D"libxl"', ], } + + virt_conf_files +=3D files('libxl.conf') + virt_aug_files +=3D files('libvirtd_libxl.aug') endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index b4fb9387a17..0826472cfca 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -20,34 +20,15 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -augeas_DATA +=3D locking/libvirt_lockd.aug - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_lockd.aug -nodist_conf_DATA +=3D locking/qemu-lockd.conf endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-lockd.conf -endif WITH_LIBXL - if WITH_SANLOCK -augeas_DATA +=3D locking/libvirt_sanlock.aug - if WITH_QEMU augeastest_DATA +=3D locking/test_libvirt_sanlock.aug -nodist_conf_DATA +=3D locking/qemu-sanlock.conf endif WITH_QEMU - -if WITH_LIBXL -nodist_conf_DATA +=3D locking/libxl-sanlock.conf -endif WITH_LIBXL - endif WITH_SANLOCK =20 -conf_DATA +=3D locking/virtlockd.conf - -augeas_DATA +=3D locking/virtlockd.aug augeastest_DATA +=3D locking/test_virtlockd.aug =20 INSTALL_DATA_DIRS +=3D locking @@ -94,14 +75,6 @@ endif WITH_LIBVIRTD uninstall-data-locking \ $(NULL) =20 -locking/%-lockd.conf: $(srcdir)/locking/lockd.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - -locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)$(MKDIR_P) locking ; \ - cp $< $@ - =20 virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index 0e48c86afc9..9e09c96f67b 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -145,4 +145,49 @@ if conf.has('WITH_LIBVIRTD') ], } endif + + virt_aug_files +=3D files('libvirt_lockd.aug') + + if conf.has('WITH_QEMU') + qemu_lockd_conf =3D configure_file( + input: 'lockd.conf', + output: 'qemu-lockd.conf', + copy: true, + ) + virt_conf_files +=3D qemu_lockd_conf + endif + + if conf.has('WITH_LIBXL') + libxl_lockd_conf =3D configure_file( + input: 'lockd.conf', + output: 'libxl-lockd.conf', + copy: true, + ) + virt_conf_files +=3D libxl_lockd_conf + endif + + if conf.has('WITH_SANLOCK') + virt_aug_files +=3D files('libvirt_sanlock.aug') + + if conf.has('WITH_QEMU') + qemu_sanlock_conf =3D configure_file( + input: 'sanlock.conf', + output: 'qemu-sanlock.conf', + copy: true, + ) + virt_conf_files +=3D qemu_sanlock_conf + endif + + if conf.has('WITH_LIBXL') + libxl_sanlock_conf =3D configure_file( + input: 'sanlock.conf', + output: 'libxl-sanlock.conf', + copy: true, + ) + virt_conf_files +=3D libxl_sanlock_conf + endif + endif + + virt_conf_files +=3D files('virtlockd.conf') + virt_aug_files +=3D files('virtlockd.aug') endif diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 8adec645d36..1ae0078e434 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -19,9 +19,6 @@ OPENRC_INIT_FILES_IN +=3D \ $(NULL) =20 if WITH_LIBVIRTD -conf_DATA +=3D logging/virtlogd.conf - -augeas_DATA +=3D logging/virtlogd.aug augeastest_DATA +=3D logging/test_virtlogd.aug =20 logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ diff --git a/src/logging/meson.build b/src/logging/meson.build index 0e58bc9e6bd..9594646c81f 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -69,4 +69,7 @@ if conf.has('WITH_LIBVIRTD') include_directories('.'), ], } + + virt_conf_files +=3D files('virtlogd.conf') + virt_aug_files +=3D files('virtlogd.aug') endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 03f03ba13db..aea70f37a87 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -77,9 +77,6 @@ if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif =20 -conf_DATA +=3D lxc/lxc.conf - -augeas_DATA +=3D lxc/libvirtd_lxc.aug augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug =20 lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index cf1f976573a..7295510c62b 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -128,4 +128,7 @@ if conf.has('WITH_LXC') xdr_dep, ], } + + virt_conf_files +=3D files('lxc.conf') + virt_aug_files +=3D files('libvirtd_lxc.aug') endif diff --git a/src/meson.build b/src/meson.build index 3a44cd9d663..f19870d2c18 100644 --- a/src/meson.build +++ b/src/meson.build @@ -577,6 +577,8 @@ endforeach =20 # Generate daemon config, augeas and augeas test files =20 +virt_conf_files +=3D 'libvirt.conf' + install_data(virt_conf_files, install_dir: confdir) install_data(virt_aug_files, install_dir: virt_aug_dir) =20 diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 80555d79a40..5817e1266f3 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -66,9 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \ > $@ || rm -f $@ =20 -conf_DATA +=3D qemu/qemu.conf - -augeas_DATA +=3D qemu/libvirtd_qemu.aug augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug =20 qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index fca7cf1658f..680ca2189a6 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -118,6 +118,9 @@ if conf.has('WITH_QEMU') ], } =20 + virt_conf_files +=3D files('qemu.conf') + virt_aug_files +=3D files('libvirtd_qemu.aug') + virt_helpers +=3D { 'name': 'virt-qemu-run', 'sources': [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894575; cv=none; d=zohomail.com; s=zohoarc; b=Dp160p+QLRyGbyCRzoORhyWe39LXqpBsBuG1oYiVgNvu7l+VMANMKvCV19bRanvp/e9dYjvxsVznV9YYn9cvEJhH4xL0smPCMa3ZXhDm3QTXoNcry8n4RzP387xV5t8YO6dxZ+NRveRik6Aels9sexpUVasJEIbeWsA1ofc5MZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894575; 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=Ol+aJxQ7x5wZ3D6V7p2fbfS/2VbL3IppcrRzJ3UmnHg=; b=j6zMTtfHv+4WrvdZjTc1r3WBh1ypVESR8OeqhvipWx3F5zm4PUFqvstn68ShzHp22xtbrgSoD4rO+ukbpsucNOfsCg5SWIJRis69LXvxBGuFQf6i+P90z2pTvqIvE3psq74Y9oIcS4jhkgAuQwNg3KVzmp/UA7mKVlxmXei3rUo= 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 1594894575565585.2140704923697; Thu, 16 Jul 2020 03:16: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-349-U583TGKHM8W9mNMzWKoCgw-1; Thu, 16 Jul 2020 06:09:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02D368064D1; Thu, 16 Jul 2020 10:09:47 +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 D67B27950F; Thu, 16 Jul 2020 10:09:46 +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 A6CA296258; Thu, 16 Jul 2020 10:09:46 +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 06GA5gvY018636 for ; Thu, 16 Jul 2020 06:05:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id A64852B6DC; Thu, 16 Jul 2020 10:05:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20C452B6DB for ; Thu, 16 Jul 2020 10:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894574; 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=Ol+aJxQ7x5wZ3D6V7p2fbfS/2VbL3IppcrRzJ3UmnHg=; b=JeGRZHzryZKUibZMgC/Kbuo7jmTcrAlglvCUamt/IdGyvUuFr6mmZhEtaaBiWHTNEtWlql 7LRu+itZm8net7LUxmTw1hW03AHzZ9sutNEJUSN+37FYudMK2SoFRWTX/ttOg+wOtu1QwH nxe7o86guJYV0r/yNsBAxTVchP3fdJg= X-MC-Unique: U583TGKHM8W9mNMzWKoCgw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 224/351] meson: src: generate libvirt daemon augeas test files Date: Thu, 16 Jul 2020 11:57:40 +0200 Message-Id: <11f46154404396f51b09a535afbd53201a442de5.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.14 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/bhyve/Makefile.inc.am | 6 ------ src/bhyve/meson.build | 5 +++++ src/libxl/Makefile.inc.am | 6 ------ src/libxl/meson.build | 5 +++++ src/locking/Makefile.inc.am | 32 -------------------------------- src/locking/meson.build | 15 +++++++++++++++ src/logging/Makefile.inc.am | 9 --------- src/logging/meson.build | 5 +++++ src/lxc/Makefile.inc.am | 6 ------ src/lxc/meson.build | 5 +++++ src/qemu/Makefile.inc.am | 6 ------ src/qemu/meson.build | 5 +++++ 12 files changed, 40 insertions(+), 65 deletions(-) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 9583580ab02..e09c503c384 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -31,10 +31,4 @@ bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \ > $@ || rm -f $@ =20 -augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug - -bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ - $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@ - endif WITH_BHYVE diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 9380ec3313f..74caddf030e 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -46,4 +46,9 @@ if conf.has('WITH_BHYVE') =20 virt_conf_files +=3D files('bhyve.conf') virt_aug_files +=3D files('libvirtd_bhyve.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirtd_bhyve.aug', + 'aug': files('test_libvirtd_bhyve.aug.in'), + 'conf': files('bhyve.conf'), + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 021bf4b8d51..9af04c4914a 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -71,12 +71,6 @@ libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \ > $@ || rm -f $@ =20 -augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug - -libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ - $(srcdir)/libxl/libxl.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@ - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 0415a0c4a71..92916831120 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -47,4 +47,9 @@ if conf.has('WITH_LIBXL') =20 virt_conf_files +=3D files('libxl.conf') virt_aug_files +=3D files('libvirtd_libxl.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirtd_libxl.aug', + 'aug': files('test_libvirtd_libxl.aug.in'), + 'conf': files('libxl.conf'), + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 0826472cfca..a2a0a4c6250 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -19,18 +19,6 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -if WITH_LIBVIRTD -if WITH_QEMU -augeastest_DATA +=3D locking/test_libvirt_lockd.aug -endif WITH_QEMU -if WITH_SANLOCK -if WITH_QEMU -augeastest_DATA +=3D locking/test_libvirt_sanlock.aug -endif WITH_QEMU -endif WITH_SANLOCK - -augeastest_DATA +=3D locking/test_virtlockd.aug - INSTALL_DATA_DIRS +=3D locking =20 install-data-locking: @@ -48,26 +36,6 @@ uninstall-data-locking: if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: endif WITH_SANLOCK - -if WITH_SANLOCK -if WITH_QEMU -locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ - locking/qemu-sanlock.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@ - -endif WITH_QEMU -endif WITH_SANLOCK - -if WITH_QEMU -locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ - locking/qemu-lockd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@ -endif WITH_QEMU - -locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \ - locking/virtlockd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@ - endif WITH_LIBVIRTD =20 .PHONY: \ diff --git a/src/locking/meson.build b/src/locking/meson.build index 9e09c96f67b..0681e4fbc4d 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -155,6 +155,11 @@ if conf.has('WITH_LIBVIRTD') copy: true, ) virt_conf_files +=3D qemu_lockd_conf + virt_test_aug_files +=3D { + 'name': 'test_libvirt_lockd.aug', + 'aug' : files('test_libvirt_lockd.aug.in'), + 'conf': qemu_lockd_conf, + } endif =20 if conf.has('WITH_LIBXL') @@ -176,6 +181,11 @@ if conf.has('WITH_LIBVIRTD') copy: true, ) virt_conf_files +=3D qemu_sanlock_conf + virt_test_aug_files +=3D { + 'name': 'test_libvirt_sanlock.aug', + 'aug' : files('test_libvirt_sanlock.aug.in'), + 'conf': qemu_sanlock_conf, + } endif =20 if conf.has('WITH_LIBXL') @@ -190,4 +200,9 @@ if conf.has('WITH_LIBVIRTD') =20 virt_conf_files +=3D files('virtlockd.conf') virt_aug_files +=3D files('virtlockd.aug') + virt_test_aug_files +=3D { + 'name': 'test_virtlockd.aug', + 'aug': files('test_virtlockd.aug.in'), + 'conf': files('virtlockd.conf'), + } endif diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 1ae0078e434..b13f53ffe41 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -18,15 +18,6 @@ OPENRC_INIT_FILES_IN +=3D \ logging/virtlogd.init.in \ $(NULL) =20 -if WITH_LIBVIRTD -augeastest_DATA +=3D logging/test_virtlogd.aug - -logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \ - logging/virtlogd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@ - -endif WITH_LIBVIRTD - virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 diff --git a/src/logging/meson.build b/src/logging/meson.build index 9594646c81f..4897cbf1f32 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -72,4 +72,9 @@ if conf.has('WITH_LIBVIRTD') =20 virt_conf_files +=3D files('virtlogd.conf') virt_aug_files +=3D files('virtlogd.aug') + virt_test_aug_files +=3D { + 'name': 'test_virtlogd.aug', + 'aug': files('test_virtlogd.aug.in'), + 'conf': files('virtlogd.conf'), + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index aea70f37a87..bee6c99b025 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -77,12 +77,6 @@ if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif =20 -augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug - -lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ - $(srcdir)/lxc/lxc.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@ - INSTALL_DATA_DIRS +=3D lxc =20 install-data-lxc: diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 7295510c62b..825c280bd10 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -131,4 +131,9 @@ if conf.has('WITH_LXC') =20 virt_conf_files +=3D files('lxc.conf') virt_aug_files +=3D files('libvirtd_lxc.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirtd_lxc.aug', + 'aug': files('test_libvirtd_lxc.aug.in'), + 'conf': files('lxc.conf'), + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 5817e1266f3..ff8a3dcbdc6 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -66,12 +66,6 @@ qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \ -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \ > $@ || rm -f $@ =20 -augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug - -qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ - $(srcdir)/qemu/qemu.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@ - INSTALL_DATA_DIRS +=3D qemu =20 install-data-qemu: diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 680ca2189a6..4d5cfec7eaa 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -120,6 +120,11 @@ if conf.has('WITH_QEMU') =20 virt_conf_files +=3D files('qemu.conf') virt_aug_files +=3D files('libvirtd_qemu.aug') + virt_test_aug_files +=3D { + 'name': 'test_libvirtd_qemu.aug', + 'aug': files('test_libvirtd_qemu.aug.in'), + 'conf': files('qemu.conf'), + } =20 virt_helpers +=3D { 'name': 'virt-qemu-run', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894413; cv=none; d=zohomail.com; s=zohoarc; b=KPzmmdGs1lSRFUguSRMKEHucTNca3EfMyxoauX0KRBit7FKayfs8s+tVYJEzS4ACnZyMKMpUWTDBQyyh9LltX3LVHaq27L6Qv6Qvtw44SeUzVqsSxs1W0at+k9qLjxcv8FZgyKAWEQKTfigmPoh8VwR0Iq4++GT5xy23LFiXO/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894413; 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=5xBhsJQmwZ0e01kTq9ciNSEl0nHfft5JyaqSgZxJq9c=; b=AczYcYu+O8lNwudYjhxDvS2b/+xCIEIgHURAteSzQ9x3HoIISt0FXPNX42aNkgZWs0QVIrDFOaZs/eRzTIZAZ+6ZDJHfp/kgwz3tGsn9Xt6AeFiFgZBs9tI0Kzdpk4NKYevR827A36PR5GXsHymlV2srpVciETEykW234/AP+Wc= 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 1594894413037308.20991681815826; Thu, 16 Jul 2020 03:13:33 -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-417-ZaO0vAkJOKCrkT47Z2eO5w-1; Thu, 16 Jul 2020 06:13:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B29EC108C; Thu, 16 Jul 2020 10:13:19 +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 93BFC72AF3; Thu, 16 Jul 2020 10:13:19 +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 62E20730DD; Thu, 16 Jul 2020 10:13:19 +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 06GA5hn4018645 for ; Thu, 16 Jul 2020 06:05:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 911DE2B6DC; Thu, 16 Jul 2020 10:05:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A8432B6DB for ; Thu, 16 Jul 2020 10:05:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894411; 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=5xBhsJQmwZ0e01kTq9ciNSEl0nHfft5JyaqSgZxJq9c=; b=hp378kApMf4j+x2EQ/wjv8V9jnlfm5NiZYgHgTmaMiNAu/FQejZHz1jg8M7oc/02A7VZXu 4E3AVhq6n7lofuvePAnFPaxncVG2QqllC8Fv306ZHiIt/k6Pem5to4l7CjJ4YR8Q5Xzi7m 1GRdcbQBWk+n1V5neXbsjTmF8t86DlU= X-MC-Unique: ZaO0vAkJOKCrkT47Z2eO5w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 225/351] meson: src: generate libvirt daemon conf and augeas files Date: Thu, 16 Jul 2020 11:57:41 +0200 Message-Id: <2f80546e151ce65ffbccaf90aec5065bd128c395.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.15 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/Makefile.am | 5 --- src/bhyve/Makefile.inc.am | 30 ------------- src/bhyve/meson.build | 5 +++ src/interface/Makefile.inc.am | 27 ------------ src/interface/meson.build | 5 +++ src/libxl/Makefile.inc.am | 27 ------------ src/libxl/meson.build | 5 +++ src/lxc/Makefile.inc.am | 27 ------------ src/lxc/meson.build | 5 +++ src/network/Makefile.inc.am | 27 ------------ src/network/meson.build | 5 +++ src/node_device/Makefile.inc.am | 28 ------------ src/node_device/meson.build | 5 +++ src/nwfilter/Makefile.inc.am | 28 ------------ src/nwfilter/meson.build | 5 +++ src/qemu/Makefile.inc.am | 27 ------------ src/qemu/meson.build | 5 +++ src/remote/Makefile.inc.am | 77 --------------------------------- src/remote/meson.build | 12 +++++ src/secret/Makefile.inc.am | 27 ------------ src/secret/meson.build | 5 +++ src/storage/Makefile.inc.am | 28 ------------ src/storage/meson.build | 5 +++ src/vbox/Makefile.inc.am | 27 ------------ src/vbox/meson.build | 5 +++ src/vz/Makefile.inc.am | 27 ------------ src/vz/meson.build | 5 +++ 27 files changed, 72 insertions(+), 412 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9693a2e1aea..82e7212b186 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -nodist_conf_DATA =3D DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D INSTALL_DATA_DIRS =3D @@ -30,7 +29,6 @@ SYM_FILES =3D USED_SYM_FILES =3D augeas_DATA =3D augeastest_DATA =3D -conf_DATA =3D if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES @@ -195,9 +193,6 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA) fi .PHONY: check-augeas =20 -AUG_GENTEST_SCRIPT =3D $(top_srcdir)/scripts/augeas-gentest.py -AUG_GENTEST =3D $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT) - if WITH_DTRACE_PROBES =20 tapset_DATA +=3D libvirt_functions.stp diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index e09c503c384..65021d785a2 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -2,33 +2,3 @@ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) - -if WITH_BHYVE -nodist_conf_DATA +=3D bhyve/virtbhyved.conf -augeas_DATA +=3D bhyve/virtbhyved.aug -augeastest_DATA +=3D bhyve/test_virtbhyved.aug - -bhyve/virtbhyved.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \ - $< > $@ - -bhyve/virtbhyved.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \ - $< > $@ - -bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \ - bhyve/virtbhyved.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtbhyved/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \ - > $@ || rm -f $@ - -endif WITH_BHYVE diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 74caddf030e..fd1f6bbad88 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -51,4 +51,9 @@ if conf.has('WITH_BHYVE') 'aug': files('test_libvirtd_bhyve.aug.in'), 'conf': files('bhyve.conf'), } + + virt_daemon_confs +=3D { + 'name': 'virtbhyved', + 'name_uc': 'Virtbhyved', + } endif diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 7d1d8ed2c4c..a189105dcac 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -6,10 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_INTERFACE =20 -nodist_conf_DATA +=3D interface/virtinterfaced.conf -augeas_DATA +=3D interface/virtinterfaced.aug -augeastest_DATA +=3D interface/test_virtinterfaced.aug - SYSCONF_FILES +=3D interface/virtinterfaced.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -48,27 +44,4 @@ virtinterface%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -interface/virtinterfaced.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \ - $< > $@ - -interface/virtinterfaced.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \ - $< > $@ - -interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \ - interface/virtinterfaced.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \ - > $@ || rm -f $@ - endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index dbf1d7ff606..fa9c674c084 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -34,4 +34,9 @@ if conf.has('WITH_INTERFACE') '-DMODULE_NAME=3D"interface"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtinterfaced', + 'name_uc': 'Virtinterfaced', + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 9af04c4914a..57271db1be8 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (LIBXL_DRIVER_SOURCES)) =20 if WITH_LIBXL =20 -nodist_conf_DATA +=3D libxl/virtxend.conf -augeas_DATA +=3D libxl/virtxend.aug -augeastest_DATA +=3D libxl/test_virtxend.aug - SYSCONF_FILES +=3D libxl/virtxend.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -48,29 +44,6 @@ virtxend.service: libxl/virtxend.service.in $(top_buildd= ir)/config.status virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -libxl/virtxend.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtxend/' \ - $< > $@ - -libxl/virtxend.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtxend/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \ - $< > $@ - -libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \ - libxl/virtxend.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtxend/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \ - > $@ || rm -f $@ - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 92916831120..2fc72d92ac2 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -52,4 +52,9 @@ if conf.has('WITH_LIBXL') 'aug': files('test_libvirtd_libxl.aug.in'), 'conf': files('libxl.conf'), } + + virt_daemon_confs +=3D { + 'name': 'virtxend', + 'name_uc': 'Virtxend', + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index bee6c99b025..2692163226c 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -11,10 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_LXC =20 -nodist_conf_DATA +=3D lxc/virtlxcd.conf -augeas_DATA +=3D lxc/virtlxcd.aug -augeastest_DATA +=3D lxc/test_virtlxcd.aug - SYSCONF_FILES +=3D lxc/virtlxcd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -50,29 +46,6 @@ virtlxcd.service: lxc/virtlxcd.service.in $(top_builddir= )/config.status virtlxc%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -lxc/virtlxcd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \ - $< > $@ - -lxc/virtlxcd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \ - $< > $@ - -lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \ - lxc/virtlxcd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtlxcd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \ - > $@ || rm -f $@ - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 825c280bd10..650eaef1d81 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -136,4 +136,9 @@ if conf.has('WITH_LXC') 'aug': files('test_libvirtd_lxc.aug.in'), 'conf': files('lxc.conf'), } + + virt_daemon_confs +=3D { + 'name': 'virtlxcd', + 'name_uc': 'Virtlxcd', + } endif diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index fe93adc0194..ee5413e85e1 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) =20 if WITH_NETWORK -nodist_conf_DATA +=3D network/virtnetworkd.conf -augeas_DATA +=3D network/virtnetworkd.aug -augeastest_DATA +=3D network/test_virtnetworkd.aug - SYSCONF_FILES +=3D network/virtnetworkd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -46,29 +42,6 @@ virtnetwork%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -network/virtnetworkd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \ - $< > $@ - -network/virtnetworkd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \ - $< > $@ - -network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \ - network/virtnetworkd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \ - > $@ || rm -f $@ - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index 9b59e442c9d..1e31f8d30cb 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -46,6 +46,11 @@ if conf.has('WITH_NETWORK') ], } =20 + virt_daemon_confs +=3D { + 'name': 'virtnetworkd', + 'name_uc': 'Virtnetworkd', + } + virt_helpers +=3D { 'name': 'libvirt_leaseshelper', 'sources': [ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 731d513c980..79491aee577 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -12,10 +12,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 =20 if WITH_NODE_DEVICES -nodist_conf_DATA +=3D node_device/virtnodedevd.conf -augeas_DATA +=3D node_device/virtnodedevd.aug -augeastest_DATA +=3D node_device/test_virtnodedevd.aug - SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -53,28 +49,4 @@ virtnodedevd.service: node_device/virtnodedevd.service.i= n \ virtnodedev%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -node_device/virtnodedevd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \ - $< > $@ - -node_device/virtnodedevd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \ - $< > $@ - -node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \ - node_device/virtnodedevd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \ - > $@ || rm -f $@ - endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index f85320cf85a..e81fe281359 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -46,4 +46,9 @@ if conf.has('WITH_NODE_DEVICES') '-DMODULE_NAME=3D"nodedev"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtnodedevd', + 'name_uc': 'Virtnodedevd', + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index eb5cade5b95..2c0d29454bb 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,10 +11,6 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -nodist_conf_DATA +=3D nwfilter/virtnwfilterd.conf -augeas_DATA +=3D nwfilter/virtnwfilterd.aug -augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug - SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -52,28 +48,4 @@ virtnwfilterd.service: nwfilter/virtnwfilterd.service.in= \ virtnwfilter%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \ - $< > $@ - -nwfilter/virtnwfilterd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \ - $< > $@ - -nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \ - nwfilter/virtnwfilterd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \ - > $@ || rm -f $@ - endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index b8f94c726c1..0c8641735c8 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -41,4 +41,9 @@ if conf.has('WITH_NWFILTER') '-DMODULE_NAME=3D"nwfilter"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtnwfilterd', + 'name_uc': 'Virtnwfilterd', + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index ff8a3dcbdc6..46a7d1e9be2 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -4,10 +4,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRI= VER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) =20 if WITH_QEMU -nodist_conf_DATA +=3D qemu/virtqemud.conf -augeas_DATA +=3D qemu/virtqemud.aug -augeastest_DATA +=3D qemu/test_virtqemud.aug - SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -43,29 +39,6 @@ virtqemud.service: qemu/virtqemud.service.in $(top_build= dir)/config.status virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -qemu/virtqemud.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtqemud/' \ - $< > $@ - -qemu/virtqemud.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtqemud/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \ - $< > $@ - -qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \ - qemu/virtqemud.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtqemud/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \ - > $@ || rm -f $@ - INSTALL_DATA_DIRS +=3D qemu =20 install-data-qemu: diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 4d5cfec7eaa..35af65cf5f5 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -133,4 +133,9 @@ if conf.has('WITH_QEMU') ], 'install_dir': bindir, } + + virt_daemon_confs +=3D { + 'name': 'virtqemud', + 'name_uc': 'Virtqemud', + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 2007bdf8654..dfea32ff21e 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -62,39 +62,6 @@ OPENRC_CONF_FILES +=3D \ =20 if WITH_LIBVIRTD =20 -augeas_DATA +=3D \ - remote/libvirtd.aug \ - remote/virtproxyd.aug \ - $(NULL) - -augeastest_DATA +=3D \ - remote/test_libvirtd.aug \ - remote/test_virtproxyd.aug \ - $(NULL) - -nodist_conf_DATA +=3D \ - remote/libvirtd.conf \ - remote/virtproxyd.conf \ - $(NULL) - -remote/libvirtd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]runstatedir[@]|@runstatedir@|' \ - -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ - $< > $@ - -remote/virtproxyd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)sed \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]runstatedir[@]|@runstatedir@|' \ - -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ - $< > $@ - INSTALL_DATA_DIRS +=3D remote =20 install-data-remote: @@ -103,50 +70,6 @@ install-data-remote: uninstall-data-remote: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: =20 -remote/libvirtd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ - -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \ - $< > $@ - -remote/virtproxyd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ - $< > $@ - -remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \ - remote/libvirtd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]runstatedir[@]|@runstatedir@|' \ - -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ - -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \ - > $@ || rm -f $@ - -remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \ - remote/virtproxyd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/d' \ - -e '/[@]END[@]/d' \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]runstatedir[@]|@runstatedir@|' \ - -e 's/[@]DAEMON_NAME[@]/virtproxyd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \ - > $@ || rm -f $@ - if WITH_SYSCTL # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 diff --git a/src/remote/meson.build b/src/remote/meson.build index 6635bcd4cff..20ccd14b458 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -120,6 +120,12 @@ if conf.has('WITH_REMOTE') ], } =20 + virt_daemon_confs +=3D { + 'name': 'libvirtd', + 'name_uc': 'Libvirtd', + 'with_ip': true, + } + virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -129,6 +135,12 @@ if conf.has('WITH_REMOTE') '-DVIRTPROXYD', ], } + + virt_daemon_confs +=3D { + 'name': 'virtproxyd', + 'name_uc': 'Virtproxyd', + 'with_ip': true, + } endif endif =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 7a03f6728ee..648648c260c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) =20 if WITH_SECRETS -nodist_conf_DATA +=3D secret/virtsecretd.conf -augeas_DATA +=3D secret/virtsecretd.aug -augeastest_DATA +=3D secret/test_virtsecretd.aug - SYSCONF_FILES +=3D secret/virtsecretd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -46,27 +42,4 @@ virtsecret%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -secret/virtsecretd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \ - $< > $@ - -secret/virtsecretd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \ - $< > $@ - -secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \ - secret/virtsecretd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtsecretd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \ - > $@ || rm -f $@ - endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index 43f1d7342d5..7b9e253d4a4 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -23,4 +23,9 @@ if conf.has('WITH_SECRETS') '-DMODULE_NAME=3D"secret"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtsecretd', + 'name_uc': 'Virtsecretd', + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ee4377d94ff..1ac4da02164 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) =20 if WITH_STORAGE -nodist_conf_DATA +=3D storage/virtstoraged.conf -augeas_DATA +=3D storage/virtstoraged.aug -augeastest_DATA +=3D storage/test_virtstoraged.aug - SYSCONF_FILES +=3D storage/virtstoraged.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -46,28 +42,4 @@ virtstorage%.socket: remote/libvirt%.socket.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -storage/virtstoraged.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \ - $< > $@ - -storage/virtstoraged.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \ - $< > $@ - -storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \ - storage/virtstoraged.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtstoraged/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \ - > $@ || rm -f $@ - - endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index 1996cd4c11c..b23b5823caa 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -121,6 +121,11 @@ if conf.has('WITH_STORAGE') '-DMODULE_NAME=3D"storage"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtstoraged', + 'name_uc': 'Virtstoraged', + } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index fc71301e595..62c7dc98a0c 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -6,10 +6,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NULL) =20 if WITH_VBOX -nodist_conf_DATA +=3D vbox/virtvboxd.conf -augeas_DATA +=3D vbox/virtvboxd.aug -augeastest_DATA +=3D vbox/test_virtvboxd.aug - SYSCONF_FILES +=3D vbox/virtvboxd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -45,27 +41,4 @@ virtvboxd.service: vbox/virtvboxd.service.in $(top_build= dir)/config.status virtvbox%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -vbox/virtvboxd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \ - $< > $@ - -vbox/virtvboxd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \ - $< > $@ - -vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \ - vbox/virtvboxd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvboxd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \ - > $@ || rm -f $@ - endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 0619834a9c8..2c28855e420 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -46,4 +46,9 @@ if conf.has('WITH_VBOX') '-DMODULE_NAME=3D"vbox"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtvboxd', + 'name_uc': 'Virtvboxd', + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 18bb0c40c46..ffc684d76de 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (VZ_DRIVER_SOURCES)) =20 =20 if WITH_VZ -nodist_conf_DATA +=3D vz/virtvzd.conf -augeas_DATA +=3D vz/virtvzd.aug -augeastest_DATA +=3D vz/test_virtvzd.aug - SYSCONF_FILES +=3D vz/virtvzd.sysconf =20 SYSTEMD_UNIT_FILES +=3D \ @@ -44,27 +40,4 @@ virtvzd.service: vz/virtvzd.service.in $(top_builddir)/c= onfig.status virtvz%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@ =20 -vz/virtvzd.conf: remote/libvirtd.conf.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvzd/' \ - $< > $@ - -vz/virtvzd.aug: remote/libvirtd.aug.in - $(AM_V_GEN)$(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvzd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \ - $< > $@ - -vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \ - vz/virtvzd.conf $(AUG_GENTEST_SCRIPT) - $(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \ - $(srcdir)/remote/test_libvirtd.aug.in | \ - $(SED) \ - -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \ - -e 's/[@]DAEMON_NAME[@]/virtvzd/' \ - -e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \ - > $@ || rm -f $@ - endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index 07ad8fc75ae..ff901179cdd 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -38,4 +38,9 @@ if conf.has('WITH_VZ') '-DMODULE_NAME=3D"vz"', ], } + + virt_daemon_confs +=3D { + 'name': 'virtvzd', + 'name_uc': 'Virtvzd', + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894134; cv=none; d=zohomail.com; s=zohoarc; b=XJomHjsSS2TiS11jcUgbTTsTnuGQ0//JnjpA32jzolp1c0GUG8l/XJqQBnqrSnvKYq6n/guH1YFqSXmsf2AYqIoOO1ZUtSL2bRkaFimuzjtN9Qf6pcBOCYfG4yjuS/QadmFQTLKNkorrGZSMjl9Rhn+M7jz14+BNQiv9B8D0pgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894134; 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=YPu53L2RP6rz4+pAMPmLtXH1zH+DkxTbPtTw+yONDpg=; b=KX9ZrgE0MMNj/ZFDFvKr9XYcgbowIHMwkDhtYMFhDr7cW7y2wi7UHnXM9NJddfbrAoGFQPOhFXT3gDSdcatukQSiSIicDlXvv/4dmzGCFBA9Pm98tArN7+Xa+764PE6yoYWSVb04Ejelb8kvDrBhcprmjdEZMKip+SwuptXwso0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894134691169.32103871072263; Thu, 16 Jul 2020 03:08:54 -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-374-vxis9UQRNXiGG2elTA8olw-1; Thu, 16 Jul 2020 06:08:36 -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 87FE580183C; Thu, 16 Jul 2020 10:08:29 +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 67F6760E3E; Thu, 16 Jul 2020 10:08:29 +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 3AAAE730E3; Thu, 16 Jul 2020 10:08:29 +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 06GA5i87018653 for ; Thu, 16 Jul 2020 06:05:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7C1132DE69; Thu, 16 Jul 2020 10:05:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9BFA2B6DB for ; Thu, 16 Jul 2020 10:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894133; 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=YPu53L2RP6rz4+pAMPmLtXH1zH+DkxTbPtTw+yONDpg=; b=SUrYReHpuhYzgMYeVwQ1bwGtUNYNPm3LyyPVG2p+46zQb+47D0lFD6WTfW0aD1xcgRpMTI S6xRE/IoVgn9mjzjLa+CejRkgXAHelARIrcNPI0Q1BVn033EBrnHLy+ifejK+yjpZah9iM AeYwoSFicOMBMrg/Uom2NtQpEBi56qA= X-MC-Unique: vxis9UQRNXiGG2elTA8olw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 226/351] meson: src: generate systemd unit files for libvirt daemons Date: Thu, 16 Jul 2020 11:57:42 +0200 Message-Id: <7e9df5d38b92d73b4991fd74e8363f29befbd59f.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 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/Makefile.am | 21 ------ src/interface/Makefile.inc.am | 26 ------- src/interface/meson.build | 9 +++ src/libxl/Makefile.inc.am | 27 ------- src/libxl/meson.build | 10 +++ src/locking/Makefile.inc.am | 19 ----- src/locking/meson.build | 10 +++ src/logging/Makefile.inc.am | 19 ----- src/logging/meson.build | 10 +++ src/lxc/Makefile.inc.am | 23 ------ src/lxc/meson.build | 9 +++ src/meson.build | 67 +++++++++++++++++ src/network/Makefile.inc.am | 25 ------- src/network/meson.build | 9 +++ src/node_device/Makefile.inc.am | 25 ------- src/node_device/meson.build | 9 +++ src/nwfilter/Makefile.inc.am | 25 ------- src/nwfilter/meson.build | 9 +++ src/qemu/Makefile.inc.am | 23 ------ src/qemu/meson.build | 9 +++ src/remote/Makefile.inc.am | 71 ------------------- src/remote/meson.build | 29 ++++++++ ...n.target.in =3D> virt-guest-shutdown.target} | 0 src/secret/Makefile.inc.am | 25 ------- src/secret/meson.build | 9 +++ src/storage/Makefile.inc.am | 25 ------- src/storage/meson.build | 9 +++ src/vbox/Makefile.inc.am | 23 ------ src/vbox/meson.build | 9 +++ src/vz/Makefile.inc.am | 23 ------ src/vz/meson.build | 9 +++ 31 files changed, 216 insertions(+), 400 deletions(-) rename src/remote/{virt-guest-shutdown.target.in =3D> virt-guest-shutdown.= target} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 82e7212b186..bd27e5acc29 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,8 +34,6 @@ tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D -SYSTEMD_UNIT_FILES =3D -SYSTEMD_UNIT_FILES_IN =3D OPENRC_INIT_FILES =3D OPENRC_INIT_FILES_IN =3D OPENRC_CONF_FILES =3D @@ -275,25 +273,6 @@ endif WITH_LIBVIRTD =20 =20 if WITH_LIBVIRTD -if LIBVIRT_INIT_SCRIPT_SYSTEMD - -SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system - -install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - -uninstall-systemd: uninstall-sysconfig - rm -f $(SYSTEMD_UNIT_FILES:%=3D$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - -INSTALL_DATA_LOCAL +=3D install-systemd -UNINSTALL_LOCAL +=3D uninstall-systemd -endif LIBVIRT_INIT_SCRIPT_SYSTEMD - if LIBVIRT_INIT_SCRIPT_OPENRC =20 OPENRC_INIT_DIR =3D $(sysconfdir)/init.d diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index a189105dcac..b4bcfb7ecaa 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -8,16 +8,6 @@ if WITH_INTERFACE =20 SYSCONF_FILES +=3D interface/virtinterfaced.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtinterfaced.service \ - virtinterfaced.socket \ - virtinterfaced-ro.socket \ - virtinterfaced-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - interface/virtinterfaced.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtinterfaced.init \ $(NULL) @@ -25,23 +15,7 @@ OPENRC_INIT_FILES_IN +=3D \ interface/virtinterfaced.init.in \ $(NULL) =20 -VIRTINTERFACED_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt interface|g' \ - -e 's|[@]service[@]|virtinterfaced|g' \ - -e 's|[@]sockprefix[@]|virtinterfaced|g' \ - $(NULL) - virtinterfaced.init: interface/virtinterfaced.init.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -virtinterfaced.service: interface/virtinterfaced.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtinterface%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index fa9c674c084..a94b1164aa1 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -39,4 +39,13 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'name_uc': 'Virtinterfaced', } + + virt_daemon_units +=3D { + 'service': 'virtinterfaced', + 'service_in': files('virtinterfaced.service.in'), + 'name': 'Libvirt interface', + 'sockprefix': 'virtinterfaced', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 57271db1be8..b29ae98269c 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -7,16 +7,6 @@ if WITH_LIBXL =20 SYSCONF_FILES +=3D libxl/virtxend.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtxend.service \ - virtxend.socket \ - virtxend-ro.socket \ - virtxend-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - libxl/virtxend.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtxend.init \ $(NULL) @@ -24,26 +14,9 @@ OPENRC_INIT_FILES_IN +=3D \ libxl/virtxend.init.in \ $(NULL) =20 -LIBXL_UNIT_COND =3D ConditionPathExists=3D/proc/xen/capabilities -LIBXL_UNIT_CONFLICT =3D Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES) - -VIRTXEND_UNIT_VARS =3D \ - $(COMMON_UNIT_VARS) \ - -e 's|[@]deps[@]|$(LIBXL_UNIT_CONFLICT)\n$(LIBXL_UNIT_COND)|g' \ - -e 's|[@]name[@]|Libvirt libxl|g' \ - -e 's|[@]service[@]|virtxend|g' \ - -e 's|[@]sockprefix[@]|virtxend|g' \ - $(NULL) - virtxend.init: libxl/virtxend.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtxend.service: libxl/virtxend.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 2fc72d92ac2..4a872198702 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -57,4 +57,14 @@ if conf.has('WITH_LIBXL') 'name': 'virtxend', 'name_uc': 'Virtxend', } + + virt_daemon_units +=3D { + 'service': 'virtxend', + 'service_in': files('virtxend.service.in'), + 'name': 'Libvirt libxl', + 'sockprefix': 'virtxend', + 'sockets': [ 'main', 'ro', 'admin' ], + 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', + 'conflicts': true, + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index a2a0a4c6250..8727efdc9a5 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -3,15 +3,6 @@ RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 -VIRTLOCKD_UNIT_FILES_IN =3D \ - locking/virtlockd.service.in \ - locking/virtlockd.socket.in \ - locking/virtlockd-admin.socket.in \ - $(NULL) - -SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOCKD_UNIT_FILES_IN:%.in=3D%)) -SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOCKD_UNIT_FILES_IN) - OPENRC_INIT_FILES +=3D \ virtlockd.init \ $(NULL) @@ -46,13 +37,3 @@ endif WITH_LIBVIRTD =20 virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlockd-admin.socket: locking/virtlockd-admin.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index 0681e4fbc4d..d35853e799b 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -134,6 +134,16 @@ if conf.has('WITH_LIBVIRTD') ], } =20 + virt_daemon_units +=3D { + 'service': 'virtlockd', + 'service_in': files('virtlockd.service.in'), + 'name': '', + 'sockprefix': '', + 'sockets': [ 'main', 'admin' ], + 'socket_in': files('virtlockd.socket.in'), + 'socket_admin_in': files('virtlockd-admin.socket.in'), + } + if conf.has('WITH_SANLOCK') virt_helpers +=3D { 'name': 'libvirt_sanlock_helper', diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index b13f53ffe41..ad07c7b7f77 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -2,15 +2,6 @@ =20 SYSCONF_FILES +=3D logging/virtlogd.sysconf =20 -VIRTLOGD_UNIT_FILES_IN =3D \ - logging/virtlogd.service.in \ - logging/virtlogd.socket.in \ - logging/virtlogd-admin.socket.in \ - $(NULL) - -SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOGD_UNIT_FILES_IN:%.in=3D%)) -SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOGD_UNIT_FILES_IN) - OPENRC_INIT_FILES +=3D \ virtlogd.init \ $(NULL) @@ -20,13 +11,3 @@ OPENRC_INIT_FILES_IN +=3D \ =20 virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlogd-admin.socket: logging/virtlogd-admin.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/logging/meson.build b/src/logging/meson.build index 4897cbf1f32..9cfd60019ea 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -77,4 +77,14 @@ if conf.has('WITH_LIBVIRTD') 'aug': files('test_virtlogd.aug.in'), 'conf': files('virtlogd.conf'), } + + virt_daemon_units +=3D { + 'service': 'virtlogd', + 'service_in': files('virtlogd.service.in'), + 'name': '', + 'sockprefix': '', + 'sockets': [ 'main', 'admin' ], + 'socket_in': files('virtlogd.socket.in'), + 'socket_admin_in': files('virtlogd-admin.socket.in'), + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 2692163226c..1b3d0a2b4a8 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -13,16 +13,6 @@ if WITH_LXC =20 SYSCONF_FILES +=3D lxc/virtlxcd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtlxcd.service \ - virtlxcd.socket \ - virtlxcd-ro.socket \ - virtlxcd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - lxc/virtlxcd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtlxcd.init \ $(NULL) @@ -30,22 +20,9 @@ OPENRC_INIT_FILES_IN +=3D \ lxc/virtlxcd.init.in \ $(NULL) =20 -VIRTLXCD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt lxc|g' \ - -e 's|[@]service[@]|virtlxcd|g' \ - -e 's|[@]sockprefix[@]|virtlxcd|g' \ - $(NULL) - virtlxcd.init: lxc/virtlxcd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtlxcd.service: lxc/virtlxcd.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtlxc%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@ - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 650eaef1d81..c539149a8c9 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -141,4 +141,13 @@ if conf.has('WITH_LXC') 'name': 'virtlxcd', 'name_uc': 'Virtlxcd', } + + virt_daemon_units +=3D { + 'service': 'virtlxcd', + 'service_in': files('virtlxcd.service.in'), + 'name': 'Libvirt lxc', + 'sockprefix': 'virtlxcd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/meson.build b/src/meson.build index f19870d2c18..b22c950c6d4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -175,6 +175,22 @@ virt_daemon_confs =3D [] virt_aug_dir =3D datadir / 'augeas' / 'lenses' virt_test_aug_dir =3D datadir / 'augeas' / 'lenses' / 'tests' =20 +# guest_unit_files: +# guest unit files to install +guest_unit_files =3D [] + +# virt_daemon_units: +# generate libvirt daemon systemd unit files +# * service - name of the service (required) +# * service_in - service source file (required) +# * name - socket description (required) +# * sockprefix - socket prefix name (required) +# * sockets - array of additional sockets (optional, default [ 'main', '= ro', 'admin' ]) +# * socket_$name_in - additional socket source files (optional, default = remote/libvirtd.socket.in ) +# * deps - socket dependencies (optional, default '') +# * conflicts - if the service conflicts with libvirtd (optional, true) +virt_daemon_units =3D [] + =20 # list subdirectories =20 @@ -652,3 +668,54 @@ foreach data : virt_daemon_confs install_dir: virt_test_aug_dir, ) endforeach + + +if conf.has('WITH_LIBVIRTD') + # Generate systemd service and socket unit files + if init_script =3D=3D 'systemd' + systemd_unit_dir =3D prefix / 'lib' / 'systemd' / 'system' + + install_data( + guest_unit_files, + install_dir: systemd_unit_dir, + ) + + foreach unit : virt_daemon_units + unit_conf =3D configuration_data() + unit_conf.set('runstatedir', runstatedir) + unit_conf.set('sbindir', sbindir) + unit_conf.set('sysconfdir', sysconfdir) + unit_conf.set('name', unit['name']) + unit_conf.set('service', unit['service']) + unit_conf.set('sockprefix', unit['sockprefix']) + unit_conf.set('deps', unit.get('deps', '')) + + configure_file( + input: unit['service_in'], + output: '@0@.service'.format(unit['service']), + configuration: unit_conf, + install: true, + install_dir: systemd_unit_dir, + ) + + foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ]) + if socket =3D=3D 'main' + socket_in_def =3D 'remote' / 'libvirtd.socket.in' + socket_in =3D unit.get('socket_in', socket_in_def) + socket_out =3D '@0@.socket'.format(unit['service']) + else + socket_in_def =3D 'remote' / 'libvirtd-@0@.socket.in'.format(soc= ket) + socket_in =3D unit.get('socket_@0@_in'.format(socket), socket_in= _def) + socket_out =3D '@0@-@1@.socket'.format(unit['service'], socket) + endif + configure_file( + input: socket_in, + output: socket_out, + configuration: unit_conf, + install: true, + install_dir: systemd_unit_dir, + ) + endforeach + endforeach + endif +endif diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index ee5413e85e1..b84057eeb72 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_NETWORK SYSCONF_FILES +=3D network/virtnetworkd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtnetworkd.service \ - virtnetworkd.socket \ - virtnetworkd-ro.socket \ - virtnetworkd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - network/virtnetworkd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtnetworkd.init \ $(NULL) @@ -24,24 +14,9 @@ OPENRC_INIT_FILES_IN +=3D \ network/virtnetworkd.init.in \ $(NULL) =20 -VIRTNETWORKD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt network|g' \ - -e 's|[@]service[@]|virtnetworkd|g' \ - -e 's|[@]sockprefix[@]|virtnetworkd|g' \ - $(NULL) - virtnetworkd.init: network/virtnetworkd.init.in $(top_builddir)/config.sta= tus $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtnetworkd.service: network/virtnetworkd.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtnetwork%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index 1e31f8d30cb..0c643900c15 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -58,4 +58,13 @@ if conf.has('WITH_NETWORK') dtrace_gen_objects, ], } + + virt_daemon_units +=3D { + 'service': 'virtnetworkd', + 'service_in': files('virtnetworkd.service.in'), + 'name': 'Libvirt network', + 'sockprefix': 'virtnetworkd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 79491aee577..beff0d6ed04 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -14,16 +14,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_NODE_DEVICES SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtnodedevd.service \ - virtnodedevd.socket \ - virtnodedevd-ro.socket \ - virtnodedevd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - node_device/virtnodedevd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtnodedevd.init \ $(NULL) @@ -31,22 +21,7 @@ OPENRC_INIT_FILES_IN +=3D \ node_device/virtnodedevd.init.in \ $(NULL) =20 -VIRTNODEDEVD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt nodedev|g' \ - -e 's|[@]service[@]|virtnodedevd|g' \ - -e 's|[@]sockprefix[@]|virtnodedevd|g' \ - $(NULL) - virtnodedevd.init: node_device/virtnodedevd.init.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -virtnodedevd.service: node_device/virtnodedevd.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtnodedev%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index e81fe281359..875e4ec775f 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -51,4 +51,13 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'name_uc': 'Virtnodedevd', } + + virt_daemon_units +=3D { + 'service': 'virtnodedevd', + 'service_in': files('virtnodedevd.service.in'), + 'name': 'Libvirt nodedev', + 'sockprefix': 'virtnodedevd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 2c0d29454bb..2384f053aeb 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -13,16 +13,6 @@ nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtnwfilterd.service \ - virtnwfilterd.socket \ - virtnwfilterd-ro.socket \ - virtnwfilterd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - nwfilter/virtnwfilterd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtnwfilterd.init \ $(NULL) @@ -30,22 +20,7 @@ OPENRC_INIT_FILES_IN +=3D \ nwfilter/virtnwfilterd.init.in \ $(NULL) =20 -VIRTNWFILTERD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt nwfilter|g' \ - -e 's|[@]service[@]|virtnwfilterd|g' \ - -e 's|[@]sockprefix[@]|virtnwfilterd|g' \ - $(NULL) - virtnwfilterd.init: nwfilter/virtnwfilterd.init.in \ $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtnwfilter%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 0c8641735c8..50ee78933e2 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -46,4 +46,13 @@ if conf.has('WITH_NWFILTER') 'name': 'virtnwfilterd', 'name_uc': 'Virtnwfilterd', } + + virt_daemon_units +=3D { + 'service': 'virtnwfilterd', + 'service_in': files('virtnwfilterd.service.in'), + 'name': 'Libvirt nwfilter', + 'sockprefix': 'virtnwfilterd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 46a7d1e9be2..0ea8905ed57 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -6,16 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (QEMU_DRIVER_SOURCES)) if WITH_QEMU SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtqemud.service \ - virtqemud.socket \ - virtqemud-ro.socket \ - virtqemud-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - qemu/virtqemud.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtqemud.init \ $(NULL) @@ -23,22 +13,9 @@ OPENRC_INIT_FILES_IN +=3D \ qemu/virtqemud.init.in \ $(NULL) =20 -VIRTQEMUD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt qemu|g' \ - -e 's|[@]service[@]|virtqemud|g' \ - -e 's|[@]sockprefix[@]|virtqemud|g' \ - $(NULL) - virtqemud.init: qemu/virtqemud.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtqemud.service: qemu/virtqemud.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D qemu =20 install-data-qemu: diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 35af65cf5f5..479c530ece8 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -138,4 +138,13 @@ if conf.has('WITH_QEMU') 'name': 'virtqemud', 'name_uc': 'Virtqemud', } + + virt_daemon_units +=3D { + 'service': 'virtqemud', + 'service_in': files('virtqemud.service.in'), + 'name': 'Libvirt qemu', + 'sockprefix': 'virtqemud', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index dfea32ff21e..159bc5e01be 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -12,41 +12,6 @@ SYSCONF_FILES +=3D \ remote/virtproxyd.sysconf \ $(NULL) =20 -LIBVIRTD_SOCKET_UNIT_FILES_IN =3D \ - remote/libvirtd.socket.in \ - remote/libvirtd-ro.socket.in \ - remote/libvirtd-admin.socket.in \ - remote/libvirtd-tcp.socket.in \ - remote/libvirtd-tls.socket.in \ - $(NULL) - -LIBVIRTD_SOCKET_UNIT_FILES =3D $(notdir $(LIBVIRTD_SOCKET_UNIT_FILES_IN:%.= in=3D%)) - -LIBVIRTD_UNIT_FILES_IN =3D \ - remote/libvirtd.service.in \ - $(LIBVIRTD_SOCKET_UNIT_FILES_IN) \ - $(NULL) - -VIRTPROXYD_UNIT_FILES_IN =3D \ - remote/virtproxyd.service.in \ - $(NULL) - -GUEST_UNIT_FILES_IN =3D \ - remote/virt-guest-shutdown.target.in \ - $(NULL) - - -SYSTEMD_UNIT_FILES +=3D \ - $(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%)) \ - $(notdir $(LIBVIRTD_UNIT_FILES_IN:remote/libvirtd%.in=3Dremote/virtproxyd= %)) \ - $(notdir $(GUEST_UNIT_FILES_IN:%.in=3D%)) \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - $(LIBVIRTD_UNIT_FILES_IN) \ - $(VIRTPROXYD_UNIT_FILES_IN) \ - $(GUEST_UNIT_FILES_IN) \ - $(NULL) - OPENRC_INIT_FILES +=3D \ libvirtd.init \ virtproxyd.init \ @@ -136,14 +101,6 @@ INSTALL_DATA_LOCAL +=3D install-sasl UNINSTALL_LOCAL +=3D uninstall-sasl endif WITH_SASL =20 -LIBVIRTD_UNIT_VARS =3D \ - $(COMMON_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt|g' \ - -e 's|[@]service[@]|libvirtd|g' \ - -e 's|[@]sockprefix[@]|libvirt|g' \ - -e 's|[@]deps[@]||g' \ - $(NULL) - LIBVIRTD_INIT_VARS =3D \ $(COMMON_UNIT_VARS) =20 @@ -155,36 +112,8 @@ LIBVIRTD_INIT_VARS +=3D \ -e 's|[@]NEED_FIREWALLD[@]||g' endif ! WITH_FIREWALLD =20 -VIRTD_UNIT_VARS =3D \ - $(COMMON_UNIT_VARS) \ - -e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)|g' \ - $(NULL) - -VIRTPROXYD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt proxy|g' \ - -e 's|[@]service[@]|virtproxyd|g' \ - -e 's|[@]sockprefix[@]|libvirt|g' \ - $(NULL) - libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 virtproxyd.init: remote/virtproxyd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -libvirt%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtproxyd.service: remote/virtproxyd.service.in $(top_builddir)/config.st= atus - $(AM_V_GEN)$(SED) $(VIRTPROXYD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtproxy%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTPROXYD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \ - $(top_builddir)/config.status - $(AM_V_GEN)cp $< $@ diff --git a/src/remote/meson.build b/src/remote/meson.build index 20ccd14b458..c0bc6f14b93 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -89,6 +89,16 @@ foreach name : libvirt_conf_files set_variable(name[2].underscorify(), tmp) endforeach =20 +libvirtd_socket_unit_files =3D [ + 'libvirtd.socket', + 'libvirtd-ro.socket', + 'libvirtd-admin.socket', + 'libvirtd-tcp.socket', + 'libvirtd-tls.socket', +] + +libvirtd_socket_conflicts =3D ' '.join(libvirtd_socket_unit_files) + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', @@ -110,6 +120,8 @@ if conf.has('WITH_REMOTE') libvirt_libs +=3D remote_driver_lib =20 if conf.has('WITH_LIBVIRTD') + guest_unit_files +=3D files('virt-guest-shutdown.target') + virt_daemons +=3D { 'name': 'libvirtd', 'c_args': [ @@ -126,6 +138,14 @@ if conf.has('WITH_REMOTE') 'with_ip': true, } =20 + virt_daemon_units +=3D { + 'service': 'libvirtd', + 'service_in': files('libvirtd.service.in'), + 'name': 'Libvirt', + 'sockprefix': 'libvirtd', + 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], + } + virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -141,6 +161,15 @@ if conf.has('WITH_REMOTE') 'name_uc': 'Virtproxyd', 'with_ip': true, } + + virt_daemon_units +=3D { + 'service': 'virtproxyd', + 'service_in': files('virtproxyd.service.in'), + 'name': 'Libvirt proxy', + 'sockprefix': 'libvirtd', + 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], + 'deps': libvirtd_socket_conflicts, + } endif endif =20 diff --git a/src/remote/virt-guest-shutdown.target.in b/src/remote/virt-gue= st-shutdown.target similarity index 100% rename from src/remote/virt-guest-shutdown.target.in rename to src/remote/virt-guest-shutdown.target diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 648648c260c..3aafe7a6a5d 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_SECRETS SYSCONF_FILES +=3D secret/virtsecretd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtsecretd.service \ - virtsecretd.socket \ - virtsecretd-ro.socket \ - virtsecretd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - secret/virtsecretd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtsecretd.init \ $(NULL) @@ -24,22 +14,7 @@ OPENRC_INIT_FILES_IN +=3D \ secret/virtsecretd.init.in \ $(NULL) =20 -VIRTSECRETD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt secret|g' \ - -e 's|[@]service[@]|virtsecretd|g' \ - -e 's|[@]sockprefix[@]|virtsecretd|g' \ - $(NULL) - virtsecretd.init: secret/virtsecretd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtsecretd.service: secret/virtsecretd.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtsecret%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index 7b9e253d4a4..a6b919dfabb 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -28,4 +28,13 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'name_uc': 'Virtsecretd', } + + virt_daemon_units +=3D { + 'service': 'virtsecretd', + 'service_in': files('virtsecretd.service.in'), + 'name': 'Libvirt secret', + 'sockprefix': 'virtsecretd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 1ac4da02164..3b4a13032aa 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_STORAGE SYSCONF_FILES +=3D storage/virtstoraged.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtstoraged.service \ - virtstoraged.socket \ - virtstoraged-ro.socket \ - virtstoraged-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - storage/virtstoraged.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtstoraged.init \ $(NULL) @@ -24,22 +14,7 @@ OPENRC_INIT_FILES_IN +=3D \ storage/virtstoraged.init.in \ $(NULL) =20 -VIRTSTORAGED_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt storage|g' \ - -e 's|[@]service[@]|virtstoraged|g' \ - -e 's|[@]sockprefix[@]|virtstoraged|g' \ - $(NULL) - virtstoraged.init: storage/virtstoraged.init.in $(top_builddir)/config.sta= tus $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtstoraged.service: storage/virtstoraged.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtstorage%.socket: remote/libvirt%.socket.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index b23b5823caa..acc9600ba4b 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -126,6 +126,15 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'name_uc': 'Virtstoraged', } + + virt_daemon_units +=3D { + 'service': 'virtstoraged', + 'service_in': files('virtstoraged.service.in'), + 'name': 'Libvirt storage', + 'sockprefix': 'virtstoraged', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 62c7dc98a0c..4968777858c 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -8,16 +8,6 @@ DRIVER_SOURCE_FILES +=3D \ if WITH_VBOX SYSCONF_FILES +=3D vbox/virtvboxd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtvboxd.service \ - virtvboxd.socket \ - virtvboxd-ro.socket \ - virtvboxd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - vbox/virtvboxd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtvboxd.init \ $(NULL) @@ -25,20 +15,7 @@ OPENRC_INIT_FILES_IN +=3D \ vbox/virtvboxd.init.in \ $(NULL) =20 -VIRTVBOXD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt vbox|g' \ - -e 's|[@]service[@]|virtvboxd|g' \ - -e 's|[@]sockprefix[@]|virtvboxd|g' \ - $(NULL) - virtvboxd.init: vbox/virtvboxd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtvboxd.service: vbox/virtvboxd.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtvbox%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 2c28855e420..1fb88513ba0 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -51,4 +51,13 @@ if conf.has('WITH_VBOX') 'name': 'virtvboxd', 'name_uc': 'Virtvboxd', } + + virt_daemon_units +=3D { + 'service': 'virtvboxd', + 'service_in': files('virtvboxd.service.in'), + 'name': 'Libvirt vbox', + 'sockprefix': 'virtvboxd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index ffc684d76de..5889d0170a4 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (VZ_DRIVER_SOURCES)) if WITH_VZ SYSCONF_FILES +=3D vz/virtvzd.sysconf =20 -SYSTEMD_UNIT_FILES +=3D \ - virtvzd.service \ - virtvzd.socket \ - virtvzd-ro.socket \ - virtvzd-admin.socket \ - $(NULL) -SYSTEMD_UNIT_FILES_IN +=3D \ - vz/virtvzd.service.in \ - $(NULL) - OPENRC_INIT_FILES +=3D \ virtvzd.init \ $(NULL) @@ -24,20 +14,7 @@ OPENRC_INIT_FILES_IN +=3D \ vz/virtvzd.init.in \ $(NULL) =20 -VIRTVZD_UNIT_VARS =3D \ - $(VIRTD_UNIT_VARS) \ - -e 's|[@]name[@]|Libvirt vz|g' \ - -e 's|[@]service[@]|virtvzd|g' \ - -e 's|[@]sockprefix[@]|virtvzd|g' \ - $(NULL) - virtvzd.init: vz/virtvzd.init.in $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ =20 -virtvzd.service: vz/virtvzd.service.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@ - -virtvz%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index ff901179cdd..dcf8f5037fd 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -43,4 +43,13 @@ if conf.has('WITH_VZ') 'name': 'virtvzd', 'name_uc': 'Virtvzd', } + + virt_daemon_units +=3D { + 'service': 'virtvzd', + 'service_in': files('virtvzd.service.in'), + 'name': 'Libvirt vz', + 'sockprefix': 'virtvzd', + 'sockets': [ 'main', 'ro', 'admin' ], + 'conflicts': true, + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894430; cv=none; d=zohomail.com; s=zohoarc; b=D1HCqgd5nuWpyYmWtcE3XMjFmutKhgCFleu2Xf9uVsJ5uweSQosmr43DpM+81rrdhkXEjFCCRdbcvUoGM7ersyKtlj6Fw/5Ck3z3gGoertjTnC4vIdzuIbO0vbCZcajuMg651gQc3RlgQ4YqG3p3Zw2vI8QxdJMR22CVhcKOJH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894430; 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=i+1iRGOhnD8F4CTKWnDxSfLXuBhcioWo8tXG+6kZBIY=; b=WRpCJrSzTH+B6KoHGjHRXvAGHwqejNcOVNFTBfl5Phah4weawl1ChkCaie9W4n7VSJLJ9N814MZwgIId6/eLLNMYeeAC2+xgiHeXx1ieeAgzrScFwNrp97tLPEoO3xvF9DcX9snP2DdCr8BWDLpUa6424a/SW2/plNUGyxqvpoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894430741319.1194585836066; Thu, 16 Jul 2020 03:13:50 -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-378-in-Fn_9FOUy2ZeJPVir6GQ-1; Thu, 16 Jul 2020 06:13:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 161EE805723; Thu, 16 Jul 2020 10:13:23 +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 ECEA772AE6; Thu, 16 Jul 2020 10:13:22 +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 BB51218045D8; Thu, 16 Jul 2020 10:13:22 +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 06GA5jZI018663 for ; Thu, 16 Jul 2020 06:05:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 65D0E2DE69; Thu, 16 Jul 2020 10:05:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D457E2B6DB for ; Thu, 16 Jul 2020 10:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894429; 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=i+1iRGOhnD8F4CTKWnDxSfLXuBhcioWo8tXG+6kZBIY=; b=FKqfy5sKPZegBAYUvEbk6a4uL957DUAUyM95ZwNO6A1sU1AzUIX/vrndhRMPoUcbEGn27s Qv81+KmXEEyTPyPDvoPv8ewb3V3Barv/nQXJ49p+g8HFz7gqM81w+lAVtN0haQH8w/ovsr frE5q451gvke4OyRsKiHRyMN6P5IXb8= X-MC-Unique: in-Fn_9FOUy2ZeJPVir6GQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 227/351] meson: src: generate openrc init files Date: Thu, 16 Jul 2020 11:57:43 +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.15 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/Makefile.am | 57 --------------------------------- src/interface/Makefile.inc.am | 10 ------ src/interface/meson.build | 5 +++ src/libxl/Makefile.inc.am | 10 ------ src/libxl/meson.build | 5 +++ src/locking/Makefile.inc.am | 11 ------- src/locking/meson.build | 5 +++ src/logging/Makefile.inc.am | 10 ------ src/logging/meson.build | 5 +++ src/lxc/Makefile.inc.am | 10 ------ src/lxc/meson.build | 5 +++ src/meson.build | 41 ++++++++++++++++++++++++ src/network/Makefile.inc.am | 10 ------ src/network/meson.build | 5 +++ src/node_device/Makefile.inc.am | 11 ------- src/node_device/meson.build | 5 +++ src/nwfilter/Makefile.inc.am | 10 ------ src/nwfilter/meson.build | 5 +++ src/qemu/Makefile.inc.am | 10 ------ src/qemu/meson.build | 5 +++ src/remote/Makefile.inc.am | 30 ----------------- src/remote/meson.build | 12 +++++++ src/secret/Makefile.inc.am | 11 ------- src/secret/meson.build | 5 +++ src/storage/Makefile.inc.am | 11 ------- src/storage/meson.build | 5 +++ src/vbox/Makefile.inc.am | 11 ------- src/vbox/meson.build | 5 +++ src/vz/Makefile.inc.am | 11 ------- src/vz/meson.build | 5 +++ 30 files changed, 118 insertions(+), 223 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bd27e5acc29..0b40c23f980 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,17 +34,8 @@ tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D -OPENRC_INIT_FILES =3D -OPENRC_INIT_FILES_IN =3D -OPENRC_CONF_FILES =3D SYSCONF_FILES =3D =20 -COMMON_UNIT_VARS =3D \ - -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - $(NULL) - include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am @@ -226,25 +217,6 @@ uninstall-sysconfig: done rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : =20 -OPENRC_CONF_DIR =3D $(sysconfdir)/conf.d - -install-openrc-conf: - $(MKDIR_P) $(DESTDIR)$(OPENRC_CONF_DIR) - for f in $(OPENRC_CONF_FILES:%.confd=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - $(INSTALL_DATA) $(srcdir)/$$f.confd \ - $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \ - done - -uninstall-openrc-conf: - for f in $(OPENRC_CONF_FILES:%.confd=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - rm -f $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \ - done - rmdir $(DESTDIR)$(OPENRC_CONF_DIR) || : - LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) =20 %.logrotate: remote/%.logrotate.in @@ -272,35 +244,6 @@ UNINSTALL_LOCAL +=3D uninstall-logrotate endif WITH_LIBVIRTD =20 =20 -if WITH_LIBVIRTD -if LIBVIRT_INIT_SCRIPT_OPENRC - -OPENRC_INIT_DIR =3D $(sysconfdir)/init.d - -install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf - $(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR) - for f in $(OPENRC_INIT_FILES:%.init=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - $(INSTALL_SCRIPT) $$f.init \ - $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \ - done - -uninstall-openrc: uninstall-openrc-conf - for f in $(OPENRC_INIT_FILES:%.init=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - rm -f $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \ - done - rmdir $(DESTDIR)$(OPENRC_INIT_DIR) || : - -INSTALL_DATA_LOCAL +=3D install-openrc -UNINSTALL_LOCAL +=3D uninstall-openrc -endif LIBVIRT_INIT_SCRIPT_OPENRC - -endif WITH_LIBVIRTD - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index b4bcfb7ecaa..f6626c7f491 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -8,14 +8,4 @@ if WITH_INTERFACE =20 SYSCONF_FILES +=3D interface/virtinterfaced.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtinterfaced.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - interface/virtinterfaced.init.in \ - $(NULL) - -virtinterfaced.init: interface/virtinterfaced.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index a94b1164aa1..a6b3e888358 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -48,4 +48,9 @@ if conf.has('WITH_INTERFACE') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtinterfaced', + 'in_file': files('virtinterfaced.init.in') + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index b29ae98269c..9a33eb5f06b 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -7,16 +7,6 @@ if WITH_LIBXL =20 SYSCONF_FILES +=3D libxl/virtxend.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtxend.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - libxl/virtxend.init.in \ - $(NULL) - -virtxend.init: libxl/virtxend.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 4a872198702..5f858dc32fc 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -67,4 +67,9 @@ if conf.has('WITH_LIBXL') 'deps': 'ConditionPathExists=3D/proc/xen/capabilities', 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtxend', + 'in_file': files('virtxend.init.in'), + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 8727efdc9a5..8a0ecd8d1f2 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -3,13 +3,6 @@ RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtlockd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - locking/virtlockd.init.in \ - $(NULL) - INSTALL_DATA_DIRS +=3D locking =20 install-data-locking: @@ -33,7 +26,3 @@ endif WITH_LIBVIRTD install-data-locking \ uninstall-data-locking \ $(NULL) - - -virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/locking/meson.build b/src/locking/meson.build index d35853e799b..f560c9b44b9 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -144,6 +144,11 @@ if conf.has('WITH_LIBVIRTD') 'socket_admin_in': files('virtlockd-admin.socket.in'), } =20 + openrc_init_files +=3D { + 'name': 'virtlockd', + 'in_file': files('virtlockd.init.in'), + } + if conf.has('WITH_SANLOCK') virt_helpers +=3D { 'name': 'libvirt_sanlock_helper', diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index ad07c7b7f77..48cae3add15 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -1,13 +1,3 @@ # vim: filetype=3Dautomake =20 SYSCONF_FILES +=3D logging/virtlogd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtlogd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - logging/virtlogd.init.in \ - $(NULL) - -virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/logging/meson.build b/src/logging/meson.build index 9cfd60019ea..40327241e3c 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -87,4 +87,9 @@ if conf.has('WITH_LIBVIRTD') 'socket_in': files('virtlogd.socket.in'), 'socket_admin_in': files('virtlogd-admin.socket.in'), } + + openrc_init_files +=3D { + 'name': 'virtlogd', + 'in_file': files('virtlogd.init.in'), + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 1b3d0a2b4a8..3cf6f96ea1d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -13,16 +13,6 @@ if WITH_LXC =20 SYSCONF_FILES +=3D lxc/virtlxcd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtlxcd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - lxc/virtlxcd.init.in \ - $(NULL) - -virtlxcd.init: lxc/virtlxcd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index c539149a8c9..6135f61d4ab 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -150,4 +150,9 @@ if conf.has('WITH_LXC') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtlxcd', + 'in_file': files('virtlxcd.init.in'), + } endif diff --git a/src/meson.build b/src/meson.build index b22c950c6d4..602e8176d99 100644 --- a/src/meson.build +++ b/src/meson.build @@ -191,6 +191,12 @@ guest_unit_files =3D [] # * conflicts - if the service conflicts with libvirtd (optional, true) virt_daemon_units =3D [] =20 +# openrc_init_files +# generate libvirt daemon openrc init files +# * name - daemon name (required) +# * in_file - source init file (required) +openrc_init_files =3D [] + =20 # list subdirectories =20 @@ -718,4 +724,39 @@ if conf.has('WITH_LIBVIRTD') endforeach endforeach endif + + # Generate openrc init files + if init_script =3D=3D 'openrc' + foreach init : openrc_init_files + init_conf =3D configuration_data() + init_conf.set('sbindir', sbindir) + init_conf.set('runstatedir', runstatedir) + if conf.has('WITH_FIREWALLD') + need_firewalld =3D 'need firewalld' + else + need_firewalld =3D '' + endif + init_conf.set('NEED_FIREWALLD', need_firewalld) + + init_file =3D configure_file( + input: init['in_file'], + output: '@0@.init'.format(init['name']), + configuration: init_conf, + ) + + install_data( + init_file, + install_dir: sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], + install_dir: sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif + endforeach + endif endif diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index b84057eeb72..81971c64ed4 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_NETWORK SYSCONF_FILES +=3D network/virtnetworkd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtnetworkd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - network/virtnetworkd.init.in \ - $(NULL) - -virtnetworkd.init: network/virtnetworkd.init.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index 0c643900c15..c27578d66b4 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -67,4 +67,9 @@ if conf.has('WITH_NETWORK') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnetworkd', + 'in_file': files('virtnetworkd.init.in'), + } endif diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index beff0d6ed04..e6fcbf6c9e5 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -13,15 +13,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_NODE_DEVICES SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtnodedevd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - node_device/virtnodedevd.init.in \ - $(NULL) - -virtnodedevd.init: node_device/virtnodedevd.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 875e4ec775f..d73867148ea 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -60,4 +60,9 @@ if conf.has('WITH_NODE_DEVICES') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnodedevd', + 'in_file': files('virtnodedevd.init.in'), + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 2384f053aeb..8fcd63cbbf9 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -13,14 +13,4 @@ nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtnwfilterd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - nwfilter/virtnwfilterd.init.in \ - $(NULL) - -virtnwfilterd.init: nwfilter/virtnwfilterd.init.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 50ee78933e2..744600a73d1 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -55,4 +55,9 @@ if conf.has('WITH_NWFILTER') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtnwfilterd', + 'in_file': files('virtnwfilterd.init.in'), + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 0ea8905ed57..ec3178c373a 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -6,16 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (QEMU_DRIVER_SOURCES)) if WITH_QEMU SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 -OPENRC_INIT_FILES +=3D \ - virtqemud.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - qemu/virtqemud.init.in \ - $(NULL) - -virtqemud.init: qemu/virtqemud.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - INSTALL_DATA_DIRS +=3D qemu =20 install-data-qemu: diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 479c530ece8..09b72335741 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -147,4 +147,9 @@ if conf.has('WITH_QEMU') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtqemud', + 'in_file': files('virtqemud.init.in'), + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 159bc5e01be..73f7578ee5e 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -12,19 +12,6 @@ SYSCONF_FILES +=3D \ remote/virtproxyd.sysconf \ $(NULL) =20 -OPENRC_INIT_FILES +=3D \ - libvirtd.init \ - virtproxyd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - remote/libvirtd.init.in \ - remote/virtproxyd.init.in \ - $(NULL) -OPENRC_CONF_FILES +=3D \ - remote/libvirtd.confd \ - remote/virtproxyd.confd \ - $(NULL) - if WITH_LIBVIRTD =20 INSTALL_DATA_DIRS +=3D remote @@ -100,20 +87,3 @@ uninstall-sasl: INSTALL_DATA_LOCAL +=3D install-sasl UNINSTALL_LOCAL +=3D uninstall-sasl endif WITH_SASL - -LIBVIRTD_INIT_VARS =3D \ - $(COMMON_UNIT_VARS) - -if WITH_FIREWALLD -LIBVIRTD_INIT_VARS +=3D \ - -e 's|[@]NEED_FIREWALLD[@]|need firewalld|g' -else ! WITH_FIREWALLD -LIBVIRTD_INIT_VARS +=3D \ - -e 's|[@]NEED_FIREWALLD[@]||g' -endif ! WITH_FIREWALLD - -libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - -virtproxyd.init: remote/virtproxyd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ diff --git a/src/remote/meson.build b/src/remote/meson.build index c0bc6f14b93..0310ad232aa 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -146,6 +146,12 @@ if conf.has('WITH_REMOTE') 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], } =20 + openrc_init_files +=3D { + 'name': 'libvirtd', + 'in_file': files('libvirtd.init.in'), + 'confd': files('libvirtd.confd'), + } + virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -170,6 +176,12 @@ if conf.has('WITH_REMOTE') 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], 'deps': libvirtd_socket_conflicts, } + + openrc_init_files +=3D { + 'name': 'virtproxyd', + 'in_file': files('virtproxyd.init.in'), + 'confd': files('virtproxyd.confd'), + } endif endif =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 3aafe7a6a5d..dd38e6888cd 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_SECRETS SYSCONF_FILES +=3D secret/virtsecretd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtsecretd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - secret/virtsecretd.init.in \ - $(NULL) - -virtsecretd.init: secret/virtsecretd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index a6b919dfabb..3b3f999f758 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -37,4 +37,9 @@ if conf.has('WITH_SECRETS') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtsecretd', + 'in_file': files('virtsecretd.init.in'), + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 3b4a13032aa..23576659785 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_STORAGE SYSCONF_FILES +=3D storage/virtstoraged.sysconf - -OPENRC_INIT_FILES +=3D \ - virtstoraged.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - storage/virtstoraged.init.in \ - $(NULL) - -virtstoraged.init: storage/virtstoraged.init.in $(top_builddir)/config.sta= tus - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index acc9600ba4b..7a1ed9f4b81 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -135,6 +135,11 @@ if conf.has('WITH_STORAGE') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtstoraged', + 'in_file': files('virtstoraged.init.in'), + } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 4968777858c..28bc3c4a585 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -7,15 +7,4 @@ DRIVER_SOURCE_FILES +=3D \ =20 if WITH_VBOX SYSCONF_FILES +=3D vbox/virtvboxd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtvboxd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - vbox/virtvboxd.init.in \ - $(NULL) - -virtvboxd.init: vbox/virtvboxd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 1fb88513ba0..f1b8012777f 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -60,4 +60,9 @@ if conf.has('WITH_VBOX') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtvboxd', + 'in_file': files('virtvboxd.init.in'), + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 5889d0170a4..7e7d402a7f0 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$= (VZ_DRIVER_SOURCES)) =20 if WITH_VZ SYSCONF_FILES +=3D vz/virtvzd.sysconf - -OPENRC_INIT_FILES +=3D \ - virtvzd.init \ - $(NULL) -OPENRC_INIT_FILES_IN +=3D \ - vz/virtvzd.init.in \ - $(NULL) - -virtvzd.init: vz/virtvzd.init.in $(top_builddir)/config.status - $(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@ - endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index dcf8f5037fd..fde1e937f35 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -52,4 +52,9 @@ if conf.has('WITH_VZ') 'sockets': [ 'main', 'ro', 'admin' ], 'conflicts': true, } + + openrc_init_files +=3D { + 'name': 'virtvzd', + 'in_file': files('virtvzd.init.in'), + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894437; cv=none; d=zohomail.com; s=zohoarc; b=ShsjmP3uRvx33k+TuCAeZsOIwtf9hqGAJN4mUx5uxO7MLByhYI3PWX1fDH3R5etuDmg2s0jQL5kZ30iszjEbCC8PiW8coMOiS6UvOHzOi1ma2fCvsHCVO3ql8pmFyX1bEyJ1t2hbdexzg+LY4cEDgSSYIp+5vzgbEvQvltlP3Qk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894437; 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=x822bLi3lOD944Ow/4yZ7XgwDuDJrkuf4SRx/54stbc=; b=LfUWLnVbRLKuGU/ZHYARRVwTkrOjpH8/8qsNS4Sy6NOTHLcWDuqoL6rfT1QGB8gAZYQNuRtyuuIk93Lc2tSpIgQGdGdWHAtKjuYmju1x0xxyn91dyaFqR6waA+KQpNAjv7jWHyr1VG+n671MNdIxwt2hB0l+I+gLsYX46xialG8= 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 159489443716538.71078729552596; Thu, 16 Jul 2020 03:13:57 -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-367-1ow48vDyMBC39RrXzfud1A-1; Thu, 16 Jul 2020 06:13:31 -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 832E480BCB4; Thu, 16 Jul 2020 10:13:25 +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 5FE466FEF7; Thu, 16 Jul 2020 10:13:25 +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 2CBF518037CD; Thu, 16 Jul 2020 10:13:25 +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 06GA5kXW018678 for ; Thu, 16 Jul 2020 06:05:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4F7B82B6DB; Thu, 16 Jul 2020 10:05:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD91B2DE6D for ; Thu, 16 Jul 2020 10:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894435; 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=x822bLi3lOD944Ow/4yZ7XgwDuDJrkuf4SRx/54stbc=; b=ZbTWTKaBJzUsrX6k8W4oghm5EwAiUkCcge/xZc58kLgquraCsKvm4ET3BRQbtdFWVupgwW aQYx+GQ91CCgPSDzo2cc5x8lmJE1kxyXJTYnk7IwRzIzYRcK0JGA9W2Ljev8DPvAjTroL2 lZ8J1x/y1OU1iGwrstF1FajlPGLpIWY= X-MC-Unique: 1ow48vDyMBC39RrXzfud1A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 228/351] meson: src: install libvirt daemon sysconf files Date: Thu, 16 Jul 2020 11:57:44 +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.12 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/Makefile.am | 19 ------------------- src/interface/Makefile.inc.am | 6 ------ src/interface/meson.build | 5 +++++ src/libxl/Makefile.inc.am | 2 -- src/libxl/meson.build | 5 +++++ src/locking/Makefile.inc.am | 1 - src/locking/meson.build | 5 +++++ src/logging/Makefile.inc.am | 3 --- src/logging/meson.build | 5 +++++ src/lxc/Makefile.inc.am | 2 -- src/lxc/meson.build | 5 +++++ src/meson.build | 14 ++++++++++++++ src/network/Makefile.inc.am | 2 -- src/network/meson.build | 5 +++++ src/node_device/Makefile.inc.am | 5 ----- src/node_device/meson.build | 5 +++++ src/nwfilter/Makefile.inc.am | 2 -- src/nwfilter/meson.build | 5 +++++ src/qemu/Makefile.inc.am | 1 - src/qemu/meson.build | 5 +++++ src/remote/Makefile.inc.am | 5 ----- src/remote/meson.build | 10 ++++++++++ src/secret/Makefile.inc.am | 4 ---- src/secret/meson.build | 5 +++++ src/storage/Makefile.inc.am | 4 ---- src/storage/meson.build | 5 +++++ src/vbox/Makefile.inc.am | 4 ---- src/vbox/meson.build | 5 +++++ src/vz/Makefile.inc.am | 5 ----- src/vz/meson.build | 5 +++++ 30 files changed, 89 insertions(+), 65 deletions(-) delete mode 100644 src/logging/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 0b40c23f980..c403a1d6b33 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,11 +34,9 @@ tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D LOGROTATE_FILES_IN =3D -SYSCONF_FILES =3D =20 include security/Makefile.inc.am include access/Makefile.inc.am -include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include vbox/Makefile.inc.am @@ -200,23 +198,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -install-sysconfig: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig - for f in $(SYSCONF_FILES:%.sysconf=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ - done - -uninstall-sysconfig: - for f in $(SYSCONF_FILES:%.sysconf=3D%) ; \ - do \ - tgt=3D`basename $$f`; \ - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ - done - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : - LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) =20 %.logrotate: remote/%.logrotate.in diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index f6626c7f491..06bd8f820b1 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -3,9 +3,3 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES= )) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) - -if WITH_INTERFACE - -SYSCONF_FILES +=3D interface/virtinterfaced.sysconf - -endif WITH_INTERFACE diff --git a/src/interface/meson.build b/src/interface/meson.build index a6b3e888358..8b5347bce43 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -53,4 +53,9 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } + + sysconf_files +=3D { + 'name': 'virtinterfaced', + 'file': files('virtinterfaced.sysconf'), + } endif diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 9a33eb5f06b..0031adb2ef3 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(= LIBXL_DRIVER_SOURCES)) =20 if WITH_LIBXL =20 -SYSCONF_FILES +=3D libxl/virtxend.sysconf - INSTALL_DATA_DIRS +=3D libxl =20 install-data-libxl: diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 5f858dc32fc..722a001e079 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -72,4 +72,9 @@ if conf.has('WITH_LIBXL') 'name': 'virtxend', 'in_file': files('virtxend.init.in'), } + + sysconf_files +=3D { + 'name': 'virtxend', + 'file': files('virtxend.sysconf'), + } endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 8a0ecd8d1f2..02ce2fa7a77 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,7 +1,6 @@ # vim: filetype=3Dautomake =20 RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x -SYSCONF_FILES +=3D locking/virtlockd.sysconf =20 INSTALL_DATA_DIRS +=3D locking =20 diff --git a/src/locking/meson.build b/src/locking/meson.build index f560c9b44b9..1d42682d608 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -149,6 +149,11 @@ if conf.has('WITH_LIBVIRTD') 'in_file': files('virtlockd.init.in'), } =20 + sysconf_files +=3D { + 'name': 'virtlockd', + 'file': files('virtlockd.sysconf'), + } + if conf.has('WITH_SANLOCK') virt_helpers +=3D { 'name': 'libvirt_sanlock_helper', diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am deleted file mode 100644 index 48cae3add15..00000000000 --- a/src/logging/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -SYSCONF_FILES +=3D logging/virtlogd.sysconf diff --git a/src/logging/meson.build b/src/logging/meson.build index 40327241e3c..8e913fb352f 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -92,4 +92,9 @@ if conf.has('WITH_LIBVIRTD') 'name': 'virtlogd', 'in_file': files('virtlogd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtlogd', + 'file': files('virtlogd.sysconf'), + } endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 3cf6f96ea1d..f65b1cdf6b9 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -11,8 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ =20 if WITH_LXC =20 -SYSCONF_FILES +=3D lxc/virtlxcd.sysconf - if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 6135f61d4ab..bcb5798dbc7 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -155,4 +155,9 @@ if conf.has('WITH_LXC') 'name': 'virtlxcd', 'in_file': files('virtlxcd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtlxcd', + 'file': files('virtlxcd.sysconf'), + } endif diff --git a/src/meson.build b/src/meson.build index 602e8176d99..7d1b9714218 100644 --- a/src/meson.build +++ b/src/meson.build @@ -197,6 +197,12 @@ virt_daemon_units =3D [] # * in_file - source init file (required) openrc_init_files =3D [] =20 +# sysconf_files +# install libvirt daemon sysconf files +# * name - daemon name (required) +# * file - source sysconf file (required) +sysconf_files =3D [] + =20 # list subdirectories =20 @@ -760,3 +766,11 @@ if conf.has('WITH_LIBVIRTD') endforeach endif endif + +foreach sysconf : sysconf_files + install_data( + sysconf['file'], + install_dir: sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) +endforeach diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 81971c64ed4..2202903870f 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) =20 if WITH_NETWORK -SYSCONF_FILES +=3D network/virtnetworkd.sysconf - INSTALL_DATA_DIRS +=3D network =20 UUID=3D$(shell uuidgen 2>/dev/null) diff --git a/src/network/meson.build b/src/network/meson.build index c27578d66b4..35391698d6d 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -72,4 +72,9 @@ if conf.has('WITH_NETWORK') 'name': 'virtnetworkd', 'in_file': files('virtnetworkd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtnetworkd', + 'file': files('virtnetworkd.sysconf'), + } endif diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index e6fcbf6c9e5..63d2548e11f 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -9,8 +9,3 @@ DRIVER_SOURCE_FILES +=3D \ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) - - -if WITH_NODE_DEVICES -SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf -endif WITH_NODE_DEVICES diff --git a/src/node_device/meson.build b/src/node_device/meson.build index d73867148ea..437924466eb 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -65,4 +65,9 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'in_file': files('virtnodedevd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtnodedevd', + 'file': files('virtnodedevd.sysconf'), + } endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 8fcd63cbbf9..4df4756adf7 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -11,6 +11,4 @@ if WITH_NWFILTER nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) =20 -SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf - endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 744600a73d1..a832c2ddaeb 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -60,4 +60,9 @@ if conf.has('WITH_NWFILTER') 'name': 'virtnwfilterd', 'in_file': files('virtnwfilterd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtnwfilterd', + 'file': files('virtnwfilterd.sysconf'), + } endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index ec3178c373a..6d1e9e78148 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -4,7 +4,6 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIV= ER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) =20 if WITH_QEMU -SYSCONF_FILES +=3D qemu/virtqemud.sysconf =20 INSTALL_DATA_DIRS +=3D qemu =20 diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 09b72335741..a7a7b4801ca 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -152,4 +152,9 @@ if conf.has('WITH_QEMU') 'name': 'virtqemud', 'in_file': files('virtqemud.init.in'), } + + sysconf_files +=3D { + 'name': 'virtqemud', + 'file': files('virtqemud.sysconf'), + } endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 73f7578ee5e..14c7a8e4141 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -7,11 +7,6 @@ LOGROTATE_FILES_IN +=3D \ remote/libvirtd.logrotate.in \ $(NULL) =20 -SYSCONF_FILES +=3D \ - remote/libvirtd.sysconf \ - remote/virtproxyd.sysconf \ - $(NULL) - if WITH_LIBVIRTD =20 INSTALL_DATA_DIRS +=3D remote diff --git a/src/remote/meson.build b/src/remote/meson.build index 0310ad232aa..cc5a24d1e68 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -152,6 +152,11 @@ if conf.has('WITH_REMOTE') 'confd': files('libvirtd.confd'), } =20 + sysconf_files +=3D { + 'name': 'libvirtd', + 'file': files('libvirtd.sysconf'), + } + virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -182,6 +187,11 @@ if conf.has('WITH_REMOTE') 'in_file': files('virtproxyd.init.in'), 'confd': files('virtproxyd.confd'), } + + sysconf_files +=3D { + 'name': 'virtproxyd', + 'file': files('virtproxyd.sysconf'), + } endif endif =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index dd38e6888cd..a60a6b507f4 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -3,7 +3,3 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) - -if WITH_SECRETS -SYSCONF_FILES +=3D secret/virtsecretd.sysconf -endif WITH_SECRETS diff --git a/src/secret/meson.build b/src/secret/meson.build index 3b3f999f758..2245790f796 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -42,4 +42,9 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'in_file': files('virtsecretd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtsecretd', + 'file': files('virtsecretd.sysconf'), + } endif diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 23576659785..d5438e8a71c 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -3,7 +3,3 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) - -if WITH_STORAGE -SYSCONF_FILES +=3D storage/virtstoraged.sysconf -endif WITH_STORAGE diff --git a/src/storage/meson.build b/src/storage/meson.build index 7a1ed9f4b81..59024746322 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -140,6 +140,11 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'in_file': files('virtstoraged.init.in'), } + + sysconf_files +=3D { + 'name': 'virtstoraged', + 'file': files('virtstoraged.sysconf'), + } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 28bc3c4a585..6197c3172b5 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -4,7 +4,3 @@ DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ $(NULL) - -if WITH_VBOX -SYSCONF_FILES +=3D vbox/virtvboxd.sysconf -endif WITH_VBOX diff --git a/src/vbox/meson.build b/src/vbox/meson.build index f1b8012777f..b6dcee279b9 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -65,4 +65,9 @@ if conf.has('WITH_VBOX') 'name': 'virtvboxd', 'in_file': files('virtvboxd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtvboxd', + 'file': files('virtvboxd.sysconf'), + } endif diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 7e7d402a7f0..380d1ffb839 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -2,8 +2,3 @@ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) - - -if WITH_VZ -SYSCONF_FILES +=3D vz/virtvzd.sysconf -endif WITH_VZ diff --git a/src/vz/meson.build b/src/vz/meson.build index fde1e937f35..9e8ac3f8cfc 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -57,4 +57,9 @@ if conf.has('WITH_VZ') 'name': 'virtvzd', 'in_file': files('virtvzd.init.in'), } + + sysconf_files +=3D { + 'name': 'virtvzd', + 'file': files('virtvzd.sysconf'), + } endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894198; cv=none; d=zohomail.com; s=zohoarc; b=f4XTUv7AhmdUwp/U2YRQUyUaFLn5wROfdnlTAvg/HHl97bO05qXWNg4nDorUcKamJFP49X9mMcftBroK59di8gtgkufN++Ci8T/qCJu5YGQPGVwD8Z45FvI6fU8DFXAIokcuhWRkyEiJ04WrC+mjK3Ps8d2E4EcD3wDnmGklPA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894198; 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=t5IYUryqP/AiOXI2vOTpW75Ysa+wZO6L4VoZl0aHUxg=; b=GX6rwZ/GKou1AvrACSrK6dc7mduSDxM7AT3fGfMv525EpcTJ7LHrJPu0xZk9IWLXetCEuZdcWY0QflLL2372NABmOxFAzcDW3mRKwWoq504cQcIkiv0T9f6WsomLpgYVEVDhUHYtHRMiUuYg6dv6iE7flWrowdE9ZQVujaNW6o4= 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 1594894198554578.7974493524141; Thu, 16 Jul 2020 03:09:58 -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-441-xD2hMicvPKaUpPaOjNh69w-1; Thu, 16 Jul 2020 06:09: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 45905800E23; Thu, 16 Jul 2020 10:09:49 +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 26C797B421; Thu, 16 Jul 2020 10:09:49 +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 E976C181A95A; Thu, 16 Jul 2020 10:09:48 +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 06GA5lPd018688 for ; Thu, 16 Jul 2020 06:05:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 38E552B6DC; Thu, 16 Jul 2020 10:05:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6FC42B6DB for ; Thu, 16 Jul 2020 10:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894197; 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=t5IYUryqP/AiOXI2vOTpW75Ysa+wZO6L4VoZl0aHUxg=; b=FKOkAj//9/Gjq9nhZFpFVLZDfHjX2/4Amj2eNuQ2PMafOmKfXej2jB+Dq/7bz3lOkuSSWs qx0054MW0I3w8YNyrlOijHuOYGlZ9zhaqnkcp1rJwwC1dJCXGOiNnXD8dMO+RUnYmbuXUI ludgGwhOTiYpFfcm4fwGoX5G0W6fom0= X-MC-Unique: xD2hMicvPKaUpPaOjNh69w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 229/351] meson: src: install empty directories Date: Thu, 16 Jul 2020 11:57:45 +0200 Message-Id: <5c5efe843e77802a8cc5e8a7a80c48f93fe3f2c7.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.13 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 --- scripts/install-dirs.sh | 5 +++++ scripts/meson.build | 1 + src/Makefile.am | 9 --------- src/libxl/Makefile.inc.am | 16 ---------------- src/libxl/meson.build | 6 ++++++ src/locking/Makefile.inc.am | 24 ------------------------ src/locking/meson.build | 12 ++++++++++++ src/lxc/Makefile.inc.am | 17 ----------------- src/lxc/meson.build | 6 ++++++ src/meson.build | 16 ++++++++++++++++ src/network/Makefile.inc.am | 5 ----- src/network/meson.build | 6 ++++++ src/qemu/Makefile.inc.am | 29 ----------------------------- src/qemu/meson.build | 10 ++++++++++ src/remote/Makefile.inc.am | 13 ------------- src/remote/meson.build | 4 ++++ 16 files changed, 66 insertions(+), 113 deletions(-) create mode 100644 scripts/install-dirs.sh diff --git a/scripts/install-dirs.sh b/scripts/install-dirs.sh new file mode 100644 index 00000000000..27558d53fe9 --- /dev/null +++ b/scripts/install-dirs.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +for dir in "$@"; do + mkdir -p $DESTDIR/$dir +done diff --git a/scripts/meson.build b/scripts/meson.build index 0d2e48c3a36..8e4f16349e5 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -20,6 +20,7 @@ scripts =3D [ 'header-ifdef.py', 'hvsupport.py', 'hyperv_wmi_generator.py', + 'install-dirs.sh', 'meson-python.sh', 'mock-noinline.py', 'prohibit-duplicate-header.py', diff --git a/src/Makefile.am b/src/Makefile.am index c403a1d6b33..894ec5162a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -227,15 +227,6 @@ endif WITH_LIBVIRTD =20 install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" =20 uninstall-local: $(UNINSTALL_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) - rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 0031adb2ef3..5af19c83512 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -2,19 +2,3 @@ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) - -if WITH_LIBXL - -INSTALL_DATA_DIRS +=3D libxl - -install-data-libxl: - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/libxl" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" - -uninstall-data-libxl: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: - rmdir "$(DESTDIR)$(runstatedir)/libvirt/libxl" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: - -endif WITH_LIBXL diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 722a001e079..a5df0011b0b 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -77,4 +77,10 @@ if conf.has('WITH_LIBXL') 'name': 'virtxend', 'file': files('virtxend.sysconf'), } + + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'libxl', + runstatedir / 'libvirt' / 'libxl', + localstatedir / 'log' / 'libvirt' / 'libxl', + ] endif diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 02ce2fa7a77..285e73a6bf4 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,27 +1,3 @@ # vim: filetype=3Dautomake =20 RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x - -INSTALL_DATA_DIRS +=3D locking - -install-data-locking: - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lockd" -if WITH_SANLOCK - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" -endif WITH_SANLOCK - -uninstall-data-locking: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: - rmdir "$(DESTDIR)$(runstatedir)/libvirt/lockd" ||: -if WITH_SANLOCK - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: -endif WITH_SANLOCK -endif WITH_LIBVIRTD - -.PHONY: \ - install-data-locking \ - uninstall-data-locking \ - $(NULL) diff --git a/src/locking/meson.build b/src/locking/meson.build index 1d42682d608..dbff78ca1bb 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -225,4 +225,16 @@ if conf.has('WITH_LIBVIRTD') 'aug': files('test_virtlockd.aug.in'), 'conf': files('virtlockd.conf'), } + + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'lockd', + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif endif diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index f65b1cdf6b9..7f312975d6c 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -15,21 +15,4 @@ if WITH_DTRACE_PROBES RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x endif =20 -INSTALL_DATA_DIRS +=3D lxc - -install-data-lxc: - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lxc" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" - -uninstall-data-lxc: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: - rmdir "$(DESTDIR)$(runstatedir)/libvirt/lxc" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: - endif WITH_LXC - -.PHONY: \ - install-data-lxc \ - uninstall-data-lxc \ - $(NULL) diff --git a/src/lxc/meson.build b/src/lxc/meson.build index bcb5798dbc7..ccb11ee1d42 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -160,4 +160,10 @@ if conf.has('WITH_LXC') 'name': 'virtlxcd', 'file': files('virtlxcd.sysconf'), } + + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'lxc', + runstatedir / 'libvirt' / 'lxc', + localstatedir / 'log' / 'libvirt' / 'lxc', + ] endif diff --git a/src/meson.build b/src/meson.build index 7d1b9714218..b8e356d8b0e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -203,6 +203,10 @@ openrc_init_files =3D [] # * file - source sysconf file (required) sysconf_files =3D [] =20 +# virt_install_dirs: +# list of directories to create during installation +virt_install_dirs =3D [] + =20 # list subdirectories =20 @@ -774,3 +778,15 @@ foreach sysconf : sysconf_files rename: [ sysconf['name'] ], ) endforeach + + +# Install empty directories + +virt_install_dirs +=3D [ + localstatedir / 'cache' / 'libvirt', + localstatedir / 'lib' / 'libvirt' / 'images', + localstatedir / 'lib' / 'libvirt' / 'filesystems', + localstatedir / 'lib' / 'libvirt' / 'boot', +] + +meson.add_install_script(install_dirs_prog.path(), virt_install_dirs) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 2202903870f..8482f924a15 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -10,9 +10,6 @@ INSTALL_DATA_DIRS +=3D network UUID=3D$(shell uuidgen 2>/dev/null) =20 install-data-network: - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/network" $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart" $(INSTALL_DATA) $(srcdir)/network/default.xml \ $(DESTDIR)$(confdir)/qemu/networks/default.xml @@ -38,8 +35,6 @@ uninstall-data-network: rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || : rmdir "$(DESTDIR)$(confdir)/qemu/networks" || : - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||: - rmdir "$(DESTDIR)$(runstatedir)/libvirt/network" ||: if WITH_FIREWALLD_ZONE rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml endif WITH_FIREWALLD_ZONE diff --git a/src/network/meson.build b/src/network/meson.build index 35391698d6d..c2085091bce 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -77,4 +77,10 @@ if conf.has('WITH_NETWORK') 'name': 'virtnetworkd', 'file': files('virtnetworkd.sysconf'), } + + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'network', + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', + runstatedir / 'libvirt' / 'network', + ] endif diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 6d1e9e78148..f665cb1f130 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -2,32 +2,3 @@ =20 DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) - -if WITH_QEMU - -INSTALL_DATA_DIRS +=3D qemu - -install-data-qemu: - $(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm" - $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu" - -uninstall-data-qemu: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||: - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm" - rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu" ||: - -endif WITH_QEMU - -.PHONY: \ - install-data-qemu \ - uninstall-data-qemu \ - $(NULL) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index a7a7b4801ca..7bdaf6c19bd 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -157,4 +157,14 @@ if conf.has('WITH_QEMU') 'name': 'virtqemud', 'file': files('virtqemud.sysconf'), } + + virt_install_dirs +=3D [ + localstatedir / 'lib' / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu', + localstatedir / 'cache' / 'libvirt' / 'qemu', + localstatedir / 'log' / 'libvirt' / 'qemu', + localstatedir / 'lib' / 'libvirt' / 'swtpm', + runstatedir / 'libvirt' / 'qemu' / 'swtpm', + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] endif diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 14c7a8e4141..287dad426cb 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -9,14 +9,6 @@ LOGROTATE_FILES_IN +=3D \ =20 if WITH_LIBVIRTD =20 -INSTALL_DATA_DIRS +=3D remote - -install-data-remote: - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" - -uninstall-data-remote: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: - if WITH_SYSCTL # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 @@ -60,11 +52,6 @@ endif WITH_POLKIT =20 endif WITH_LIBVIRTD =20 -.PHONY: \ - install-data-remote \ - uninstall-data-remote \ - $(NULL) - # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if WITH_SASL diff --git a/src/remote/meson.build b/src/remote/meson.build index cc5a24d1e68..b18754d02c1 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -192,6 +192,10 @@ if conf.has('WITH_REMOTE') 'name': 'virtproxyd', 'file': files('virtproxyd.sysconf'), } + + virt_install_dirs +=3D [ + localstatedir / 'log' / 'libvirt', + ] endif endif =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894813; cv=none; d=zohomail.com; s=zohoarc; b=DslIvutW7tgjjx3/pN50BBJrDZDsmPB+bly35vn4/vlIOkb/t7f93M+h7Zx0NvR0NQIxOOCOw4KyVfCEz4tKiBkz9B9RFSTj7uJ4yZcWorWRajhZ5/aPgW5Du0kFuZ7W2IUhNcdLUl3iOzyRRf3rWnIsSa66yftdqZVN10YSTbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894813; 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=ee6gc0xGf+i061b/tYoLnf1WEZYhL854MhpSOltOrZk=; b=gmJrXehsE4T9e3ymc4CZ41PUXuKDXr4vz2UBjOHJcYWLTUMm+jvjv57gJnPt+5zx5gi33LnFi9l70y7FMRAjjiXBD5+IX6XSLUD2LWud0NWor6ikc3Cd5JodhfG4ghbJM83ux5i0Jmc4WKIGjgMO94WrNRPYq8NFSrgaa4RR3l4= 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 1594894813855642.1556338613088; Thu, 16 Jul 2020 03:20:13 -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-9-K7oLoepZNfSd5rwHc7T2Ww-1; Thu, 16 Jul 2020 06:13:33 -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 D850D1008303; Thu, 16 Jul 2020 10:13:27 +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 B065370100; Thu, 16 Jul 2020 10:13:27 +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 7B00A730E1; Thu, 16 Jul 2020 10:13:27 +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 06GA5m35018696 for ; Thu, 16 Jul 2020 06:05:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 220182B6DB; Thu, 16 Jul 2020 10:05:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 906C72B6E6 for ; Thu, 16 Jul 2020 10:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894812; 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=ee6gc0xGf+i061b/tYoLnf1WEZYhL854MhpSOltOrZk=; b=jRklCfaU8a/PXi3DUq4yBxXQ0N18px84v9U6cV3PZ5bRyMpZvjegQ1iMKGxnRXgSvBBp31 YmndVeZmjwOQjhYuL5q/gpvY6IOHhOo3PzO/YdmfTloTJFJu8ivadPhlvA1PjuUn5rbJNq Bg8z24feTscAmqNtvnHc5kqp3LeW/c0= X-MC-Unique: K7oLoepZNfSd5rwHc7T2Ww-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 230/351] meson: src: generate logrotate files Date: Thu, 16 Jul 2020 11:57:46 +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.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/Makefile.am | 28 ---------------------------- src/remote/Makefile.inc.am | 7 ------- src/remote/meson.build | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 894ec5162a3..07516aa43ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,6 @@ if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D -LOGROTATE_FILES_IN =3D =20 include security/Makefile.inc.am include access/Makefile.inc.am @@ -198,33 +197,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir= )/scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -LOGROTATE_FILES :=3D $(LOGROTATE_FILES_IN:remote/%.in=3D%) - -%.logrotate: remote/%.logrotate.in - $(AM_V_GEN)sed \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - -if WITH_LIBVIRTD -install-logrotate: $(LOGROTATE_FILES) - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/logrotate.d/ - for f in $(LOGROTATE_FILES) ; \ - do \ - tgt=3D`echo $$f | sed -e 's/.logrotate//'`; \ - $(INSTALL_DATA) $$f \ - $(DESTDIR)$(sysconfdir)/logrotate.d/$$tgt; \ - done - -uninstall-logrotate: - rm -f $(LOGROTATE_FILES:%.logrotate=3D$(DESTDIR)$(sysconfdir)/logrotate.d= /%) - rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : - -INSTALL_DATA_LOCAL +=3D install-logrotate -UNINSTALL_LOCAL +=3D uninstall-logrotate -endif WITH_LIBVIRTD - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) =20 diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 287dad426cb..8fbe8425b3b 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,12 +1,5 @@ # vim: filetype=3Dautomake =20 -LOGROTATE_FILES_IN +=3D \ - remote/libvirtd.qemu.logrotate.in \ - remote/libvirtd.lxc.logrotate.in \ - remote/libvirtd.libxl.logrotate.in \ - remote/libvirtd.logrotate.in \ - $(NULL) - if WITH_LIBVIRTD =20 if WITH_SYSCTL diff --git a/src/remote/meson.build b/src/remote/meson.build index b18754d02c1..3b9f6117b62 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -99,6 +99,13 @@ libvirtd_socket_unit_files =3D [ =20 libvirtd_socket_conflicts =3D ' '.join(libvirtd_socket_unit_files) =20 +logrotate_files =3D [ + 'libvirtd.qemu', + 'libvirtd.lxc', + 'libvirtd.libxl', + 'libvirtd', +] + if conf.has('WITH_REMOTE') remote_driver_lib =3D static_library( 'virt_remote_driver', @@ -196,6 +203,22 @@ if conf.has('WITH_REMOTE') virt_install_dirs +=3D [ localstatedir / 'log' / 'libvirt', ] + + logrotate_conf =3D configuration_data() + logrotate_conf.set('localstatedir', localstatedir) + + foreach name : logrotate_files + log_file =3D configure_file( + input: '@0@.logrotate.in'.format(name), + output: '@0@.logrotate'.format(name), + configuration: logrotate_conf, + ) + install_data( + log_file, + install_dir: sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach endif endif =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894421; cv=none; d=zohomail.com; s=zohoarc; b=laEkidZCT8wazqLm1LhsrYP0HRtKyPvVq8v10e9gLDoaW8AXNa/5gHkJD8I+G1IiqJUGh/y269strDdG08hP0r1kSqAcKGQ288GqJyMX8SKUj44voG7oEpxU6CmoIy9L2mE+x3oAs1DBBdb7qglQaxiFpwuAKTQF7HJZF8UeM7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894421; 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=OniFu0wK1F/Fy7eDW+RR6i9KRS/P8rIqnCJwDptB+YM=; b=cTqiw1dbHm+3fZemCg1XkuCT40kmAkNPoYxGsVfIMm7XMjnGuz9F0OJPPb9UDr8K3iMqPDyJUkhxZcvF2191AAKbUQvdaTwlYWi+jvPlRSpUnfUVPLr12vI5Cv9m4E2bn0HwYzdQPyQwlAQXrO6/I+/DMLCA0fRlMG6nIkA2uTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894421165838.7729789000359; Thu, 16 Jul 2020 03:13:41 -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-106-Y4Nul459MnmLinx3QgNJSw-1; Thu, 16 Jul 2020 06:13:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 122171009617; Thu, 16 Jul 2020 10:13:31 +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 E464D78A5B; Thu, 16 Jul 2020 10:13:30 +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 B5C60730E6; Thu, 16 Jul 2020 10:13:30 +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 06GA5nPe018703 for ; Thu, 16 Jul 2020 06:05:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09AC32B6DB; Thu, 16 Jul 2020 10:05:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78F1C2B6E6 for ; Thu, 16 Jul 2020 10:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894419; 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=OniFu0wK1F/Fy7eDW+RR6i9KRS/P8rIqnCJwDptB+YM=; b=gVqcUhwlDIuEFCEnynG+7FxFGuQf0WkrBP4Q6NDC5DvssXnJ9zmkvdlgFlyX0g/o8rBhcm /6O1b8zOjcRiS57hhLkb6SaQrvdnSEd4oqIVv2ueCw+uK2xx/91ws+jL+C4XhGG3UCnfHQ ncec4owqNNFxmOIr8siypVzZwSv8YC8= X-MC-Unique: Y4Nul459MnmLinx3QgNJSw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 231/351] meson: src/access: generate org.libvirt.api.policy Date: Thu, 16 Jul 2020 11:57:47 +0200 Message-Id: <1eecd0b526196698a3b5891a819d85aec5282b50.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.14 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/access/Makefile.inc.am | 15 --------------- src/access/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 72c62a0d2cd..d90829632ff 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -6,21 +6,6 @@ ACCESS_DRIVER_API_FILES =3D \ libvirt_access_lxc.xml \ $(NULL) =20 -ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy - -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(top_srcdir)/scripts/genpolkit.py Makefile.am - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) \ - $(top_srcdir)/scripts/genpolkit.py $< > $@ || rm -f $@ - -if WITH_POLKIT - -polkitactiondir =3D $(datadir)/polkit-1/actions -if WITH_LIBVIRTD -polkitaction_DATA =3D $(ACCESS_DRIVER_POLKIT_POLICY) -endif WITH_LIBVIRTD -endif ! WITH_POLKIT - libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ diff --git a/src/access/meson.build b/src/access/meson.build index f3b605f0009..71bc4670091 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -9,6 +9,8 @@ access_polkit_sources =3D [ 'viraccessdriverpolkit.c', ] =20 +access_perm_h =3D files('viraccessperm.h') + remote_path =3D meson.source_root() / 'src' / 'remote' =20 access_gen_headers =3D [] @@ -58,6 +60,18 @@ endforeach =20 if conf.has('WITH_POLKIT') access_sources +=3D access_polkit_sources + + if conf.has('WITH_LIBVIRTD') + custom_target( + 'org.libvirt.api.policy', + input: access_perm_h, + output: 'org.libvirt.api.policy', + command: [ meson_python_prog, genpolkit_prog, '@INPUT@' ], + capture: true, + install: true, + install_dir: datadir / 'polkit-1' / 'actions', + ) + endif endif =20 virt_access_lib =3D static_library( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894423; cv=none; d=zohomail.com; s=zohoarc; b=HTH7jkFcclMN6Uiv4WfgoOOVwHIsN9+xgXY/03UWP1UWy6Yanh4JDSIeOdVDfQ19/elnTdehyi4WafSbinR3ycAoeX2HVAUakcqIvN7xtPSAef5tTaV1vhXtEiXhgDmKnRb87adpmhWodapNzRhSficjRn5WnE6QKDT7gR0BssM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894423; 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=RtNLZxS8HPZC0SkDX1vqmji1/lIGtxZX79hN1Bre5r0=; b=A7BD79qGHnMahgA504nMdLBq7aV4u7ErBJyujtowLkp4sqhuTHnz2Wic8GMXzHvEKiOZBa1pBANBnatw0BVHWT1bD4YLvfDKCJUGZ188/5WDttCyOVZm0XEN+L6BjWWDmQYdwM2U+5OCyd0w/LrBcSJodGG7p54qJXL5opnxIbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894423158301.60967802696587; Thu, 16 Jul 2020 03:13:43 -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-24-SXUS8fRYP1S8Vpetx_x0Qg-1; Thu, 16 Jul 2020 06:13:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49D4B100AA24; Thu, 16 Jul 2020 10:13:34 +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 2C1E472ADB; Thu, 16 Jul 2020 10:13:34 +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 EFA2E18034F3; Thu, 16 Jul 2020 10:13:33 +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 06GA5nG5018711 for ; Thu, 16 Jul 2020 06:05:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id E88712B6DC; Thu, 16 Jul 2020 10:05:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61CDD2B6DB for ; Thu, 16 Jul 2020 10:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894421; 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=RtNLZxS8HPZC0SkDX1vqmji1/lIGtxZX79hN1Bre5r0=; b=K9y27dP1cmyYSHty0eDzbZmAvq6ReNZ16uQtFxjaJhuCCfM3mbLDfJdgYDwE7xQyTedegy W89d7HJbdEP+Wn8KUeej2H/Bo6GtkyfZoJ3/2sVAophhoXLAl7iOhK6dkN8BYlj/1ylQrm XUVHcRkzkZYarXPo+g1FjVxq5lT/Ud0= X-MC-Unique: SXUS8fRYP1S8Vpetx_x0Qg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 232/351] meson: src/access: generate libvirt_access*.xml files Date: Thu, 16 Jul 2020 11:57:48 +0200 Message-Id: <68d201eb7a9001702a51d7db6e11c3e59adc24e9.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.15 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/Makefile.am | 1 - src/access/Makefile.inc.am | 21 --------------------- src/access/meson.build | 12 ++++++++++++ 3 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 src/access/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 07516aa43ae..63705b36b6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,6 @@ endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D =20 include security/Makefile.inc.am -include access/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include vbox/Makefile.inc.am diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am deleted file mode 100644 index d90829632ff..00000000000 --- a/src/access/Makefile.inc.am +++ /dev/null @@ -1,21 +0,0 @@ -# vim: filetype=3Dautomake - -ACCESS_DRIVER_API_FILES =3D \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml \ - $(NULL) - -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Daclapi \ - lxc LXC $(LXC_PROTOCOL) > $@ - diff --git a/src/access/meson.build b/src/access/meson.build index 71bc4670091..2d8a2a90716 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -16,16 +16,19 @@ remote_path =3D meson.source_root() / 'src' / 'remote' access_gen_headers =3D [] access_gen_sources =3D [] access_gen_sym =3D [] +access_gen_xml =3D [] =20 foreach name : [ 'remote', 'qemu', 'lxc' ] if name =3D=3D 'remote' header_file =3D 'viraccessapicheck.h' source_file =3D 'viraccessapicheck.c' syms_file =3D 'libvirt_access.syms' + xml_file =3D 'libvirt_access.xml' else header_file =3D 'viraccessapicheck@0@.h'.format(name) source_file =3D 'viraccessapicheck@0@.c'.format(name) syms_file =3D 'libvirt_access_@0@.syms'.format(name) + xml_file =3D 'libvirt_access_@0@.xml'.format(name) endif protocol_file =3D remote_path / '@0@_protocol.x'.format(name) =20 @@ -56,6 +59,15 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] gendispatch_prog, '--mode=3Daclsym', name, name.to_upper(), protocol= _file, ] ) + + access_gen_xml +=3D custom_target( + xml_file, + output: xml_file, + capture: true, + command: [ + gendispatch_prog, '--mode=3Daclapi', name, name.to_upper(), protocol= _file, + ], + ) endforeach =20 if conf.has('WITH_POLKIT') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894510; cv=none; d=zohomail.com; s=zohoarc; b=jLu1GIzJ1xssmfJbnd5NkS75J9aNk2vmGWz+xgT5pYoWk39qFVsu4e542NkbzVLMpxxyT87q0Ni6cOzqWHfQ6hpzH/gK7opn34dpjY2bsqIFx3QSvj96jl7CmrfR45ehu7ZEUYUl77yBTn/dZ+1qSgMOC3nuuBI6WCDnUXGmgTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894510; 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=k2IlvSzYy/lg3Gi+/OXNtZvjJ5Eimr/5xCqsqaCFWAg=; b=X3j0DY2jDByb8jG2qXj4LaBCnhUXiWYmS5ZKxRRNarGrcGiFwpQ4YT/cnyPuWT/XW8HVfqtf5crdVLbsHuPOo6rthtKttYhDGj7W4wvImWXvmvG9+0f4S9erZeMBxCwCvo8wKS18nSL3NV/tL7x/HIs5upRMVjPyiIqnfqmUCv8= 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 1594894510159565.8402654531677; Thu, 16 Jul 2020 03:15:10 -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-501-VEETnuV7O-SWPg2iZGGqwg-1; Thu, 16 Jul 2020 06:09:57 -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 B4AE81888AA9; Thu, 16 Jul 2020 10:09:51 +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 8F6011001B07; Thu, 16 Jul 2020 10:09:51 +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 57DEC181A96B; Thu, 16 Jul 2020 10:09:51 +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 06GA5ow3018721 for ; Thu, 16 Jul 2020 06:05:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id D381F2B6DC; Thu, 16 Jul 2020 10:05:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C2722B6DB for ; Thu, 16 Jul 2020 10:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894508; 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=k2IlvSzYy/lg3Gi+/OXNtZvjJ5Eimr/5xCqsqaCFWAg=; b=NG18Waxp8LeIGZ1I5QDrwJqteTLIpaBGSHPUR7BWPfWv+MXqH2ZNVWcaJCVV1oOZV2nNdT /SGuweIKB74h+Jqwlc/1n2kXk2KUfzPnuVY7LnKRVYbaD7kEy7EgITB2xhALutUOgnJhNf j68vprvo47xANJ4xo6czmkkvTBKuUzI= X-MC-Unique: VEETnuV7O-SWPg2iZGGqwg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 233/351] meson: src/network: install default network xml Date: Thu, 16 Jul 2020 11:57:49 +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.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 --- scripts/install-symlink.sh | 7 +++++ scripts/meson.build | 1 + src/network/Makefile.inc.am | 20 ------------- src/network/{default.xml =3D> default.xml.in} | 0 src/network/meson.build | 32 +++++++++++++++++++++ 5 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 scripts/install-symlink.sh rename src/network/{default.xml =3D> default.xml.in} (100%) diff --git a/scripts/install-symlink.sh b/scripts/install-symlink.sh new file mode 100644 index 00000000000..bfd1f5ad37d --- /dev/null +++ b/scripts/install-symlink.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +mkdir -p $DESTDIR/$1 + +cd $DESTDIR/$1 + +ln -f -s $2 $3 diff --git a/scripts/meson.build b/scripts/meson.build index 8e4f16349e5..3038dfc8d21 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -21,6 +21,7 @@ scripts =3D [ 'hvsupport.py', 'hyperv_wmi_generator.py', 'install-dirs.sh', + 'install-symlink.sh', 'meson-python.sh', 'mock-noinline.py', 'prohibit-duplicate-header.py', diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 8482f924a15..c19b1f99529 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -7,23 +7,7 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ if WITH_NETWORK INSTALL_DATA_DIRS +=3D network =20 -UUID=3D$(shell uuidgen 2>/dev/null) - install-data-network: - $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart" - $(INSTALL_DATA) $(srcdir)/network/default.xml \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml - test -z "$(UUID)" || \ - { sed -e "s,,; $(UUID)," \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml | \ - tr ";" "\n" > \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \ - cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ - rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; } - ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ - rm -f default.xml && \ - $(LN_S) ../default.xml default.xml ) if WITH_FIREWALLD_ZONE $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones" $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \ @@ -31,10 +15,6 @@ if WITH_FIREWALLD_ZONE endif WITH_FIREWALLD_ZONE =20 uninstall-data-network: - rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml - rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml - rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || : - rmdir "$(DESTDIR)$(confdir)/qemu/networks" || : if WITH_FIREWALLD_ZONE rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml endif WITH_FIREWALLD_ZONE diff --git a/src/network/default.xml b/src/network/default.xml.in similarity index 100% rename from src/network/default.xml rename to src/network/default.xml.in diff --git a/src/network/meson.build b/src/network/meson.build index c2085091bce..2ca7d268c6e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -83,4 +83,36 @@ if conf.has('WITH_NETWORK') localstatedir / 'lib' / 'libvirt' / 'dnsmasq', runstatedir / 'libvirt' / 'network', ] + + uuidgen_prog =3D find_program('uuidgen', required: false) + + if uuidgen_prog.found() + uuid =3D run_command(uuidgen_prog).stdout().strip() + + configure_file( + input: 'default.xml.in', + output: 'default.xml', + command: [ + 'sed', '-e', 's||\\n @0@|'.format(uuid= ), + '@INPUT@', + ], + capture: true, + install: true, + install_dir: confdir / 'qemu' / 'networks', + ) + else + configure_file( + input: 'default.xml.in', + output: 'default.xml', + copy: true, + install: true, + install_dir: confdir / 'qemu' / 'networks', + ) + endif + + meson.add_install_script( + install_symlink_prog.path(), + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894206; cv=none; d=zohomail.com; s=zohoarc; b=hMIDuhPaBZyNfDnfeiVqvOXckSWDaweRa+WnFB4LGnhwABn4y2uaTXfr8LoipNjN8HQrqcHT5VGMV0vZEV/JtHIu2A5s+yWn+GOgMuUueAx5wF6Yv1txuiTnNY70yhnHutzstIHfGuUrVtZQ2W347oNyAdjKgh836CaRLaDUmak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894206; 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=w6HB7Wz3cB8Ymfj82RgLhuYs1Syh5zlXeq298fo1fYM=; b=cfVFyctjvpd3F9XFdERwTVFiZ2dv3VsXHI4HZw65S93thUV3a+VsQ6Fa5zI//01WouE+jY0Qe+lOpGOJ836FTAad/dKULoVk9YdTvX3FSJ2MjQm56XjKqHtyTInp1AnejFh8Mpi3Mu5tQ5G6JoYw/0u7FYAoY7vl3x0KbPowTjU= 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 1594894206027468.964936513112; Thu, 16 Jul 2020 03:10:06 -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-249-aSTESBLwPeGvUxlXqtn9vg-1; Thu, 16 Jul 2020 06:09:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 149FA108D; Thu, 16 Jul 2020 10:09:54 +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 EB43572ADE; Thu, 16 Jul 2020 10:09:53 +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 BE8E3A36E5; Thu, 16 Jul 2020 10:09:53 +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 06GA5pcZ018733 for ; Thu, 16 Jul 2020 06:05:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id B974A2B6DC; Thu, 16 Jul 2020 10:05:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33DBF2B6DB for ; Thu, 16 Jul 2020 10:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894204; 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=w6HB7Wz3cB8Ymfj82RgLhuYs1Syh5zlXeq298fo1fYM=; b=b1WfebDHq/mUayke0Fh4Ccf7mbCSpcubEVBRi3o1FuKBMlU8Z4LvkjgfxnEFotUvNR5Kt/ vCJW4qG57Pg3lvayD5VJ8QcUOjVKAG+04PuPUI5o81zwtasi6jVCN19v+B3iGgFSCMFc1g GUDyeT52S7xIvtur0b9WIVLEazUaRjI= X-MC-Unique: aSTESBLwPeGvUxlXqtn9vg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 234/351] meson: src/network: install firewalld zone file Date: Thu, 16 Jul 2020 11:57:50 +0200 Message-Id: <83f52d172dd30d31a6beb7e0a98d9fe20758001d.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.15 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/Makefile.am | 7 ++----- src/network/Makefile.inc.am | 22 ---------------------- src/network/meson.build | 8 ++++++++ 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 63705b36b6f..7305a069f07 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ =20 DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -INSTALL_DATA_DIRS =3D INSTALL_DATA_LOCAL =3D UNINSTALL_LOCAL =3D SYM_FILES =3D @@ -196,8 +195,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)= /scripts/gensystemtap.py =20 endif WITH_DTRACE_PROBES =20 -install-data-local: $(INSTALL_DATA_LOCAL) \ - $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) +install-data-local: $(INSTALL_DATA_LOCAL) =20 -uninstall-local: $(UNINSTALL_LOCAL) \ - $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) +uninstall-local: $(UNINSTALL_LOCAL) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c19b1f99529..c13a6831cc0 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -3,25 +3,3 @@ DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) - -if WITH_NETWORK -INSTALL_DATA_DIRS +=3D network - -install-data-network: -if WITH_FIREWALLD_ZONE - $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones" - $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \ - $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml -endif WITH_FIREWALLD_ZONE - -uninstall-data-network: -if WITH_FIREWALLD_ZONE - rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml -endif WITH_FIREWALLD_ZONE - -endif WITH_NETWORK - -.PHONY: \ - install-data-network \ - uninstall-data-network \ - $(NULL) diff --git a/src/network/meson.build b/src/network/meson.build index 2ca7d268c6e..948dad39432 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -115,4 +115,12 @@ if conf.has('WITH_NETWORK') confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) + + if conf.has('WITH_FIREWALLD_ZONE') + install_data( + 'libvirt.zone', + install_dir: prefix / 'lib' / 'firewalld' / 'zones', + rename: [ 'libvirt.xml' ], + ) + endif endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894125; cv=none; d=zohomail.com; s=zohoarc; b=CGGUz8OpYncwsG7dEBA0XKy5k52QiIaKHaAoEwVd7LDmuORNW2+SW7Xlm41aMy9wc7atL3+Vbn2e3sg8r24Pft0h2+WOuMfbs79aqVRULfn/tgQgmQFrrXxj2kIx0seIoG00qhJbh8t4nw2mO/ghHtPdfogbvqqApOygm8rSfRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894125; 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=pQCWgwAm2yrorMjfy9s3I7FjgkujvOsGWkPl3UxmDdU=; b=HkyXX9piwJqqtvLfc28Rav8ohmT+BZfoBY2/f87gJzwYTf+hVfP4OVpzQ527/rRL+N5kQmE6TKIW+cLFCmgrRWWxA56O+Z4slSybSavhGvREIhnez82Anqy0DPmlRFFp3Ymg3kcrglSpZpknRL8QpP1b6UhIUGPJc4R0tkyi/Rk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894125606447.3389338230879; Thu, 16 Jul 2020 03:08:45 -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-424-uhEDOZ7hNeSVcUjU9bKwrw-1; Thu, 16 Jul 2020 06:08:40 -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 082F61888AB6; Thu, 16 Jul 2020 10:08:32 +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 D81B260E3E; Thu, 16 Jul 2020 10:08:31 +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 A4ABA180223F; Thu, 16 Jul 2020 10:08:31 +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 06GA5qL7018748 for ; Thu, 16 Jul 2020 06:05:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id A28152B6DC; Thu, 16 Jul 2020 10:05:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D6692B6DB for ; Thu, 16 Jul 2020 10:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894123; 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=pQCWgwAm2yrorMjfy9s3I7FjgkujvOsGWkPl3UxmDdU=; b=Ai0Z7VHr/NlKf4i/1HsJIQ27x71nXUOX2siH2gjqusP351CFf9lQthT6SKIFk822IBNbfW 1yNIf9Hrkd6r+efciQvYxKfxzDm1rbmK7Na/4XTPr7BMG48xlrZMLpt9/KuEFsBAUiEYOH TWOSkZQlnSaiH+VrHh9+6nGJ5APT5ks= X-MC-Unique: uhEDOZ7hNeSVcUjU9bKwrw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 235/351] meson: src/nwfilter: install nwfilter XML files Date: Thu, 16 Jul 2020 11:57:51 +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.12 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/nwfilter/Makefile.inc.am | 9 --------- src/nwfilter/meson.build | 2 ++ src/nwfilter/xml/meson.build | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/nwfilter/xml/meson.build diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 4df4756adf7..4d34d7f3ad1 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,14 +1,5 @@ # vim: filetype=3Dautomake =20 -NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) - DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) - -if WITH_NWFILTER - -nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter -nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) - -endif WITH_NWFILTER diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a832c2ddaeb..a05f0ce8fcf 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -65,4 +65,6 @@ if conf.has('WITH_NWFILTER') 'name': 'virtnwfilterd', 'file': files('virtnwfilterd.sysconf'), } + + subdir('xml') endif diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build new file mode 100644 index 00000000000..95af75bb15e --- /dev/null +++ b/src/nwfilter/xml/meson.build @@ -0,0 +1,22 @@ +nwfilter_xml_files =3D [ + 'allow-arp.xml', + 'allow-dhcp-server.xml', + 'allow-dhcp.xml', + 'allow-incoming-ipv4.xml', + 'allow-ipv4.xml', + 'clean-traffic-gateway.xml', + 'clean-traffic.xml', + 'no-arp-ip-spoofing.xml', + 'no-arp-mac-spoofing.xml', + 'no-arp-spoofing.xml', + 'no-ip-multicast.xml', + 'no-ip-spoofing.xml', + 'no-mac-broadcast.xml', + 'no-mac-spoofing.xml', + 'no-other-l2-traffic.xml', + 'no-other-rarp-traffic.xml', + 'qemu-announce-self-rarp.xml', + 'qemu-announce-self.xml', +] + +install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nw= filter') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894447; cv=none; d=zohomail.com; s=zohoarc; b=QCdVRxq3AVo8/bYYBaYxcJuwD2HqA5eYins/vinkAgYLj3gWrD8JeDWiUuvN4j29uqBuvyMaEMhiyknjoDhfeqTLuOTBR5oc0F4fBlMmRYbA5uym79j1qr6trekE2m+hGsnKWgP81bsZy+IB9yia22n8vxF2s74ZIxH9fUKdd/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894447; 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=6t4Fm/RzCeL4M3Gw/MsIHaslefEjQo9v7ndS2pL3Xwk=; b=NwG109oInqhhtWWS+Od6upruCdk5gHdLPnG4JuZz3VS3RjWg+4iUIz/Wt8vmvGtp35lUSoukcW7F5gpTg567CgsTHd6wbi+LkhOGBW9qv3wxY5EpiVwzlk7//lCV/sHPr7O3j4zbKSPWUKs7JKVaai0aqWdHWk6yeSZ3FDTk99A= 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 1594894447399996.9907907489657; Thu, 16 Jul 2020 03:14:07 -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-444-FM6qEIFHNUW37NUlCaEm7Q-1; Thu, 16 Jul 2020 06:08:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F9CE100AA28; Thu, 16 Jul 2020 10:08:34 +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 422272B6E6; Thu, 16 Jul 2020 10:08:34 +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 1100C730E9; Thu, 16 Jul 2020 10:08:34 +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 06GA5rml018759 for ; Thu, 16 Jul 2020 06:05:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8AAF02B6DC; Thu, 16 Jul 2020 10:05:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0575B2B6DB for ; Thu, 16 Jul 2020 10:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894446; 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=6t4Fm/RzCeL4M3Gw/MsIHaslefEjQo9v7ndS2pL3Xwk=; b=AX8z18Y+i5WKtQbZtdunXXnFj+hypTlyYOMZAtmJjVcXQeCw2KXHPwxqHecrlGxVSxKLR1 LqyhEiP5wSvFTOHswNAnjHByodiol++WkKHThrthl7tdY6mlqlXBzd/BuA0J/0duNFbyxq UksxuUFJwRJFk/IjHVa5AutViH3RP7E= X-MC-Unique: FM6qEIFHNUW37NUlCaEm7Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 236/351] meson: src/remote: install libvirt sysctl config file Date: Thu, 16 Jul 2020 11:57:52 +0200 Message-Id: <42a52b2dd530a577b98b4e81a45b6ac12084d946.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.23 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/remote/Makefile.inc.am | 18 ------------------ src/remote/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 8fbe8425b3b..f80f4a06325 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -2,24 +2,6 @@ =20 if WITH_LIBVIRTD =20 -if WITH_SYSCTL -# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on -# /usr/lib/sysctl.d/ even when libdir is /usr/lib64 -sysctldir =3D $(prefix)/lib/sysctl.d - -install-sysctl: - $(MKDIR_P) $(DESTDIR)$(sysctldir) - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \ - $(DESTDIR)$(sysctldir)/60-libvirtd.conf - -uninstall-sysctl: - rm -f $(DESTDIR)$(sysctldir)/60-libvirtd.conf - rmdir $(DESTDIR)$(sysctldir) || : - -INSTALL_DATA_LOCAL +=3D install-sysctl -UNINSTALL_LOCAL +=3D uninstall-sysctl -endif WITH_SYSCTL - if WITH_POLKIT polkitdir =3D $(datadir)/polkit-1 polkitactionsdir =3D $(polkitdir)/actions diff --git a/src/remote/meson.build b/src/remote/meson.build index 3b9f6117b62..cd6e849c9a8 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -219,6 +219,16 @@ if conf.has('WITH_REMOTE') rename: [ name ], ) endforeach + + if conf.has('WITH_SYSCTL') + # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insist= s on + # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 + install_data( + 'libvirtd.sysctl', + install_dir: prefix / 'lib' / 'sysctl.d', + rename: [ '60-libvirtd.conf' ], + ) + endif endif endif =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894126; cv=none; d=zohomail.com; s=zohoarc; b=cli7I41xeS7xS7z0HAsiieTFjyYZ4ST/8/oqud2XkphCaR5Wt/LOCdOLRLEH/i5We/FD7eceQudBpbyWNCseGx+j1TcZlUUdBevKYYjkk1XQIJfzDtXoQx4Ilpehb6cJcJAzU/pEMP9+Fnhlk6o82g4jIJ9kYb8Cuu3Wa0E7cBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894126; 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=3HKeRpMA3Ojw5bN3vcaFPvjShHUPmtm6kIS5iw/kbvQ=; b=AYfjZVaxHm1zWZa5p2x1ugDS3UiU5GS26j34MS1Las9KKVw33NlaR0IpLM4WqWfFelCdMvRd3Fm4N4E9X8Eu//SeJsq8MVeDRPK2r5By8bXp8cKCM2+bvZMMM5GYxcOayc0bJ8+65ZuBprB3rFOjEDXF7jPlhyl9QshiWZZOQ/c= 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 1594894126919167.55888608445207; Thu, 16 Jul 2020 03:08:46 -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-227-eDtLWgAgM1yJOwhitleraw-1; Thu, 16 Jul 2020 06:08:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E670F100AA2A; Thu, 16 Jul 2020 10:08:37 +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 81D5579509; Thu, 16 Jul 2020 10:08:37 +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 52F89730EF; Thu, 16 Jul 2020 10:08:37 +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 06GA5sPJ018766 for ; Thu, 16 Jul 2020 06:05:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 72DDE2DE6B; Thu, 16 Jul 2020 10:05:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1A912B6DB for ; Thu, 16 Jul 2020 10:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894125; 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=3HKeRpMA3Ojw5bN3vcaFPvjShHUPmtm6kIS5iw/kbvQ=; b=fUOSRBJus8Du/WU9xDU7ge7RXP8g5ad6ffy1SrWg6CIEv3hSJ4Jc8bX8BugkyPtNtOPPpV 3RvOhOIjOsqbRps1UHg3qWNeRmr4yWysAey9PjPsAdp7bPzv2QXxmnyxhuU4WMboOTjv74 pzyD/d67D7zZRnMzy55NLsOUNRWpZ10= X-MC-Unique: eDtLWgAgM1yJOwhitleraw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 237/351] meson: src/remote: install polkit files Date: Thu, 16 Jul 2020 11:57:53 +0200 Message-Id: <07b6f468ee004e8f26ea5910133597871087f2a6.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.14 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/remote/Makefile.inc.am | 27 --------------------------- src/remote/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index f80f4a06325..6a4af4aad31 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -1,32 +1,5 @@ # vim: filetype=3Dautomake =20 -if WITH_LIBVIRTD - -if WITH_POLKIT -polkitdir =3D $(datadir)/polkit-1 -polkitactionsdir =3D $(polkitdir)/actions -polkitrulesdir =3D $(polkitdir)/rules.d - -install-polkit: - $(MKDIR_P) $(DESTDIR)$(polkitactionsdir) - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \ - $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy - $(MKDIR_P) $(DESTDIR)$(polkitrulesdir) - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ - $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules - -uninstall-polkit: - rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy - rmdir $(DESTDIR)$(polkitactionsdir) || : - rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules - rmdir $(DESTDIR)$(polkitrulesdir) || : - -INSTALL_DATA_LOCAL +=3D install-polkit -UNINSTALL_LOCAL +=3D uninstall-polkit -endif WITH_POLKIT - -endif WITH_LIBVIRTD - # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if WITH_SASL diff --git a/src/remote/meson.build b/src/remote/meson.build index cd6e849c9a8..1169403722f 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -229,6 +229,20 @@ if conf.has('WITH_REMOTE') rename: [ '60-libvirtd.conf' ], ) endif + + if conf.has('WITH_POLKIT') + polkitdir =3D datadir / 'polkit-1' + install_data( + 'libvirtd.policy', + install_dir: polkitdir / 'actions', + rename: [ 'org.libvirt.unix.policy' ], + ) + install_data( + 'libvirtd.rules', + install_dir: polkitdir / 'rules.d', + rename: [ '50-libvirt.rules' ], + ) + endif endif endif =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894750; cv=none; d=zohomail.com; s=zohoarc; b=WvxT1gVVcoXhuFjw6Yoa2M9w79pgOpKcID/Up2Z5KBqnDUiXw55BUwY7S7PUrmGz4GvDBOQjsbMlgM9W0WGx+I/f8cgyTuwE9N3SAcuWicxPdux55DHg4rCq0JhWWFoH/C2rKvpQy4KhSHWHu4yZ60sPJimBaaoz/Kpr+2Qf8uc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894750; 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=hMbwtEDnXDFThTP89hAoAr+yiYP4MVniKrnS+7nB2+c=; b=RhCDF/GVPa20mSROrGtx16uZnuL5/gEStli2ZZTNWHYzLeWZSoqKVcA+md3E8kspJOFJqhlnEoX9s8HQXc7J8rY25qmCiXR0q2vS8XhE87XQjA9pC2vFzxJdjK3X0k34ODBj5qDZHy5HiPARclVAQALvatVGHwj4Tz6j0yBsn6E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894750192337.88872004555185; Thu, 16 Jul 2020 03:19:10 -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-306-KYNLFuTwMtiHunWwJi9CBA-1; Thu, 16 Jul 2020 06:10:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 609858015FB; Thu, 16 Jul 2020 10:09:56 +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 40DBF78485; Thu, 16 Jul 2020 10:09:56 +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 124D4A36EB; Thu, 16 Jul 2020 10:09:56 +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 06GA5tTd018777 for ; Thu, 16 Jul 2020 06:05:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A5E02DE6B; Thu, 16 Jul 2020 10:05:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9C622B6DB for ; Thu, 16 Jul 2020 10:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894749; 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=hMbwtEDnXDFThTP89hAoAr+yiYP4MVniKrnS+7nB2+c=; b=bPXRf0LS+siGUBe1igQmbjEznUHA0fkFsqh+qJQXeljF1O8HIKEtyQ18nKXMVCo+BZUdLi lZUq3+E7RHNjFMH+qJ78702qYSs0RIGELa2ptB+h/zw4UG5UjpCa1k7CpEeqB2SA/oB7Pw ++u2r0AuezUyHYn+w3YU5rcewYPaasI= X-MC-Unique: KYNLFuTwMtiHunWwJi9CBA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 238/351] meson: src/remote: install libvirtd sasl file Date: Thu, 16 Jul 2020 11:57:54 +0200 Message-Id: <54f596aa0b192f5a3c6542a1a9e0105399ae9893.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.11 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/Makefile.am | 1 - src/remote/Makefile.inc.am | 19 ------------------- src/remote/meson.build | 10 ++++++++++ 3 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 src/remote/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 7305a069f07..acdbe30e0e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,6 @@ include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am include secret/Makefile.inc.am include storage/Makefile.inc.am -include remote/Makefile.inc.am =20 =20 # .libs/libvirt.so is built by libtool as a side-effect of the Makefile diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am deleted file mode 100644 index 6a4af4aad31..00000000000 --- a/src/remote/Makefile.inc.am +++ /dev/null @@ -1,19 +0,0 @@ -# vim: filetype=3Dautomake - -# This is needed for clients too, so can't wrap in -# the WITH_LIBVIRTD conditional -if WITH_SASL -sasldir =3D $(sysconfdir)/sasl2 - -install-sasl: - $(MKDIR_P) $(DESTDIR)$(sasldir) - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ - $(DESTDIR)$(sasldir)/libvirt.conf - -uninstall-sasl: - rm -f $(DESTDIR)$(sasldir)/libvirt.conf - rmdir $(DESTDIR)$(sasldir) || : - -INSTALL_DATA_LOCAL +=3D install-sasl -UNINSTALL_LOCAL +=3D uninstall-sasl -endif WITH_SASL diff --git a/src/remote/meson.build b/src/remote/meson.build index 1169403722f..055857ae360 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -252,4 +252,14 @@ else sym_files +=3D 'libvirt_remote.syms' endif =20 +# This is needed for clients too, so can't wrap in +# the WITH_LIBVIRTD conditional +if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', + install_dir: sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) +endif + remote_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894426; cv=none; d=zohomail.com; s=zohoarc; b=Lm3lE+zZQ7LU/9IVJLt92Kr1mDxHzsU7vlWFs8sOkMDI+I49Lzj9ozJqL3Rhe7qs9SIZe5Fvanr/L2DsbRe9E4DUwl/vSsK/0gH0YpVntvuZUkwnmS+8D3GcjynQzL5NrnD/0VUmEQ69kiz3ljN7gd3H17qV/QSC7l4877bJw90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894426; 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=p42IOEHVB40aDzmLVG3K0bUTRvkVuG1N4VfyovcY8Tg=; b=fyQOEFyEbdxtGqDkYzP00Dv5M6I5rOFwf4nE34AJiJJ46I5wI0/y0Sr89vjE5dZ5NLr2DR41KQ7atnxjXoMm6x0vGY9Pz3hafkurdaC6IEeaW+cjepb92/7ZupOzwv226G5jrXsy4hRtpOwD9GaDHtbWmy2QtVjp+1ySMI+ucAU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894426378585.1376808971402; Thu, 16 Jul 2020 03:13:46 -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-98-bThaR9kwMZCrmEeSKkSKsg-1; Thu, 16 Jul 2020 06:13:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 054291888AB6; Thu, 16 Jul 2020 10:13:37 +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 D976E6FED1; Thu, 16 Jul 2020 10:13:36 +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 A99C8180143C; Thu, 16 Jul 2020 10:13:36 +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 06GA5uFd018787 for ; Thu, 16 Jul 2020 06:05:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 425682DE6B; Thu, 16 Jul 2020 10:05:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B15BB2B6DB for ; Thu, 16 Jul 2020 10:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894425; 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=p42IOEHVB40aDzmLVG3K0bUTRvkVuG1N4VfyovcY8Tg=; b=gngZVYmaJh718QehTDDIQEmjn4zDB0eS04ARyjsQlsCzZwVuGYWneI5pWqChzArCF9LkWO 1whioKcqs6Qlsv2Ggrc6v1tAgao1UFDrIFRNTEMYR6LtKB0NRR0ElbN5sxz+qMiZXr4XOk TLiYSQBzcmjiHOG2ut3JxyvVfju8+XY= X-MC-Unique: bThaR9kwMZCrmEeSKkSKsg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 239/351] meson: src/security: install apparmor profile files Date: Thu, 16 Jul 2020 11:57:55 +0200 Message-Id: <8edbeb21f56dcae32f205c1dec3b3780800e29c1.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.11 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/Makefile.am | 7 --- src/security/Makefile.inc.am | 52 ------------------- src/security/apparmor/meson.build | 38 ++++++++++++++ .../usr.lib.libvirt.virt-aa-helper.local | 1 + src/security/meson.build | 4 ++ 5 files changed, 43 insertions(+), 59 deletions(-) delete mode 100644 src/security/Makefile.inc.am create mode 100644 src/security/apparmor/meson.build create mode 100644 src/security/apparmor/usr.lib.libvirt.virt-aa-helper.lo= cal diff --git a/src/Makefile.am b/src/Makefile.am index acdbe30e0e0..18cc33185a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,8 +22,6 @@ =20 DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -INSTALL_DATA_LOCAL =3D -UNINSTALL_LOCAL =3D SYM_FILES =3D USED_SYM_FILES =3D augeas_DATA =3D @@ -33,7 +31,6 @@ tapset_DATA =3D endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D =20 -include security/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am include vbox/Makefile.inc.am @@ -193,7 +190,3 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)= /scripts/gensystemtap.py $(RPC_PROBE_FILES) > $@ =20 endif WITH_DTRACE_PROBES - -install-data-local: $(INSTALL_DATA_LOCAL) - -uninstall-local: $(UNINSTALL_LOCAL) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am deleted file mode 100644 index 50e2706be9f..00000000000 --- a/src/security/Makefile.inc.am +++ /dev/null @@ -1,52 +0,0 @@ -# vim: filetype=3Dautomake - -SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN =3D \ - security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ - security/apparmor/usr.sbin.libvirtd.in \ - $(NULL) - -SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES =3D \ - $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN:%.in=3D%) - $(NULL) - -security/apparmor/%: $(srcdir)/security/apparmor/%.in - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(SED) \ - -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ - -e 's|[@]sbindir[@]|@sbindir@|' \ - -e 's|[@]runstatedir[@]|@runstatedir@|' \ - -e 's|[@]libexecdir[@]|@libexecdir@|' \ - $< > $@ - -if WITH_APPARMOR_PROFILES -apparmordir =3D $(sysconfdir)/apparmor.d/ -apparmor_DATA =3D \ - $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - $(NULL) - -abstractionsdir =3D $(apparmordir)/abstractions -abstractions_DATA =3D \ - security/apparmor/libvirt-qemu \ - security/apparmor/libvirt-lxc \ - $(NULL) - -templatesdir =3D $(apparmordir)/libvirt -templates_DATA =3D \ - security/apparmor/TEMPLATE.qemu \ - security/apparmor/TEMPLATE.lxc \ - $(NULL) - -APPARMOR_LOCAL_DIR =3D "$(DESTDIR)$(apparmordir)/local" -install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ - 'usr.lib.libvirt.virt-aa-helper'" \ - >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - -uninstall-apparmor-local: - rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - -INSTALL_DATA_LOCAL +=3D install-apparmor-local -UNINSTALL_LOCAL +=3D uninstall-apparmor-local -endif WITH_APPARMOR_PROFILES diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build new file mode 100644 index 00000000000..af437802112 --- /dev/null +++ b/src/security/apparmor/meson.build @@ -0,0 +1,38 @@ +apparmor_gen_profiles =3D [ + 'usr.lib.libvirt.virt-aa-helper', + 'usr.sbin.libvirtd', +] + +apparmor_gen_profiles_conf =3D configuration_data() +apparmor_gen_profiles_conf.set('sysconfdir', sysconfdir) +apparmor_gen_profiles_conf.set('sbindir', sbindir) +apparmor_gen_profiles_conf.set('runstatedir', runstatedir) +apparmor_gen_profiles_conf.set('libexecdir', libexecdir) + +apparmor_dir =3D sysconfdir / 'apparmor.d' + +foreach name : apparmor_gen_profiles + configure_file( + input: '@0@.in'.format(name), + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, + install_dir: apparmor_dir, + ) +endforeach + +install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], + install_dir: apparmor_dir / 'abstractions', +) + +install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], + install_dir: apparmor_dir / 'libvirt', +) + +install_data( + 'usr.lib.libvirt.virt-aa-helper.local', + install_dir: apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', +) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/s= rc/security/apparmor/usr.lib.libvirt.virt-aa-helper.local new file mode 100644 index 00000000000..c0990e51d0b --- /dev/null +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local @@ -0,0 +1 @@ +# Site-specific additions and overrides for 'usr.lib.libvirt.virt-aa-helpe= r' diff --git a/src/security/meson.build b/src/security/meson.build index 4014ddccc45..4f876c03c2d 100644 --- a/src/security/meson.build +++ b/src/security/meson.build @@ -51,3 +51,7 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR') ], } endif + +if conf.has('WITH_APPARMOR_PROFILES') + subdir('apparmor') +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894428; cv=none; d=zohomail.com; s=zohoarc; b=b+twue6Y+RL/oEefTcAyQWowifh2ZnpJv5tyBqRsdJgq/NnsevIX7fnyYtVIJ3lryLrIlN6sFhqGsuQmqqbFMS0LkwnzNUVBTdlC3cvOHXpb3N5McK084RY49DQGv08OQzNqm4KVQnK6OOUJZghi3utesV7SE7EOujITPpWWVj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894428; 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=XJoBzr4MJC6vM43kYvD7THylfzgyISPcfOPZ85EIcqU=; b=N5PA0WPtvTgM5CeqPhgIg1n5pK7KCsF8rFjmxqbSFDqBXNpaAZSP8gMV4WjlctGT78s5kIjZ8gB0EI3UDYnacYYLlsilknIqJhAEx0z1BYSd5iZh62wfhxxIYlf5B/c+ehYcXLOaCKmSDQQMQyxlQXO/tZJL81fpJWDuk87uViY= 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 1594894428751481.02490771112764; Thu, 16 Jul 2020 03:13:48 -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-313-gx0HMtvsNyybm2dwWTvcLA-1; Thu, 16 Jul 2020 06:13:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C97D805723; Thu, 16 Jul 2020 10:13:39 +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 3D73E72E4A; Thu, 16 Jul 2020 10:13:39 +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 09464730EA; Thu, 16 Jul 2020 10:13:39 +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 06GA5xlq018814 for ; Thu, 16 Jul 2020 06:05:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id E10452B6DC; Thu, 16 Jul 2020 10:05:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B5842B6DB for ; Thu, 16 Jul 2020 10:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894427; 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=XJoBzr4MJC6vM43kYvD7THylfzgyISPcfOPZ85EIcqU=; b=Kq+Ia/B/atg+stOFzpD/6MIpDRcy9/Zt4OrlkFG5pMaahpCs7/dmpXTHDVUypaThQ6Ducy 6YAG/7uNknz/oKv4m60gsp7d2Ij4YMkcVYvN8tQPlzn9deGnp1Jrz0rKbFgLnL9vE8tJr0 +jo0BdeBhBfPwTW764mFtoDZG7dufJU= X-MC-Unique: gx0HMtvsNyybm2dwWTvcLA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 240/351] meson: src: add check-symfile test Date: Thu, 16 Jul 2020 11:57:56 +0200 Message-Id: <0118f685b9118114d120be299853a2aebda0f1ed.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.11 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/Makefile.am | 11 +---------- src/meson.build | 12 ++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 18cc33185a0..0e0fc621e53 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,15 +47,6 @@ include secret/Makefile.inc.am include storage/Makefile.inc.am =20 =20 -# .libs/libvirt.so is built by libtool as a side-effect of the Makefile -# rule for libvirt.la. However, checking symbols relies on Linux ELF layo= ut -if WITH_LINUX -check-symfile: libvirt.syms libvirt.la - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \ - libvirt.syms .libs/libvirt.so -else ! WITH_LINUX -check-symfile: -endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py= \ $(srcdir) $(SYM_FILES) @@ -147,7 +138,7 @@ check-aclperms: $(srcdir)/access/viraccessperm.h \ $(srcdir)/access/viraccessperm.c =20 -check-local: check-protocol check-symfile check-symsorting \ +check-local: check-protocol check-symsorting \ check-drivername check-driverimpls check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) diff --git a/src/meson.build b/src/meson.build index b8e356d8b0e..0c94483965d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -790,3 +790,15 @@ virt_install_dirs +=3D [ ] =20 meson.add_install_script(install_dirs_prog.path(), virt_install_dirs) + + +# Check driver files + +if host_machine.system() =3D=3D 'linux' + test( + 'check-symfile', + python3_prog, + args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ], + env: runutf8, + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894207; cv=none; d=zohomail.com; s=zohoarc; b=mfVU3DfZqeep3tDV4LlFDX0laC/0fqMJRS299wkEwRe4UJZCKHMj12axDVVzr+iGrJZ+kdvBaK2V2GzsO/O7rI87pIso9CJo7gdn33Ag+07+kRfzGXjOcR3T8dS/GDJqsDL3mxyq7Kdn14A6qXTB070YK2CDSM6bcM/X4p5Zc0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894207; 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=P/EYo5y5y/usX05qcoEkrpfqSMEy+in7zXDzjjBDsAY=; b=lB6GOm+IYmchnTOa4Es/UZuXF0xVT1jXvIBuuMalB2PncRkFBQgfS/F4dZT/OV/Ci/bFOhu30wrgemkOtkPbtB1aHZwS0LjK46mwXhjleo9ofv48iCCqdab47m2edouiHdfUmm2hGdB3cLESNKCkmK6xm1TGvlCl5a3rwcE7Pi4= 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 1594894207949893.257754543873; Thu, 16 Jul 2020 03:10:07 -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-483-U8WbV1u9MC6FfhATwNpzrQ-1; Thu, 16 Jul 2020 06:10:04 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 929AC1098; Thu, 16 Jul 2020 10:09: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 759AE72ADB; Thu, 16 Jul 2020 10:09: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 48F5CA36ED; Thu, 16 Jul 2020 10:09:58 +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 06GA60eU018870 for ; Thu, 16 Jul 2020 06:06:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id C9C8D2B6DC; Thu, 16 Jul 2020 10:06:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 439942B6DB for ; Thu, 16 Jul 2020 10:06:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894206; 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=P/EYo5y5y/usX05qcoEkrpfqSMEy+in7zXDzjjBDsAY=; b=EE7UKAl/CU10ZlQezSKvqMzQ1Nck9Pd2UKNNn8U3WocUeCv/j+zmjhEHUE5LGH3RUwFbWB JAriCF3Yi0ckBD7gPAwzbPoVoXv4tDQIOIE1thbu//GTAQrWTvVPVMIOJJTVi3w976raXa T9vcimB1O6vjj099EoMS49Wi9Qwo7BU= X-MC-Unique: U8WbV1u9MC6FfhATwNpzrQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 241/351] meson: src: add check-symsorting Date: Thu, 16 Jul 2020 11:57:57 +0200 Message-Id: <0b8503710129e0300ad0456ac813cd50743a3895.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.15 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/Makefile.am | 13 +------------ src/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0e0fc621e53..11fb9122631 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,8 +22,6 @@ =20 DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D -SYM_FILES =3D -USED_SYM_FILES =3D augeas_DATA =3D augeastest_DATA =3D if WITH_DTRACE_PROBES @@ -47,10 +45,6 @@ include secret/Makefile.inc.am include storage/Makefile.inc.am =20 =20 -check-symsorting: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py= \ - $(srcdir) $(SYM_FILES) - # Keep this list synced with RPC_PROBE_FILES PROTOCOL_STRUCTS =3D \ $(srcdir)/remote_protocol-structs \ @@ -138,17 +132,12 @@ check-aclperms: $(srcdir)/access/viraccessperm.h \ $(srcdir)/access/viraccessperm.c =20 -check-local: check-protocol check-symsorting \ +check-local: check-protocol \ check-drivername check-driverimpls check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 -# All .syms files should be placed in exactly one of these three lists, -# depending on whether they are stored in git and/or used in the build. -SYM_FILES +=3D $(USED_SYM_FILES) - - check-local: check-augeas =20 check-augeas: $(augeas_DATA) $(augeastest_DATA) diff --git a/src/meson.build b/src/meson.build index 0c94483965d..21d4b9aa412 100644 --- a/src/meson.build +++ b/src/meson.build @@ -802,3 +802,14 @@ if host_machine.system() =3D=3D 'linux' env: runutf8, ) endif + +test( + 'check-symsorting', + python3_prog, + args: [ + check_symsorting_prog.path(), + meson.current_source_dir(), + files(sym_files, used_sym_files), + ], + env: runutf8, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894130; cv=none; d=zohomail.com; s=zohoarc; b=Arb52Ijg6qCtdrf2cglRbzh8wPpNDxek2TMn8Um2P619KRHAh0gywPvxYrtr8ycAj4BD/vyAKKG6aRdchaWHmQxPW6+96UkMedDTEnNi7xYYrdjsU4TSPY1g2hkRfmJiwUqZmWc34l5XKkZUjYm+COOTX9DQ+oSjeKCQy5RAa+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894130; 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=GRGfoAp8ypYb4zFsTOW26wHASMxV4nepj6zqDg9g+Go=; b=EDZY/LraMFzEhh7oWBe62QCohfkHQx0phtl1ih2TXPheadp5jtM/lLUPURS29VB9k9WlacNbdG9HBDhCXva3N20hR3hlpYMhRCxRs/Y8M5GVxaFQROPQIYZj7XF/5DbQSlp3qVbtvprOD6q2g+gBx8CqWTz5d//qFJe8TN/VXZ0= 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 1594894130638221.42921626582597; Thu, 16 Jul 2020 03:08:50 -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-251-kwtqAb5jPBG7DTLnLcvSNw-1; Thu, 16 Jul 2020 06:08:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D48CE1888AAB; Thu, 16 Jul 2020 10:08:39 +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 B57A6710D7; Thu, 16 Jul 2020 10:08:39 +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 87AE5730F2; Thu, 16 Jul 2020 10:08:39 +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 06GA61pv018882 for ; Thu, 16 Jul 2020 06:06:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id B22B22B6DB; Thu, 16 Jul 2020 10:06:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D45C2B6E6 for ; Thu, 16 Jul 2020 10:06:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894129; 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=GRGfoAp8ypYb4zFsTOW26wHASMxV4nepj6zqDg9g+Go=; b=IYmGHyLvw/CmSdRdwwJ5Z3C+6sDp5bj3G23IsdINeQe3zhQ1DPHpLzYCSQxBiMmvRKDRUF iO8DERnfJh0SSN/88khfsvtFp0Ks/65uUf6GdDjLtk75M6m3wr/7MHCWZH4y3QTsQmyHWK 9PBbCvERMa5B4obbig5KG7vsJVKuKFw= X-MC-Unique: kwtqAb5jPBG7DTLnLcvSNw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 242/351] meson: src: add check-drivername test Date: Thu, 16 Jul 2020 11:57:58 +0200 Message-Id: <35c48c0375b112ea8847f501e0a2af6441fbfd14.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.15 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/Makefile.am | 21 +-------------------- src/meson.build | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 11fb9122631..e5d338409dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,25 +99,6 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -DRIVERS =3D \ - $(srcdir)/driver-hypervisor.h \ - $(srcdir)/driver-interface.h \ - $(srcdir)/driver-network.h \ - $(srcdir)/driver-nodedev.h \ - $(srcdir)/driver-nwfilter.h \ - $(srcdir)/driver-secret.h \ - $(srcdir)/driver-state.h \ - $(srcdir)/driver-storage.h \ - $(srcdir)/driver-stream.h \ - $(NULL) - -check-drivername: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py= \ - $(DRIVERS) \ - $(srcdir)/libvirt_public.syms \ - $(srcdir)/libvirt_qemu.syms \ - $(srcdir)/libvirt_lxc.syms - check-driverimpls: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-driverimpls.p= y \ $(DRIVER_SOURCE_FILES) @@ -133,7 +114,7 @@ check-aclperms: $(srcdir)/access/viraccessperm.c =20 check-local: check-protocol \ - check-drivername check-driverimpls check-aclrules \ + check-driverimpls check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 diff --git a/src/meson.build b/src/meson.build index 21d4b9aa412..5fb90f61687 100644 --- a/src/meson.build +++ b/src/meson.build @@ -269,6 +269,18 @@ driver_sources =3D [ 'libvirt-stream.c', ] =20 +driver_headers =3D [ + 'driver-hypervisor.h', + 'driver-interface.h', + 'driver-network.h', + 'driver-nodedev.h', + 'driver-nwfilter.h', + 'driver-secret.h', + 'driver-state.h', + 'driver-storage.h', + 'driver-stream.h', +] + driver_lib =3D static_library( 'virt_driver', [ @@ -813,3 +825,13 @@ test( ], env: runutf8, ) + +test( + 'check-drivername', + python3_prog, + args: [ + check_drivername_prog.path(), files(driver_headers), + files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms, + ], + env: runutf8, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894924; cv=none; d=zohomail.com; s=zohoarc; b=G6EzCwOcw4afI9G3diKkSSKVZifxzs0xAUx5ZMEg6hCn+ko3L4KR1P+CFajqc89OBgMUEW8ohZM8sdwuPjzcOdCyGW2aVfmn+tQkVwuvEwSQkmgrMVNl5amkpx9RBWDjzuIhBGdh5P+Hux2QGVgceg04NZRhBMbBO3eBcze4nmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894924; 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=i3oH98p8TBqtt3zLeGKilbrs6/U6GsKbsWfHPOG85ic=; b=m7FkTB96gTI6MCPND5MbRIcBnE3H9/BgvF6IeJymfNWWrEGCLg5jFvRWva/76+PukUjEFaq5pLKAqrHhBpvTVw2NxVXmxLQINkXW008fN9gES1w8eZgQ4zJGjXXECRQY9f+v5FUAFTyw51z6rsTtr92KqmoZjwA9LTinMjG0GLw= 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 1594894924535228.7236754663843; Thu, 16 Jul 2020 03:22:04 -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-299-UaEKNJlUPxazOiHGmDw1SQ-1; Thu, 16 Jul 2020 06:10:07 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01B63100AA22; Thu, 16 Jul 2020 10:10:02 +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 B7F7272AEE; Thu, 16 Jul 2020 10:10:00 +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 83250181AC45; Thu, 16 Jul 2020 10:10:00 +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 06GA62m8018938 for ; Thu, 16 Jul 2020 06:06:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9B65D2B6DB; Thu, 16 Jul 2020 10:06:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15D242B6E2 for ; Thu, 16 Jul 2020 10:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894923; 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=i3oH98p8TBqtt3zLeGKilbrs6/U6GsKbsWfHPOG85ic=; b=iDLNUXWQFAKu76UfYZYuPwQoureaQ5gXQRrk4iam0QuEekhnc+znDnXV3tsvRllxWG/qBi 5sIlhC+8QdyG2c5JutQHe6b+xLgwoZJ8YSJPhv8x5+wMI8JQG9C7mg5j1PqithIPNdOV/z tqu+QXX7iEvTiLYxEm/pqJwCE7i1Siw= X-MC-Unique: UaEKNJlUPxazOiHGmDw1SQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 243/351] meson: src: add check-driverimpls test Date: Thu, 16 Jul 2020 11:57:59 +0200 Message-Id: <755e77cd140c5d7fa802b3d8a2b420a3b8d8ae5e.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.15 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/Makefile.am | 8 +------- src/bhyve/Makefile.inc.am | 1 - src/bhyve/meson.build | 2 ++ src/interface/Makefile.inc.am | 1 - src/interface/meson.build | 2 ++ src/libxl/Makefile.inc.am | 1 - src/libxl/meson.build | 2 ++ src/lxc/Makefile.inc.am | 4 ---- src/lxc/meson.build | 6 ++++++ src/meson.build | 11 +++++++++++ src/network/Makefile.inc.am | 1 - src/network/meson.build | 2 ++ src/node_device/Makefile.inc.am | 6 ------ src/node_device/meson.build | 2 ++ src/nwfilter/Makefile.inc.am | 1 - src/nwfilter/meson.build | 2 ++ src/qemu/Makefile.inc.am | 1 - src/qemu/meson.build | 2 ++ src/secret/Makefile.inc.am | 1 - src/secret/meson.build | 2 ++ src/storage/Makefile.inc.am | 1 - src/storage/meson.build | 2 ++ src/vbox/Makefile.inc.am | 6 ------ src/vbox/meson.build | 5 +++++ src/vz/Makefile.inc.am | 1 - src/vz/meson.build | 2 ++ 26 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 src/vbox/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index e5d338409dc..54e3ed42974 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -DRIVER_SOURCE_FILES =3D STATEFUL_DRIVER_SOURCE_FILES =3D augeas_DATA =3D augeastest_DATA =3D @@ -31,7 +30,6 @@ RPC_PROBE_FILES =3D =20 include locking/Makefile.inc.am include admin/Makefile.inc.am -include vbox/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include libxl/Makefile.inc.am @@ -99,10 +97,6 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -check-driverimpls: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-driverimpls.p= y \ - $(DRIVER_SOURCE_FILES) - check-aclrules: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \ $(REMOTE_PROTOCOL) \ @@ -114,7 +108,7 @@ check-aclperms: $(srcdir)/access/viraccessperm.c =20 check-local: check-protocol \ - check-driverimpls check-aclrules \ + check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 65021d785a2..7a9c6a87242 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index fd1f6bbad88..12b933b0b44 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -10,6 +10,8 @@ bhyve_sources =3D files( 'bhyve_process.c', ) =20 +driver_source_files +=3D bhyve_sources + if conf.has('WITH_BHYVE') bhyve_driver_impl =3D static_library( 'virt_driver_bhyve_impl', diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 06bd8f820b1..6cd6dff3b90 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES= )) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) diff --git a/src/interface/meson.build b/src/interface/meson.build index 8b5347bce43..bd04a7f350f 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') interface_driver_sources +=3D 'interface_backend_udev.c' endif =20 +driver_source_files +=3D files(interface_driver_sources) + if conf.has('WITH_INTERFACE') virt_modules +=3D { 'name': 'virt_driver_interface', diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5af19c83512..d713f4e75aa 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index a5df0011b0b..6720d826435 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -10,6 +10,8 @@ libxl_driver_sources =3D [ 'xen_xm.c', ] =20 +driver_source_files +=3D files(libxl_driver_sources) + if conf.has('WITH_LIBXL') libxl_driver_imp =3D static_library( 'virt_driver_libxl_impl', diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 7f312975d6c..6abd08e333e 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,9 +1,5 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ diff --git a/src/lxc/meson.build b/src/lxc/meson.build index ccb11ee1d42..65dff6a7c4b 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -40,6 +40,12 @@ lxc_monitor_generated =3D custom_target( capture: true, ) =20 +driver_source_files +=3D [ + files(lxc_driver_sources), + lxc_monitor_protocol_generated, + lxc_monitor_generated, +] + lxc_controller_sources =3D files( 'lxc_conf.c', 'lxc_container.c', diff --git a/src/meson.build b/src/meson.build index 5fb90f61687..e30bf7e90b6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -207,6 +207,10 @@ sysconf_files =3D [] # list of directories to create during installation virt_install_dirs =3D [] =20 +# driver_source_files: +# driver source files to check +driver_source_files =3D [] + =20 # list subdirectories =20 @@ -835,3 +839,10 @@ test( ], env: runutf8, ) + +test( + 'check-driverimpls', + python3_prog, + args: [ check_driverimpls_prog.path(), driver_source_files ], + env: runutf8, +) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index c13a6831cc0..cf5cff4ea88 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) diff --git a/src/network/meson.build b/src/network/meson.build index 948dad39432..c33404dfd96 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -3,6 +3,8 @@ network_driver_sources =3D [ 'bridge_driver_platform.c', ] =20 +driver_source_files +=3D files(network_driver_sources) + network_leases_helper_sources =3D files( 'leaseshelper.c', ) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 63d2548e11f..ddd906fa782 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -1,11 +1,5 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_HAL_SOURCES)) \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_UDEV_SOURCES)) \ - $(NULL) - STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 437924466eb..0ac2aecf4f1 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -10,6 +10,8 @@ if conf.has('WITH_UDEV') node_device_driver_sources +=3D 'node_device_udev.c' endif =20 +driver_source_files +=3D files(node_device_driver_sources) + if conf.has('WITH_NODE_DEVICES') node_device_driver_impl =3D static_library( 'virt_driver_nodedev_impl', diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 4d34d7f3ad1..68bc42c2edf 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a05f0ce8fcf..c2c186903d8 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -6,6 +6,8 @@ nwfilter_driver_sources =3D [ 'nwfilter_learnipaddr.c', ] =20 +driver_source_files +=3D files(nwfilter_driver_sources) + if conf.has('WITH_NWFILTER') nwfilter_driver_impl =3D static_library( 'virt_driver_nwfilter_impl', diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index f665cb1f130..96265d2893b 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 7bdaf6c19bd..c74acf9d14b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -37,6 +37,8 @@ qemu_driver_sources =3D [ 'qemu_virtiofs.c', ] =20 +driver_source_files +=3D files(qemu_driver_sources) + qemu_dtrace_gen_headers =3D [] qemu_dtrace_gen_objects =3D [] =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index a60a6b507f4..361305283a5 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) diff --git a/src/secret/meson.build b/src/secret/meson.build index 2245790f796..bbcd74ce309 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -2,6 +2,8 @@ secret_driver_sources =3D [ 'secret_driver.c', ] =20 +driver_source_files +=3D files(secret_driver_sources) + if conf.has('WITH_SECRETS') virt_modules +=3D { 'name': 'virt_driver_secret', diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index d5438e8a71c..0834ac43a64 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -1,5 +1,4 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) diff --git a/src/storage/meson.build b/src/storage/meson.build index 59024746322..b14dcf969d9 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -8,6 +8,8 @@ storage_driver_sources =3D [ storage_driver_backend_sources, ] =20 +driver_source_files +=3D files(storage_driver_sources) + storage_backend_fs_sources =3D [ 'storage_backend_fs.c', ] diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am deleted file mode 100644 index 6197c3172b5..00000000000 --- a/src/vbox/Makefile.inc.am +++ /dev/null @@ -1,6 +0,0 @@ -# vim: filetype=3Dautomake - -DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ - $(srcdir)/vbox/vbox_tmpl.c \ - $(NULL) diff --git a/src/vbox/meson.build b/src/vbox/meson.build index b6dcee279b9..8451e3018be 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -10,6 +10,11 @@ vbox_driver_sources =3D [ 'vbox_XPCOMCGlue.c', ] =20 +driver_source_files +=3D files( + vbox_driver_sources, + 'vbox_tmpl.c', +) + if conf.has('WITH_VBOX') vbox_driver_impl =3D static_library( 'virt_driver_vbox_impl', diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 380d1ffb839..eb6721fb135 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -1,4 +1,3 @@ # vim: filetype=3Dautomake =20 -DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) diff --git a/src/vz/meson.build b/src/vz/meson.build index 9e8ac3f8cfc..903e1f1359f 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -4,6 +4,8 @@ vz_driver_sources =3D [ 'vz_sdk.c', ] =20 +driver_source_files +=3D files(vz_driver_sources) + if conf.has('WITH_VZ') vz_driver_impl =3D static_library( 'virt_driver_vz_impl', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894401; cv=none; d=zohomail.com; s=zohoarc; b=Rq1nMANFHuqmLFvNByMSfUeeRKpj1+9mQZdJDZAjujaxtwir7ZyHuuULwaA4DaU2ajOUJdwG2GJ2t2zvFcglApy3rk6ZtqQkW7CrkBgjzqEb80g6vt1nXfoow5ryRqJ90WYetSYrq4OhUMHZsHX1KtpADWi9tetxoyi7v5JYi9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894401; 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=O3giV5AaWYFtu5Ao4vC+i+fDyPQXXa0GyaCoJKAsiA8=; b=lnygT2MrrHHFDSEODq4CRbPGcgdoLNdleq26VZ6+Vu27AxQs4hggfuVfhzbBcdMfXvhp26iC674F6ccpJsEV/CewwMrvTQn2CTZc1iUvOqBnFuH5C/kcDTCweXldcdRcGVwgWh82i5srZRDmwYCsopICjjTWRQPel78irAwi0f4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894401675840.4507990608955; Thu, 16 Jul 2020 03:13:21 -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-329-SFpYauZFNKuLiKsVM3PNdw-1; Thu, 16 Jul 2020 06:10:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 861CC10059C4; Thu, 16 Jul 2020 10:10: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 63CE679505; Thu, 16 Jul 2020 10:10:03 +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 2C54D1805318; Thu, 16 Jul 2020 10:10:03 +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 06GA63hw019121 for ; Thu, 16 Jul 2020 06:06:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84CCA2B6DC; Thu, 16 Jul 2020 10:06:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1D332B6DB for ; Thu, 16 Jul 2020 10:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894400; 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=O3giV5AaWYFtu5Ao4vC+i+fDyPQXXa0GyaCoJKAsiA8=; b=Yio0tNK5d0Voj1TLt4/p80HeryrwkGlR730589En8h/uSR3SphPYXVxf2ZAQ5Asjagl6vU MHyTL04jGyg/p4pvwOPZWA3VWz5rTkqWSwuRxk3nFLX1reUefF+bpkUFIuTj//lN5QDB+q sq5XMEhaO4S2MQoCtGhoIzPcBPMCCkk= X-MC-Unique: SFpYauZFNKuLiKsVM3PNdw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 244/351] meson: src: add check-aclrules test Date: Thu, 16 Jul 2020 11:58:00 +0200 Message-Id: <055e2ecbb83bb71b9b6cd412e2b5a9b2f75da65c.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.14 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/Makefile.am | 17 ----------------- src/bhyve/Makefile.inc.am | 3 --- src/bhyve/meson.build | 1 + src/interface/Makefile.inc.am | 4 ---- src/interface/meson.build | 1 + src/libxl/Makefile.inc.am | 3 --- src/libxl/meson.build | 1 + src/lxc/Makefile.inc.am | 5 ----- src/lxc/meson.build | 6 ++++++ src/meson.build | 11 +++++++++++ src/network/Makefile.inc.am | 4 ---- src/network/meson.build | 1 + src/node_device/Makefile.inc.am | 5 ----- src/node_device/meson.build | 2 ++ src/nwfilter/Makefile.inc.am | 4 ---- src/nwfilter/meson.build | 1 + src/qemu/Makefile.inc.am | 3 --- src/qemu/meson.build | 1 + src/secret/Makefile.inc.am | 4 ---- src/secret/meson.build | 1 + src/storage/Makefile.inc.am | 4 ---- src/storage/meson.build | 1 + src/vz/Makefile.inc.am | 3 --- src/vz/meson.build | 1 + 24 files changed, 28 insertions(+), 59 deletions(-) delete mode 100644 src/bhyve/Makefile.inc.am delete mode 100644 src/interface/Makefile.inc.am delete mode 100644 src/libxl/Makefile.inc.am delete mode 100644 src/network/Makefile.inc.am delete mode 100644 src/node_device/Makefile.inc.am delete mode 100644 src/nwfilter/Makefile.inc.am delete mode 100644 src/qemu/Makefile.inc.am delete mode 100644 src/secret/Makefile.inc.am delete mode 100644 src/storage/Makefile.inc.am delete mode 100644 src/vz/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 54e3ed42974..3b5195f2266 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -STATEFUL_DRIVER_SOURCE_FILES =3D augeas_DATA =3D augeastest_DATA =3D if WITH_DTRACE_PROBES @@ -30,17 +29,7 @@ RPC_PROBE_FILES =3D =20 include locking/Makefile.inc.am include admin/Makefile.inc.am -include qemu/Makefile.inc.am -include bhyve/Makefile.inc.am -include libxl/Makefile.inc.am -include vz/Makefile.inc.am include lxc/Makefile.inc.am -include interface/Makefile.inc.am -include network/Makefile.inc.am -include nwfilter/Makefile.inc.am -include node_device/Makefile.inc.am -include secret/Makefile.inc.am -include storage/Makefile.inc.am =20 =20 # Keep this list synced with RPC_PROBE_FILES @@ -97,18 +86,12 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -check-aclrules: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclrules.py \ - $(REMOTE_PROTOCOL) \ - $(STATEFUL_DRIVER_SOURCE_FILES) - check-aclperms: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \ $(srcdir)/access/viraccessperm.h \ $(srcdir)/access/viraccessperm.c =20 check-local: check-protocol \ - check-aclrules \ check-aclperms check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am deleted file mode 100644 index 7a9c6a87242..00000000000 --- a/src/bhyve/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SO= URCES)) diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 12b933b0b44..6dc8b7d29ff 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -11,6 +11,7 @@ bhyve_sources =3D files( ) =20 driver_source_files +=3D bhyve_sources +stateful_driver_source_files +=3D bhyve_sources =20 if conf.has('WITH_BHYVE') bhyve_driver_impl =3D static_library( diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am deleted file mode 100644 index 6cd6dff3b90..00000000000 --- a/src/interface/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) diff --git a/src/interface/meson.build b/src/interface/meson.build index bd04a7f350f..bf9d649282e 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -11,6 +11,7 @@ if conf.has('WITH_UDEV') endif =20 driver_source_files +=3D files(interface_driver_sources) +stateful_driver_source_files +=3D files(interface_driver_sources) =20 if conf.has('WITH_INTERFACE') virt_modules +=3D { diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am deleted file mode 100644 index d713f4e75aa..00000000000 --- a/src/libxl/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SO= URCES)) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 6720d826435..b2e9ca07d4a 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -11,6 +11,7 @@ libxl_driver_sources =3D [ ] =20 driver_source_files +=3D files(libxl_driver_sources) +stateful_driver_source_files +=3D files(libxl_driver_sources) =20 if conf.has('WITH_LIBXL') libxl_driver_imp =3D static_library( diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 6abd08e333e..564b3519bcb 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -1,10 +1,5 @@ # vim: filetype=3Dautomake =20 -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ - $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) - if WITH_LXC =20 if WITH_DTRACE_PROBES diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 65dff6a7c4b..8b51093a387 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -46,6 +46,12 @@ driver_source_files +=3D [ lxc_monitor_generated, ] =20 +stateful_driver_source_files +=3D [ + files(lxc_driver_sources), + lxc_monitor_protocol_generated, + lxc_monitor_generated, +] + lxc_controller_sources =3D files( 'lxc_conf.c', 'lxc_container.c', diff --git a/src/meson.build b/src/meson.build index e30bf7e90b6..6747f11a3f3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -211,6 +211,10 @@ virt_install_dirs =3D [] # driver source files to check driver_source_files =3D [] =20 +# stateful_driver_source_files: +# stateful driver source files to check +stateful_driver_source_files =3D [] + =20 # list subdirectories =20 @@ -846,3 +850,10 @@ test( args: [ check_driverimpls_prog.path(), driver_source_files ], env: runutf8, ) + +test( + 'check-aclrules', + python3_prog, + args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), s= tateful_driver_source_files ], + env: runutf8, +) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am deleted file mode 100644 index cf5cff4ea88..00000000000 --- a/src/network/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) diff --git a/src/network/meson.build b/src/network/meson.build index c33404dfd96..a3836bb12be 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -4,6 +4,7 @@ network_driver_sources =3D [ ] =20 driver_source_files +=3D files(network_driver_sources) +stateful_driver_source_files +=3D files(network_driver_sources) =20 network_leases_helper_sources =3D files( 'leaseshelper.c', diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am deleted file mode 100644 index ddd906fa782..00000000000 --- a/src/node_device/Makefile.inc.am +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ - $(NULL) diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 0ac2aecf4f1..d833b329da4 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -2,6 +2,8 @@ node_device_driver_sources =3D [ 'node_device_driver.c', ] =20 +stateful_driver_source_files +=3D files(node_device_driver_sources) + if conf.has('WITH_HAL') node_device_driver_sources +=3D 'node_device_hal.c' endif diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am deleted file mode 100644 index 68bc42c2edf..00000000000 --- a/src/nwfilter/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index c2c186903d8..6e9734e6a26 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -7,6 +7,7 @@ nwfilter_driver_sources =3D [ ] =20 driver_source_files +=3D files(nwfilter_driver_sources) +stateful_driver_source_files +=3D files(nwfilter_driver_sources) =20 if conf.has('WITH_NWFILTER') nwfilter_driver_impl =3D static_library( diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am deleted file mode 100644 index 96265d2893b..00000000000 --- a/src/qemu/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOU= RCES)) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index c74acf9d14b..640ef273ca8 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -38,6 +38,7 @@ qemu_driver_sources =3D [ ] =20 driver_source_files +=3D files(qemu_driver_sources) +stateful_driver_source_files +=3D files(qemu_driver_sources) =20 qemu_dtrace_gen_headers =3D [] qemu_dtrace_gen_objects =3D [] diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am deleted file mode 100644 index 361305283a5..00000000000 --- a/src/secret/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) diff --git a/src/secret/meson.build b/src/secret/meson.build index bbcd74ce309..1605729f49b 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -3,6 +3,7 @@ secret_driver_sources =3D [ ] =20 driver_source_files +=3D files(secret_driver_sources) +stateful_driver_source_files +=3D files(secret_driver_sources) =20 if conf.has('WITH_SECRETS') virt_modules +=3D { diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am deleted file mode 100644 index 0834ac43a64..00000000000 --- a/src/storage/Makefile.inc.am +++ /dev/null @@ -1,4 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) diff --git a/src/storage/meson.build b/src/storage/meson.build index b14dcf969d9..86abfedbdde 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -9,6 +9,7 @@ storage_driver_sources =3D [ ] =20 driver_source_files +=3D files(storage_driver_sources) +stateful_driver_source_files +=3D files(storage_driver_sources) =20 storage_backend_fs_sources =3D [ 'storage_backend_fs.c', diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am deleted file mode 100644 index eb6721fb135..00000000000 --- a/src/vz/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -STATEFUL_DRIVER_SOURCE_FILES +=3D $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURC= ES)) diff --git a/src/vz/meson.build b/src/vz/meson.build index 903e1f1359f..0ab83731071 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -5,6 +5,7 @@ vz_driver_sources =3D [ ] =20 driver_source_files +=3D files(vz_driver_sources) +stateful_driver_source_files +=3D files(vz_driver_sources) =20 if conf.has('WITH_VZ') vz_driver_impl =3D static_library( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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-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=JslCf60aIhlJw3FxPk36e7jIbSR0/f+yFFperx+VfUpjmnkF1Sg1z6aLNNclPC+InArW3zNVKlK7bMAhYFzja8Sk/HmuzsGVb5xMzgH+Wut85nWqwWjoPSOntogvl2eLVS99rZ/chvO4N8l+ouDUQuw+hDgZuMQCF/Y4hPUtuHk= 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=PNZFo01XL4e4weaVcV7B/Fje6YmrufJusaaAscJ1U0w=; b=nPpG5UJpJxXoMLZq7+9vXZypwRhW7fse3Mhm0JGK38FvweOoVL5wgpusWWyNZ8amNQNQWi4+vvkZDseOmk6CIGh4bumowgWyy4mtYlM4jVAs0oZD4e7RQjM8KSVPsOmj3MMHqV7MfwU98Tl6ZEnUB/7YrF+syqPRdqRdPnAq47I= 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594894332913538.3100422849647; 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-419-L-leZplEPl6qM_yRH_gUcg-1; Thu, 16 Jul 2020 06:10:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1087B80BCAD; Thu, 16 Jul 2020 10:10:06 +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 E544E6FED1; Thu, 16 Jul 2020 10:10:05 +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 AEAC8A36EF; Thu, 16 Jul 2020 10:10:05 +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 06GA64f0019264 for ; Thu, 16 Jul 2020 06:06:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B82A2B6DC; Thu, 16 Jul 2020 10:06:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA04F2B6DB for ; Thu, 16 Jul 2020 10:06:03 +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=PNZFo01XL4e4weaVcV7B/Fje6YmrufJusaaAscJ1U0w=; b=f32DSeU+dtq0pbjV0enIC8jMixIMMWe4jF/c3Xou8npUhq+1Xo+b+JAoGplFOvGR2yknk2 tML32PCAA1qY84gJ6jEPlCunGdoBhqK8w1y4uZqv8tTQzSZ2lurUWtAlwlx7u6R68r8bdu eTVDnZZKJ0lNJ3ueDzZo8CMkijyDfJA= X-MC-Unique: L-leZplEPl6qM_yRH_gUcg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 245/351] meson: src/access: add check-aclperms test Date: Thu, 16 Jul 2020 11:58:01 +0200 Message-Id: <575082be211632e9fe0d46a2fd75b8cc8983cddf.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.11 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/Makefile.am | 7 +------ src/access/meson.build | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3b5195f2266..d697114d7e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,13 +86,8 @@ else !WITH_REMOTE check-protocol: endif !WITH_REMOTE =20 -check-aclperms: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-aclperms.py \ - $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/viraccessperm.c - check-local: check-protocol \ - check-aclperms check-admin + check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 diff --git a/src/access/meson.build b/src/access/meson.build index 2d8a2a90716..beb61eddaf5 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -112,3 +112,10 @@ access_dep =3D declare_dependency( ) =20 generated_sym_files +=3D access_gen_sym + +test( + 'check-aclperms', + python3_prog, + args: [ check_aclperms_prog.path(), access_perm_h, files('viraccessperm.= c') ], + env: runutf8, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594895105; cv=none; d=zohomail.com; s=zohoarc; b=XeC9m86re+VuJlF1CUkstnesi78/B449cdGr7kXjF91PqvN0uckGhehsBk/e9+ySvAuJxxl6YuJ360nr2ir/IVde9xwlHLLrM28joSpAcmfJuV4rN4C4es5Pw6xxQHbRD02NH7ZiAIjwXXARk2R2IHArOF0hZzVuu+yVW05HfdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895105; 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=i/G4Kd/SRYTi7IA9AD4Qen8FPANKnqLhZIPit/IY87g=; b=SNLdUCZJsi+8bHFpUGXR6T6vmbaOwBzFdm69j3wKjlU27knIQZvFbUl4TppmJ38kdG7nz0qlxGw3s79IKqtfmva8ZVsYZeLzgtA7lywTVq7NDKP4+9sV+BMEG0KZfXqXZ5h5mbuVGb7ixEN/u/48Kz50vgD/vCGUT1EV0YIXPFU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594895105975403.5007176883604; Thu, 16 Jul 2020 03:25:05 -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-217-A0ppNt7PMci1ENW-6Oe7dA-1; Thu, 16 Jul 2020 06:08:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2AC281888AC8; Thu, 16 Jul 2020 10:08:42 +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 0C989710D7; Thu, 16 Jul 2020 10:08:42 +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 D2E36730F5; Thu, 16 Jul 2020 10:08:41 +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 06GA65mE019321 for ; Thu, 16 Jul 2020 06:06:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5434D2B6DB; Thu, 16 Jul 2020 10:06:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C28862B6E6 for ; Thu, 16 Jul 2020 10:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895104; 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=i/G4Kd/SRYTi7IA9AD4Qen8FPANKnqLhZIPit/IY87g=; b=dfwpTOXI6JqeyZJJ8C0W9dONbVYSLc+/KW6lwPJyKTtMFApEa0tcgJZoCXETE62XGWMVLy hayCRsewnmaa5L7pGi1gZksGTpiNPWPjpLhhg4xobOxu1DoNby6FqNaJffbNGpszlYXOU7 WqsQ6w4mGQilL+m86Xga6RNVlaclwMs= X-MC-Unique: A0ppNt7PMci1ENW-6Oe7dA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 246/351] meson: src: add check-augeas test Date: Thu, 16 Jul 2020 11:58:02 +0200 Message-Id: <3f5dd7a231615c3c7272c58c2ea6deb06876cdb0.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.15 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 --- scripts/check-augeas.sh | 12 ++++++++++++ scripts/meson.build | 1 + src/Makefile.am | 17 ----------------- src/meson.build | 18 +++++++++++++++++- 4 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 scripts/check-augeas.sh diff --git a/scripts/check-augeas.sh b/scripts/check-augeas.sh new file mode 100644 index 00000000000..68609d555a7 --- /dev/null +++ b/scripts/check-augeas.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +AUGPARSE=3D$1 +srcdir=3D$2 +builddir=3D$3 +augeastest=3D$4 + +set -vx + +for f in $augeastest; do + ${AUGPARSE} -I "$srcdir" -I "$builddir" $f +done diff --git a/scripts/meson.build b/scripts/meson.build index 3038dfc8d21..05bf6ff7231 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -3,6 +3,7 @@ scripts =3D [ 'augeas-gentest.py', 'check-aclperms.py', 'check-aclrules.py', + 'check-augeas.sh', 'check-driverimpls.py', 'check-drivername.py', 'check-file-access.py', diff --git a/src/Makefile.am b/src/Makefile.am index d697114d7e8..88e44fab2b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,8 +20,6 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -augeas_DATA =3D -augeastest_DATA =3D if WITH_DTRACE_PROBES tapset_DATA =3D endif WITH_DTRACE_PROBES @@ -91,21 +89,6 @@ check-local: check-protocol \ .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 =20 -check-local: check-augeas - -check-augeas: $(augeas_DATA) $(augeastest_DATA) - $(AM_V_GEN) \ - if test -x "$(AUGPARSE)"; then \ - for f in $(augeastest_DATA); do \ - DIR=3D$$(dirname "$$f"); \ - FILE=3D$$(basename "$$f"); \ - "$(AUGPARSE)" \ - -I "$(srcdir)/$$DIR" -I "$(builddir)/$$DIR" \ - "$$DIR/$$FILE" || exit 1; \ - done; \ - fi -.PHONY: check-augeas - if WITH_DTRACE_PROBES =20 tapset_DATA +=3D libvirt_functions.stp diff --git a/src/meson.build b/src/meson.build index 6747f11a3f3..9b4c26e32ea 100644 --- a/src/meson.build +++ b/src/meson.build @@ -646,6 +646,8 @@ foreach data : virt_test_aug_files ) endforeach =20 +augeas_test_data =3D [] + foreach data : virt_daemon_confs daemon_conf =3D configuration_data() daemon_conf.set('runstatedir', runstatedir) @@ -694,7 +696,7 @@ foreach data : virt_daemon_confs ) =20 test_aug_out =3D 'test_@0@.aug'.format(data['name']) - custom_target( + augeas_test_file =3D custom_target( test_aug_out, input: [ conf_out, test_aug_tmp ], output: test_aug_out, @@ -703,6 +705,7 @@ foreach data : virt_daemon_confs install: true, install_dir: virt_test_aug_dir, ) + augeas_test_data +=3D augeas_test_file endforeach =20 =20 @@ -857,3 +860,16 @@ test( args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), s= tateful_driver_source_files ], env: runutf8, ) + +if augparse_prog.found() + test( + 'check-augeas', + check_augeas_prog, + args: [ + augparse_prog.path(), + meson.current_source_dir(), + meson.current_build_dir(), + augeas_test_data, + ], + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894430; cv=none; d=zohomail.com; s=zohoarc; b=ckQG1TFuMIoeYUCLtX6n4BCAQzg8oHAOLq7p2DFzOc3aMxBptbOj3ZuSeqYanugOn+M6pjcSO4xq4WXaTCT7vLqWy95Hrene0/ofFiN2yPw8/869EkcS5aMxcqN2QbC6raxAtHWDURvKHH5wmZ2AxYuYnqBgSEuqhKn/R1rfWR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894430; 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=XFZvcyoCQ1uN7GoihsNBC5ZL9ChWUbNnk68FZNxMqsA=; b=ji90Acl1+V+cnrwd+EPcG12A+VT+I/Ey6XfqGiT6/UlNEbtdd69KmqBhbv7OEbFHhhscuNWLxxHkC9wJjcmg8hXl8GLU85dYqTvKfCT5jND6tFq+tBqAGoH8EI+Lo6nyEu1IKPhd75dDAKtS8QdDNR0zhVTAwZlkNcjkk5SWudY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894430881468.68641247479536; Thu, 16 Jul 2020 03:13:50 -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-312-6KQHnI9aNPO0zEQgQdiZ8Q-1; Thu, 16 Jul 2020 06:13:47 -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 0FE701098; Thu, 16 Jul 2020 10:13:42 +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 E27F010098A1; Thu, 16 Jul 2020 10:13:41 +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 B49551803503; Thu, 16 Jul 2020 10:13:41 +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 06GA66at019326 for ; Thu, 16 Jul 2020 06:06:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3DCAB2B6DC; Thu, 16 Jul 2020 10:06:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABD292B6DB for ; Thu, 16 Jul 2020 10:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894429; 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=XFZvcyoCQ1uN7GoihsNBC5ZL9ChWUbNnk68FZNxMqsA=; b=CNUUbG3ubm+mfnsXSxgakCIB17Ax3An2Az5eGqWwxVoO8f0FxSwjjt7U4aTtOZ2R4hQLVn h13TEILVmH/nnWxw5XWgLl+nJXPvqVArK0cNAypPV3Ddyty3SLd0Vi1PindOSvSy0op0PJ 7KdOB34RN91uBNGjSzF0FF6iy8ECrCE= X-MC-Unique: 6KQHnI9aNPO0zEQgQdiZ8Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 247/351] meson: src: build libvirt_functions.stp Date: Thu, 16 Jul 2020 11:58:03 +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.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/Makefile.am | 24 ------------------------ src/admin/meson.build | 2 ++ src/locking/Makefile.inc.am | 3 --- src/locking/meson.build | 2 ++ src/lxc/Makefile.inc.am | 9 --------- src/lxc/meson.build | 2 ++ src/meson.build | 14 ++++++++++++++ src/remote/meson.build | 2 ++ src/rpc/meson.build | 2 ++ 9 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 src/locking/Makefile.inc.am delete mode 100644 src/lxc/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 88e44fab2b9..7289f247362 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,14 +20,9 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -if WITH_DTRACE_PROBES -tapset_DATA =3D -endif WITH_DTRACE_PROBES RPC_PROBE_FILES =3D =20 -include locking/Makefile.inc.am include admin/Makefile.inc.am -include lxc/Makefile.inc.am =20 =20 # Keep this list synced with RPC_PROBE_FILES @@ -87,22 +82,3 @@ endif !WITH_REMOTE check-local: check-protocol \ check-admin .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) - - -if WITH_DTRACE_PROBES - -tapset_DATA +=3D libvirt_functions.stp - -# Keep this list synced with PROTOCOL_STRUCTS -RPC_PROBE_FILES +=3D $(srcdir)/rpc/virnetprotocol.x \ - $(srcdir)/rpc/virkeepaliveprotocol.x \ - $(srcdir)/remote/remote_protocol.x \ - $(srcdir)/remote/lxc_protocol.x \ - $(srcdir)/remote/qemu_protocol.x \ - $(srcdir)/admin/admin_protocol.x - -libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemt= ap.py - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/gensystemtap.py \ - $(RPC_PROBE_FILES) > $@ - -endif WITH_DTRACE_PROBES diff --git a/src/admin/meson.build b/src/admin/meson.build index c9dff4d92a0..330fe2f98d1 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -5,6 +5,8 @@ admin_driver_sources =3D [ =20 admin_driver_protocol =3D files('admin_protocol.x') =20 +rpc_probe_files +=3D admin_driver_protocol + admin_driver_generated =3D [] =20 admin_driver_generated +=3D custom_target( diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am deleted file mode 100644 index 285e73a6bf4..00000000000 --- a/src/locking/Makefile.inc.am +++ /dev/null @@ -1,3 +0,0 @@ -# vim: filetype=3Dautomake - -RPC_PROBE_FILES +=3D $(srcdir)/locking/lock_protocol.x diff --git a/src/locking/meson.build b/src/locking/meson.build index dbff78ca1bb..5c49bc641f8 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -1,5 +1,7 @@ lock_protocol =3D 'lock_protocol.x' =20 +rpc_probe_files +=3D files(lock_protocol) + lock_driver_sources =3D [ 'lock_manager.c', 'lock_driver_nop.c', diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am deleted file mode 100644 index 564b3519bcb..00000000000 --- a/src/lxc/Makefile.inc.am +++ /dev/null @@ -1,9 +0,0 @@ -# vim: filetype=3Dautomake - -if WITH_LXC - -if WITH_DTRACE_PROBES -RPC_PROBE_FILES +=3D $(srcdir)/lxc/lxc_monitor_protocol.x -endif - -endif WITH_LXC diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 8b51093a387..0999e1c96b8 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -13,6 +13,8 @@ lxc_driver_sources =3D [ =20 lxc_monitor_protocol =3D files('lxc_monitor_protocol.x') =20 +rpc_probe_files +=3D lxc_monitor_protocol + lxc_monitor_protocol_generated =3D [] =20 lxc_monitor_protocol_generated +=3D custom_target( diff --git a/src/meson.build b/src/meson.build index 9b4c26e32ea..7965c5fb18a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -75,6 +75,8 @@ if conf.has('WITH_DTRACE_PROBES') ) endif =20 +rpc_probe_files =3D [] + =20 # symbol files =20 @@ -802,6 +804,18 @@ foreach sysconf : sysconf_files ) endforeach =20 +if conf.has('WITH_DTRACE_PROBES') + custom_target( + 'libvirt_functions.stp', + input: rpc_probe_files, + output: 'libvirt_functions.stp', + command: [ meson_python_prog, gensystemtap_prog, '@INPUT@' ], + capture: true, + install: true, + install_dir: systemtap_dir, + ) +endif + =20 # Install empty directories =20 diff --git a/src/remote/meson.build b/src/remote/meson.build index 055857ae360..fa7ce7ce5be 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -37,6 +37,8 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', ], ) + + rpc_probe_files +=3D files(protocol_x) endforeach =20 remote_daemon_sources =3D files( diff --git a/src/rpc/meson.build b/src/rpc/meson.build index 8f4372bb3e2..d759fa21aec 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -45,6 +45,8 @@ foreach name : [ 'virnet', 'virkeepalive' ] genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@', ], ) + + rpc_probe_files +=3D protocol_file endforeach =20 rpc_server_sources =3D [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894326; cv=none; d=zohomail.com; s=zohoarc; b=EIG8kyNs5HdjVjWy865MxP3vbUEf3b4If44KoDHiuadgvyJD1XIf+Z6SWXqZvaMV1siuTLSyw1eze+FEsaXuNCbJOXJtoC11s6mEzk6VuweghmlPnTmEoyD35nAcmu/7OCHhvF3GR5JYduifM1lv1btr4/KvmBmsGcF4vxkyMzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894326; 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=/vFwy4Q2jxrJ8aijMUo+3ZtWMIrIC6JNKt8oR3H2GwU=; b=bbO6cQ1tz8tYpPpNT8tA+QragAYCfvliaVinruUsfL7djxrmICYS6/xgcu2hfq/T8hJPDc1Zi+bR+zhOgil/VD/uMqJHS6q3nUhCfs/LocaGyX19ZfOu4YzANIqqDnjFmgT38UpmpN9vNoJi9RniBaXQY26owW28U5LlLCN0dxw= 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 1594894326853714.4345470297253; Thu, 16 Jul 2020 03:12:06 -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-162-bK-DeEn7NPi4dZzM5E16oA-1; Thu, 16 Jul 2020 06:08:51 -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 BE4A6100AA35; Thu, 16 Jul 2020 10:08:45 +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 9D7FB1053B01; Thu, 16 Jul 2020 10:08:45 +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 6CFAF94EE6; Thu, 16 Jul 2020 10:08:45 +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 06GA675j019335 for ; Thu, 16 Jul 2020 06:06:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 261B82B6DB; Thu, 16 Jul 2020 10:06:07 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 950422B6E6 for ; Thu, 16 Jul 2020 10:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894325; 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=/vFwy4Q2jxrJ8aijMUo+3ZtWMIrIC6JNKt8oR3H2GwU=; b=Fvfsge4HrpOeHpzMP4qe2UOppqi9GozD5Ey3vnqX9bMp6gY3AhprSuMcVUA+Fj9xP8hSnC dlU9s9VGxp4woZsEWw7j2PRxWaYS6AniFqovGXW54QsyU50Hueyho1Bb/tOEWm+SsBLyM0 oHV8TagubXQ7f+4DaaNGjjBH6v8MmE4= X-MC-Unique: bK-DeEn7NPi4dZzM5E16oA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 248/351] meson: src: add check*protocol tests Date: Thu, 16 Jul 2020 11:58:04 +0200 Message-Id: <890a19611f97f902c3d1cbf387d7e467a81df88f.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 --- meson.build | 1 + scripts/check-remote-protocol.py | 75 +++++++++++--------------------- src/Makefile.am | 61 -------------------------- src/admin/meson.build | 7 +++ src/locking/meson.build | 7 +++ src/lxc/meson.build | 7 +++ src/meson.build | 23 ++++++++++ src/remote/meson.build | 21 +++++++++ src/rpc/meson.build | 14 ++++++ 9 files changed, 106 insertions(+), 110 deletions(-) diff --git a/meson.build b/meson.build index 457d752ffb5..eb659c64aa0 100644 --- a/meson.build +++ b/meson.build @@ -920,6 +920,7 @@ optional_programs =3D [ 'mm-ctl', 'modprobe', 'ovs-vsctl', + 'pdwtags', 'radvd', 'rmmod', 'scrub', diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protoc= ol.py index e28fb80cdd1..00b8570f9bb 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -31,55 +31,32 @@ import re import subprocess import sys =20 -cc =3D sys.argv[1] -proto_lo =3D sys.argv[2] -expected =3D sys.argv[3] - -proto_lo =3D proto_lo.replace("/", "/.libs/") - -ccargv =3D cc.split(" ") -ccargv.append("-v") -ccproc =3D subprocess.Popen(ccargv, stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT) -out, err =3D ccproc.communicate() -out =3D out.decode("utf-8") -if out.find("clang") !=3D -1: - print("WARNING: skipping pdwtags test with Clang", file=3Dsys.stderr) - sys.exit(0) - - -def which(program): - def is_exe(fpath): - return (os.path.isfile(fpath) and - os.access(fpath, os.X_OK)) - - fpath, fname =3D os.path.split(program) - if fpath: - if is_exe(program): - return program - else: - for path in os.environ["PATH"].split(os.pathsep): - exe_file =3D os.path.join(path, program) - if is_exe(exe_file): - return exe_file - - return None - - -pdwtags =3D which("pdwtags") -if pdwtags is None: - print("WARNING: you lack pdwtags; skipping the protocol test", - file=3Dsys.stderr) - print("WARNING: install the dwarves package to get pdwtags", - file=3Dsys.stderr) - sys.exit(0) - -proto_o =3D proto_lo.replace(".lo", ".o") - -if not os.path.exists(proto_o): - raise Exception("Missing %s", proto_o) - -pdwtagsproc =3D subprocess.Popen(["pdwtags", "--verbose", proto_o], +name =3D sys.argv[1] +libname =3D sys.argv[2] +builddir =3D sys.argv[3] +pdwtags =3D sys.argv[4] +expected =3D sys.argv[5] + + +def get_subdir(dirname, subdir): + objectdir =3D "" + reg =3D re.compile(subdir) + for d in os.listdir(path=3Ddirname): + if reg.match(d): + objectdir =3D d + break + + if objectdir =3D=3D "": + raise Exception("Failed to find '{0}' in '{1}'".format(subdir, dir= name)) + + return os.path.join(dirname, objectdir) + + +objectdir =3D get_subdir(builddir, r'.*@{0}@.*'.format(libname)) + +proto_o =3D get_subdir(objectdir, r'.*{0}\.c\.o'.format(name)) + +pdwtagsproc =3D subprocess.Popen([pdwtags, "--verbose", proto_o], stdout=3Dsubprocess.PIPE, stderr=3Dsubproce= ss.PIPE) out, err =3D pdwtagsproc.communicate() out =3D out.decode("utf-8") diff --git a/src/Makefile.am b/src/Makefile.am index 7289f247362..33e32506525 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,65 +20,4 @@ # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. =20 -RPC_PROBE_FILES =3D - include admin/Makefile.inc.am - - -# Keep this list synced with RPC_PROBE_FILES -PROTOCOL_STRUCTS =3D \ - $(srcdir)/remote_protocol-structs \ - $(srcdir)/lxc_protocol-structs \ - $(srcdir)/qemu_protocol-structs \ - $(srcdir)/virnetprotocol-structs \ - $(srcdir)/virkeepaliveprotocol-structs \ - $(srcdir)/lxc_monitor_protocol-structs \ - $(srcdir)/lock_protocol-structs \ - $(srcdir)/admin_protocol-structs \ - $(NULL) - -if WITH_REMOTE -check-protocol: $(PROTOCOL_STRUCTS) $(PROTOCOL_STRUCTS:structs=3Dstruct) - -# Ensure that we don't change the struct or member names or member ordering -# in remote_protocol.x The check-remote-protocol.py script post-processes -# output to extract the bits we want. - -CHECK_REMOTE_PROTOCOL =3D $(top_srcdir)/scripts/check-remote-protocol.py - -# The .o file that pdwtags parses is created as a side effect of running -# libtool; but from make's perspective we depend on the .lo file. -$(srcdir)/remote_protocol-struct \ - $(srcdir)/qemu_protocol-struct \ - $(srcdir)/lxc_protocol-struct: \ - $(srcdir)/%-struct: remote/libvirt_driver_remote_la-%.lo - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" $< $(@)s -$(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \ - $(srcdir)/%-struct: rpc/libvirt_net_rpc_la-%.lo - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" $< $(@)s -if WITH_LXC -$(srcdir)/lxc_monitor_protocol-struct: \ - $(srcdir)/%-struct: lxc/libvirt_driver_lxc_impl_la-%.lo - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" $< $(@)s -endif WITH_LXC -$(srcdir)/lock_protocol-struct: \ - $(srcdir)/%-struct: locking/lockd_la-%.lo - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" $< $(@)s -$(srcdir)/admin_protocol-struct: \ - $(srcdir)/%-struct: admin/libvirt_admin_la-%.lo - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(CHECK_REMOTE_PROTOCOL) \ - "$(CC)" $< $(@)s - -else !WITH_REMOTE -# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be -# re-generated when configured --without-remote. -check-protocol: -endif !WITH_REMOTE - -check-local: check-protocol \ - check-admin -.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) diff --git a/src/admin/meson.build b/src/admin/meson.build index 330fe2f98d1..5652a58e0fb 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -94,6 +94,13 @@ admin_driver_lib =3D static_library( =20 libvirt_libs +=3D admin_driver_lib =20 +check_protocols +=3D { + 'name': 'admin_protocol', + 'libname': 'virt_admin_driver', + 'builddir': meson.current_build_dir(), + 'depends': admin_driver_lib, +} + virt_conf_files +=3D files('libvirt-admin.conf') =20 admin_inc_dir =3D include_directories('.') diff --git a/src/locking/meson.build b/src/locking/meson.build index 5c49bc641f8..4c30acb2eb9 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -90,6 +90,13 @@ if conf.has('WITH_LIBVIRTD') ], ) =20 + check_protocols +=3D { + 'name': 'lock_protocol', + 'libname': 'lockd_impl', + 'builddir': meson.current_build_dir(), + 'depends': lockd_lib_impl, + } + lockdriver_dir =3D libdir / 'libvirt' / 'lock-driver' =20 virt_modules +=3D { diff --git a/src/lxc/meson.build b/src/lxc/meson.build index 0999e1c96b8..093ad809029 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -99,6 +99,13 @@ if conf.has('WITH_LXC') ], ) =20 + check_protocols +=3D { + 'name': 'lxc_monitor_protocol', + 'libname': 'virt_driver_lxc_impl', + 'builddir': meson.current_build_dir(), + 'depends': lxc_driver_impl_lib, + } + virt_modules +=3D { 'name': 'virt_driver_lxc', 'link_whole': [ diff --git a/src/meson.build b/src/meson.build index 7965c5fb18a..3f1c456245a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -217,6 +217,14 @@ driver_source_files =3D [] # stateful driver source files to check stateful_driver_source_files =3D [] =20 +# check_protocols: +# check if $name.x is in sync with $name-structs +# name - name of the protocol (required) +# libname - name of the meson library (required) +# builddir - build directory for the library (required) +# depends - library that this test depends on (required) +check_protocols =3D [] + =20 # list subdirectories =20 @@ -887,3 +895,18 @@ if augparse_prog.found() ], ) endif + +if pdwtags_prog.found() + foreach proto : check_protocols + test( + 'check-@0@'.format(proto['name']), + python3_prog, + args: [ + check_remote_protocol_prog.path(), proto['name'], proto['libname'], + proto['builddir'], pdwtags_prog.path(), files('@0@-structs'.format= (proto['name'])), + ], + env: runutf8, + depends: proto['depends'], + ) + endforeach +endif diff --git a/src/remote/meson.build b/src/remote/meson.build index fa7ce7ce5be..130d246fcec 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -126,6 +126,27 @@ if conf.has('WITH_REMOTE') ], ) =20 + check_protocols +=3D { + 'name': 'remote_protocol', + 'libname': 'virt_remote_driver', + 'builddir': meson.current_build_dir(), + 'depends': remote_driver_lib, + } + + check_protocols +=3D { + 'name': 'qemu_protocol', + 'libname': 'virt_remote_driver', + 'builddir': meson.current_build_dir(), + 'depends': remote_driver_lib, + } + + check_protocols +=3D { + 'name': 'lxc_protocol', + 'libname': 'virt_remote_driver', + 'builddir': meson.current_build_dir(), + 'depends': remote_driver_lib, + } + libvirt_libs +=3D remote_driver_lib =20 if conf.has('WITH_LIBVIRTD') diff --git a/src/rpc/meson.build b/src/rpc/meson.build index d759fa21aec..18ea0602602 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -81,6 +81,20 @@ virt_rpc_lib =3D static_library( ], ) =20 +check_protocols +=3D { + 'name': 'virnetprotocol', + 'libname': 'virt_net_rpc', + 'builddir': meson.current_build_dir(), + 'depends': virt_rpc_lib, +} + +check_protocols +=3D { + 'name': 'virkeepaliveprotocol', + 'libname': 'virt_net_rpc', + 'builddir': meson.current_build_dir(), + 'depends': virt_rpc_lib, +} + virt_rpc_server_lib =3D static_library( 'virt_net_rpc_server', [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594895241; cv=none; d=zohomail.com; s=zohoarc; b=Ifgfle29NQMmNmLX345ww5DeRHc6yGk2tmd/1M1ubLbx5DgnwDQvxKZ7T0ybgpiT0fY0CA4JtyPKa4LPSVtwByiFsUz/vdx0RVICale8BleY1OG1HWKt6oWxShAdxFtF5mcAI/+q1WdzJ+M6HJig9V5fADMGqSAT7H5TEDOha24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895241; 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=rgSYMP2Qnj+fF/SNZQIqHbwVOzFJjiDq4t6WPPgU7Zw=; b=Hs8rRtxx5bHCrjLj54OXBnDb8Uxm+7HyfZnSoUfgCmkJMIxuQpyyHgY6WzMijZ7iwIRqSCZg7AE8V4+olgLaIE265rpdpeS/pMfL+Y7pDwOUdU31k8dharBOs5cyCrOKqAIa5348c/p6vjk2OFV2KloTj1vKcGs9qJBXBzubVEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594895241815883.9614036403858; Thu, 16 Jul 2020 03:27:21 -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-503-QHZh5okFO-GZXq8cO3DJfw-1; Thu, 16 Jul 2020 06:13:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F5B4108A; Thu, 16 Jul 2020 10:13:44 +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 42A8A724A9; Thu, 16 Jul 2020 10:13:44 +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 0EB351803B3E; Thu, 16 Jul 2020 10:13:44 +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 06GA68x3019341 for ; Thu, 16 Jul 2020 06:06:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DE5F2DE69; Thu, 16 Jul 2020 10:06:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CE252B6DB for ; Thu, 16 Jul 2020 10:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895240; 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=rgSYMP2Qnj+fF/SNZQIqHbwVOzFJjiDq4t6WPPgU7Zw=; b=g6mm3nGTHjx1314MQb0yEnP/2HY6b4oL4KVAp9GRCSBNl1rH4mDUKkVn+VZ1nA0scgDI9C NIKYL/MoyvOubf9Ths9+h5a4J047pOlfuVp5v7VxYOM8D13SwmWv/oX/gZPyL1Am0D9o3n 6ctmYAgBjUjuo8R0OXRv11vRxo4RX5o= X-MC-Unique: QHZh5okFO-GZXq8cO3DJfw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 249/351] meson: src: add check-admin-symfile test Date: Thu, 16 Jul 2020 11:58:05 +0200 Message-Id: <4589d8788db157a9274ab5a2a7f5257a0bb8777a.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.11 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/admin/Makefile.inc.am | 10 +--------- src/meson.build | 7 +++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index ec084299b85..a2af10a158d 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -2,14 +2,6 @@ =20 ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms =20 -if WITH_LINUX -check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \ - admin/libvirt_admin.syms .libs/libvirt-admin.so -else ! WITH_LINUX -check-admin-symfile: -endif ! WITH_LINUX - check-admin-symsorting: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py= \ $(srcdir) $(ADMIN_SYM_FILES) @@ -18,4 +10,4 @@ check-admin-drivername: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py= \ $(srcdir)/admin/libvirt_admin_public.syms =20 -check-admin: check-admin-symfile check-admin-symsorting check-admin-driver= name +check-admin: check-admin-symsorting check-admin-drivername diff --git a/src/meson.build b/src/meson.build index 3f1c456245a..9a2a152f316 100644 --- a/src/meson.build +++ b/src/meson.build @@ -846,6 +846,13 @@ if host_machine.system() =3D=3D 'linux' args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ], env: runutf8, ) + + test( + 'check-admin-symfile', + python3_prog, + args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin_l= ib ], + env: runutf8, + ) endif =20 test( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894863; cv=none; d=zohomail.com; s=zohoarc; b=eAtqgnEkEL3UUaqt+mSfse1AEpurcngRx4tDoDMJrypX2HOx5NaK/ZOj44tjgg680IO7yAjEwkKvtbMJaaPX3lqTzZ4na2BaHp1QYVpy22zGUoRrZAOacAmR7V7KQPe3yIjHSWh2QUN2vMZipnC0jh7MYBpdcNkxcFpk2Zzvhcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894863; 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=um2sZWB+E4QTW2miYoSUisj90mpp8UGTOgJTR8TchXA=; b=PQAxY77GJaLpSlzNhFgq5z/RSWprJoW29NRtgdr+Rqh7yqb/aK5yDl8OiNfdijXRJ8Dk1yp3tMIMS/Bgropz11+PPw3NwDW4LaNXXPH5I7rYrxAnCbaK/W/nHn2NDGG9ZO2hS1LpwwX44WazrKAk3p18SXFR5A256bDUtkVq4nQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 15948948639721.238487723006756; Thu, 16 Jul 2020 03:21:03 -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-408-4ceAvNZcN26nKBxv5nXHWQ-1; Thu, 16 Jul 2020 06:13:52 -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 B6FDD1888AAA; Thu, 16 Jul 2020 10:13:46 +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 974F77B41E; Thu, 16 Jul 2020 10:13:46 +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 654C71802022; Thu, 16 Jul 2020 10:13:46 +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 06GA68xl019347 for ; Thu, 16 Jul 2020 06:06:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA1022DE69; Thu, 16 Jul 2020 10:06:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64F632B6DB for ; Thu, 16 Jul 2020 10:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894862; 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=um2sZWB+E4QTW2miYoSUisj90mpp8UGTOgJTR8TchXA=; b=QGIEuzR7zkWE5UDfzDlOxvbHhjBr3Y3NYJ59HfJGqmyl/j+TUPy/Th+Pe/GbVZfTVW9tVW 1iIz/P1o26gUj5kmw52vXCxXUga1ZRcjFZDFhSNHdPAVEMRrnjG8yM/q8zysqfyUIQ98Wc IEBofSAACQSvc1pCmbaajJcSl8rFCWc= X-MC-Unique: 4ceAvNZcN26nKBxv5nXHWQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 250/351] meson: src: add check-admin-symsorting test Date: Thu, 16 Jul 2020 11:58:06 +0200 Message-Id: <335c714b080467e029d7609f119dc126d46e9869.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.13 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/admin/Makefile.inc.am | 8 +------- src/admin/meson.build | 6 +++++- src/meson.build | 11 +++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index a2af10a158d..9d6f3c4cca4 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -1,13 +1,7 @@ # vim: filetype=3Dautomake =20 -ADMIN_SYM_FILES =3D $(srcdir)/admin/libvirt_admin_private.syms - -check-admin-symsorting: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py= \ - $(srcdir) $(ADMIN_SYM_FILES) - check-admin-drivername: $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py= \ $(srcdir)/admin/libvirt_admin_public.syms =20 -check-admin: check-admin-symsorting check-admin-drivername +check-admin: check-admin-drivername diff --git a/src/admin/meson.build b/src/admin/meson.build index 5652a58e0fb..ed675270845 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -51,11 +51,15 @@ admin_client_generated =3D custom_target( capture: true, ) =20 +libvirt_admin_private_syms =3D files( + 'libvirt_admin_private.syms', +) + libvirt_admin_syms =3D custom_target( 'libvirt_admin.syms', input: [ 'libvirt_admin_public.syms', - 'libvirt_admin_private.syms', + libvirt_admin_private_syms, ], output: 'libvirt_admin.syms', command: [ gen_sym_files_prog, 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_= version(), '@INPUT@' ], diff --git a/src/meson.build b/src/meson.build index 9a2a152f316..24c54241a68 100644 --- a/src/meson.build +++ b/src/meson.build @@ -866,6 +866,17 @@ test( env: runutf8, ) =20 +test( + 'check-admin-symsorting', + python3_prog, + args: [ + check_symsorting_prog.path(), + meson.current_source_dir(), + libvirt_admin_private_syms, + ], + env: runutf8, +) + test( 'check-drivername', python3_prog, --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894831; cv=none; d=zohomail.com; s=zohoarc; b=ZOh/hT3ZmvNndKyzuQffL1a/YyvrCBNoBXrUZKY9YyBEHBL2NIf9yBKGmm8ZImeWpC+Tmm53nXy6tym6mJzQ/2Vy4hvSWYvFr+q1Kqr8Dyb0wk2oYCedFF8VOghhmLX5ndKOxXl68fxMEOljqn9/KAFqJc/5YnADVRkTpIMUWME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894831; 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=u1AacIBjRt5jChGjplkByLu8ZjgSSxh0hbN/u+BUOPg=; b=Sij1/qyAf0ZIBPbna4xVCii0iFq3Q+QmtLlvoROGbVY/SM8m9Z9qj8jKyLL4Dm8YKicknXUQDgRc2Q5cgj4rj3M6e8Ous9ib7f81R1BELFd4CvVeYz+F5qM2rg/+N0F2UGvf3ZjjCGPSuwVBGH3GxmJCH8saKjWcMyLu77LkiHg= 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 1594894831449253.66489994087817; Thu, 16 Jul 2020 03:20:31 -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-395-YT0ukMP6Ne-GzRthyJfw8w-1; Thu, 16 Jul 2020 06:08:53 -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 14D6A100AA39; Thu, 16 Jul 2020 10:08:48 +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 E999A7B426; Thu, 16 Jul 2020 10:08:47 +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 B8EA496236; Thu, 16 Jul 2020 10:08:47 +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 06GA69nB019360 for ; Thu, 16 Jul 2020 06:06:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id D21B22DE69; Thu, 16 Jul 2020 10:06:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D2832B6DB for ; Thu, 16 Jul 2020 10:06:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894830; 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=u1AacIBjRt5jChGjplkByLu8ZjgSSxh0hbN/u+BUOPg=; b=E6hqimHrO/bTAvEwMNaq4qo2GwykHe2Sid5E3OhUZ5z94/0aDO4v3Bv4o7MIGtE4fWw4Fm AMnBI5dMMJhgzaT/4baKqmNHPCZo45hwkwqiXd4R0FfCpRq/6sg7rrc1PlTMRmCQaOD4m3 zESzzhERfysY3+GCa57Q4IFLwZVjdJg= X-MC-Unique: YT0ukMP6Ne-GzRthyJfw8w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 251/351] meson: src: add check-admin-drivername test Date: Thu, 16 Jul 2020 11:58:07 +0200 Message-Id: <014e95924d3301d02ccd9afa0f71856b89c78b08.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.13 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 --- Makefile.am | 2 +- configure.ac | 2 +- src/Makefile.am | 23 ----------------------- src/admin/Makefile.inc.am | 7 ------- src/admin/meson.build | 6 +++++- src/meson.build | 9 +++++++++ 6 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 src/Makefile.am delete mode 100644 src/admin/Makefile.inc.am diff --git a/Makefile.am b/Makefile.am index 6df2176364a..c5809204e6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . src tools docs \ +SUBDIRS =3D . tools docs \ tests po examples =20 XZ_OPT ?=3D -v -T0 diff --git a/configure.ac b/configure.ac index af52f957cb2..c26076fd79b 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile src/Makefile docs/Makefile \ + Makefile docs/Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 33e32506525..00000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2018 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -# No libraries with the exception of LIBXML should be listed -# here. List them against the individual XXX_la_CFLAGS targets -# that actually use them. - -include admin/Makefile.inc.am diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am deleted file mode 100644 index 9d6f3c4cca4..00000000000 --- a/src/admin/Makefile.inc.am +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=3Dautomake - -check-admin-drivername: - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-drivername.py= \ - $(srcdir)/admin/libvirt_admin_public.syms - -check-admin: check-admin-drivername diff --git a/src/admin/meson.build b/src/admin/meson.build index ed675270845..394ac2b04ad 100644 --- a/src/admin/meson.build +++ b/src/admin/meson.build @@ -51,6 +51,10 @@ admin_client_generated =3D custom_target( capture: true, ) =20 +libvirt_admin_public_syms =3D files( + 'libvirt_admin_public.syms', +) + libvirt_admin_private_syms =3D files( 'libvirt_admin_private.syms', ) @@ -58,7 +62,7 @@ libvirt_admin_private_syms =3D files( libvirt_admin_syms =3D custom_target( 'libvirt_admin.syms', input: [ - 'libvirt_admin_public.syms', + libvirt_admin_public_syms, libvirt_admin_private_syms, ], output: 'libvirt_admin.syms', diff --git a/src/meson.build b/src/meson.build index 24c54241a68..08892b536e2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -887,6 +887,15 @@ test( env: runutf8, ) =20 +test( + 'check-admin-drivername', + python3_prog, + args: [ + check_drivername_prog.path(), libvirt_admin_public_syms, + ], + env: runutf8, +) + test( 'check-driverimpls', python3_prog, --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894811; cv=none; d=zohomail.com; s=zohoarc; b=ap0QZadVpiQgR0Yv2QfqsayCWaKFvhTfPWPLb8jeD5PI1F7DVCvvKC8w2QQ7UQYsdF5ZdEgRimyMuR/II/1OCdqDIcmCFlMz6IdCq11Din3eGNLeltPOK/XXg+4Ftsv9bbRa6giJq7h2xZ9teR5tImdC8GLt2Zsz06Uffllf3UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894811; 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=lrHXZj5gOsR3vs9UdI5k0nOueMd5LnL6XQSWol+DBPw=; b=CM2Sc6OT2XZjO9goTLy9Sa/x2x16SWrUPEzlhDjKg1EgwDqGCIVWIgIxEE1m1DNXAGmtdSugDi7XVt4OKQvvM3PIdHJ0OTTwhwIfjgA9ZBiemcqi2yq9mWhUrpQGQI+zcAOvyvQw0zq1pXzUyP1+NWmS3KOzNJUqOj6pXM04rQk= 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 1594894811798406.6790193107545; Thu, 16 Jul 2020 03:20:11 -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-441-vujNQkjyOwyZuNY7ZhV_TA-1; Thu, 16 Jul 2020 06:08:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 478341888AAB; Thu, 16 Jul 2020 10:08:50 +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 2AE9C710D7; Thu, 16 Jul 2020 10:08: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 F0F119623C; Thu, 16 Jul 2020 10:08: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 06GA6A2G019376 for ; Thu, 16 Jul 2020 06:06:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id BAAC82B6DC; Thu, 16 Jul 2020 10:06:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 350422B6DB for ; Thu, 16 Jul 2020 10:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894810; 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=lrHXZj5gOsR3vs9UdI5k0nOueMd5LnL6XQSWol+DBPw=; b=M/YDV5/A9birjRFU4ESRKQMeqZoCTNG2QkJsOTzvw3qaSxmQOL5lCi5o3e1UANNAi5iFbo ZSEQvLbwP4ekwYKXfSx/P6I1Q4/+UsTpqlER3iFfD0IbOk71BvOdorpu2Q44eO3pFbUp3M WvIMh9cnUoXeLtM+XDAya6LilhVtpCc= X-MC-Unique: vujNQkjyOwyZuNY7ZhV_TA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 252/351] meson: src: configure pkg-config files used by run script Date: Thu, 16 Jul 2020 11:58:08 +0200 Message-Id: <7fc8b76a858bd5eb176f787422697d6b55efebe3.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.15 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 --- configure.ac | 3 --- src/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c26076fd79b..dc1a27ae94b 100644 --- a/configure.ac +++ b/configure.ac @@ -118,9 +118,6 @@ AC_CONFIG_FILES([\ libvirt-qemu.pc \ libvirt-lxc.pc \ libvirt-admin.pc \ - src/libvirt.pc \ - src/libvirt-qemu.pc \ - src/libvirt-lxc.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile \ examples/Makefile \ diff --git a/src/meson.build b/src/meson.build index 08892b536e2..946c124079a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -937,3 +937,23 @@ if pdwtags_prog.found() ) endforeach endif + +# configure pkg-config files for run script +run_pkg_config_files =3D [ + 'libvirt-lxc.pc.in', + 'libvirt-qemu.pc.in', + 'libvirt.pc.in', +] + +run_pkg_config_conf =3D configuration_data() +run_pkg_config_conf.set('VERSION', meson.project_version()) +run_pkg_config_conf.set('abs_top_builddir', meson.build_root()) +run_pkg_config_conf.set('abs_top_srcdir', meson.source_root()) + +foreach file : run_pkg_config_files + configure_file( + input: file, + output: '@BASENAME@', + configuration: run_pkg_config_conf, + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894692; cv=none; d=zohomail.com; s=zohoarc; b=j8x2AY0x44s03aCKvIusRe9WDeFvLSmu+WlMQsiI+KmlJESZSJZoStqljSgVglJZIU3n/8svJi713FKRUdDlVn3V7Be5TW1XCEnIqnhUMRnkawxMdRhK9SZBpqGnY6xSkmXDAPfcsGfSLmazap9HE0ucZskKSffIydkeg9y55hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894692; 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=8rIU4qteu/nQDSYVNgmuGLoErxb8H1v+Ua57hPuVKFs=; b=XD2nisM3xULRAdvTN32mU5FENC0frZY/rP1XMsHP5+q3ae91oWVe9YCcogRfh01KY9Bj2YBfBEU7XrWI455iFG/IoP3nSKxq/jNtTNrhe5Q11dUDT4rePrhhk+EVPtEBeJV6mmysTL3DXoCL1ZyNQmEAx03rQwXvJGHQ1aN+gZg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894692494959.8776279861163; Thu, 16 Jul 2020 03:18: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-314-UXP-6ZN_M16hQWTpt_gSPQ-1; Thu, 16 Jul 2020 06:08:58 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC50E10059C0; Thu, 16 Jul 2020 10:08:52 +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 8B6C65D9DC; Thu, 16 Jul 2020 10:08:52 +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 571161800FEA; Thu, 16 Jul 2020 10:08:52 +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 06GA6BRK019391 for ; Thu, 16 Jul 2020 06:06:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A33D32B6DC; Thu, 16 Jul 2020 10:06:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E44F2B6DB for ; Thu, 16 Jul 2020 10:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894691; 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=8rIU4qteu/nQDSYVNgmuGLoErxb8H1v+Ua57hPuVKFs=; b=L4r8PBPgadtDMJkrgvJKjb0YGLtEn7cuf6n3hDuu6wxsAIlqyruxQWKsGzyaPIT8dOYtii NTGJBABvd+9EwAoX0Ut17faFAUxjcleZQnWQsvw/3yTzPVnoxA4hUgUyoPs+NqtyQRTZDx QynuxBhEh5RGYF8QJPyFFueIbk5OSzM= X-MC-Unique: UXP-6ZN_M16hQWTpt_gSPQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 253/351] meson: add tools directory Date: Thu, 16 Jul 2020 11:58:09 +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.14 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 --- meson.build | 2 ++ tools/Makefile.am | 20 -------------------- tools/meson.build | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 tools/meson.build diff --git a/meson.build b/meson.build index eb659c64aa0..69145512519 100644 --- a/meson.build +++ b/meson.build @@ -2203,6 +2203,8 @@ subdir('include') =20 subdir('src') =20 +subdir('tools') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/tools/Makefile.am b/tools/Makefile.am index 19c3b88777c..f266d3e72e7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,32 +15,12 @@ ## License along with this library. If not, see ## . =20 -AM_CPPFLAGS =3D \ - -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/src -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir) \ - $(NULL) - # We do not want to accidentally include stuff from src/ # dir or public API dir. Specific files can # still be included via their path relative to the root if # needed STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 -AM_CFLAGS =3D \ - $(WARN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(NULL) - -AM_LDFLAGS =3D \ - $(RELRO_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) - ICON_FILES =3D \ libvirt_win_icon_16x16.ico \ libvirt_win_icon_32x32.ico \ diff --git a/tools/meson.build b/tools/meson.build new file mode 100644 index 00000000000..49214e5706f --- /dev/null +++ b/tools/meson.build @@ -0,0 +1,16 @@ +tools_inc_dir =3D include_directories('.') + +tools_dep =3D declare_dependency( + compile_args: coverage_flags, + dependencies: [ + libxml_dep, + glib_dep, + ], + include_directories: [ + libvirt_inc, + src_inc_dir, + util_inc_dir, + top_inc_dir, + ], + link_args: libvirt_relro + libvirt_no_indirect + libvirt_no_undefined, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894145; cv=none; d=zohomail.com; s=zohoarc; b=GhQuTEFwoOKR18q4A5AVPw9xR3psjygCwix8XfC0+GL8+tJkLZOOyEnWxkngQnwLNwtUdEaZ9U+LL7GeZ9FmdtEBV8Dd82GtP2yL0ckrpMgUqa1uhBmx9+XPey+C+/isObHMikMak0TMDftchw6njlDzigLbx7n9VW+YiWEbAtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894145; 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=UwkadCyu+AV7IANDUFwctlyW3Q5fZq0rE3o2VkwSfgw=; b=VLyEdCbxuTM+heCh6r9+ByKBMwFjlgO7bk68p6KmyOPdm7MttVUU8b+FAEYbWrvQul2ampFuG3MEAfw1eWiZdD4fGMr37N3scnLol1OCWWTBMsvm9n//Tgaqyfz6OdKDRcbCwBprkw/2Z2O1tlBlnlgxOUrL9dK58oI1qze7vSI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894145185183.20521070165375; Thu, 16 Jul 2020 03:09:05 -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-410-xYcpdByiOWutXH7TCc2AkQ-1; Thu, 16 Jul 2020 06:09:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10751100AA35; Thu, 16 Jul 2020 10:08:55 +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 E5C1A5D9DC; Thu, 16 Jul 2020 10:08:54 +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 B66859624B; Thu, 16 Jul 2020 10:08:54 +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 06GA6CQF019403 for ; Thu, 16 Jul 2020 06:06:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8ABB32B6DB; Thu, 16 Jul 2020 10:06:12 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05A382B6E2 for ; Thu, 16 Jul 2020 10:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894144; 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=UwkadCyu+AV7IANDUFwctlyW3Q5fZq0rE3o2VkwSfgw=; b=XL1o+C1aOeiqoHcx2RkiHV9g9I9ckHRqVT6PzUMIJq1OL2Asr59njjoJvDTd7fsjO9Zeib ZB1hUXKAyh1r/L5b6QrQ0Ry3Q+rg8kSzXSY6vvmmZhB/lPhQf813KfX3ZbwcxumeTJbrt+ fmKjG9cMzWONuWWccSrOR0t3yk5hJLQ= X-MC-Unique: xYcpdByiOWutXH7TCc2AkQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 254/351] meson: tools: build libvirt_shell.a static library Date: Thu, 16 Jul 2020 11:58:10 +0200 Message-Id: <75beffa02a4e463f4238328c25b98dbfb9461de3.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.14 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 --- tools/Makefile.am | 19 +------------------ tools/meson.build | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index f266d3e72e7..01c24bec02d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -64,24 +64,7 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ =20 -noinst_LTLIBRARIES =3D libvirt_shell.la -libvirt_shell_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) \ - $(NULL) -libvirt_shell_la_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) -libvirt_shell_la_LIBADD =3D \ - ../src/libvirt.la \ - $(LIBXML_LIBS) \ - $(READLINE_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -libvirt_shell_la_SOURCES =3D \ - vsh.c vsh.h \ - vsh-table.c vsh-table.h +noinst_LTLIBRARIES =3D =20 virt_host_validate_SOURCES =3D \ virt-host-validate.c \ diff --git a/tools/meson.build b/tools/meson.build index 49214e5706f..3a4bd760688 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -14,3 +14,21 @@ tools_dep =3D declare_dependency( ], link_args: libvirt_relro + libvirt_no_indirect + libvirt_no_undefined, ) + +libvirt_shell_lib =3D static_library( + 'virt_shell', + [ + 'vsh.c', + 'vsh-table.c', + ], + dependencies: [ + tools_dep, + readline_dep, + ], + link_with: [ + libvirt_lib, + ], + link_args: [ + coverage_flags, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894153; cv=none; d=zohomail.com; s=zohoarc; b=F/LEzWxDu7yxhfHHuWoNZdB1Vkd5DTnxZel4Dhr161pzMD60HaxagsjlMOx7Z1S0zoWSCiSy0ZIYbBDpEE9Rr+TkthTDOVUez7sK1MjEIhdYSc5k2MEMwvMgsfIFhm1FDDTXTJ2/j+BF9bTT2oG3Y+VxFxl9+edNaThrqsfBnrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894153; 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=t6wAaMVxOnlL4uC/ZMTD81APiEm3ugFBFXvW98O4KJQ=; b=nXI1FlW4iUu0zbuH02kMMCd38R7I1D/WEauC+uMnk4Xdx4lvWHxRQFR2Cd/XPzqpebP6YKA6MbCy1cKTGwlBMy2dMWOx7PkoNndOsl+xUuf90EPh4iP8M4MGphsHhwqhMoQIFRuocJyQomULGVRgGMuYMHB46mc9u4I/UWgFCiE= 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 1594894153075745.1057430938513; Thu, 16 Jul 2020 03:09:13 -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-153-4PaSPY3sOcerpSh-DrrbtQ-1; Thu, 16 Jul 2020 06:09:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B1F38027F3; Thu, 16 Jul 2020 10:08:57 +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 3956361465; Thu, 16 Jul 2020 10:08:57 +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 073649A302; Thu, 16 Jul 2020 10:08:57 +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 06GA6Dcp019420 for ; Thu, 16 Jul 2020 06:06:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 72D942DE6D; Thu, 16 Jul 2020 10:06:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1A232B6DB for ; Thu, 16 Jul 2020 10:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894152; 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=t6wAaMVxOnlL4uC/ZMTD81APiEm3ugFBFXvW98O4KJQ=; b=PcNFcLImOAz8nN5FIwv0RlFk9goxDBW86lDcgweIFEHJDDltf8RJ08l762Pg+7ancaLJym oXF9Hciu4Aigg/EG8BPmtOtXht8aYaammjhnS9fwC46yg4Y5z23OC0PGOoJP592L/ht5Uu jL2kqtyYUy5mRZU51fezYNCsIa6EfWU= X-MC-Unique: 4PaSPY3sOcerpSh-DrrbtQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 255/351] meson: tools: build virt-host-validate binary Date: Thu, 16 Jul 2020 11:58:11 +0200 Message-Id: <827787dac66b194d2a16295a50099d18c37ef396.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.16 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 --- tools/Makefile.am | 43 ------------------------------------------- tools/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 01c24bec02d..d285146622f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -45,10 +45,6 @@ bin_PROGRAMS +=3D virt-login-shell libexec_PROGRAMS =3D virt-login-shell-helper endif WITH_LOGIN_SHELL =20 -if WITH_HOST_VALIDATE -bin_PROGRAMS +=3D virt-host-validate -endif WITH_HOST_VALIDATE - virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ @@ -66,45 +62,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virt_host_validate_SOURCES =3D \ - virt-host-validate.c \ - virt-host-validate-common.c virt-host-validate-common.h - -VIRT_HOST_VALIDATE_QEMU =3D \ - virt-host-validate-qemu.c \ - virt-host-validate-qemu.h -VIRT_HOST_VALIDATE_LXC =3D \ - virt-host-validate-lxc.c \ - virt-host-validate-lxc.h -VIRT_HOST_VALIDATE_BHYVE =3D \ - virt-host-validate-bhyve.c \ - virt-host-validate-bhyve.h -if WITH_QEMU -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_QEMU) -endif ! WITH_QEMU - -if WITH_LXC -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_LXC) -endif ! WITH_LXC - -if WITH_BHYVE -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_BHYVE) -endif ! WITH_BHYVE - -virt_host_validate_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -virt_host_validate_LDADD =3D \ - ../src/libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - -virt_host_validate_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - # virt-login-shell will be setuid, and must not link to anything # except glibc. It wil scrub the environment and then invoke the # real virt-login-shell-helper binary. diff --git a/tools/meson.build b/tools/meson.build index 3a4bd760688..8c7d3ec64ab 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -32,3 +32,45 @@ libvirt_shell_lib =3D static_library( coverage_flags, ], ) + +if conf.has('WITH_HOST_VALIDATE') + virt_host_validate_sources =3D [ + 'virt-host-validate.c', + 'virt-host-validate-common.c', + ] + + if conf.has('WITH_QEMU') + virt_host_validate_sources +=3D [ + 'virt-host-validate-qemu.c', + ] + endif + if conf.has('WITH_LXC') + virt_host_validate_sources +=3D [ + 'virt-host-validate-lxc.c', + ] + endif + if conf.has('WITH_BHYVE') + virt_host_validate_sources +=3D [ + 'virt-host-validate-bhyve.c', + ] + endif + + executable( + 'virt-host-validate', + [ + virt_host_validate_sources, + ], + dependencies: [ + tools_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894573; cv=none; d=zohomail.com; s=zohoarc; b=dauiKOuZedPr7vVA8w3qsIN0WVEeJ/edbtNZ6CSwegS0/22fk9X0qyf7BeZkrRMzEmHrSSwNG2iKQiOiopcGZtLlDNFgml/9opQBT+LYwpMNOIt3PP4+8zeBYEWABzWpzactF/PVUOr2mc1rDqfr8GXVEtvMnDFSR8daSXjzIXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894573; 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=Erg2opM+5YSmomy9dirGHWkqXUKdcFKnZX3G73+h0lU=; b=R+gMm80wHCd87PnvLfw/ckUuGxMa3swlE3N3WQfk+INmtD1lLMjUyZd4HgcIKCv5LyIiUM+YmXr9bKjNXgMKsLrKVFsaRvoj9D0pO6LnAxJxmG0t59jcdTl2cmXHE6w0EPWonjPSHXM4CenZOKbqgCVzXonjTIDN3KACuc7TwF0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894573592250.7200481632649; Thu, 16 Jul 2020 03:16:13 -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-129-W_CV5DxLNnaXZ6ivqc5P_w-1; Thu, 16 Jul 2020 06:13:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 161C880BCC2; Thu, 16 Jul 2020 10:13:49 +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 EAE9372AE7; Thu, 16 Jul 2020 10:13:48 +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 B84CE730EF; Thu, 16 Jul 2020 10:13:48 +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 06GA6EDG019442 for ; Thu, 16 Jul 2020 06:06:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5AA8A2DE69; Thu, 16 Jul 2020 10:06:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA1412B6DB for ; Thu, 16 Jul 2020 10:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894572; 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=Erg2opM+5YSmomy9dirGHWkqXUKdcFKnZX3G73+h0lU=; b=LePz4/k6CfJJSd80H7EGOoKG0MLX8oAFZEIu4dDymHp5kwu0IRqmhCj0xdZE9dCQ5HQHX2 X7mMYBOc1AsNiRtikHyyY6ExR4yXEJSId8j5g44akME3Fpg3ryYJuch5pt1ai/oPLQSEEi p+tomTfxYo//C4bwIGzz3lIK8nLhLcc= X-MC-Unique: W_CV5DxLNnaXZ6ivqc5P_w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 256/351] meson: tools: build virt-login-shell binary Date: Thu, 16 Jul 2020 11:58:12 +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.15 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 --- tools/Makefile.am | 9 --------- tools/meson.build | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d285146622f..50acdeab22e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -41,7 +41,6 @@ endif WITH_SANLOCK =20 if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf -bin_PROGRAMS +=3D virt-login-shell libexec_PROGRAMS =3D virt-login-shell-helper endif WITH_LOGIN_SHELL =20 @@ -62,14 +61,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -# virt-login-shell will be setuid, and must not link to anything -# except glibc. It wil scrub the environment and then invoke the -# real virt-login-shell-helper binary. -virt_login_shell_SOURCES =3D \ - virt-login-shell.c - -virt_login_shell_CPPFLAGS =3D $(STANDALONE_CPPFLAGS) - virt_login_shell_helper_SOURCES =3D \ virt-login-shell-helper.c =20 diff --git a/tools/meson.build b/tools/meson.build index 8c7d3ec64ab..59c5f3c56ff 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -74,3 +74,20 @@ if conf.has('WITH_HOST_VALIDATE') install_rpath: libdir, ) endif + +if conf.has('WITH_LOGIN_SHELL') + # virt-login-shell will be setuid, and must not link to anything + # except glibc. It wil scrub the environment and then invoke the + # real virt-login-shell-helper binary. + executable( + 'virt-login-shell', + [ + 'virt-login-shell.c', + ], + include_directories: [ + top_inc_dir, + ], + install: true, + install_dir: bindir, + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894334; cv=none; d=zohomail.com; s=zohoarc; b=alIbXfkyaZLgLRMYz564f+0uOgULuCv5x/b+ckJRt6+Hb7m1FD4fVLo6UE+WCs6LsFpLz05Q9e7gm4mUZ3mWlkFLPYMJ+6hjLYBG4N2s/XznpvHes4BQZfnFn3wZg/Kkvtos3GqgG8nlJIsqcwfw5u+5p2PAcGxRZr5JHWZY2fQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894334; 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=bURcfsz/wR7uIVLNqyDBhyt1+AvWFb2SaP4Qwtn8LVM=; b=S8cmTY4KQ7LzUDvMhnmeqQXqK9BmMDM5ohAyySPpNzXahPh03eE9aT3O2/RBhyCm8s+RL139AAwl0DQkplXCC448Cy7S8p+EQqXt2+rC1DMURwHNii/9nisHem2NSQseC0woGBZxvxpOgRQM19037aOSnhULR1OBk+tuTwMx3iE= 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 1594894334377215.78458728562862; Thu, 16 Jul 2020 03:12:14 -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-252-sytnBQa4Pni540qBSzdNqQ-1; Thu, 16 Jul 2020 06:10:14 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA1BE8015F4; Thu, 16 Jul 2020 10:10:08 +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 AA2AC6FED1; Thu, 16 Jul 2020 10:10:08 +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 7569D181A779; Thu, 16 Jul 2020 10:10:08 +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 06GA6Fe5019452 for ; Thu, 16 Jul 2020 06:06:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4289F2B6DB; Thu, 16 Jul 2020 10:06:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1F2E2DE6D for ; Thu, 16 Jul 2020 10:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894333; 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=bURcfsz/wR7uIVLNqyDBhyt1+AvWFb2SaP4Qwtn8LVM=; b=CF1CiMDSjubaYB1sDdpo5IVs02Ua7PNT+Tk1QyMQU2F2y5JXgVFlpkSncJ3/vVbRf5CAok +jONhUI1/U+Ru93CvtoZaDfYYmLF8Wgh1ekSrAVqtAtDDE/AZNshHSyzXUOT4Dy7jO4dTb v3jit3Bu0UffSOF4tIhG34A809gCMhI= X-MC-Unique: sytnBQa4Pni540qBSzdNqQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 257/351] meson: tools: build virt-login-shell-helper binary Date: Thu, 16 Jul 2020 11:58:13 +0200 Message-Id: <51cec0b482cfa8c49a0b3b402b1953a27dc19c4b.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.11 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 --- tools/Makefile.am | 18 ------------------ tools/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 50acdeab22e..de1edbd54a0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -41,7 +41,6 @@ endif WITH_SANLOCK =20 if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf -libexec_PROGRAMS =3D virt-login-shell-helper endif WITH_LOGIN_SHELL =20 virt-xml-validate: virt-xml-validate.in Makefile @@ -61,23 +60,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virt_login_shell_helper_SOURCES =3D \ - virt-login-shell-helper.c - -virt_login_shell_helper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) -virt_login_shell_helper_LDADD =3D \ - ../src/libvirt.la \ - ../src/libvirt-lxc.la \ - $(GLIB_LIBS) \ - $(NULL) - -virt_login_shell_helper_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - virsh_SOURCES =3D \ virsh.c virsh.h \ virsh-backup.c virsh-backup.h \ diff --git a/tools/meson.build b/tools/meson.build index 59c5f3c56ff..53bc1af7bc4 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -90,4 +90,24 @@ if conf.has('WITH_LOGIN_SHELL') install: true, install_dir: bindir, ) + + executable( + 'virt-login-shell-helper', + [ + 'virt-login-shell-helper.c', + ], + dependencies: [ + tools_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_lib, + libvirt_lxc_lib, + ], + install: true, + install_dir: libexecdir, + install_rpath: libdir, + ) endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894507; cv=none; d=zohomail.com; s=zohoarc; b=OYgHW9zJOlk9J8Nbgt9tlgQQRpGyvyw4TgZtQrkJQTQeeax5qQTPBZppDeRFWOFYkyQpTmwUHVNPaFAonZ3/xzGFplULPw5BUm38zmZM8IzZ/1yr9wyI3Y8jHrG7bAQgq4h0kX5UAnijOWmhBICqxyzI7Kg2NYCIWWfgk6As/uA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894507; 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=W99l1G6mR15WMpkwo+9k5L8qGsI3BPp1QObymplh5Mw=; b=gxRKfA//B4lW5E4WymEfLLasHYyy3TVzA/dDS5FE1h3iMvjyvSnJA8kzzSb3C3JLABIQxleRgRjzSkH4C6URUKzIjZZzrGV8YhPAN8skpTCBW0TSRwPc9MvzTa3bAPQ7R6XvtuHz1r1RCHYxeIG3VmoYSGmmhpnwyGzgPdFoaWc= 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 1594894507389933.4839604887428; Thu, 16 Jul 2020 03:15:07 -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-335-or7QKJXLNJKPEMofjCUedQ-1; Thu, 16 Jul 2020 06:13:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BD1C100AA22; Thu, 16 Jul 2020 10:13:51 +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 5B3DC17D04; Thu, 16 Jul 2020 10:13:51 +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 2A1E31800FEA; Thu, 16 Jul 2020 10:13:51 +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 06GA6IHg019481 for ; Thu, 16 Jul 2020 06:06:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id C18B82B6DC; Thu, 16 Jul 2020 10:06:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE912B6DB for ; Thu, 16 Jul 2020 10:06:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894506; 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=W99l1G6mR15WMpkwo+9k5L8qGsI3BPp1QObymplh5Mw=; b=g/LxIxyxYrbePlQW10NtCMSaJOomGDZY0pRHPVNXBsBvZBSVAuP80gO/cEBC0QTlhBy2MF jeGNl2yEmiXxSYVyXLQpIuNy87DyR6M4GBHo4r7LgNYS7MGYnLERZkF4xbLdAgnJ2xX3BA ELsD1CESXkGJ3xn8mPHpyq55v6m6DcY= X-MC-Unique: or7QKJXLNJKPEMofjCUedQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 258/351] meson: tools: build virsh_win_icon object file Date: Thu, 16 Jul 2020 11:58:14 +0200 Message-Id: <2d7ea7130d63e5f492f04482b7a9ebbacd8a0e53.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.14 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 --- Makefile.am | 2 -- configure.ac | 14 -------------- m4/virt-win-windres.m4 | 36 ------------------------------------ meson.build | 1 + tools/Makefile.am | 29 ----------------------------- tools/meson.build | 31 +++++++++++++++++++++++++++++++ 6 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 m4/virt-win-windres.m4 diff --git a/Makefile.am b/Makefile.am index c5809204e6b..0b62d15eef5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,6 @@ SUBDIRS =3D . tools docs \ XZ_OPT ?=3D -v -T0 export XZ_OPT =20 -ACLOCAL_AMFLAGS =3D -I m4 - pkgconfigdir =3D $(libdir)/pkgconfig pkgconfig_DATA =3D libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin= .pc =20 diff --git a/configure.ac b/configure.ac index dc1a27ae94b..24724e3755a 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,6 @@ dnl License along with this library. If not, see dnl . =20 AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([ foreign @@ -90,10 +89,6 @@ dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG =20 =20 -dnl MinGW checks -LIBVIRT_WIN_CHECK_WINDRES - - # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether # we're building shared libraries. This is the name of the directory # in which .o files will be created. @@ -124,12 +119,3 @@ AC_CONFIG_FILES([\ tests/Makefile \ tools/Makefile]) AC_OUTPUT - -AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Configuration summary]) -AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) -AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Windows]) -AC_MSG_NOTICE([]) -LIBVIRT_WIN_RESULT_WINDRES -AC_MSG_NOTICE([]) diff --git a/m4/virt-win-windres.m4 b/m4/virt-win-windres.m4 deleted file mode 100644 index e913eb48b8e..00000000000 --- a/m4/virt-win-windres.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The MinGW windres checks -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_WIN_CHECK_WINDRES], [ - dnl Look for windres to build a Windows icon resource. - with_windres=3Dno - case "$host" in - *-*-mingw* ) - AC_CHECK_TOOL([WINDRES], [windres], []) - if test "x$WINDRES" !=3D "x"; then - with_windres=3Dyes - fi - ;; - esac - AM_CONDITIONAL([WITH_WIN_ICON], [test "$with_windres" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_WIN_RESULT_WINDRES], [ - LIBVIRT_RESULT([windres], [$with_windres], [$WINDRES]) -]) diff --git a/meson.build b/meson.build index 69145512519..b623ddbf4fd 100644 --- a/meson.build +++ b/meson.build @@ -2307,6 +2307,7 @@ summary(libs_summary, section: 'Libraries', bool_yn: = true) =20 win_summary =3D { 'MinGW': host_machine.system() =3D=3D 'windows', + 'windres': host_machine.system() =3D=3D 'windows', } summary(win_summary, section: 'Windows', bool_yn: true) =20 diff --git a/tools/Makefile.am b/tools/Makefile.am index de1edbd54a0..4f4adf94382 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,13 +21,6 @@ # needed STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 -ICON_FILES =3D \ - libvirt_win_icon_16x16.ico \ - libvirt_win_icon_32x32.ico \ - libvirt_win_icon_48x48.ico \ - libvirt_win_icon_64x64.ico \ - virsh_win_icon.rc - confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 @@ -125,28 +118,6 @@ virt_admin_CFLAGS =3D \ =20 if WITH_WIN_ICON virsh_LDADD +=3D virsh_win_icon.$(OBJEXT) - -# Before you edit virsh_win_icon.rc, please note the following -# limitations of the resource file format: -# -# (1) '..' is not permitted in the icon filename field. -# (2) '-' is not permitted in the icon filename field. -# (3) Comments are not permitted in the file. -# -# Windows appears to choose the first <=3D 32x32 icon it finds -# in the resource file. Therefore you should list the available -# icons from largest to smallest, and make sure that the 32x32 -# icon is the most legible. -# -# Windows .ICO is a special MS-only format. GIMP and other -# tools can write it. However there are several variations, -# and Windows seems to do its own colour quantization. More -# information is needed in this area. - -virsh_win_icon.$(OBJEXT): virsh_win_icon.rc - $(AM_V_GEN)$(WINDRES) \ - --input-format rc --input $< \ - --output-format coff --output $@ endif WITH_WIN_ICON =20 install-data-local: install-systemd install-nss \ diff --git a/tools/meson.build b/tools/meson.build index 53bc1af7bc4..c110cfcf177 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -111,3 +111,34 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libdir, ) endif + +if host_machine.system() =3D=3D 'windows' + # Before you edit virsh_win_icon.rc, please note the following + # limitations of the resource file format: + # + # (1) '..' is not permitted in the icon filename field. + # (2) '-' is not permitted in the icon filename field. + # (3) Comments are not permitted in the file. + # + # Windows appears to choose the first <=3D 32x32 icon it finds + # in the resource file. Therefore you should list the available + # icons from largest to smallest, and make sure that the 32x32 + # icon is the most legible. + # + # Windows .ICO is a special MS-only format. GIMP and other + # tools can write it. However there are several variations, + # and Windows seems to do its own colour quantization. More + # information is needed in this area. + windres =3D import('windows') + virsh_icon_res =3D windres.compile_resources( + 'virsh_win_icon.rc', + depend_files: [ + 'libvirt_win_icon_16x16.ico', + 'libvirt_win_icon_32x32.ico', + 'libvirt_win_icon_48x48.ico', + 'libvirt_win_icon_64x64.ico', + ], + ) +else + virsh_icon_res =3D [] +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894636; cv=none; d=zohomail.com; s=zohoarc; b=T02VUtNCocoe/qChEKuI9ew3YFhyeEgvinZ8Vorx0SD0GUQ43d9xbhSS6OD0XxMNEkxITmIwHjqq5jmm45FdV0HOzAJOmTXJw26P7lQBrTkg7IBG5jsk853a+gRyXWN1XZHkcbXhlEl0K2ZPOSfr+rL1CxhwRGQYd8cEshZKWyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894636; 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=AoaHLYxdkD0ilKV6Vg0tmIn98K+8XkYSGEbOs9uv+PQ=; b=hZg6P74wdx4TZV2AWzoWELh++YYZ0LoNPVSoMYSC4Kyn4E3qpJfPgH8kISRvewR4eLJW0Ua41p8blMqTFtgJBGlN33pnisa7ynaCHDWbthKrF76ooTiNof2Ijo864mYDkJ0jnDHFuDo2rZGTdqpzbDa9n0Bxhy3MnIsKv+bvNSE= 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 1594894636085626.1453850685444; Thu, 16 Jul 2020 03:17:16 -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-312-W4D_QqHDMxeuPLtd7V57OQ-1; Thu, 16 Jul 2020 06:10:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F321D10059AA; Thu, 16 Jul 2020 10:10:11 +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 D688072ACF; Thu, 16 Jul 2020 10:10:11 +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 A1100181A8CC; Thu, 16 Jul 2020 10:10:11 +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 06GA6JRl019501 for ; Thu, 16 Jul 2020 06:06:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAC192B6DB; Thu, 16 Jul 2020 10:06:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24E192B6E6 for ; Thu, 16 Jul 2020 10:06:18 +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=AoaHLYxdkD0ilKV6Vg0tmIn98K+8XkYSGEbOs9uv+PQ=; b=hsLeKqXSQfPrEFaHPSLbZZ3Dv2bk+ZTnwkD71E6rscMkLS30v2BgpFIMO3sigHod0it1bH QZaiIdFw9CQYnZVQdr92Dy/8eFVRuJvqVqMSxDo8b7J6ms5jUEBK9NZOrA55sTPBSwD+tf M0PjNdgxXbdaeMzmoDekZyjIBJfk848= X-MC-Unique: W4D_QqHDMxeuPLtd7V57OQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 259/351] meson: tools: build virsh binary Date: Thu, 16 Jul 2020 11:58:15 +0200 Message-Id: <03edbc5d9fdc55bc9c18468b7ec8f5a9289b4cbe.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.15 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 --- tools/Makefile.am | 50 +--------------------------------------------- tools/meson.build | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 4f4adf94382..2cf165dffdf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,7 +25,7 @@ confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 bin_SCRIPTS =3D virt-xml-validate virt-pki-validate -bin_PROGRAMS =3D virsh virt-admin +bin_PROGRAMS =3D virt-admin libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -53,50 +53,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virsh_SOURCES =3D \ - virsh.c virsh.h \ - virsh-backup.c virsh-backup.h \ - virsh-checkpoint.c virsh-checkpoint.h \ - virsh-completer.c virsh-completer.h \ - virsh-completer-domain.c virsh-completer-domain.h \ - virsh-completer-checkpoint.c virsh-completer-checkpoint.h \ - virsh-completer-host.c virsh-completer-host.h \ - virsh-completer-interface.c virsh-completer-interface.h \ - virsh-completer-network.c virsh-completer-network.h \ - virsh-completer-nodedev.c virsh-completer-nodedev.h \ - virsh-completer-nwfilter.c virsh-completer-nwfilter.h \ - virsh-completer-pool.c virsh-completer-pool.h \ - virsh-completer-secret.c virsh-completer-secret.h \ - virsh-completer-snapshot.c virsh-completer-snapshot.h \ - virsh-completer-volume.c virsh-completer-volume.h \ - virsh-console.c virsh-console.h \ - virsh-domain.c virsh-domain.h \ - virsh-domain-monitor.c virsh-domain-monitor.h \ - virsh-host.c virsh-host.h \ - virsh-interface.c virsh-interface.h \ - virsh-network.c virsh-network.h \ - virsh-nodedev.c virsh-nodedev.h \ - virsh-nwfilter.c virsh-nwfilter.h \ - virsh-pool.c virsh-pool.h \ - virsh-secret.c virsh-secret.h \ - virsh-snapshot.c virsh-snapshot.h \ - virsh-util.c virsh-util.h \ - virsh-volume.c virsh-volume.h \ - $(NULL) - -virsh_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) -virsh_LDADD =3D \ - $(STATIC_BINARIES) \ - ../src/libvirt-lxc.la \ - ../src/libvirt-qemu.la \ - libvirt_shell.la -virsh_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) - virt_admin_SOURCES =3D \ virt-admin.c virt-admin.h \ virt-admin-completer.c virt-admin-completer.h \ @@ -116,10 +72,6 @@ virt_admin_CFLAGS =3D \ $(AM_CFLAGS) \ $(READLINE_CFLAGS) =20 -if WITH_WIN_ICON -virsh_LDADD +=3D virsh_win_icon.$(OBJEXT) -endif WITH_WIN_ICON - install-data-local: install-systemd install-nss \ install-bash-completion =20 diff --git a/tools/meson.build b/tools/meson.build index c110cfcf177..20523b400bd 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -142,3 +142,54 @@ if host_machine.system() =3D=3D 'windows' else virsh_icon_res =3D [] endif + +executable( + 'virsh', + [ + 'virsh.c', + 'virsh-backup.c', + 'virsh-checkpoint.c', + 'virsh-completer.c', + 'virsh-completer-domain.c', + 'virsh-completer-checkpoint.c', + 'virsh-completer-host.c', + 'virsh-completer-interface.c', + 'virsh-completer-network.c', + 'virsh-completer-nodedev.c', + 'virsh-completer-nwfilter.c', + 'virsh-completer-pool.c', + 'virsh-completer-secret.c', + 'virsh-completer-snapshot.c', + 'virsh-completer-volume.c', + 'virsh-console.c', + 'virsh-domain.c', + 'virsh-domain-monitor.c', + 'virsh-host.c', + 'virsh-interface.c', + 'virsh-network.c', + 'virsh-nodedev.c', + 'virsh-nwfilter.c', + 'virsh-pool.c', + 'virsh-secret.c', + 'virsh-snapshot.c', + 'virsh-util.c', + 'virsh-volume.c', + virsh_icon_res, + ], + dependencies: [ + tools_dep, + readline_dep, + thread_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_lxc_lib, + libvirt_qemu_lib, + libvirt_shell_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894830; cv=none; d=zohomail.com; s=zohoarc; b=OcmZW6LnM3cHxDnL7fetplnGEcpA+j/3OuGMGMABKHPELutHkp6NHtDccdytaDOXpu7QTyMJBId9XK/UVbodCvS8vV8HHVI90ax5SUKAD52c82kIKOZvynYSIbSSLFlckPODfkMn2IuMU5L3aFYB517+EqsEj9+i2xVLDpFnh+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894830; 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=VtLnE1R08Y4VUyID5UtZQeBAnh/SQ7Bs9AcrzIXomjg=; b=C14lIEiEOUaqOpTQZ7zlt+uMEvjJOVGlKfij44JzrolmnSzocTRvoY/3NDk0/7P+pl0ohChQ7yYo2oBtcdmlocrz4IwP3UWw1jI6B+SjiRP7dPBmPfRYQ42xBzcQEvlNg1O/MQNfPIk8J3g3mrcqameQrHgcZD8mNEJqr8OK/So= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948948305691000.1058734667022; Thu, 16 Jul 2020 03:20:30 -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-175-3w63dVPwPmyaTNB0cB6snQ-1; Thu, 16 Jul 2020 06:13:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6D5180BCA8; Thu, 16 Jul 2020 10:13:53 +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 B55CD5C5B7; Thu, 16 Jul 2020 10:13:53 +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 81B75181D0A4; Thu, 16 Jul 2020 10:13:53 +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 06GA6KlF019517 for ; Thu, 16 Jul 2020 06:06:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 92E462B6DC; Thu, 16 Jul 2020 10:06:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DE842B6DB for ; Thu, 16 Jul 2020 10:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894829; 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=VtLnE1R08Y4VUyID5UtZQeBAnh/SQ7Bs9AcrzIXomjg=; b=ATGnDLIZhQ3pbF382tz3pezRBveqBV/TaLg5nfrhEfmZ/vb/ZN7bRmBGHRGxklGkHoCvEa gxMHRrPLv/A78OvsD05k8W+S7QE7Y+K0GfzFhOZTepMP7861iNxhbg8ETNu/ipYguGNtYb lPc1nYcdfSOXxX4Um0+v5hV7jzFPmU8= X-MC-Unique: 3w63dVPwPmyaTNB0cB6snQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 260/351] meson: tools: build virt-admin binary Date: Thu, 16 Jul 2020 11:58:16 +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.16 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 --- tools/Makefile.am | 20 -------------------- tools/meson.build | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 2cf165dffdf..5a0614756f9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,7 +25,6 @@ confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 bin_SCRIPTS =3D virt-xml-validate virt-pki-validate -bin_PROGRAMS =3D virt-admin libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -53,25 +52,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virt_admin_SOURCES =3D \ - virt-admin.c virt-admin.h \ - virt-admin-completer.c virt-admin-completer.h \ - $(NULL) - -virt_admin_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(STATIC_BINARIES) \ - $(NULL) -virt_admin_LDADD =3D \ - ../src/libvirt-admin.la \ - libvirt_shell.la \ - $(LIBXML_LIBS) \ - $(NULL) -virt_admin_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) - install-data-local: install-systemd install-nss \ install-bash-completion =20 diff --git a/tools/meson.build b/tools/meson.build index 20523b400bd..d2d82903f1c 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -193,3 +193,25 @@ executable( install_dir: bindir, install_rpath: libdir, ) + +executable( + 'virt-admin', + [ + 'virt-admin.c', + 'virt-admin-completer.c', + ], + dependencies: [ + tools_dep, + readline_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_admin_lib, + libvirt_shell_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894685; cv=none; d=zohomail.com; s=zohoarc; b=ikyILvF1bAUQrmqu5hOfRnTfySgaJbiS3+JziULpCPTtipzOHkjG6EBh4col+iV4q/ipHmPeMhHWTzxF7qbOsTOqbSfXKTANMuXRQryKdXMCMJWw+lZ96xP/4mYHHtPrfp0lq87MBPAPEnppLjEZCPLStt+m3rKXxyWtuSe7mJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894685; 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=8W2i5S3epkxAoGRI22LT/+laqt4tXQ5AMR/MA8ceqQU=; b=EEuZPeVRutDoUPaOWFbmUrJNHGnLgm7shkr9R4vqBX5nkDs3sSM53ptlxpBoujuRPox8IZVuw6cCD5uY6QSsdxPezQBbXxrm5hrLgs9iGsC1ghcGD3yuPj3Cn7SCwtbTrzjqO0xgHo/Ne0fWujx0MUp3WAohqlFsJ0sc1UcdgZE= 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 159489468500012.949357763027365; Thu, 16 Jul 2020 03:18:05 -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-187-Mt4TCJKmPUG02Y02XXRgdg-1; Thu, 16 Jul 2020 06:09:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9983C8015F4; Thu, 16 Jul 2020 10:08:59 +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 7BBD3710D7; Thu, 16 Jul 2020 10:08:59 +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 4A61E181A3FB; Thu, 16 Jul 2020 10:08:59 +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 06GA6L4g019527 for ; Thu, 16 Jul 2020 06:06:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BB8F2B6DC; Thu, 16 Jul 2020 10:06:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA8862B6DB for ; Thu, 16 Jul 2020 10:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894683; 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=8W2i5S3epkxAoGRI22LT/+laqt4tXQ5AMR/MA8ceqQU=; b=Qz1W4QjB0IKALLe/xChnWFOE+vLqF5UY88aAXWeWgvhiB6B/2/ZgRwQj+9jgHjJ12GlpzL UguWmC7liC9Q+I/JERT+m7bzWFp2rC57yc8gUysny9uLt5xvDpwAEE2HXjVcPT/ZtDJhoZ dkLMTjf8mQo3QlyPeIIh9X9msQRGNSA= X-MC-Unique: Mt4TCJKmPUG02Y02XXRgdg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 261/351] meson: tools: generate virt-xml-validate script Date: Thu, 16 Jul 2020 11:58:17 +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.15 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 --- tools/Makefile.am | 7 +------ tools/meson.build | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 5a0614756f9..6040e7e74ad 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,7 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 -bin_SCRIPTS =3D virt-xml-validate virt-pki-validate +bin_SCRIPTS =3D virt-pki-validate libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -35,11 +35,6 @@ if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf endif WITH_LOGIN_SHELL =20 -virt-xml-validate: virt-xml-validate.in Makefile - $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ - -e 's|[@]VERSION@|$(VERSION)|g' \ - < $< > $@ || (rm $@ && exit 1) && chmod +x $@ - virt-pki-validate: virt-pki-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ diff --git a/tools/meson.build b/tools/meson.build index d2d82903f1c..5e985cff593 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -215,3 +215,15 @@ executable( install_dir: bindir, install_rpath: libdir, ) + +tools_conf =3D configuration_data() +tools_conf.set('VERSION', meson.project_version()) +tools_conf.set('schemadir', pkgdatadir / 'schemas') + +configure_file( + input: 'virt-xml-validate.in', + output: 'virt-xml-validate', + configuration: tools_conf, + install: true, + install_dir: bindir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894227; cv=none; d=zohomail.com; s=zohoarc; b=ng1C7Xq7lcVd7XBmqRBpqgA25JfR3AK40Ihz0eHd1iMJmz/jHjk0YmNt2gYX0wSFimX1VCiilDxhe4kU+vHagMoxg61IXuaCquVT8bOw/iJ0yvzqPP3poBuAeddBylH1AiKTXc6xc5H+irLXUqPW7L9JOvM5qLs6m1L2vsrPKsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894227; 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=7tGp05za3C7qGz0Hq3nsO7o5DlIqgHhcR2XjFNA+7yY=; b=E4nqPXIeR66k8T5OlZ5KOL71Peh95OvTF/87dWhgEK5PIfAwe8CoVw+DQo26QljOc/EyfjASk4qzHuy9TXmUfgiLo3em6CesxsGYw+kELyuwyCZkBfaiEDKFOT2uZvWL9Vw9GMpNjPweT7oHQo4rWIUUfncAoJO52VK79KDGs20= 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 159489422730672.86577633081663; Thu, 16 Jul 2020 03:10:27 -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-21-W9J_a9NVNUGpK7gXpLFE1Q-1; Thu, 16 Jul 2020 06:10:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 768F210059CB; Thu, 16 Jul 2020 10:10:14 +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 5646C72AE9; Thu, 16 Jul 2020 10:10:14 +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 25001A36F5; Thu, 16 Jul 2020 10:10:14 +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 06GA6MY7019541 for ; Thu, 16 Jul 2020 06:06:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 64B3F2B6DC; Thu, 16 Jul 2020 10:06:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D391C2B6DB for ; Thu, 16 Jul 2020 10:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894226; 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=7tGp05za3C7qGz0Hq3nsO7o5DlIqgHhcR2XjFNA+7yY=; b=ILwxffmHnqcVDAFp8ZNh8LpZYeqFYqccJOZu9E1oJo7EefIaCuapKC/0wjmQwbg1LKq+fY 0+IsVkJS5OvHG1xEsjsL0NpOQaUfQvKFMKi4Q/Td7LHt6Y/xvAGEHBoGlazvAd2UNRJ6JW pOFNLSrN54dTKUF/4EcHt7uVtuQckjk= X-MC-Unique: W9J_a9NVNUGpK7gXpLFE1Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 262/351] meson: tools: generate virt-pki-validate script Date: Thu, 16 Jul 2020 11:58:18 +0200 Message-Id: <508a65fc46391acd9e97160616ad1889876aba9d.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.15 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 --- tools/Makefile.am | 6 ------ tools/meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 6040e7e74ad..ee7f8b5b1ab 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,6 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 -bin_SCRIPTS =3D virt-pki-validate libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -35,11 +34,6 @@ if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf endif WITH_LOGIN_SHELL =20 -virt-pki-validate: virt-pki-validate.in Makefile - $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|g' \ - -e 's|[@]VERSION@|$(VERSION)|g' \ - < $< > $@ || (rm $@ && exit 1) && chmod +x $@ - virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \ -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \ diff --git a/tools/meson.build b/tools/meson.build index 5e985cff593..50a7267f911 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -219,6 +219,7 @@ executable( tools_conf =3D configuration_data() tools_conf.set('VERSION', meson.project_version()) tools_conf.set('schemadir', pkgdatadir / 'schemas') +tools_conf.set('sysconfdir', sysconfdir) =20 configure_file( input: 'virt-xml-validate.in', @@ -227,3 +228,11 @@ configure_file( install: true, install_dir: bindir, ) + +configure_file( + input: 'virt-pki-validate.in', + output: 'virt-pki-validate', + configuration: tools_conf, + install: true, + install_dir: bindir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894225; cv=none; d=zohomail.com; s=zohoarc; b=RYWsHFmpQhl+FtQi9A/iSzpahoHJtSLGW8Mb6rofmc+yCzZFli7dgVAJdn4ndSelmxTvYA5nRCVkHJRGTb7SIAIelgdJi1jKS0Ca8C+SNHkSk7j8OpFKXgOpzaD2GAXLdfM/qJzHh2HhKC5qJEiZhxnPaFR/FHtZHT6BeTmY1eg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894225; 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=mVWiB5fbV3mLKTN+SURFQnOHSakJvZzSKag73TXEbsc=; b=JqxUxM2hgurLXkGXH3W87eKFkVwU/1iLpZVw1ucXLh1gNeBmHK+a8N/tp8+8X4VsYb+W+2zvIqg6l5cmiEJr9O6sbzLlQMkw76aEKMEag9auUh9FUn8sv0vtFkCCfprqBtmbbIaqEYEzNCbP28AZpSy1v2lIBOJnrYpgKNxnngA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894225872389.02581005969057; Thu, 16 Jul 2020 03:10:25 -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-50-iLFmI6-UO1eivs11GKECtQ-1; Thu, 16 Jul 2020 06:10:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDBEE80572E; Thu, 16 Jul 2020 10:10:16 +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 BABF32B6DB; Thu, 16 Jul 2020 10:10:16 +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 878D9180531D; Thu, 16 Jul 2020 10:10:16 +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 06GA6NXs019561 for ; Thu, 16 Jul 2020 06:06:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E3342B6DC; Thu, 16 Jul 2020 10:06:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCFD62B6DB for ; Thu, 16 Jul 2020 10:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894224; 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=mVWiB5fbV3mLKTN+SURFQnOHSakJvZzSKag73TXEbsc=; b=dLiqE9U/7AjFgcOjiTb/I/tZwe4PF/HK4JOAdrRVxWBje1vM9tdUmm+TtItB8AHx8q8BHZ 1iDm+KlohDwZ8aGZMadxXo1Hs0sxatNHWtY1wyKbqGupHssjJv2rBGgTKAfjUqOxpLCfrS D8EI+/wLiu5BsjtXb5Bem8DPSIt7dSY= X-MC-Unique: iLFmI6-UO1eivs11GKECtQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 263/351] meson: tools: generate virt-sanlock-cleanup script Date: Thu, 16 Jul 2020 11:58:19 +0200 Message-Id: <93c0ab2597beb0f79fe0a74258ccf4f246a51705.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.23 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 --- tools/Makefile.am | 9 --------- tools/meson.build | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index ee7f8b5b1ab..94ea385354e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -26,19 +26,10 @@ conf_DATA =3D =20 libexec_SCRIPTS =3D libvirt-guests.sh =20 -if WITH_SANLOCK -sbin_SCRIPTS =3D virt-sanlock-cleanup -endif WITH_SANLOCK - if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf endif WITH_LOGIN_SHELL =20 -virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile - $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \ - -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \ - || (rm $@ && exit 1) && chmod +x $@ - noinst_LTLIBRARIES =3D =20 install-data-local: install-systemd install-nss \ diff --git a/tools/meson.build b/tools/meson.build index 50a7267f911..d114c109ea6 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -218,6 +218,7 @@ executable( =20 tools_conf =3D configuration_data() tools_conf.set('VERSION', meson.project_version()) +tools_conf.set('localstatedir', localstatedir) tools_conf.set('schemadir', pkgdatadir / 'schemas') tools_conf.set('sysconfdir', sysconfdir) =20 @@ -236,3 +237,13 @@ configure_file( install: true, install_dir: bindir, ) + +if conf.has('WITH_SANLOCK') + configure_file( + input: 'virt-sanlock-cleanup.in', + output: 'virt-sanlock-cleanup', + configuration: tools_conf, + install: true, + install_dir: sbindir, + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894513; cv=none; d=zohomail.com; s=zohoarc; b=UvEYfIOD3SmEmh06qWMKq3RcxBGTwVrGA8iJehqk42iGhur2LI3lwAczGh3M7CQUGPw611My4kR/g2yauW/DYKIdl+JZb2Y9pVAOFzDvYSXkJkvDZT3bwiAZwpu16xbdzfXY5LGO39qNBTtvbwwPf2MO+ouxUNcpbv+cfq9VduU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894513; 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=U502svT2OJ14YA72pwbnu9Vspnj39qqfCYgNRoRWkS4=; b=NTyluy68hxlQAHfqtuP/M7/Y2az8f6FF8Coc2R7LFYXagfzFkrOnGlV8eRQsGiF35+SYPK5h5DmK9YiUcC9bkCpXLVbgPVCRxgHACWX34G/vyn1PW4DLGqXqj4QzywTXawgHACTq9lhdaOhZna8lfL8Z2v3bkFjBnrMV9TLIW4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894513404146.04960282315676; Thu, 16 Jul 2020 03:15:13 -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-428-3Wo4wtmGMPiAv5fJG0NGFA-1; Thu, 16 Jul 2020 06:14:03 -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 3CF021091; Thu, 16 Jul 2020 10:13:56 +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 16E9510098AE; Thu, 16 Jul 2020 10:13:56 +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 DB241730F4; Thu, 16 Jul 2020 10:13:55 +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 06GA6OS3019568 for ; Thu, 16 Jul 2020 06:06:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 370CD2B6DC; Thu, 16 Jul 2020 10:06:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A610A2B6DB for ; Thu, 16 Jul 2020 10:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894512; 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=U502svT2OJ14YA72pwbnu9Vspnj39qqfCYgNRoRWkS4=; b=fW+tv4VbNNUgoOl8AMHqftWox/QHD6P4X6LRoiw3pei4G762v4iJYFbdY4jZFGMVi4qfbC 0usAKBkJxBu/r6OWY2O7dOJqI7lrejmWIk1fv7IanBoTT6UIcfiJjIClpTqfCpEOFVHOhA SaqvBnnZ/D3SUOmTnZaKYwwAmQ7nD/U= X-MC-Unique: 3Wo4wtmGMPiAv5fJG0NGFA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 264/351] meson: tools: generate libvirt-guests.sh script Date: Thu, 16 Jul 2020 11:58:20 +0200 Message-Id: <2778b12aa108b7b4de0f443af2e0cbef7ef465c9.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 --- tools/Makefile.am | 14 -------------- tools/meson.build | 12 ++++++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 94ea385354e..39bc7349a88 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,8 +24,6 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 -libexec_SCRIPTS =3D libvirt-guests.sh - if WITH_LOGIN_SHELL conf_DATA +=3D virt-login-shell.conf endif WITH_LOGIN_SHELL @@ -47,18 +45,6 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: =20 -libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status - $(AM_V_GEN)sed \ - -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ - -e 's|[@]bindir[@]|$(bindir)|g' \ - -e 's|[@]localedir[@]|$(localedir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - < $< > $@-t && \ - chmod a+x $@-t && \ - mv $@-t $@ - SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 if LIBVIRT_INIT_SCRIPT_SYSTEMD diff --git a/tools/meson.build b/tools/meson.build index d114c109ea6..ad83dd9508b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -217,8 +217,12 @@ executable( ) =20 tools_conf =3D configuration_data() +tools_conf.set('PACKAGE', meson.project_name()) tools_conf.set('VERSION', meson.project_version()) +tools_conf.set('bindir', bindir) +tools_conf.set('localedir', localedir) tools_conf.set('localstatedir', localstatedir) +tools_conf.set('sbindir', sbindir) tools_conf.set('schemadir', pkgdatadir / 'schemas') tools_conf.set('sysconfdir', sysconfdir) =20 @@ -247,3 +251,11 @@ if conf.has('WITH_SANLOCK') install_dir: sbindir, ) endif + +configure_file( + input: 'libvirt-guests.sh.in', + output: 'libvirt-guests.sh', + configuration: tools_conf, + install: true, + install_dir: libexecdir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894447; cv=none; d=zohomail.com; s=zohoarc; b=oKzJJhRmASokHQxXCmtb2P0pKRC7eDnOS57nVk3G05SKg1ZeC0d0/albPS4HoEG9eF578xT9RmwAuz68+dgoEMoXFdQBvNxCWc2bvcTAqEKuZYmLowj2/b6a1UQKFReezpjEoLYE/iGijK5y00mzX1/lS2qtcZ3sGewvpmeUYZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894447; 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=H5dVaTw4eI6nZqQDYNfSLMB+MPmGB1GwkU/5rcn4j9w=; b=BT/V8YDLy5g46lc9xB7EBP76qK85lUMxlmzLKKUtZqzGpWdDkJpHtBWaulOAet2pU4i4oz/6M1rag7sVme75VUuxSYp73b/Frbzkpl2dXMwAXWI6l4ykUS3hXNrPhzqWxnvTTuGY3pqiq6Z9Qgsz6s98hCnmZ3oFB6Rde5PM45k= 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 1594894447518415.431499122779; Thu, 16 Jul 2020 03:14:07 -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-271-8TP3k1gKN0-XPVri0P-lcg-1; Thu, 16 Jul 2020 06:14:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80E651009628; Thu, 16 Jul 2020 10:13: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 5C4CD2B6DB; Thu, 16 Jul 2020 10:13: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 276B3730FA; Thu, 16 Jul 2020 10:13:58 +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 06GA6Pvt019574 for ; Thu, 16 Jul 2020 06:06:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1EE142B6DC; Thu, 16 Jul 2020 10:06:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E0482B6DB for ; Thu, 16 Jul 2020 10:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894446; 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=H5dVaTw4eI6nZqQDYNfSLMB+MPmGB1GwkU/5rcn4j9w=; b=IRt3uHsRdsf2gcIBcKJxKyUJM4hgGyRwmxdDdcnjMNdZbLcFdO9zuG7rI5mI0UtNSjwVUS Kd7R/G1TvvArHXcnEVD+3W3dz/J9CqGqvfT0HfBQs79FSM4hBDE4bRlCMRqIkYAj6BvL9Z DYQHqR8Ip8s9h1OwNSnG7JgM3m1YMg0= X-MC-Unique: 8TP3k1gKN0-XPVri0P-lcg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 265/351] meson: tools: install virt-login-shell.conf Date: Thu, 16 Jul 2020 11:58:21 +0200 Message-Id: <959bb6d87ccfe54d8eb198317678154cf19a98f4.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.23 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 --- tools/Makefile.am | 7 ------- tools/meson.build | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 39bc7349a88..655e22d95ea 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,13 +21,6 @@ # needed STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 -confdir =3D $(sysconfdir)/libvirt -conf_DATA =3D - -if WITH_LOGIN_SHELL -conf_DATA +=3D virt-login-shell.conf -endif WITH_LOGIN_SHELL - noinst_LTLIBRARIES =3D =20 install-data-local: install-systemd install-nss \ diff --git a/tools/meson.build b/tools/meson.build index ad83dd9508b..446831557e1 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -110,6 +110,8 @@ if conf.has('WITH_LOGIN_SHELL') install_dir: libexecdir, install_rpath: libdir, ) + + install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt= ') endif =20 if host_machine.system() =3D=3D 'windows' --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894530; cv=none; d=zohomail.com; s=zohoarc; b=nIJC6vEUCsonCmToy56EuZW3+36DV7vN/mDdZf31UbA1SjL0x7gxxjHaLvZXyhSayVdnVI9xrU80y6kl202vhcrts8SnHRsh07c+IdsLVuTfKE3eXRy/QIwtX44yY2sE/lnM0ziQrtdkLIovo6fepfffOAxUoEofv02JCppMut8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894530; 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=h6tN5omlMGKvhcmAW6HlVxvQMaKyNW9hnIE/eQ+HP7Y=; b=X+ZYjSozy2tgVmoMD84OVyXXDVXfCKRVJeoK3i42z9BzQCCCJunAaYYtetLU0VWHicPd+JB5otIkskiDGB4Dudb7vKgYK79l4oEYt+E5nvxDC5nzeC2RXBceDMiyViwkb6l9/OXuAGfg2FTk8ICrCrQOeAiPdR/FTI8vifrPSXk= 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 1594894530084847.3477652435361; Thu, 16 Jul 2020 03:15:30 -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-82-YekuRKrfPc6paWzYSe4cCw-1; Thu, 16 Jul 2020 06:10:25 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B9231094; Thu, 16 Jul 2020 10:10:19 +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 3C58178485; Thu, 16 Jul 2020 10:10:19 +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 0C6C8A36F9; Thu, 16 Jul 2020 10:10:19 +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 06GA6Q0B019585 for ; Thu, 16 Jul 2020 06:06:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 06F8A2B6DC; Thu, 16 Jul 2020 10:06:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75DD42B6DB for ; Thu, 16 Jul 2020 10:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894529; 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=h6tN5omlMGKvhcmAW6HlVxvQMaKyNW9hnIE/eQ+HP7Y=; b=hyPswlJ+ugxT2wfetp6JIOKY2a10PVCMDOx5nKZ0DHrdJMdvdngwPdhvcmJMwefrCXymud J3mtpvI55bMOv9DaJVpx70melJgcTkJ4gHg5RgFShqlLpmyCta86Qs6ihBMW4ojEpNPxaX 6iT0/Zhj9irBtWCiyQOsMm5JyrzjrPE= X-MC-Unique: YekuRKrfPc6paWzYSe4cCw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 266/351] meson: tools: install libvirt-guests sysconf file Date: Thu, 16 Jul 2020 11:58: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.11 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 --- tools/Makefile.am | 13 ++----------- tools/meson.build | 8 ++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 655e22d95ea..9c6c6b3d3c9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -29,24 +29,15 @@ install-data-local: install-systemd install-nss \ uninstall-local: uninstall-systemd uninstall-nss \ uninstall-bash-completion =20 -install-sysconfig: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig - $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests - -uninstall-sysconfig: - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests - rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: - SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system =20 if LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh +install-systemd: libvirt-guests.service libvirt-guests.sh $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirt-guests.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service =20 -uninstall-systemd: uninstall-sysconfig +uninstall-systemd: rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: =20 diff --git a/tools/meson.build b/tools/meson.build index 446831557e1..b95ced3728b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -261,3 +261,11 @@ configure_file( install: true, install_dir: libexecdir, ) + +if init_script =3D=3D 'systemd' + install_data( + 'libvirt-guests.sysconf', + install_dir: sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594895131; cv=none; d=zohomail.com; s=zohoarc; b=RM9rXll/bXW0jHC67cgRACQMFqelgsXPLAH42LhrxpgbqxZrz4rEXRKg6Gh/loWHA8n4gt9TYJ27h8ZtPHQ7aVXyNOwbXzn+AcegkCoLFTCN77pzdqxYoeeeE9a8Z/HOYkuA8y9pbr27FLmmdNai8qT+gd7dK8owSBGkKz7oLyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895131; 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=ArYMBrZDu9CbbtRoETAKZKELunSlGFnr91uarZVMHe4=; b=OQFDDgC4I61D23upJ2QGhwKdXKhr/rHrTD6gHoRoW6MPH+2jmv3PG/wvooWapLKqcSOKu79C2S2+RmhUZ2C03ptmsLZWxS9z39nrl2UHq6M0PLaRlhLsw3PE30/APRgq8FVFvYN3xpoZJXHqBVy8uYK7B0bnBGQ3uCfv6tVXR1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594895131934507.3442609389117; Thu, 16 Jul 2020 03:25:31 -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-42-71aZcu8hNEqSPYgmsRu5rA-1; Thu, 16 Jul 2020 06:14: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 CCB1B1888AA7; Thu, 16 Jul 2020 10:14:00 +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 A9B9A6FEFF; Thu, 16 Jul 2020 10:14:00 +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 7740F180530A; Thu, 16 Jul 2020 10:14:00 +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 06GA6Qd8019596 for ; Thu, 16 Jul 2020 06:06:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E203A2B6DB; Thu, 16 Jul 2020 10:06:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DDE62B6E6 for ; Thu, 16 Jul 2020 10:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895130; 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=ArYMBrZDu9CbbtRoETAKZKELunSlGFnr91uarZVMHe4=; b=NbEG06wpBUziDw4vHMrqKL7zDjybuAc/b2lMta4LZrVB7S2JPf6TK7QDGetpVpRL2ORuiO iuisc79T+KAPhAOhT94irU036ZTIFZHkKqUcK8A5WtF9zR29KeqI1YKLvHFGWwTz5DNH4F JrLXEae1Zfd8bHXPV2+tJ1SH79I4EZ0= X-MC-Unique: 71aZcu8hNEqSPYgmsRu5rA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 267/351] meson: tools: generate libvirt-guests.service systemd unit Date: Thu, 16 Jul 2020 11:58:23 +0200 Message-Id: <3e4a4d19614137582af509fa6728ba7bc41b7045.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 --- tools/Makefile.am | 34 ++-------------------------------- tools/meson.build | 9 +++++++++ 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 9c6c6b3d3c9..ba3b0bbc120 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,42 +23,12 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-systemd install-nss \ +install-data-local: install-nss \ install-bash-completion =20 -uninstall-local: uninstall-systemd uninstall-nss \ +uninstall-local: uninstall-nss \ uninstall-bash-completion =20 -SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system - -if LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - -uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: -uninstall-systemd: -endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD - -libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.s= tatus - $(AM_V_GEN)sed \ - -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ - -e 's|[@]bindir[@]|$(bindir)|g' \ - -e 's|[@]localedir[@]|$(localedir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ - -e 's|[@]sbindir[@]|$(sbindir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]libexecdir[@]|$(libexecdir)|g' \ - < $< > $@-t && \ - mv $@-t $@ - - if WITH_BASH_COMPLETION install-bash-completion: $(MKDIR_P) "$(DESTDIR)$(BASH_COMPLETIONS_DIR)" diff --git a/tools/meson.build b/tools/meson.build index b95ced3728b..ce8f2bdd1e3 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -222,6 +222,7 @@ tools_conf =3D configuration_data() tools_conf.set('PACKAGE', meson.project_name()) tools_conf.set('VERSION', meson.project_version()) tools_conf.set('bindir', bindir) +tools_conf.set('libexecdir', libexecdir) tools_conf.set('localedir', localedir) tools_conf.set('localstatedir', localstatedir) tools_conf.set('sbindir', sbindir) @@ -268,4 +269,12 @@ if init_script =3D=3D 'systemd' install_dir: sysconfdir / 'sysconfig', rename: 'libvirt-guests', ) + + configure_file( + input: 'libvirt-guests.service.in', + output: 'libvirt-guests.service', + configuration: tools_conf, + install: true, + install_dir: prefix / 'lib' / 'systemd' / 'system', + ) endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894761; cv=none; d=zohomail.com; s=zohoarc; b=QCHBe+EefWcw7fLnHEDbxhoVj6ZLs7nTu2RrIRPRbG5l7l+rPF9/1EigsdRGxgQap/wZ7I3feVadPJvD6kMPs/nGfS68Wv26EOVrqv7xOyztxqNs1mcb/pMOUZStVqtqeN3aUVLBmEmUCdmUKO5ToTlbHNluGn38TMYg1QEoeSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894761; 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=EhJ+EtBXcVzcX7tybTwnDgJrOimNkVPz+TEBMAC349I=; b=Yj6zU9alRMeszk3dX5UsUX7JeSjd3tiy7qBArvPD0ye764GYEa6DqhWzBujFdU8p6WqXuF/+MVFWniYuR4UNl5/fpxFkADISepiHLOfSa1xcG85tidJfE/HfUmliIQWFWV+1BNDacAmQEoW8Gv5iUNOAGXer/80BnHSEohjIMAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894761401994.5245445667655; Thu, 16 Jul 2020 03:19:21 -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-189-KoGBAhzwOJ22v0z2TP___w-1; Thu, 16 Jul 2020 06:10:27 -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 BCA2D100AA2B; Thu, 16 Jul 2020 10:10:21 +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 96BDD1053B03; Thu, 16 Jul 2020 10:10:21 +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 5ADA6A36FD; Thu, 16 Jul 2020 10:10:21 +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 06GA6RIQ019610 for ; Thu, 16 Jul 2020 06:06:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id CA9EE2B6DC; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 453E52B6DB for ; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894760; 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=EhJ+EtBXcVzcX7tybTwnDgJrOimNkVPz+TEBMAC349I=; b=Kiw5WnLCC1zZn75d+nc54/vWzzPmGD893GZXp8HLw74BkVSx9qcjM7/QHuuP7HnHBuQ+Si i7jPAaWlmAq4GFIvDRArtV3BO9HkuR/cCut6qv1dkUN7S1D8S0lDJYWLvnnhiopLJPnnt3 cS8np6d/ajC8jvqm9f1YGRHGKWUicPE= X-MC-Unique: KoGBAhzwOJ22v0z2TP___w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 268/351] meson: tools: install bash-completion files Date: Thu, 16 Jul 2020 11:58:24 +0200 Message-Id: <499347c9d205623dcff6c62cc4bd90897c05915c.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 --- tools/Makefile.am | 27 ++------------------------- tools/bash-completion/meson.build | 13 +++++++++++++ tools/meson.build | 4 ++++ 3 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 tools/bash-completion/meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am index ba3b0bbc120..9c91cac9ccf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,32 +23,9 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-nss \ - install-bash-completion - -uninstall-local: uninstall-nss \ - uninstall-bash-completion - -if WITH_BASH_COMPLETION -install-bash-completion: - $(MKDIR_P) "$(DESTDIR)$(BASH_COMPLETIONS_DIR)" - $(INSTALL_DATA) $(srcdir)/bash-completion/vsh \ - "$(DESTDIR)$(BASH_COMPLETIONS_DIR)/vsh" - ( cd $(DESTDIR)$(BASH_COMPLETIONS_DIR) && \ - rm -f virsh virt-admin && \ - $(LN_S) vsh virsh && \ - $(LN_S) vsh virt-admin ) - -uninstall-bash-completion: - rm -f $(DESTDIR)$(BASH_COMPLETIONS_DIR)/vsh \ - $(DESTDIR)$(BASH_COMPLETIONS_DIR)/virsh \ - $(DESTDIR)$(BASH_COMPLETIONS_DIR)/virt-admin - rmdir $(DESTDIR)$(BASH_COMPLETIONS_DIR) ||: -else ! WITH_BASH_COMPLETION -install-bash-completion: -uninstall-bash-completion: -endif ! WITH_BASH_COMPLETION +install-data-local: install-nss =20 +uninstall-local: uninstall-nss =20 if WITH_WIRESHARK_DISSECTOR =20 diff --git a/tools/bash-completion/meson.build b/tools/bash-completion/meso= n.build new file mode 100644 index 00000000000..4cc0892accf --- /dev/null +++ b/tools/bash-completion/meson.build @@ -0,0 +1,13 @@ +install_data('vsh', install_dir: bash_completion_dir) + +meson.add_install_script( + install_symlink_prog.path(), + bash_completion_dir, + 'vsh', 'virsh', +) + +meson.add_install_script( + install_symlink_prog.path(), + bash_completion_dir, + 'vsh', 'virt-admin', +) diff --git a/tools/meson.build b/tools/meson.build index ce8f2bdd1e3..36c05d43d9c 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -278,3 +278,7 @@ if init_script =3D=3D 'systemd' install_dir: prefix / 'lib' / 'systemd' / 'system', ) endif + +if bash_completion_dep.found() + subdir('bash-completion') +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894686; cv=none; d=zohomail.com; s=zohoarc; b=YkOcnsZrqKzkIyN8wmO16wRpoTiwehJyA02AzalJSjCQXyQO7qcT9mYly/Gn5yA3G5fNbM3bMIWck+Q4s3jEoFfwQIpoeQ7xaSTABDj7BJJ/YghBc5VhWvhCxqkwiJ+fmcZIpmW5XPLXU8bTkwaYn+JL/U0uYJtyGaewn6hx+q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894686; 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=0SAyMFppEJeAzIJcnPZDmNoMEHfkqm5VcvxhJN4Pic8=; b=LPNK9r/O4Lh1IOm+3A/GG8F/txX+kZZPT5I77uGOovCf8TFUxivvvrJ1GFtklLHPCvRNh343OoeoBZ3dCVkiIrLnsd+G324RmqMnDCaqEZ6fm0A2q7cbNkMII1rrIwm3YWHQ6ayzFR/mgRSUp+fFha4HdEWMI2H1iv1qaD3ak1c= 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 1594894686889101.92285249330234; Thu, 16 Jul 2020 03:18:06 -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-461-3ToBw_CbMpqQC387A9rrww-1; Thu, 16 Jul 2020 06:14:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 624D11888AAD; Thu, 16 Jul 2020 10:14:03 +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 3F4DF2B6DB; Thu, 16 Jul 2020 10:14:03 +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 0E2F0730FF; Thu, 16 Jul 2020 10:14:03 +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 06GA6SHx019621 for ; Thu, 16 Jul 2020 06:06:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id B249F2B6DC; Thu, 16 Jul 2020 10:06:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D6342B6DB for ; Thu, 16 Jul 2020 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894685; 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=0SAyMFppEJeAzIJcnPZDmNoMEHfkqm5VcvxhJN4Pic8=; b=GoogsTjElXpHGdV2LSpp+am0fUCMfjh0WwQ7+RzQFdguETY+WOOq+4EY1AJeL6ncnVJ+EY 35H2BFf1l0wvFtCMb2RSWTv2E6azYbusQQVW9OsIMTDTUucj91TMqKMvdnumIcG9DhFWH3 SXeGeHu99NAX8rD92SVvfbsp5QOnotE= X-MC-Unique: 3ToBw_CbMpqQC387A9rrww-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 269/351] meson: tools: introduce nss directory Date: Thu, 16 Jul 2020 11:58:25 +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.84 on 10.5.11.23 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 --- tools/Makefile.am | 33 --------------------------------- tools/meson.build | 4 ++++ tools/nss/meson.build | 11 +++++++++++ 3 files changed, 15 insertions(+), 33 deletions(-) create mode 100644 tools/nss/meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am index 9c91cac9ccf..3d9d042d2f3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,10 +23,6 @@ STANDALONE_CPPFLAGS =3D -I$(top_srcdir) =20 noinst_LTLIBRARIES =3D =20 -install-data-local: install-nss - -uninstall-local: uninstall-nss - if WITH_WIRESHARK_DISSECTOR =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la @@ -57,35 +53,6 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrs= tub.pl \ =20 endif WITH_WIRESHARK_DISSECTOR =20 -if WITH_BSD_NSS -LIBVIRT_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_nss_bsd.syms -LIBVIRT_GUEST_NSS_SYMBOL_FILE =3D \ - $(LIBVIRT_NSS_SYMBOL_FILE) -NSS_SO_VER =3D 1 - -install-nss: - ( cd $(DESTDIR)$(libdir) && \ - rm -f nss_libvirt.so.$(NSS_SO_VER) && \ - $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) &&= \ - rm -f nss_libvirt_guest.so.$(NSS_SO_VER) && \ - $(LN_S) libnss_libvirt_guest.so.$(NSS_SO_VER) \ - nss_libvirt_guest.so.$(NSS_SO_VER)) - -uninstall-nss: - -rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER) - -rm -f $(DESTDIR)$(libdir)/nss_libvirt_guest.so.$(NSS_SO_VER) -else ! WITH_BSD_NSS -LIBVIRT_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_nss.syms -LIBVIRT_GUEST_NSS_SYMBOL_FILE =3D \ - $(srcdir)/nss/libvirt_guest_nss.syms -NSS_SO_VER =3D 2 - -install-nss: -uninstall-nss: -endif ! WITH_BSD_NSS - LIBVIRT_NSS_SOURCES =3D \ nss/libvirt_nss.c \ nss/libvirt_nss.h \ diff --git a/tools/meson.build b/tools/meson.build index 36c05d43d9c..52d997d2e73 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -282,3 +282,7 @@ endif if bash_completion_dep.found() subdir('bash-completion') endif + +if conf.has('WITH_NSS') + subdir('nss') +endif diff --git a/tools/nss/meson.build b/tools/nss/meson.build new file mode 100644 index 00000000000..b83a63c9c34 --- /dev/null +++ b/tools/nss/meson.build @@ -0,0 +1,11 @@ +if conf.has('WITH_BSD_NSS') + nss_sym_file =3D 'libvirt_nss_bsd.syms' + nss_guest_sym_file =3D nss_sym_file + nss_so_ver =3D '1' + nss_prefix =3D '' +else + nss_sym_file =3D 'libvirt_nss.syms' + nss_guest_sym_file =3D 'libvirt_guest_nss.syms' + nss_so_ver =3D '2' + nss_prefix =3D 'lib' +endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894627; cv=none; d=zohomail.com; s=zohoarc; b=XkBwZKfr2uodT/LXXgaK6Q8uSJBtreO8Qre9JJViN4ZkVajMePpOXm+mzu7DQJaYSm5wEYJw8p4vjB+OEOKZJX4RcrPDQBvWY86A4Agk4vusJK/rZbt8bg/zxFXJcG2xuhadcbccfMXGfx3ruIiYw400izxoT9Phs/hQPyJpTFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894627; 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=7z1RPBnxkmdgDMNUp+sLGtB/gnDxouZ+wDRLjywu6I0=; b=R5I3/FeU1jCep8WfSK4lmHfrpSiUyfM5VCbqVXG75czWaud+QJSBDCGiBqiBazrit746Ibvod2yIx73Nia8ODi0xCT7+afNBRDXvhMdlMW1xQD6JW50TpDEfrqd4za07atlp4xqMPhbxRw1h+ARoAnbBXN3kae1L60r+CgtsgtE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894627132233.33080208382307; Thu, 16 Jul 2020 03:17:07 -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-467-NjhvHeq6PZuAlGuE5CzLtA-1; Thu, 16 Jul 2020 06:14:11 -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 A482280BCB9; Thu, 16 Jul 2020 10:14:05 +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 80FA96FEFF; Thu, 16 Jul 2020 10:14:05 +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 528CA96232; Thu, 16 Jul 2020 10:14:05 +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 06GA6TJU019633 for ; Thu, 16 Jul 2020 06:06:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A3262B6DC; Thu, 16 Jul 2020 10:06:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1569D2B6DB for ; Thu, 16 Jul 2020 10:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894625; 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=7z1RPBnxkmdgDMNUp+sLGtB/gnDxouZ+wDRLjywu6I0=; b=AzRZp1m+SIHIr8iAS3sjgwRF4ab/t1gxPANm/lQJHqd4F65mToNAqyG/mBrneR6WMBXAJY 2bdLV00mtxYCOx5YIqekUMG1HBUJwOcROxnQhPeQt7106BPNhhttQEqT58q9cmgtCLt1wq EKniccf7DLKmko9MBsHFUnx7gxERelk= X-MC-Unique: NjhvHeq6PZuAlGuE5CzLtA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 270/351] meson: tools: build libnss_libvirt_impl.a static library Date: Thu, 16 Jul 2020 11:58:26 +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.12 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 --- tools/Makefile.am | 22 ---------------------- tools/nss/meson.build | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 3d9d042d2f3..d6a0ccdab2c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -53,29 +53,7 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrs= tub.pl \ =20 endif WITH_WIRESHARK_DISSECTOR =20 -LIBVIRT_NSS_SOURCES =3D \ - nss/libvirt_nss.c \ - nss/libvirt_nss.h \ - nss/libvirt_nss_leases.c \ - nss/libvirt_nss_leases.h \ - $(NULL) - if WITH_NSS -noinst_LTLIBRARIES +=3D nss/libnss_libvirt_impl.la -nss_libnss_libvirt_impl_la_SOURCES =3D \ - $(LIBVIRT_NSS_SOURCES) - -nss_libnss_libvirt_impl_la_CPPFLAGS =3D $(STANDALONE_CPPFLAGS) -nss_libnss_libvirt_impl_la_CFLAGS =3D \ - -DLIBVIRT_NSS \ - $(YAJL_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -nss_libnss_libvirt_impl_la_LIBADD =3D \ - $(YAJL_LIBS) \ - $(NULL) - nss_libnss_libvirt_la_SOURCES =3D nss_libnss_libvirt_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \ diff --git a/tools/nss/meson.build b/tools/nss/meson.build index b83a63c9c34..9bccdafd19b 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -9,3 +9,22 @@ else nss_so_ver =3D '2' nss_prefix =3D 'lib' endif + +nss_sources =3D [ + 'libvirt_nss.c', + 'libvirt_nss_leases.c', +] + +nss_libvirt_impl =3D static_library( + 'nss_libvirt_impl', + [ + nss_sources, + ], + c_args: [ + '-DLIBVIRT_NSS' + ], + dependencies: [ + tools_dep, + yajl_dep, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894233; cv=none; d=zohomail.com; s=zohoarc; b=jE4yFG0rfS2EIV3rqgwX3PEGyMSV+KmTFaXjb0tZbYB8Vf44iU9EaakUNZlFlnc0/eA69dzEtleSxYNO7a6BMZLNO9p1H1okwxKfNRuuISa8tw0wUvi6ZkEZWL8yS64FE9sQNxCoSVkX7n/GYQmQGdHTSi1Dxu2qXQR3fJyNnfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894233; 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=U+bGDcPzb6is7wHjYt0BJ+zCRRAUt/a+eELBOsyxkk4=; b=OUIt0OlLNBCdS1JuRmXZQH9AVyINMR0PPmnLd8iAKPeaUvEjIlUJbJBPjFkWutOopereKdapFKAH5xzNRclxSyvHRGb8FUFuj4H6M48O+jMRq/UOlJVl7WIjVju6mcxtpdsvcy3/sirPnbZhUbS9MIgvuxsRhrcTRY3sR81KnVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894233123776.939107993288; Thu, 16 Jul 2020 03:10:33 -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-430-S8zB3ClTPCSaW_P_p49kxQ-1; Thu, 16 Jul 2020 06:10:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21F6B107ACCA; Thu, 16 Jul 2020 10:10:24 +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 F24482DE6B; Thu, 16 Jul 2020 10:10:23 +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 BD07AA3701; Thu, 16 Jul 2020 10:10:23 +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 06GA6Uie019646 for ; Thu, 16 Jul 2020 06:06:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 817CC2B6DC; Thu, 16 Jul 2020 10:06:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0D142B6DB for ; Thu, 16 Jul 2020 10:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894231; 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=U+bGDcPzb6is7wHjYt0BJ+zCRRAUt/a+eELBOsyxkk4=; b=Nvbt3JTiynAaTxahHt1fA2Tb2Fg14dBDJMefanHjGK1Wb2O8Ue0bAj2nDfzN/zbMecLE/g A7wO7Hnk3WNacHrb05Wcz0AmEEU53vGvJqeP7JWA1aeo3WINVdzdudFPH9CaGMZCNCCa9L MEhUV9MCGJVfZvhvCURw4kA+OM7NaB8= X-MC-Unique: S8zB3ClTPCSaW_P_p49kxQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 271/351] meson: tools: build libnss_libvirt_guest_impl.a static library Date: Thu, 16 Jul 2020 11:58:27 +0200 Message-Id: <2a40fc99b10d9ecc82d4c1a68d27257d29996296.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.23 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 --- tools/Makefile.am | 23 ----------------------- tools/nss/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d6a0ccdab2c..b1388280fef 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,10 +19,6 @@ # dir or public API dir. Specific files can # still be included via their path relative to the root if # needed -STANDALONE_CPPFLAGS =3D -I$(top_srcdir) - -noinst_LTLIBRARIES =3D - if WITH_WIRESHARK_DISSECTOR =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la @@ -71,25 +67,6 @@ nss_libnss_libvirt_la_DEPENDENCIES =3D \ $(nss_libnss_libvirt_la_LIBADD) \ $(LIBVIRT_NSS_SYMBOL_FILE) =20 -noinst_LTLIBRARIES +=3D nss/libnss_libvirt_guest_impl.la -nss_libnss_libvirt_guest_impl_la_SOURCES =3D \ - $(LIBVIRT_NSS_SOURCES) \ - nss/libvirt_nss_macs.h \ - nss/libvirt_nss_macs.c \ - $(NULL) - -nss_libnss_libvirt_guest_impl_la_CPPFLAGS =3D $(STANDALONE_CPPFLAGS) -nss_libnss_libvirt_guest_impl_la_CFLAGS =3D \ - -DLIBVIRT_NSS \ - -DLIBVIRT_NSS_GUEST \ - $(YAJL_CFLAGS) \ - $(AM_CFLAGS) \ - $(NULL) - -nss_libnss_libvirt_guest_impl_la_LIBADD =3D \ - $(YAJL_LIBS) \ - $(NULL) - nss_libnss_libvirt_guest_la_SOURCES =3D nss_libnss_libvirt_guest_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_GUEST_NSS_SYMBOL_FILE) \ diff --git a/tools/nss/meson.build b/tools/nss/meson.build index 9bccdafd19b..ef75ffe0010 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -15,6 +15,10 @@ nss_sources =3D [ 'libvirt_nss_leases.c', ] =20 +nss_guest_sources =3D [ + 'libvirt_nss_macs.c', +] + nss_libvirt_impl =3D static_library( 'nss_libvirt_impl', [ @@ -28,3 +32,19 @@ nss_libvirt_impl =3D static_library( yajl_dep, ], ) + +nss_libvirt_guest_impl =3D static_library( + 'nss_libvirt_guest_impl', + [ + nss_sources, + nss_guest_sources, + ], + c_args: [ + '-DLIBVIRT_NSS', + '-DLIBVIRT_NSS_GUEST', + ], + dependencies: [ + tools_dep, + yajl_dep, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894749; cv=none; d=zohomail.com; s=zohoarc; b=CqNzyP+PZiCaf6BTCJb2gOr7JL6kkf7iCA5sPFuI/A36NNnOGFhh6ywcuo4OkJa0/ZPoBvKFcJpfwth7wevbkuDWOWOs4KFRo607/7MolqtZ5FELb5lJgmb3aFGpVLZAtL9kOdEUBYM2EHokE6td4v82uFqGWI/QAG2Ez10MAoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894749; 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=87C/EOdpA6zgLTA6CD2OxT6KzbgPPF8FwHRKaLU7NCY=; b=X1Xk2lP850AnBiDq1FwKKWYJ5c/0q22ibX2f/X/fKV4BEzWVZFWgHERbz6cOc3DDA+inb3qi2/QHmopX2rD/yKXU40A7kblJy4k2Lwnm9uYIXfoRQkaoJ2ofpPiNHf56mg+hJVg1rCk8DAavNzBV0YpAIs7kECw7bH5hfoVfjPk= 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 1594894749409144.2572491522277; Thu, 16 Jul 2020 03:19: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-363-MKHIo0tMPKKT602gynGLLg-1; Thu, 16 Jul 2020 06:14:13 -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 E4B6E1009616; Thu, 16 Jul 2020 10:14:07 +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 C270570108; Thu, 16 Jul 2020 10:14:07 +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 8E994181D0AB; Thu, 16 Jul 2020 10:14:07 +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 06GA6VWk019656 for ; Thu, 16 Jul 2020 06:06:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 68E1E2B6DB; Thu, 16 Jul 2020 10:06:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8E3B2DE6B for ; Thu, 16 Jul 2020 10:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894748; 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=87C/EOdpA6zgLTA6CD2OxT6KzbgPPF8FwHRKaLU7NCY=; b=EJ23w73MucfQmXFM/cnVBQrGlW3OnXM4dDLWI8CFzwITZ+JfFt59VT+ToGNA0EIYCATSzi +aK2+i15aHhSaUWJmHNB/wX+y+W3i0H0kTbyrwdtvA6kM/5L3l5TEeuRAncSIDm5XXrzW8 HxKlSQXS4yUGd43GKRG1Z+a9RwNiX0c= X-MC-Unique: MKHIo0tMPKKT602gynGLLg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 272/351] meson: tools: build libnss_libvirt.so shared library Date: Thu, 16 Jul 2020 11:58:28 +0200 Message-Id: <46ed6fd18f9486217eca39dce7d4566a3d8871b6.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 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 --- tools/Makefile.am | 18 ------------------ tools/nss/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index b1388280fef..d33e5a20885 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -50,23 +50,6 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrs= tub.pl \ endif WITH_WIRESHARK_DISSECTOR =20 if WITH_NSS -nss_libnss_libvirt_la_SOURCES =3D -nss_libnss_libvirt_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \ - $(AM_LDFLAGS) \ - -module \ - -export-dynamic \ - -avoid-version \ - -shared \ - -shrext .so.$(NSS_SO_VER) - -nss_libnss_libvirt_la_LIBADD =3D \ - nss/libnss_libvirt_impl.la - -nss_libnss_libvirt_la_DEPENDENCIES =3D \ - $(nss_libnss_libvirt_la_LIBADD) \ - $(LIBVIRT_NSS_SYMBOL_FILE) - nss_libnss_libvirt_guest_la_SOURCES =3D nss_libnss_libvirt_guest_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_GUEST_NSS_SYMBOL_FILE) \ @@ -85,7 +68,6 @@ nss_libnss_libvirt_guest_la_DEPENDENCIES =3D \ $(LIBVIRT_GUEST_NSS_SYMBOL_FILE) =20 lib_LTLIBRARIES =3D \ - nss/libnss_libvirt.la \ nss/libnss_libvirt_guest.la =20 endif WITH_NSS diff --git a/tools/nss/meson.build b/tools/nss/meson.build index ef75ffe0010..cfdcc1fe774 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -48,3 +48,23 @@ nss_libvirt_guest_impl =3D static_library( yajl_dep, ], ) + +nss_libvirt_syms =3D '@0@@1@'.format( + version_script_flags, + meson.current_source_dir() / nss_sym_file, +) + +nss_libvirt_lib =3D shared_module( + 'nss_libvirt', + name_prefix: nss_prefix, + name_suffix: 'so.@0@'.format(nss_so_ver), + link_args: [ + nss_libvirt_syms, + libvirt_export_dynamic, + ], + link_whole: [ + nss_libvirt_impl, + ], + install: true, + install_dir: libdir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894999; cv=none; d=zohomail.com; s=zohoarc; b=PhDoXaaVjw+SaEIGKaz7TCAy/fG1QHsiCPtaV3XTdh/Lfu64AqryEkqc7RSilNjvj7iWdYaW9FNFD6Fv8jWdmYdJSRT+SS6ltLbf6QiPdsX1pbaVW7+r4CPnt00w6RZRjgSkYRFsbRCdMIpRjLU3fOunkz4YMj4BJUin1erZIS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894999; 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=r7y+hJCSjxlQDRYUq3zZgYdaiLkPka37EpyONl9kD2g=; b=SiExjcOexwTN8p96qsr6+W7+6hHM+U6yIAK0x36KIFg0q0TKjCGSs84aZIbFym/8ku4bJO5IlU2i+VS2d3ueSu4pAYGHYe5yvQnI2Ttm+FBRqHHmCzIZ7SH4jLdgtA0MiS/5S5H7+K/673fZ6EQtp29HQRAvEYahJcxL5y+ob18= 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 1594894999695602.3283931951113; Thu, 16 Jul 2020 03:23:19 -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-459-8yGOBNM7MD-KxE8aYuhqBA-1; Thu, 16 Jul 2020 06:10:32 -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 9048E10A2; Thu, 16 Jul 2020 10:10:26 +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 4FDA37B41F; Thu, 16 Jul 2020 10:10:26 +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 187BAA3704; Thu, 16 Jul 2020 10:10:26 +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 06GA6W3R019666 for ; Thu, 16 Jul 2020 06:06:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 524462B6DC; Thu, 16 Jul 2020 10:06:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0C4E2B6DB for ; Thu, 16 Jul 2020 10:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894998; 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=r7y+hJCSjxlQDRYUq3zZgYdaiLkPka37EpyONl9kD2g=; b=C5E3GcsJLk3UIJWUEgpmGiofOkd/PRyGfwbIyuDAod6aVm9+yJLtCmIolFrvU40PMl8nHz ilFS2nFPflKbNQoqahzcpYg7j++YJERVbIBmzasg1qnBd3nv/BgCvzCci4Rbuu7uzvH5yb ffTv3ZeZl7sh4hNmILQQNpj7YmeKs5g= X-MC-Unique: 8yGOBNM7MD-KxE8aYuhqBA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 273/351] meson: tools: build libnss_libvirt_guest.so shared_library Date: Thu, 16 Jul 2020 11:58:29 +0200 Message-Id: <17388a07e8e271e33a20fe62b52359120bc93b6f.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.13 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 --- tools/Makefile.am | 23 ----------------------- tools/nss/meson.build | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index d33e5a20885..4cb0a07afb8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,26 +48,3 @@ wireshark/src/libvirt/protocol.h: wireshark/util/genxdrs= tub.pl \ $(WS_DISSECTOR_PROTO_FILES) =20 endif WITH_WIRESHARK_DISSECTOR - -if WITH_NSS -nss_libnss_libvirt_guest_la_SOURCES =3D -nss_libnss_libvirt_guest_la_LDFLAGS =3D \ - $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_GUEST_NSS_SYMBOL_FILE) \ - $(AM_LDFLAGS) \ - -module \ - -export-dynamic \ - -avoid-version \ - -shared \ - -shrext .so.$(NSS_SO_VER) - -nss_libnss_libvirt_guest_la_LIBADD =3D \ - nss/libnss_libvirt_guest_impl.la - -nss_libnss_libvirt_guest_la_DEPENDENCIES =3D \ - $(nss_libnss_libvirt_guest_la_LIBADD) \ - $(LIBVIRT_GUEST_NSS_SYMBOL_FILE) - -lib_LTLIBRARIES =3D \ - nss/libnss_libvirt_guest.la - -endif WITH_NSS diff --git a/tools/nss/meson.build b/tools/nss/meson.build index cfdcc1fe774..b07bfa4be8b 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -54,6 +54,11 @@ nss_libvirt_syms =3D '@0@@1@'.format( meson.current_source_dir() / nss_sym_file, ) =20 +nss_libvirt_guest_syms =3D '@0@@1@'.format( + version_script_flags, + meson.current_source_dir() / nss_guest_sym_file, +) + nss_libvirt_lib =3D shared_module( 'nss_libvirt', name_prefix: nss_prefix, @@ -68,3 +73,18 @@ nss_libvirt_lib =3D shared_module( install: true, install_dir: libdir, ) + +nss_libvirt_guest_lib =3D shared_library( + 'nss_libvirt_guest', + name_prefix: nss_prefix, + name_suffix: 'so.@0@'.format(nss_so_ver), + link_args: [ + nss_libvirt_guest_syms, + libvirt_export_dynamic, + ], + link_whole: [ + nss_libvirt_guest_impl, + ], + install: true, + install_dir: libdir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894153; cv=none; d=zohomail.com; s=zohoarc; b=kZs3IwkW/5ayGd4HMWkdULcEC1xwlXY5/wUmEyXwrK1F7ux6zE8EF+OPLZpekiCLWpSv2quoaQm9ZsMld3FN14AcGm4OgGisftFbWWIV3sM38QQjVpHTuQUUALFrGw9Cn/Qmu0eGeH8mbiSSZj6o+xq4RpHwiSAEhxVJDEZLvM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894153; 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=B79APSRfMoJ2fWSKoMYXDn0YDK6KHo5PPH+2n1OpBC0=; b=bbhM/I6mAxX/nokuPvICTF/OFTQOCDPphkN/O/0OYO+1BW2zyv0Wuk5F8IgQCDxcq8vo8GhA9Y/XmwxxXK7roddAG0Q/N9pVFtewODWqALLiChXKm3BM95GCtcM8IH/1NiClOXmOmG//rWtqEBGCCLN0vawnXJg7aF21SixWKvE= 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 1594894153876866.8125211110794; Thu, 16 Jul 2020 03:09:13 -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-293-m1q7k3wpNEWpWzZPIImccQ-1; Thu, 16 Jul 2020 06:09:10 -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 734A610059D1; Thu, 16 Jul 2020 10:09:02 +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 5144E7B42B; Thu, 16 Jul 2020 10:09: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 1CF38180351C; Thu, 16 Jul 2020 10:09: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 06GA6XkZ019684 for ; Thu, 16 Jul 2020 06:06:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3B7E42B6DC; Thu, 16 Jul 2020 10:06:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA7A72B6DB for ; Thu, 16 Jul 2020 10:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894152; 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=B79APSRfMoJ2fWSKoMYXDn0YDK6KHo5PPH+2n1OpBC0=; b=GR1jTX66mmWlGEZ5KXE8L0nNRksuKPTs4TWMIOs8CKlDz5mQh0PWAkxmq3i8EIVbs0Ofmu 5QrqPJfb00SukW5r2r2+Cx5shuRlotmiyWuEziTubZSiVVrgQeXEzkxHSUX08ZpPmoO2Qf b34VgZBxqh6qqCrmkGRc5ADirEH4/eA= X-MC-Unique: m1q7k3wpNEWpWzZPIImccQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 274/351] meson: tools: introduce wireshark directory Date: Thu, 16 Jul 2020 11:58:30 +0200 Message-Id: <0fbf86f26e44e82f82a3192ff89bb523438c008c.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.13 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 --- tools/meson.build | 4 ++++ tools/wireshark/meson.build | 1 + 2 files changed, 5 insertions(+) create mode 100644 tools/wireshark/meson.build diff --git a/tools/meson.build b/tools/meson.build index 52d997d2e73..f2c2af764b7 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -286,3 +286,7 @@ endif if conf.has('WITH_NSS') subdir('nss') endif + +if wireshark_dep.found() + subdir('wireshark') +endif diff --git a/tools/wireshark/meson.build b/tools/wireshark/meson.build new file mode 100644 index 00000000000..a71bc04eb37 --- /dev/null +++ b/tools/wireshark/meson.build @@ -0,0 +1 @@ +genxdrstup_prog =3D find_program('util/genxdrstub.pl') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894459; cv=none; d=zohomail.com; s=zohoarc; b=kKskoAqLShJL2zjxCqudeN2rKEhOE5XEFT4val7Wov0/2QqxRcU07rCnAIkgvAsjB0P4Jc2kt4UEnndErZlnBhWkkZbj7/jaUyxCAK37D5NEpn+i+s8So7zvKlU5cwYtABsMoQVeBR1jBWCpu8kXwcBT2191aL35xberK5K3ZI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894459; 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=I5E5V2VJ8rWpDcxtSmhyZnqjvBveTIfJ1ra/3N+YBrc=; b=OAcZaI8XDSchJsPKFuJB1cOrZPbtVSyei7rR5x6W/PkW2/w4xAVreOwU04kmzfFEBS7j/0EzU8sIh+GCH7MkMqQvXdQ5nlexlBDY3MlswrlWeyGEfWnk2td0puz+RuiV19FxVamdO7ZQ1qCaGp1OsybG7TqB2E/vaCDtF/utvKM= 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 1594894459854200.13478554771712; Thu, 16 Jul 2020 03:14:19 -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-445-I0x274slONm008jd6m-GEA-1; Thu, 16 Jul 2020 06:14:16 -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 BD36E1800D42; Thu, 16 Jul 2020 10:14:10 +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 9A4486FEFE; Thu, 16 Jul 2020 10:14:10 +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 65665180222C; Thu, 16 Jul 2020 10:14:10 +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 06GA6YYo019689 for ; Thu, 16 Jul 2020 06:06:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 245EF2DE69; Thu, 16 Jul 2020 10:06:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92C522B6DB for ; Thu, 16 Jul 2020 10:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894458; 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=I5E5V2VJ8rWpDcxtSmhyZnqjvBveTIfJ1ra/3N+YBrc=; b=ezTpXRtqbRV/H1vwmE30uLX8ar88mMqtv2lT66OORKvohHkSlQN4C1fOW3A4aix16iSRxL e0qY0NpiA8WVdzCDOb7TF8ub8IwC+pCCC6bZ+rzai3ETt5OD/0Wnc0LuA6w2gr5ToCdw5T E9m2LsIMl/crs4snALDRf3hfnzB7FTw= X-MC-Unique: I0x274slONm008jd6m-GEA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 275/351] meson: tools: modify genxdrstub to work with meson Date: Thu, 16 Jul 2020 11:58:31 +0200 Message-Id: <6777824310a2b1d32d0556ac0b193690e362222a.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 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" Instead of using environment variables pass the values to the script as arguments. Signed-off-by: Pavel Hrdina --- tools/wireshark/util/genxdrstub.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/wireshark/util/genxdrstub.pl b/tools/wireshark/util/genx= drstub.pl index cae64b2f49c..8adbebdbab1 100755 --- a/tools/wireshark/util/genxdrstub.pl +++ b/tools/wireshark/util/genxdrstub.pl @@ -30,7 +30,10 @@ use File::Spec; my $DEBUG =3D 0; # Enable if you want to see debug output sub dbg { print STDERR @_ if $DEBUG } =20 -die "ERROR: No arguments" unless @ARGV; +die "ERROR: No arguments" unless @ARGV >=3D 3; + +my $libvirt_version =3D shift; +my $builddir =3D shift; =20 # Context object referenced from entire this script my $c =3D Context->new; @@ -559,7 +562,7 @@ sub add_header_file { =20 local $self->{header_contents} =3D []; $self->print("/* *DO NOT MODIFY* this file directly.\n"); - $self->print(" * This file was generated by $0 from libvirt version $E= NV{LIBVIRT_VERSION} */\n"); + $self->print(" * This file was generated by $0 from libvirt version $l= ibvirt_version */\n"); my $ucname =3D uc $name; $self->print("#ifndef _$ucname\_H_\n"); $self->print("#define _$ucname\_H_\n"); @@ -576,7 +579,7 @@ sub finalize { =20 for my $header (@{ $self->{headers} || [] }) { my ($name, $contents) =3D @$header; - my $file =3D File::Spec->catfile($ENV{PWD}, 'libvirt', "$name.h"); + my $file =3D File::Spec->catfile($builddir, "$name.h"); open my $fh, '>', $file or die "Cannot open file $file: $!"; CORE::print $fh map { ref($_) ? ($_->{refcnt} ? $_->{body} : ()) := $_ } @$contents; --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894385; cv=none; d=zohomail.com; s=zohoarc; b=JVGZYo8RbiEr+vD48VblBGAVJJBC2cfrT56wp/Tyu5pkNsWbUCCpTpkKt0yfhjgxefq3ung5SEavNPRsUBe9WJXo7QEOrmgs8UUEuoqzPyUiPEJEUblF+uvRkkshB++4y/0idJLgsU6CfFZJ9/6wGCYV+AB5UcvMnOogPQ4Sfd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894385; 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=79W1CjSfFIHIZ0LJjIERr8dqdDv3E5GgnyR9OndBjq0=; b=mW40vA3brQrIqFqGwwbGY/HlSUbjQYR8j3lVOnQB2Tp/8jFDLMz3R7Ytl2CFQBJ8CUV4bQKVQmvXjiR28tYYY37kVXQ/t4/IPcSnGWFh85fB3zdfLcH6NdCQObxqDKvwdCu3defX6n9S+evNwJLYg2tqWPOWv+nduPjUbAZjAkY= 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 1594894385053537.0304345195834; Thu, 16 Jul 2020 03:13:05 -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-27-krJfvwCeNnuL0BlNe_xqtA-1; Thu, 16 Jul 2020 06:10:34 -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 C83848027F2; Thu, 16 Jul 2020 10:10:28 +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 A38986FEF9; Thu, 16 Jul 2020 10:10:28 +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 6DD12181AC8F; Thu, 16 Jul 2020 10:10:28 +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 06GA6beZ019718 for ; Thu, 16 Jul 2020 06:06:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB7832DE69; Thu, 16 Jul 2020 10:06:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5677C2B6DB for ; Thu, 16 Jul 2020 10:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894383; 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=79W1CjSfFIHIZ0LJjIERr8dqdDv3E5GgnyR9OndBjq0=; b=hSRUI+DRDZbJAT7Dnkm4V/GJSOBgUyGx9lkEd9ckyZ08aSmcJ58C2T2+T9YkcgPmI0dNfV 1+6BYC7viRNqQ9ZTDZxs1Fv6e3VBMHMhqJR0PWGb3yMbNW3DCz4slJsI9GpIr3RvtEbOLV cdcD+3KdOxAo08GRlwNwpQCLMvlMWjw= X-MC-Unique: krJfvwCeNnuL0BlNe_xqtA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 276/351] meson: tools/wireshark: generate protocol header files Date: Thu, 16 Jul 2020 11:58:32 +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.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 --- tools/Makefile.am | 13 ------------- tools/wireshark/meson.build | 2 ++ tools/wireshark/src/libvirt/meson.build | 20 ++++++++++++++++++++ tools/wireshark/src/meson.build | 1 + 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 tools/wireshark/src/libvirt/meson.build create mode 100644 tools/wireshark/src/meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am index 4cb0a07afb8..b42bcf29c53 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,18 +33,5 @@ wireshark_src_libvirt_la_SOURCES =3D \ wireshark/src/packet-libvirt.c: wireshark/src/packet-libvirt.h \ wireshark/src/libvirt/protocol.h =20 -WS_DISSECTOR_PROTO_FILES =3D \ - $(abs_top_srcdir)/src/remote/remote_protocol.x \ - $(abs_top_srcdir)/src/remote/qemu_protocol.x \ - $(abs_top_srcdir)/src/remote/lxc_protocol.x \ - $(abs_top_srcdir)/src/rpc/virkeepaliveprotocol.x - -wireshark/src/libvirt/protocol.h: wireshark/util/genxdrstub.pl \ - $(WS_DISSECTOR_PROTO_FILES) - $(AM_V_GEN)$(MKDIR_P) wireshark/src/libvirt && \ - cd wireshark/src && \ - LIBVIRT_VERSION=3D$(LIBVIRT_VERSION) \ - $(PERL) $(abs_top_srcdir)/tools/wireshark/util/genxdrstub.pl \ - $(WS_DISSECTOR_PROTO_FILES) =20 endif WITH_WIRESHARK_DISSECTOR diff --git a/tools/wireshark/meson.build b/tools/wireshark/meson.build index a71bc04eb37..cb43a0640d9 100644 --- a/tools/wireshark/meson.build +++ b/tools/wireshark/meson.build @@ -1 +1,3 @@ genxdrstup_prog =3D find_program('util/genxdrstub.pl') + +subdir('src') diff --git a/tools/wireshark/src/libvirt/meson.build b/tools/wireshark/src/= libvirt/meson.build new file mode 100644 index 00000000000..9d54f827d37 --- /dev/null +++ b/tools/wireshark/src/libvirt/meson.build @@ -0,0 +1,20 @@ +wireshark_protocol =3D custom_target( + 'protocol.h', + input: [ + meson.source_root() / 'src' / 'remote' / 'remote_protocol.x', + meson.source_root() / 'src' / 'remote' / 'qemu_protocol.x', + meson.source_root() / 'src' / 'remote' / 'lxc_protocol.x', + meson.source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', + ], + output: [ + 'protocol.h', + 'remote.h', + 'qemu.h', + 'lxc.h', + 'keepalive.h', + ], + command: [ + genxdrstup_prog, meson.project_version(), + meson.current_build_dir(), '@INPUT@', + ], +) diff --git a/tools/wireshark/src/meson.build b/tools/wireshark/src/meson.bu= ild new file mode 100644 index 00000000000..f41189ba8df --- /dev/null +++ b/tools/wireshark/src/meson.build @@ -0,0 +1 @@ +subdir('libvirt') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=jFsubkU9ApFLump0cLGo6VUj/ITCN9DmJO1o9+ASFHtXNY7edCakGaBkYI4p89k7q8rxeqA3Pt5FtUNaCfV1nNVGPsxpfz1/g3KhL0sWDjj8rA+obWtUowV5j+sb+IrbLm4BWPgZE4rK8mwFKciiRPo0BeBE9pMAGzWf5YEM528= 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=cteTVUUDtVnTZAscX5rSTFODkUdG3uGgVT1zILHkluA=; b=CHoa4YSAfYEG3+SKxmJEONgMmjXHGc1wqIWVgOtkUlPzyXHhLRmidnG74KKYSki+yxFxKWNSXBvcTHg49zoDR3LlEKYDp4MR5723oPj+K8L7VIcgilWFefZ4e1EckxFrdS8W3OkRC7Wzh+4CEVw9XRnqc94QXhYCLkW8EnSwwMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894689723938.2592771495171; 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-4-zODqeB13OY29f_9OQkjxDA-1; Thu, 16 Jul 2020 06:09:10 -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 DDD7A10059C4; Thu, 16 Jul 2020 10:09:04 +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 BD4437B41E; Thu, 16 Jul 2020 10:09:04 +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 8D60F9A30B; Thu, 16 Jul 2020 10:09:04 +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 06GA6cqW019732 for ; Thu, 16 Jul 2020 06:06:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id C50A12DE69; Thu, 16 Jul 2020 10:06:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F20A2B6DB for ; Thu, 16 Jul 2020 10:06:38 +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=cteTVUUDtVnTZAscX5rSTFODkUdG3uGgVT1zILHkluA=; b=XiTWRvoT8WiTiLvEyTqnc9+c9cJg45BF2k+dPcJ07G/j7TS2QvdyFHHrK1AxWmgHBvm84T ldT4ZKOutrtOB3/jsp8nknx8jfz6ZfJUP6TWN0eN0DM+HEqWOjckM0+0d6FO2MlQbb34lR t8V1tyk/uRXbQ1+NzjkYBzm8eLcc3Dk= X-MC-Unique: zODqeB13OY29f_9OQkjxDA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 277/351] meson: tools/wireshark: build libvirt.so wireshark module Date: Thu, 16 Jul 2020 11:58:33 +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 --- Makefile.am | 2 +- configure.ac | 3 +-- tools/Makefile.am | 37 --------------------------------- tools/wireshark/src/meson.build | 16 ++++++++++++++ 4 files changed, 18 insertions(+), 40 deletions(-) delete mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0b62d15eef5..363c5cf66fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . tools docs \ +SUBDIRS =3D . docs \ tests po examples =20 XZ_OPT ?=3D -v -T0 diff --git a/configure.ac b/configure.ac index 24724e3755a..20926ee9f19 100644 --- a/configure.ac +++ b/configure.ac @@ -116,6 +116,5 @@ AC_CONFIG_FILES([\ libvirt.spec mingw-libvirt.spec \ po/Makefile \ examples/Makefile \ - tests/Makefile \ - tools/Makefile]) + tests/Makefile]) AC_OUTPUT diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index b42bcf29c53..00000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## Copyright (C) 2005-2016 Red Hat, Inc. -## Copyright (C) 2013 Yuto KAWAMURA(kawamuray) -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -# We do not want to accidentally include stuff from src/ -# dir or public API dir. Specific files can -# still be included via their path relative to the root if -# needed -if WITH_WIRESHARK_DISSECTOR - -ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la -wireshark_src_libvirt_la_CFLAGS =3D \ - -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) $(AM_CFLAGS) -wireshark_src_libvirt_la_LDFLAGS =3D -avoid-version -module -wireshark_src_libvirt_la_SOURCES =3D \ - wireshark/src/packet-libvirt.h \ - wireshark/src/packet-libvirt.c \ - wireshark/src/plugin.c - -wireshark/src/packet-libvirt.c: wireshark/src/packet-libvirt.h \ - wireshark/src/libvirt/protocol.h - - -endif WITH_WIRESHARK_DISSECTOR diff --git a/tools/wireshark/src/meson.build b/tools/wireshark/src/meson.bu= ild index f41189ba8df..49ccc9bb86e 100644 --- a/tools/wireshark/src/meson.build +++ b/tools/wireshark/src/meson.build @@ -1 +1,17 @@ subdir('libvirt') + +shared_library( + 'virt', + [ + 'packet-libvirt.c', + 'plugin.c', + wireshark_protocol, + ], + dependencies: [ + wireshark_dep, + xdr_dep, + tools_dep, + ], + install: true, + install_dir: wireshark_plugindir, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894629; cv=none; d=zohomail.com; s=zohoarc; b=kQtIfZQf6hIMbqkmOE9ixoBWtlCbKgqzlObWlcLofVE5PNZcHPbNXOEwbxszfJSDuuJyaBJuzhNqPtZo+/poEFNlLBIDVLB4UIwEIvebJ724IFXTggcrDKwHfLYTkoo+twhfZ9zgopq8RCG1z4xu4m9ctu1fLN8VbBZ7sFFoFZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894629; 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=UuyFJM/2394/EjW1FxnOd/QhUCQ0qkOjyKonnCarvNk=; b=axjqsJ17HGOQon6cOO7EqUtVelip1wEvVfxZK++ZIY9lodC93LMJ5+Q8Dye4ifoPuZkfMDwYxVDJ2vWMBIV+mDhawvGuzw3oV0C7FVHToTDIxsZ0OCTKM1FcDRfSNXbj/gm60njP2gscfk3Sg3II7ojT5OQUewMNLHcChk53X/A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894629846549.1069786178786; Thu, 16 Jul 2020 03:17: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-478-L1IuSO-rMr-APEgARJROeA-1; Thu, 16 Jul 2020 06:14:18 -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 21BCA8027F0; Thu, 16 Jul 2020 10:14:13 +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 007101053B01; Thu, 16 Jul 2020 10:14:12 +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 BDD7A181D0AA; Thu, 16 Jul 2020 10:14:12 +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 06GA6dpS019742 for ; Thu, 16 Jul 2020 06:06:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEBFC2DE69; Thu, 16 Jul 2020 10:06:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28DB02B6DB for ; Thu, 16 Jul 2020 10:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894628; 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=UuyFJM/2394/EjW1FxnOd/QhUCQ0qkOjyKonnCarvNk=; b=KqYKFrzyVZcIwfpVff/lTcQzZzef3+fhSVBzo3NKeBb0x/v2Ls/DV6PyaI5rV910wxLBit Ssxj6SEEwUwe0x8cqli4WY2O/M62NpZiwSNq/QAqcSsVnff9VwNM6FdHs4QY0EPXQBSmbK aN9EajLeHWcnExQb6ZWwm0AWVnxc4Z4= X-MC-Unique: L1IuSO-rMr-APEgARJROeA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 278/351] meson: introduce tests directory Date: Thu, 16 Jul 2020 11:58:34 +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.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 --- meson.build | 2 ++ tests/Makefile.am | 32 -------------------------------- tests/meson.build | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 tests/meson.build diff --git a/meson.build b/meson.build index b623ddbf4fd..2e894df1ab2 100644 --- a/meson.build +++ b/meson.build @@ -2205,6 +2205,8 @@ subdir('src') =20 subdir('tools') =20 +subdir('tests') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1b384f3d0c2..79fc271ac64 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,38 +16,6 @@ ## License along with this library. If not, see ## . =20 -AM_CPPFLAGS =3D \ - -I$(top_builddir) -I$(top_srcdir) \ - -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/src -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/conf \ - -I$(top_srcdir)/src/hypervisor \ - -I$(top_builddir)/src/rpc \ - $(NULL) - -WARN_CFLAGS +=3D $(RELAXED_FRAME_LIMIT_CFLAGS) - -AM_CFLAGS =3D \ - -Dabs_builddir=3D"\"$(abs_builddir)\"" \ - -Dabs_top_builddir=3D"\"$(abs_top_builddir)\"" \ - -Dabs_srcdir=3D"\"$(abs_srcdir)\"" \ - -Dabs_top_srcdir=3D"\"$(abs_top_srcdir)\"" \ - $(LIBXML_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(APPARMOR_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(XDR_CFLAGS) \ - $(WARN_CFLAGS) - -AM_LDFLAGS =3D \ - -export-dynamic - MOCKLIBS_LDFLAGS =3D -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation \ $(MINGW_EXTRA_LDFLAGS) diff --git a/tests/meson.build b/tests/meson.build new file mode 100644 index 00000000000..ab4acbbea9d --- /dev/null +++ b/tests/meson.build @@ -0,0 +1,30 @@ +tests_dep =3D declare_dependency( + compile_args: [ + '-Dabs_builddir=3D"@0@"'.format(meson.current_build_dir()), + '-Dabs_top_builddir=3D"@0@"'.format(meson.build_root()), + '-Dabs_srcdir=3D"@0@"'.format(meson.current_source_dir()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + ] + coverage_flags + cc_flags_relaxed_frame_limit, + dependencies: [ + apparmor_dep, + dlopen_dep, + glib_dep, + gnutls_dep, + libnl_dep, + libxml_dep, + rpc_dep, + sasl_dep, + selinux_dep, + xdr_dep, + yajl_dep, + ], + include_directories: [ + conf_inc_dir, + hypervisor_inc_dir, + libvirt_inc, + src_inc_dir, + top_inc_dir, + util_inc_dir, + ], + link_args: libvirt_export_dynamic, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894267; cv=none; d=zohomail.com; s=zohoarc; b=XCQxgMQYpUA09MOgexJ3kR1VdXfDIWpkqst57F4T/xU0aQEByyR/zjXfb90z8qbOfdCJ2eEZN0He70TePzR5iYOotfRwaMMfTPntR4O8MjagJS5B3OjvqvASQoGz2NUFp8h5BUITNZYhCvJtyeUqyaHl4+EkPWiodQIfreUD6sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894267; 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=1cNZJQg+F7Mhb4LhC+9v05s57BcCwRSDY6D1tBrvfFw=; b=UuJH3T6+LAMB3E0x6ML8/JC1jgECLHhykCQyyzibD5MMTC2QvFJkCmDXnAx4qNJG2a9t89Y+4kOxHQFOht068qNv29hWBx8zO+ep13qZ7ZZ71kaieKyjyh6uQVpDBavV+dg3MtzohjPV28kGzpP9gvZ89uU6ZVbGNM1vXQOAn1Y= 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 1594894267567175.81561061272384; Thu, 16 Jul 2020 03:11:07 -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-201-wK-AIpOLOhSn-kLr88Ymvg-1; Thu, 16 Jul 2020 06:10:36 -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 3BCA3100AA39; Thu, 16 Jul 2020 10:10:31 +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 1643E79D16; Thu, 16 Jul 2020 10:10:31 +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 D83DEA3706; Thu, 16 Jul 2020 10:10:30 +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 06GA6e1x019803 for ; Thu, 16 Jul 2020 06:06:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98C662B6DC; Thu, 16 Jul 2020 10:06:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12AE72B6DB for ; Thu, 16 Jul 2020 10:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894266; 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=1cNZJQg+F7Mhb4LhC+9v05s57BcCwRSDY6D1tBrvfFw=; b=PaKyFJce+v44IMXqApCpmVxBcqZWYMSBU7c77dYAlRThJYmJoVpC+NiYcYGH68vOjFc3SU FC8DNHvK62kReUqlPHFGrQ9qEP7qSfV8baya9boWpW7e3JQ+eCzoFtHrHF012f8dlM6n0w QVIRHW+pPT0LsKSxlrS4IghFc1uRkR8= X-MC-Unique: wK-AIpOLOhSn-kLr88Ymvg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 279/351] meson: tests: build mock shared modules Date: Thu, 16 Jul 2020 11:58:35 +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 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 --- tests/Makefile.am | 201 +--------------------------------------------- tests/meson.build | 89 ++++++++++++++++++++ 2 files changed, 90 insertions(+), 200 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 79fc271ac64..3cdeedb2308 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,10 +16,6 @@ ## License along with this library. If not, see ## . =20 -MOCKLIBS_LDFLAGS =3D -avoid-version \ - -rpath /evil/libtool/hack/to/force/shared/lib/creation \ - $(MINGW_EXTRA_LDFLAGS) - DRIVERLIB_LDFLAGS =3D \ -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation \ @@ -39,9 +35,6 @@ LDADDS =3D \ $(GLIB_LIBS) \ $(NULL) =20 -MOCKLIBS_LIBS =3D \ - ../src/libvirt.la - test_helpers =3D commandhelper ssh test_programs =3D virshtest sockettest \ virhostcputest virbuftest \ @@ -79,22 +72,6 @@ test_programs =3D virshtest sockettest \ virerrortest \ $(NULL) =20 -test_libraries =3D libshunload.la \ - libvirportallocatormock.la \ - libvirnetdaemonmock.la \ - libvirnetserverclientmock.la \ - libvircgroupmock.la \ - libvirhostdevmock.la \ - libvirpcimock.la \ - libvirnetdevmock.la \ - libvirrandommock.la \ - libvirprocessmock.la \ - libvirhostcpumock.la \ - libdomaincapsmock.la \ - libvirfilecachemock.la \ - libqemuhotplugmock.la \ - $(NULL) - if WITH_REMOTE test_programs +=3D \ virnetmessagetest \ @@ -111,12 +88,6 @@ test_programs +=3D fchosttest test_programs +=3D scsihosttest test_programs +=3D vircaps2xmltest test_programs +=3D virresctrltest -test_libraries +=3D libvirusbmock.la \ - libvirnetdevbandwidthmock.la \ - libvirnumamock.la \ - libvirtestmock.la \ - libvirfilemock.la \ - $(NULL) endif WITH_LINUX =20 if WITH_LIBVIRTD @@ -127,7 +98,6 @@ if WITH_DBUS test_programs +=3D virdbustest \ virsystemdtest \ $(NULL) -test_libraries +=3D libvirdbusmock.la if WITH_POLKIT test_programs +=3D virpolkittest endif WITH_POLKIT @@ -150,7 +120,7 @@ ssh_LDADD =3D $(COVERAGE_LDFLAGS) if WITH_LIBXL test_programs +=3D xlconfigtest \ xmconfigtest libxlxml2domconfigtest -test_libraries +=3D libxltestdriver.la libxlmock.la +test_libraries +=3D libxltestdriver.la endif WITH_LIBXL =20 if WITH_QEMU @@ -169,10 +139,6 @@ test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ test_helpers +=3D qemucapsprobe test_libraries +=3D libqemumonitortestutils.la \ libqemutestdriver.la \ - libqemuxml2argvmock.la \ - libqemucaps2xmlmock.la \ - libqemucapsprobemock.la \ - libqemucpumock.la \ $(NULL) endif WITH_QEMU =20 @@ -202,7 +168,6 @@ endif WITH_VMWARE =20 if WITH_BHYVE test_programs +=3D bhyvexml2argvtest bhyvexml2xmltest bhyveargv2xmltest -test_libraries +=3D libbhyvexml2argvmock.la libbhyveargv2xmlmock.la endif WITH_BHYVE =20 if WITH_YAJL @@ -253,7 +218,6 @@ endif WITH_LINUX if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest test_programs +=3D nsstest nssguesttest -test_libraries +=3D libnssmock.la endif WITH_NSS =20 test_programs +=3D storagevolxml2xmltest @@ -391,12 +355,6 @@ libxlxml2domconfigtest_SOURCES =3D \ testutils.c testutils.h libxlxml2domconfigtest_LDADD =3D libxltestdriver.la \ $(libxl_LDADDS) $(LIBXML_LIBS) - -libxlmock_la_SOURCES =3D \ - libxlmock.c -libxlmock_la_CFLAGS =3D $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) $(GLIB_CFLAGS) -libxlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libxlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) endif ! WITH_LIBXL =20 QEMUMONITORTESTUTILS_SOURCES =3D \ @@ -419,16 +377,6 @@ libqemutestdriver_la_SOURCES =3D libqemutestdriver_la_LDFLAGS =3D $(DRIVERLIB_LDFLAGS) libqemutestdriver_la_LIBADD =3D $(qemu_LDADDS) =20 -libqemucpumock_la_SOURCES =3D \ - qemucpumock.c testutilshostcpus.h -libqemucpumock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libqemucpumock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libqemuhotplugmock_la_SOURCES =3D \ - qemuhotplugmock.c -libqemuhotplugmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libqemuhotplugmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - qemuxml2argvtest_SOURCES =3D \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h \ @@ -437,11 +385,6 @@ qemuxml2argvtest_SOURCES =3D \ qemuxml2argvtest_LDADD =3D libqemutestdriver.la libqemumonitortestutils.la= \ $(LDADDS) $(LIBXML_LIBS) =20 -libqemuxml2argvmock_la_SOURCES =3D \ - qemuxml2argvmock.c -libqemuxml2argvmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libqemuxml2argvmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - qemuxml2xmltest_SOURCES =3D \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h \ @@ -469,11 +412,6 @@ qemucapsprobe_SOURCES =3D \ qemucapsprobe_LDADD =3D \ libqemutestdriver.la $(LDADDS) =20 -libqemucapsprobemock_la_SOURCES =3D \ - qemucapsprobemock.c -libqemucapsprobemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libqemucapsprobemock_la_LIBADD =3D $(MOCKLIBS_LIBS) - qemucommandutiltest_SOURCES =3D \ qemucommandutiltest.c \ testutils.c testutils.h \ @@ -489,11 +427,6 @@ qemucaps2xmltest_SOURCES =3D \ $(NULL) qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) =20 -libqemucaps2xmlmock_la_SOURCES =3D \ - qemucaps2xmlmock.c -libqemucaps2xmlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libqemucaps2xmlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - qemuagenttest_SOURCES =3D \ qemuagenttest.c \ testutils.c testutils.h \ @@ -633,16 +566,6 @@ vmwarevertest_LDADD =3D $(LDADDS) endif ! WITH_VMWARE =20 if WITH_BHYVE -libbhyvexml2argvmock_la_SOURCES =3D \ - bhyvexml2argvmock.c -libbhyvexml2argvmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libbhyvexml2argvmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libbhyveargv2xmlmock_la_SOURCES =3D \ - bhyveargv2xmlmock.c -libbhyveargv2xmlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libbhyveargv2xmlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - bhyve_LDADDS =3D \ ../src/libvirt_driver_bhyve_impl.la \ $(LDADDS) \ @@ -880,10 +803,6 @@ vircapstest_LDADD +=3D ../src/libvirt_driver_lxc_impl.= la endif WITH_LXC vircapstest_LDADD +=3D $(LDADDS) =20 -libdomaincapsmock_la_SOURCES =3D domaincapsmock.c -libdomaincapsmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libdomaincapsmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - domaincapstest_SOURCES =3D \ domaincapstest.c testutils.h testutils.c \ virfilewrapper.c virfilewrapper.h \ @@ -917,21 +836,11 @@ virnetdaemontest_SOURCES =3D \ testutils.h testutils.c virnetdaemontest_LDADD =3D $(LDADDS) =20 -libvirnetdaemonmock_la_SOURCES =3D \ - virnetdaemonmock.c -libvirnetdaemonmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirnetdaemonmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - virnetserverclienttest_SOURCES =3D \ virnetserverclienttest.c \ testutils.h testutils.c virnetserverclienttest_LDADD =3D $(LDADDS) =20 -libvirnetserverclientmock_la_SOURCES =3D \ - virnetserverclientmock.c -libvirnetserverclientmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirnetserverclientmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - virnettlscontexttest_SOURCES =3D \ virnettlscontexttest.c \ virnettlshelpers.h virnettlshelpers.c \ @@ -997,20 +906,10 @@ virportallocatortest_SOURCES =3D \ virportallocatortest.c testutils.h testutils.c virportallocatortest_LDADD =3D $(LDADDS) =20 -libvirportallocatormock_la_SOURCES =3D \ - virportallocatormock.c -libvirportallocatormock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirportallocatormock_la_LIBADD =3D $(MOCKLIBS_LIBS) - vircgrouptest_SOURCES =3D \ vircgrouptest.c testutils.h testutils.c vircgrouptest_LDADD =3D $(LDADDS) =20 -libvircgroupmock_la_SOURCES =3D \ - vircgroupmock.c -libvircgroupmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvircgroupmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - vircryptotest_SOURCES =3D \ vircryptotest.c testutils.h testutils.c vircryptotest_LDADD =3D $(LDADDS) @@ -1023,56 +922,14 @@ virpcitest_SOURCES =3D \ virpcitest.c testutils.h testutils.c virpcitest_LDADD =3D $(LDADDS) =20 -libvirpcimock_la_SOURCES =3D \ - virpcimock.c -libvirpcimock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirpcimock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirrandommock_la_SOURCES =3D \ - virrandommock.c -libvirrandommock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirrandommock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirprocessmock_la_SOURCES =3D \ - virprocessmock.c -libvirprocessmock_la_CFLAGS =3D $(AM_CFLAGS) -libvirprocessmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirprocessmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirhostcpumock_la_SOURCES =3D \ - virhostcpumock.c -libvirhostcpumock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirhostcpumock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirfilecachemock_la_SOURCES =3D \ - virfilecachemock.c -libvirfilecachemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirfilecachemock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirhostdevmock_la_SOURCES =3D \ - virhostdevmock.c \ - $(NULL) -libvirhostdevmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirhostdevmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - if WITH_LINUX vircaps2xmltest_SOURCES =3D \ vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper= .c vircaps2xmltest_LDADD =3D $(LDADDS) =20 -libvirnumamock_la_SOURCES =3D \ - virnumamock.c -libvirnumamock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirnumamock_la_LIBADD =3D $(MOCKLIBS_LIBS) - virresctrltest_SOURCES =3D \ virresctrltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c virresctrltest_LDADD =3D $(LDADDS) - -libvirfilemock_la_SOURCES =3D \ - virfilemock.c -libvirfilemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirfilemock_la_LIBADD =3D $(MOCKLIBS_LIBS) endif ! WITH_LINUX =20 if WITH_NSS @@ -1095,11 +952,6 @@ nssguesttest_LDADD =3D \ $(LDADDS) \ ../tools/nss/libnss_libvirt_guest_impl.la =20 -libnssmock_la_SOURCES =3D \ - nssmock.c -libnssmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libnssmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. nsslinktest_SOURCES =3D nsslinktest.c @@ -1118,13 +970,6 @@ nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvir= t_guest_impl.la nssguestlinktest_LDFLAGS =3D $(NULL) endif ! WITH_NSS =20 -libvirdeterministichashmock_la_SOURCES =3D \ - virdeterministichashmock.c -libvirdeterministichashmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirdeterministichashmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -test_libraries +=3D libvirdeterministichashmock.la - if WITH_YAJL virmacmaptest_SOURCES =3D \ virmacmaptest.c testutils.h testutils.c @@ -1144,12 +989,6 @@ virnetdevtest_SOURCES =3D \ virnetdevtest_CFLAGS =3D $(AM_CFLAGS) $(LIBNL_CFLAGS) virnetdevtest_LDADD =3D $(LDADDS) =20 -libvirnetdevmock_la_SOURCES =3D \ - virnetdevmock.c -libvirnetdevmock_la_CFLAGS =3D $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirnetdevmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirnetdevmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - virrotatingfiletest_SOURCES =3D \ virrotatingfiletest.c testutils.h testutils.c virrotatingfiletest_LDADD =3D $(LDADDS) @@ -1162,25 +1001,6 @@ virusbtest_LDADD =3D $(LDADDS) virnetdevbandwidthtest_SOURCES =3D \ virnetdevbandwidthtest.c testutils.h testutils.c virnetdevbandwidthtest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) - -libvirusbmock_la_SOURCES =3D virusbmock.c -libvirusbmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirusbmock_la_LIBADD =3D $(MOCKLIBS_LIBS) \ - $(PROBES_O) \ - ../src/libvirt_util.la - -libvirnetdevbandwidthmock_la_SOURCES =3D \ - virnetdevbandwidthmock.c -libvirnetdevbandwidthmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirnetdevbandwidthmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - -libvirtestmock_la_SOURCES =3D \ - virtestmock.c -libvirtestmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirtestmock_la_LIBADD =3D \ - $(MOCKLIBS_LIBS) \ - $(PROBES_O) \ - ../src/libvirt_util.la endif ! WITH_LINUX =20 if WITH_DBUS @@ -1189,12 +1009,6 @@ virdbustest_SOURCES =3D \ virdbustest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) virdbustest_LDADD =3D $(LDADDS) $(DBUS_LIBS) =20 -libvirdbusmock_la_SOURCES =3D \ - virdbusmock.c -libvirdbusmock_la_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) -libvirdbusmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) -libvirdbusmock_la_LIBADD =3D $(MOCKLIBS_LIBS) - virpolkittest_SOURCES =3D \ virpolkittest.c testutils.h testutils.c virpolkittest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) @@ -1224,15 +1038,6 @@ seclabeltest_LDADD =3D $(LDADDS) =20 if WITH_SECDRIVER_SELINUX if WITH_ATTR -if WITH_TESTS -noinst_LTLIBRARIES +=3D libsecurityselinuxhelper.la -else ! WITH_TESTS -check_LTLIBRARIES +=3D libsecurityselinuxhelper.la -endif ! WITH_TESTS - -libsecurityselinuxhelper_la_SOURCES =3D \ - securityselinuxhelper.c -libsecurityselinuxhelper_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) =20 securityselinuxtest_SOURCES =3D \ securityselinuxtest.c testutils.h testutils.c @@ -1304,10 +1109,6 @@ eventtest_SOURCES =3D \ eventtest_LDADD =3D $(LDADDS) endif WITH_LIBVIRTD =20 -libshunload_la_SOURCES =3D shunloadhelper.c -libshunload_la_LIBADD =3D ../src/libvirt.la -libshunload_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) - shunloadtest_SOURCES =3D \ shunloadtest.c shunloadtest_LDADD =3D $(THREAD_LIBS) $(DLOPEN_LIBS) diff --git a/tests/meson.build b/tests/meson.build index ab4acbbea9d..ca6e5b5f74d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -28,3 +28,92 @@ tests_dep =3D declare_dependency( ], link_args: libvirt_export_dynamic, ) + + +# mock_libs: +# each entry is a dictionary with following items: +# * name - mock library name which is also used as default source file n= ame (required) +# * sources - override default sources based on name (optional, default = []) +# * deps - additional dependencies (optional, default []) + +mock_libs =3D [ + { 'name': 'domaincapsmock' }, + { 'name': 'shunload', 'sources': [ 'shunloadhelper.c' ] }, + { 'name': 'vircgroupmock' }, + { 'name': 'virdeterministichashmock' }, + { 'name': 'virfilecachemock' }, + { 'name': 'virhostcpumock' }, + { 'name': 'virhostdevmock' }, + { 'name': 'virnetdaemonmock' }, + { 'name': 'virnetdevmock' }, + { 'name': 'virnetserverclientmock' }, + { 'name': 'virpcimock' }, + { 'name': 'virportallocatormock' }, + { 'name': 'virprocessmock' }, + { 'name': 'virrandommock' }, +] + +if host_machine.system() =3D=3D 'linux' + mock_libs +=3D [ + { 'name': 'virfilemock' }, + { 'name': 'virnetdevbandwidthmock' }, + { 'name': 'virnumamock' }, + { 'name': 'virtestmock' }, + { 'name': 'virusbmock' }, + ] +endif + +if conf.has('WITH_BHYVE') + mock_libs +=3D [ + { 'name': 'bhyveargv2xmlmock' }, + { 'name': 'bhyvexml2argvmock' }, + ] +endif + +if conf.has('WITH_DBUS') + mock_libs +=3D [ + { 'name': 'virdbusmock', 'deps': [ dbus_dep ] }, + ] +endif + +if conf.has('WITH_LIBXL') + mock_libs +=3D [ + { 'name': 'xlmock', 'sources': [ 'libxlmock.c' ], 'deps': [ libxl_dep = ] }, + ] +endif + +if conf.has('WITH_NSS') + mock_libs +=3D [ + { 'name': 'nssmock' }, + ] +endif + +if conf.has('WITH_QEMU') + mock_libs +=3D [ + { 'name': 'qemucaps2xmlmock' }, + { 'name': 'qemucapsprobemock' }, + { 'name': 'qemucpumock' }, + { 'name': 'qemuhotplugmock' }, + { 'name': 'qemuxml2argvmock' }, + ] +endif + +if conf.has('WITH_SECDRIVER_SELINUX') + mock_libs +=3D [ + { 'name': 'securityselinuxhelper' }, + ] +endif + +foreach mock : mock_libs + shared_module( + mock['name'], + mock.get('sources', [ '@0@.c'.format(mock['name']) ]), + dependencies: [ + tests_dep, + mock.get('deps', []), + ], + link_with: [ + libvirt_lib, + ], + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894564; cv=none; d=zohomail.com; s=zohoarc; b=bBjrXz7YFYX9XQZWJBx03RgTfLtzNr8szPN3oaTdt8BtfCJvB1YU4EpJ5W5TbFVwamcjcFrSP5o2twlC5+EjnlXW4sTVUqr5ARzPROr3GyjDkX+TyKgWj8btEmWzsvdZE3ZW69hb1kvDu4JZI24ej1bGw/alpgjfeI4uaFHMXww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894564; 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=2PnfVT3a5obknAphFSp9UuL9oniu8r42/k8iA6NdAqo=; b=neUQv2/GNmQQMY89bn5J49FjWFf9dBr/1oP1OxjfB+RgADD6kC45L4jA9R5/pyfWZJ7ZOadirAkGoAtOXyb+zVKuD13gOfDph/+07A18uLQdzLmd9saBtsM6JPLyRxTRlkNX/T5DqgWsReuTIbBFlFkKbm1SFJCBm6fkIYJ7wxM= 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 1594894564539126.81295011831446; Thu, 16 Jul 2020 03:16:04 -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-220-J77Q0EfTMXes-F2zV6Qmug-1; Thu, 16 Jul 2020 06:14:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E9BA1080; Thu, 16 Jul 2020 10:14:15 +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 5063A78483; Thu, 16 Jul 2020 10:14:15 +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 1F875181D0AE; Thu, 16 Jul 2020 10:14:15 +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 06GA6fm4019813 for ; Thu, 16 Jul 2020 06:06:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 817C22B6DC; Thu, 16 Jul 2020 10:06:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F007D2B6DB for ; Thu, 16 Jul 2020 10:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894563; 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=2PnfVT3a5obknAphFSp9UuL9oniu8r42/k8iA6NdAqo=; b=ifNfiGWpmOkyXBSMZj5YfNlQqk8v4chT1DJeLxC2/pPgoYaFwj310EiTprCIhXHOA5RGLK X/JdUD1YUmihMxMrLy/CquHlCbTF7XtyzTbbxGrip7/Jux/c0dp3tzmgqzAM++7QlWZmtl pdXDtoFFt2tSG5tbAHbZFGcIhb/+F4w= X-MC-Unique: J77Q0EfTMXes-F2zV6Qmug-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 280/351] meson: tests: built utils static libraries Date: Thu, 16 Jul 2020 11:58:36 +0200 Message-Id: <32dd6ea741095964aac5b17859e76d250bf89972.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.11 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" With the old build system we just list the source files directly for each test, but this would not work as expected with Meson. For every binary there is a separate directory with its object files which would mean all the utils sources would be compiled repeatedly for every test using them. Having static libraries ensures that the utils sources are compiled only once. Signed-off-by: Pavel Hrdina --- tests/Makefile.am | 10 +-------- tests/meson.build | 53 +++++++++++++++++++++++++++++++++++++++++++++++ tests/testutils.c | 2 +- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3cdeedb2308..3bc1a791a16 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,7 +137,7 @@ test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ qemuvhostusertest \ $(NULL) test_helpers +=3D qemucapsprobe -test_libraries +=3D libqemumonitortestutils.la \ +test_libraries +=3D \ libqemutestdriver.la \ $(NULL) endif WITH_QEMU @@ -357,16 +357,8 @@ libxlxml2domconfigtest_LDADD =3D libxltestdriver.la \ $(libxl_LDADDS) $(LIBXML_LIBS) endif ! WITH_LIBXL =20 -QEMUMONITORTESTUTILS_SOURCES =3D \ - qemumonitortestutils.c \ - qemumonitortestutils.h \ - testutilsqemuschema.h testutilsqemuschema.c \ - $(NULL) - if WITH_QEMU =20 -libqemumonitortestutils_la_SOURCES =3D $(QEMUMONITORTESTUTILS_SOURCES) - qemu_LDADDS =3D ../src/libvirt_driver_qemu_impl.la if WITH_DTRACE_PROBES qemu_LDADDS +=3D ../src/libvirt_qemu_probes.lo diff --git a/tests/meson.build b/tests/meson.build index ca6e5b5f74d..5cbd3cd2077 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -117,3 +117,56 @@ foreach mock : mock_libs ], ) endforeach + + +# build libraries used by tests + +test_utils_lib =3D static_library( + 'test_utils', + [ 'testutils.c' ], + dependencies: [ tests_dep ], +) + +if conf.has('WITH_LIBXL') + test_utils_xen_lib =3D static_library( + 'test_utils_xen', + [ 'testutilsxen.c' ], + dependencies: [ tests_dep ], + ) + +else + test_utils_xen_lib =3D [] +endif + +if conf.has('WITH_LXC') + test_utils_lxc_lib =3D static_library( + 'test_utils_lxc', + [ 'testutilslxc.c' ], + dependencies: [ tests_dep ], + ) +else + test_utils_lxc_lib =3D [] +endif + +if conf.has('WITH_QEMU') + test_utils_qemu_lib =3D static_library( + 'test_utils_qemu', + [ 'testutilsqemu.c' ], + dependencies: [ tests_dep ], + ) + + test_utils_qemu_monitor_lib =3D static_library( + 'test_utils_qemu_monitor', + [ 'qemumonitortestutils.c', 'testutilsqemuschema.c' ], + dependencies: [ tests_dep ], + ) +else + test_utils_qemu_lib =3D [] + test_utils_qemu_monitor_lib =3D [] +endif + +test_file_wrapper_lib =3D static_library( + 'test_file_wrapper', + [ 'virfilewrapper.c' ], + dependencies: [ tests_dep ], +) diff --git a/tests/testutils.c b/tests/testutils.c index a1cd093e4e2..3f53f635fc2 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -340,7 +340,7 @@ virTestRewrapFile(const char *filename) =20 script =3D g_strdup_printf("%s/scripts/test-wrap-argv.py", abs_top_src= dir); =20 - cmd =3D virCommandNewArgList(PYTHON, script, "--in-place", filename, N= ULL); + cmd =3D virCommandNewArgList(PYTHON3, script, "--in-place", filename, = NULL); if (virCommandRun(cmd, NULL) < 0) return -1; =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894156; cv=none; d=zohomail.com; s=zohoarc; b=h3QRnNssTffchdfKtFqOU9Kum74wJAZ6KfOjQqtDlhJp5GjqreSuGjv87imWs4hOaTGp/dxfOalSJiZ9LKeo+Avtz+6aIKDq/wNs3r/DHAJBKj9WsouvSY3253u0gopR2npw7MJyv5LV1dxIOo1Y7np9YwWhfISyikQkFFdFMLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894156; 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=5ewOETORjBX+ZErP1s9qAnXqrLPmQRGyaW6fsfKoEU0=; b=m40LVVhWiaLaENMDL8zyDquW4U97tFS+lpCVu6Sa71wk1tmt6Defi0q+G/m2sc8WFTuB4/PQVY5z+Fv9ikGe7bDJIur3FurJFo2mNaJ2FliIO2EqhG+3s9hw60YmKZkIYN8I3O0S7bK16SSQqc8XnAFrB/tFwJdnOeIpmFLwiSY= 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 1594894156538687.9276428599991; Thu, 16 Jul 2020 03:09:16 -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-435-YVW5sUbAM2a4u6lKVeOK2A-1; Thu, 16 Jul 2020 06:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C3501888AA0; Thu, 16 Jul 2020 10:09:07 +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 1E0F65C5B7; Thu, 16 Jul 2020 10:09:07 +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 E37379A30F; Thu, 16 Jul 2020 10:09:06 +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 06GA6goT019825 for ; Thu, 16 Jul 2020 06:06:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A1F22B6DC; Thu, 16 Jul 2020 10:06:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D91792B6DB for ; Thu, 16 Jul 2020 10:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894155; 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=5ewOETORjBX+ZErP1s9qAnXqrLPmQRGyaW6fsfKoEU0=; b=LxdWwGrh0Pw+m7NK4yRy+rWLHULT2uF9M5FA0bMh9fmEoZrC09wPOm1uO24NAVEV3UkuVz Xxnxfj+ypiVhjzeJRtQZgO/7XfbEv09lMsbuNc4xUjz0LlCZKSwVqO13GolXPr188x9Uyl YY2jUqKpWDVphfNP29fC6VdFx+RghRM= X-MC-Unique: YVW5sUbAM2a4u6lKVeOK2A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 281/351] meson: tests: build commandhelper binary Date: Thu, 16 Jul 2020 11:58:37 +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.16 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 --- tests/Makefile.am | 14 +------------- tests/meson.build | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3bc1a791a16..eaaae0c0568 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,7 +35,7 @@ LDADDS =3D \ $(GLIB_LIBS) \ $(NULL) =20 -test_helpers =3D commandhelper ssh +test_helpers =3D ssh test_programs =3D virshtest sockettest \ virhostcputest virbuftest \ commandtest seclabeltest \ @@ -759,18 +759,6 @@ commandtest_SOURCES =3D \ commandtest.c testutils.h testutils.c commandtest_LDADD =3D $(LDADDS) =20 -# Must not link to any libvirt modules - libc only -# otherwise external libraries might unexpectedly leak -# file descriptors into commandhelper invalidating the -# test logic assumptions -commandhelper_SOURCES =3D \ - commandhelper.c -commandhelper_LDADD =3D \ - $(NO_INDIRECT_LDFLAGS) - -commandhelper_LDFLAGS =3D -static - - virkmodtest_SOURCES =3D \ virkmodtest.c testutils.h testutils.c virkmodtest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 5cbd3cd2077..fa116a0e249 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -170,3 +170,20 @@ test_file_wrapper_lib =3D static_library( [ 'virfilewrapper.c' ], dependencies: [ tests_dep ], ) + + +# build helpers used by tests + +# Must not link to any libvirt modules - libc only otherwise external +# libraries might unexpectedly leak file descriptors into commandhelper +# invalidating the test logic assumptions. +executable( + 'commandhelper', + [ 'commandhelper.c' ], + dependencies: [ + tests_dep, + ], + link_args: [ + libvirt_no_indirect, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894383; cv=none; d=zohomail.com; s=zohoarc; b=FxYDhGzeNW5MKIDiMXV/LNHtFC2foYyyIfGTJOYL1pE2ZoL6Fw/IeOgzjVnDimhwhvHWAvRrUq4Motp40En1hSvY477YiE4hjtzZHBNMhIAGmME/9lsKoYIj/s0UCj7hlRGGF2GAMpNYn5gbnaLHpN2H+t/kUh0aNq+zGg4T/JI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894383; 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=nVBtrSal7KboxsURnzlIHpYgNgyd/uRGHTxQvNAkmhs=; b=hEXaMQprBLnyn8N8YuAzLqekXNJzhSLPx9UzWVY+IZNITn3oP8KAoWbv9HiGhBEufIev5AtvcVoZu5B/P3ArnVlM9YkXb8SPUf1o84mH7d1yFKTLFifMcrNRfWdSmdlI6Lt6uUT8qLhJheQTXuL5wg4c/n96lNBYjkPzC/brZEs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894383739837.4546344865159; Thu, 16 Jul 2020 03:13:03 -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-453-0RroqAMyMnm17mF_8UNYFw-1; Thu, 16 Jul 2020 06:09:16 -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 765DD10059AA; Thu, 16 Jul 2020 10:09:09 +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 53F0070103; Thu, 16 Jul 2020 10:09:09 +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 233E59A313; Thu, 16 Jul 2020 10:09:09 +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 06GA6hTk019837 for ; Thu, 16 Jul 2020 06:06:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5391A2B6DB; Thu, 16 Jul 2020 10:06:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1F7A2B6E6 for ; Thu, 16 Jul 2020 10:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894382; 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=nVBtrSal7KboxsURnzlIHpYgNgyd/uRGHTxQvNAkmhs=; b=J94gEGiVFAFeECa3DXIWlelcUDjVfe+Cvlj2zyom8Rng74CK0Qr74jjLDTsoH9Ct/62NXe gNr/yhDU3MA2nZureWjTZ53ndOIrqKNpPMCJcY+hE7+ORzoH+Vlruu1WAFxoSt/cPxsshE M8/QJOQFPVJIUC25l+b4f9O62qYpG2s= X-MC-Unique: 0RroqAMyMnm17mF_8UNYFw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 282/351] meson: tests: build fake ssh binary Date: Thu, 16 Jul 2020 11:58:38 +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.12 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 --- tests/Makefile.am | 5 ----- tests/meson.build | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index eaaae0c0568..5591c999f11 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,7 +35,6 @@ LDADDS =3D \ $(GLIB_LIBS) \ $(NULL) =20 -test_helpers =3D ssh test_programs =3D virshtest sockettest \ virhostcputest virbuftest \ commandtest seclabeltest \ @@ -113,10 +112,6 @@ endif WITH_QEMU endif WITH_ATTR endif WITH_SECDRIVER_SELINUX =20 -# This is a fake SSH we use from virnetsockettest -ssh_SOURCES =3D ssh.c -ssh_LDADD =3D $(COVERAGE_LDFLAGS) - if WITH_LIBXL test_programs +=3D xlconfigtest \ xmconfigtest libxlxml2domconfigtest diff --git a/tests/meson.build b/tests/meson.build index fa116a0e249..d825526dc78 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -187,3 +187,15 @@ executable( libvirt_no_indirect, ], ) + +# This is a fake SSH we use from virnetsockettest +executable( + 'ssh', + [ 'ssh.c' ], + dependencies: [ + tests_dep, + ], + link_args: [ + coverage_flags, + ], +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894161; cv=none; d=zohomail.com; s=zohoarc; b=hoJvGJfytB1BBy5jAfOXG1acdMvHGNbJviQjby/7GqtXMyG+ITLfspI0a7xsu7dg9ogsMNKbyuPI1fd5WBeij0Ff7nBXhSRWonFHRBvi2yWNNDPjzJkAiMms+OttVhRWGRTL6ZG0CTQrKFaDW4EuUhW9nhaL1+NgrjldmhtEam4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894161; 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=E8dVAioYJm0U/RIxyOBnlP1L5k8TqV4QgSFDBPp+vlc=; b=F24wYavuycmlXWawV+2yp+bMQmWoqMqL9VoxfY4eKbyeEGDWlGlAluX4X3xalyjqvpqJ/36Xr0OObmQmeyS4A59WZwIlFKAm3XTtKBQFPL+aEUHmEE/xX5rhD0wWGtarTeCPMlUh2CZJfKV1scoWd44u0fU32PGTkGagYCc+xSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894161034359.07357034987876; Thu, 16 Jul 2020 03:09:21 -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-110-4PbTABHDP424mr541JzYwQ-1; Thu, 16 Jul 2020 06:09:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8353100AA23; Thu, 16 Jul 2020 10:09:11 +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 970B917D04; Thu, 16 Jul 2020 10:09:11 +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 630DD18184AE; Thu, 16 Jul 2020 10:09:11 +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 06GA6iOa019842 for ; Thu, 16 Jul 2020 06:06:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3B27C2B6DC; Thu, 16 Jul 2020 10:06:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA7CD2B6DB for ; Thu, 16 Jul 2020 10:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894159; 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=E8dVAioYJm0U/RIxyOBnlP1L5k8TqV4QgSFDBPp+vlc=; b=jDf0bzE9Q6q2Ys87t9eR0ALVFlemRuZASi/67Crg1pyCLAjBIKxHPQbwJyRcjtPQHRy5H5 lF0ZZYVWrdFfJctIpjk7LltaSYk7CYKMdp8DNMBpT6we2BG6edVxnbEYyV6OANFhWS1iO1 2mBRjFP/29CSTrxxMzt8jtUZ5JUPSSo= X-MC-Unique: 4PbTABHDP424mr541JzYwQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 283/351] meson: tests: add test environment variables Date: Thu, 16 Jul 2020 11:58:39 +0200 Message-Id: <486aa24e834f09f788b22364f7356227bd05200b.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.14 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 --- tests/Makefile.am | 12 ------------ tests/meson.build | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5591c999f11..fc48527792b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -300,18 +300,6 @@ endif ! WITH_TESTS TESTS =3D $(test_programs) \ $(test_scripts) =20 -VIR_TEST_EXPENSIVE ?=3D $(VIR_TEST_EXPENSIVE_DEFAULT) -TESTS_ENVIRONMENT =3D \ - abs_top_builddir=3D"$(abs_top_builddir)" \ - abs_top_srcdir=3D"$(abs_top_srcdir)" \ - abs_builddir=3D"$(abs_builddir)" \ - abs_srcdir=3D"$(abs_srcdir)" \ - LIBVIRT_AUTOSTART=3D0 \ - LC_ALL=3DC \ - VIR_TEST_EXPENSIVE=3D$(VIR_TEST_EXPENSIVE) \ - $(VG) - - VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ --suppressions=3D$(abs_srcdir)/.valgrind.supp diff --git a/tests/meson.build b/tests/meson.build index d825526dc78..cc83159934f 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -29,6 +29,21 @@ tests_dep =3D declare_dependency( link_args: libvirt_export_dynamic, ) =20 +tests_env =3D [ + 'abs_builddir=3D@0@'.format(meson.current_build_dir()), + 'abs_srcdir=3D@0@'.format(meson.current_source_dir()), + 'abs_top_builddir=3D@0@'.format(meson.build_root()), + 'abs_top_srcdir=3D@0@'.format(meson.source_root()), + 'LC_ALL=3DC', + 'LIBVIRT_AUTOSTART=3D0', +] + +if use_expensive_tests + tests_env +=3D 'VIR_TEST_EXPENSIVE=3D1' +else + tests_env +=3D 'VIR_TEST_EXPENSIVE=3D0' +endif + =20 # mock_libs: # each entry is a dictionary with following items: --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894184; cv=none; d=zohomail.com; s=zohoarc; b=VSEtqQT/ME+X/Z/7jekSpu6yvQQbX+2IAM6gR9k3Ogq0Y/1ODxdQhQGwUtSjb5QJwMgQcbbIsDs03FyVEZsNkSPUymbEbugRcfdO3WJNz0vL6aliG0uLajl8teLfbHixe/dLymHoqXvO2kTBOqQ1A5AxeFK2EL920c/MT/qby3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894184; 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=m9pNv7VEFy6XTlg6OaRWakEjoSJCNtX2UQg6nF4eeGs=; b=WxpOnw84rRguW30kZRlIFmEnClRJAdgkSh2OqLq6X/XqQodgBUMaxQkp128hCgFh9yFB+RSM/6/su+3noTvwC8+fSF07hdLzxwGOj0BlZXsV2rBT1efhv548e7/iaLgOtr7TzhPxBYzRAU0aajwuE46hKR438A/OaPnkKpcu+lU= 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 1594894184149615.8804753102016; Thu, 16 Jul 2020 03:09:44 -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-173-RC3HP8xeMO-nxlE1HZ_XZg-1; Thu, 16 Jul 2020 06:09:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D40B100AA2C; Thu, 16 Jul 2020 10:09:14 +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 4C05878494; Thu, 16 Jul 2020 10:09:14 +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 1CF7A9A314; Thu, 16 Jul 2020 10:09:14 +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 06GA6jbi019847 for ; Thu, 16 Jul 2020 06:06:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 227252B6DC; Thu, 16 Jul 2020 10:06:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 922872B6DB for ; Thu, 16 Jul 2020 10:06:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894182; 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=m9pNv7VEFy6XTlg6OaRWakEjoSJCNtX2UQg6nF4eeGs=; b=TMkn7oiVEJr4oFJ4nUrL5EoXqM86R5TgPldksSUSK+WnGFtthmvTDZEynlZeRpBKhpXTTb Ew5vYeGcYxnvL4RH9U92TrAZ04ojhmdKLByI6bFOExidYp2xiFuX81yUEa9KroVHUC13bU wNSXCJVnUOP2aRk9kFrBICH5oTS6pJM= X-MC-Unique: RC3HP8xeMO-nxlE1HZ_XZg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 284/351] meson: tests: build shared libraries Date: Thu, 16 Jul 2020 11:58:40 +0200 Message-Id: <5d66e63e3f0378b7ba861e99a0c8856e5f66134d.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.11 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 --- tests/Makefile.am | 21 --------------------- tests/meson.build | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index fc48527792b..856ae8dad15 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,13 +16,6 @@ ## License along with this library. If not, see ## . =20 -DRIVERLIB_LDFLAGS =3D \ - -avoid-version \ - -rpath /evil/libtool/hack/to/force/shared/lib/creation \ - $(MINGW_EXTRA_LDFLAGS) \ - $(FLAT_NAMESPACE_FLAGS) \ - $(NULL) - PROBES_O =3D if WITH_DTRACE_PROBES PROBES_O +=3D ../src/libvirt_probes.lo @@ -115,7 +108,6 @@ endif WITH_SECDRIVER_SELINUX if WITH_LIBXL test_programs +=3D xlconfigtest \ xmconfigtest libxlxml2domconfigtest -test_libraries +=3D libxltestdriver.la endif WITH_LIBXL =20 if WITH_QEMU @@ -132,9 +124,6 @@ test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ qemuvhostusertest \ $(NULL) test_helpers +=3D qemucapsprobe -test_libraries +=3D \ - libqemutestdriver.la \ - $(NULL) endif WITH_QEMU =20 if WITH_LXC @@ -291,10 +280,8 @@ endif WITH_LINUX =20 if WITH_TESTS noinst_PROGRAMS =3D $(test_programs) $(test_helpers) -noinst_LTLIBRARIES =3D $(test_libraries) else ! WITH_TESTS check_PROGRAMS =3D $(test_programs) $(test_helpers) -check_LTLIBRARIES =3D $(test_libraries) endif ! WITH_TESTS =20 TESTS =3D $(test_programs) \ @@ -317,10 +304,6 @@ libxl_LDADDS =3D \ $(LDADDS) \ $(NULL) =20 -libxltestdriver_la_SOURCES =3D -libxltestdriver_la_LDFLAGS =3D $(DRIVERLIB_LDFLAGS) -libxltestdriver_la_LIBADD =3D $(libxl_LDADDS) - xlconfigtest_SOURCES =3D \ xlconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -348,10 +331,6 @@ qemu_LDADDS +=3D ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES qemu_LDADDS +=3D $(LDADDS) =20 -libqemutestdriver_la_SOURCES =3D -libqemutestdriver_la_LDFLAGS =3D $(DRIVERLIB_LDFLAGS) -libqemutestdriver_la_LIBADD =3D $(qemu_LDADDS) - qemuxml2argvtest_SOURCES =3D \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h \ diff --git a/tests/meson.build b/tests/meson.build index cc83159934f..cdcb87453fc 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -149,8 +149,14 @@ if conf.has('WITH_LIBXL') dependencies: [ tests_dep ], ) =20 + test_xen_driver_lib =3D shared_library( + 'test_xen_driver', + link_whole: [ libxl_driver_imp ], + link_with: [ libvirt_lib ], + ) else test_utils_xen_lib =3D [] + test_xen_driver_lib =3D [] endif =20 if conf.has('WITH_LXC') @@ -175,7 +181,15 @@ if conf.has('WITH_QEMU') [ 'qemumonitortestutils.c', 'testutilsqemuschema.c' ], dependencies: [ tests_dep ], ) + + test_qemu_driver_lib =3D shared_library( + 'test_qemu_driver', + [ qemu_dtrace_gen_objects ], + link_whole: [ qemu_driver_impl ], + link_with: [ libvirt_lib ], + ) else + test_qemu_driver_lib =3D [] test_utils_qemu_lib =3D [] test_utils_qemu_monitor_lib =3D [] endif --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894443; cv=none; d=zohomail.com; s=zohoarc; b=lafrlLB8KKeIlJ1v9Q2pStwU3SGwEhMOaK2eurivI5kZeO+ixzGha7Xwkr99HCaS2lUEKgOhD+uFAEpuGNnzaHe9oPtjbbxISoq26ydeMjh9N77QfaSp9vF552v11+4H9Bl0drcTE9EXArx6koU+zb6VCOI1Ni8n8Z3fhmGx9k4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894443; 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=tUNJv+rxI0xM3fD2sdRKsk48BZQB1qjmled1Bj10vyk=; b=mh8e4sZb0HhdQu1I+r1Mx0LGNwbJx1VB62L7b73gelEYKmslDb2k516Ql2U7B4MY+TADnejfmpYH4hB51fMPWRu/vFhk/U5vKsOBJX8MiK2ox/jJmnLEBKbo5mpCGEEIatYXrOlPO3ihfhVz+Vl6dRv3KR3gcjVR1QOboy37tdQ= 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 1594894443839423.9899733103939; Thu, 16 Jul 2020 03:14:03 -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-463-rJo9Y9DXPwGL3XEyg_KCtg-1; Thu, 16 Jul 2020 06:10:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 913ED108E; Thu, 16 Jul 2020 10:10:34 +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 38EF672AEF; Thu, 16 Jul 2020 10:10:34 +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 0985BA3709; Thu, 16 Jul 2020 10:10:34 +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 06GA6kKK019855 for ; Thu, 16 Jul 2020 06:06:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AB5F2B6DC; Thu, 16 Jul 2020 10:06:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 793A92B6DB for ; Thu, 16 Jul 2020 10:06:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894442; 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=tUNJv+rxI0xM3fD2sdRKsk48BZQB1qjmled1Bj10vyk=; b=InaxiDiO7pf6CuZHT/ao12WPPiD/sHlaKeDUa40uuj4gnC/CKTphy8pn2N3kCNHWgYu4Ne iNxKLxaflbBkjVFlJWlu/EL8og4279KEcxwZKFfjsi1tOoebnapuuaNlPu/WYPm8uhTCrX 6a5d3acRQy+3ZWfKq8Yf/1d/mGy/7+I= X-MC-Unique: rJo9Y9DXPwGL3XEyg_KCtg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 285/351] meson: tests: add test binaries build support Date: Thu, 16 Jul 2020 11:58:41 +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.15 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 --- tests/Makefile.am | 12 ------------ tests/meson.build | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 856ae8dad15..45740b3e08a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,18 +16,6 @@ ## License along with this library. If not, see ## . =20 -PROBES_O =3D -if WITH_DTRACE_PROBES -PROBES_O +=3D ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -LDADDS =3D \ - $(NO_INDIRECT_LDFLAGS) \ - $(PROBES_O) \ - ../src/libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - test_programs =3D virshtest sockettest \ virhostcputest virbuftest \ commandtest seclabeltest \ diff --git a/tests/meson.build b/tests/meson.build index cdcb87453fc..1fb332e7973 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -228,3 +228,48 @@ executable( coverage_flags, ], ) + + +# build and define libvirt tests + +# tests: +# each entry is a dictionary with following items: +# * name - name of the test which is also used as default source file na= me (required) +# * sources - override default sources based on name (optional, default = [ '$name.c' ]) +# * c_args - args used by test (optional, default []) +# * deps - additional dependencies (optional, default []) +# * include - include_directories (optional, default []) +# * link_with - compiled libraries to link with (optional, default []) + +tests =3D [] + +foreach data : tests + test_sources =3D '@0@.c'.format(data['name']) + test_bin =3D executable( + data['name'], + [ + data.get('sources', test_sources), + dtrace_gen_objects, + ], + c_args: [ + data.get('c_args', []), + ], + dependencies: [ + tests_dep, + data.get('deps', []), + ], + include_directories: [ + data.get('include', []), + ], + link_args: [ + libvirt_no_indirect, + ], + link_with: [ + libvirt_lib, + test_utils_lib, + data.get('link_with', []), + ], + export_dynamic: true, + ) + test(data['name'], test_bin, env: tests_env) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894468; cv=none; d=zohomail.com; s=zohoarc; b=JqWSVU4c8QSgKok7DM7aNKrIsYMQWoI4cZCYNPUfmnl6xCT1rXIeQdMFbI1Gn5zpGfoKxM2vvvm6cYmhO/9sAZYpjlGGtvGWnkhgs4SF779K1gUfTMPqozO5quH9n9hDZ3Y5istuOp07E67PQ1HTXqyontRquE9fNUxtAeuF904= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894468; 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=1X6hAdKaBNEUTQR3F4aPhyvEWkXs3ASaCuUFfNfL100=; b=CIRvg8/qUFsXVCfij8kUs+qIAlJiKMckgohVE6h6wmRmetuSl3g7c8OJoAn62XDgVONxKF7daT7ki42UX53KQQ94CEFC+LHZFRw21RtLKtmuaspMXm/48N2TAC37br8oBNPmcVFKQR2aApXNlP3WVYYsO4CwW2PplxVPwFfgcaw= 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 1594894468364505.2840909619524; Thu, 16 Jul 2020 03:14:28 -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-229-V9eE3zNfPdmEjKoZFq3PBw-1; Thu, 16 Jul 2020 06:14:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D90C21094; Thu, 16 Jul 2020 10:14:17 +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 BA8C45C1C3; Thu, 16 Jul 2020 10:14:17 +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 8A31E96236; Thu, 16 Jul 2020 10:14:17 +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 06GA6kwh019868 for ; Thu, 16 Jul 2020 06:06:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id E88BB2B6DB; Thu, 16 Jul 2020 10:06:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62FE82B6E6 for ; Thu, 16 Jul 2020 10:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894466; 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=1X6hAdKaBNEUTQR3F4aPhyvEWkXs3ASaCuUFfNfL100=; b=GgGMkF84kNLV40Dls/9V6BF4KMjBQXhz4H1T3UaTdfdBoku8M1Z2emRqRb3YDTLeH8+Gc3 JEBF29cN+H0cIx11zaQd+UEVHZCRY5TtD18hws3BgxSwWAj527JI5uVUJZ3e+9zFV+4Z+H DultZclMDzAuuZOXOqoCRPkgRASxRXw= X-MC-Unique: V9eE3zNfPdmEjKoZFq3PBw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 286/351] meson: tests: introduce generic tests Date: Thu, 16 Jul 2020 11:58:42 +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.16 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 --- tests/Makefile.am | 329 ---------------------------------------------- tests/meson.build | 82 +++++++++++- 2 files changed, 81 insertions(+), 330 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 45740b3e08a..a7f7fd88a44 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,42 +16,6 @@ ## License along with this library. If not, see ## . =20 -test_programs =3D virshtest sockettest \ - virhostcputest virbuftest \ - commandtest seclabeltest \ - virhashtest virconftest \ - utiltest shunloadtest \ - virtimetest viruritest \ - viralloctest \ - virauthconfigtest \ - virbitmaptest \ - vircgrouptest \ - vircryptotest \ - virpcitest \ - virendiantest \ - virfiletest \ - virfilecachetest \ - virfirewalltest \ - viriscsitest \ - virkeycodetest \ - virlockspacetest \ - virlogtest \ - virrotatingfiletest \ - virschematest \ - virstringtest \ - virportallocatortest \ - sysinfotest \ - virkmodtest \ - vircapstest \ - domaincapstest \ - domainconftest \ - virhostdevtest \ - virnetdevtest \ - virtypedparamtest \ - vshtabletest \ - virerrortest \ - $(NULL) - if WITH_REMOTE test_programs +=3D \ virnetmessagetest \ @@ -146,11 +110,6 @@ if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL =20 -test_programs +=3D \ - networkxml2xmlupdatetest \ - virnetworkportxml2xmltest \ - $(NULL) - if WITH_NETWORK test_programs +=3D \ networkxml2xmltest \ @@ -163,9 +122,6 @@ if WITH_STORAGE_SHEEPDOG test_programs +=3D storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG =20 -test_programs +=3D nwfilterxml2xmltest -test_programs +=3D virnwfilterbindingxml2xmltest - if WITH_NWFILTER test_programs +=3D nwfilterebiptablestest test_programs +=3D nwfilterxml2firewalltest @@ -192,24 +148,10 @@ test_helpers +=3D nsslinktest nssguestlinktest test_programs +=3D nsstest nssguesttest endif WITH_NSS =20 -test_programs +=3D storagevolxml2xmltest - -test_programs +=3D nodedevxml2xmltest - if WITH_NODE_DEVICES test_programs +=3D nodedevmdevctltest endif WITH_NODE_DEVICES =20 -test_programs +=3D interfacexml2xmltest - -test_programs +=3D cputest - -test_programs +=3D metadatatest - -test_programs +=3D secretxml2xmltest - -test_programs +=3D genericxml2xmltest - if WITH_LINUX test_programs +=3D virusbtest \ virnetdevbandwidthtest \ @@ -247,8 +189,6 @@ test_programs +=3D \ virdriverconnvalidatetest endif ! WITH_LIBVIRTD =20 -test_programs +=3D objecteventtest - if WITH_SECDRIVER_APPARMOR if WITH_LIBVIRTD test_scripts +=3D virt-aa-helper-test @@ -281,11 +221,6 @@ VALGRIND =3D valgrind --quiet --leak-check=3Dfull --tr= ace-children=3Dyes \ valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" =20 -sockettest_SOURCES =3D \ - sockettest.c \ - testutils.c testutils.h -sockettest_LDADD =3D $(LDADDS) - if WITH_LIBXL libxl_LDADDS =3D \ ../src/libvirt_driver_libxl_impl.la \ @@ -528,16 +463,6 @@ bhyveargv2xmltest_SOURCES =3D \ bhyveargv2xmltest_LDADD =3D $(bhyve_LDADDS) endif ! WITH_BHYVE =20 -networkxml2xmlupdatetest_SOURCES =3D \ - networkxml2xmlupdatetest.c \ - testutils.c testutils.h -networkxml2xmlupdatetest_LDADD =3D $(LDADDS) - -virnetworkportxml2xmltest_SOURCES =3D \ - virnetworkportxml2xmltest.c \ - testutils.c testutils.h -virnetworkportxml2xmltest_LDADD =3D $(LDADDS) - if WITH_NETWORK networkxml2xmltest_SOURCES =3D \ networkxml2xmltest.c \ @@ -565,16 +490,6 @@ storagebackendsheepdogtest_LDADD =3D \ $(LDADDS) endif ! WITH_STORAGE_SHEEPDOG =20 -nwfilterxml2xmltest_SOURCES =3D \ - nwfilterxml2xmltest.c \ - testutils.c testutils.h -nwfilterxml2xmltest_LDADD =3D $(LDADDS) - -virnwfilterbindingxml2xmltest_SOURCES =3D \ - virnwfilterbindingxml2xmltest.c \ - testutils.c testutils.h -virnwfilterbindingxml2xmltest_LDADD =3D $(LDADDS) - if WITH_NWFILTER nwfilterebiptablestest_SOURCES =3D \ nwfilterebiptablestest.c \ @@ -588,17 +503,6 @@ nwfilterxml2firewalltest_LDADD =3D \ ../src/libvirt_driver_nwfilter_impl.la $(LDADDS) endif WITH_NWFILTER =20 -secretxml2xmltest_SOURCES =3D \ - secretxml2xmltest.c \ - testutils.c testutils.h -secretxml2xmltest_LDADD =3D $(LDADDS) - -genericxml2xmltest_SOURCES =3D \ - genericxml2xmltest.c \ - testutils.c testutils.h -genericxml2xmltest_LDADD =3D $(LDADDS) - - if WITH_STORAGE virstorageutiltest_SOURCES =3D \ virstorageutiltest.c \ @@ -639,16 +543,6 @@ storagepoolcapstest_SOURCES =3D \ storagepoolcapstest_LDADD =3D $(LDADDS) endif ! WITH_STORAGE =20 -storagevolxml2xmltest_SOURCES =3D \ - storagevolxml2xmltest.c \ - testutils.c testutils.h -storagevolxml2xmltest_LDADD =3D $(LDADDS) - -nodedevxml2xmltest_SOURCES =3D \ - nodedevxml2xmltest.c \ - testutils.c testutils.h -nodedevxml2xmltest_LDADD =3D $(LDADDS) - if WITH_NODE_DEVICES nodedevmdevctltest_SOURCES =3D \ nodedevmdevctltest.c \ @@ -659,100 +553,6 @@ nodedevmdevctltest_LDADD =3D \ $(LDADDS) endif WITH_NODE_DEVICES =20 -interfacexml2xmltest_SOURCES =3D \ - interfacexml2xmltest.c \ - testutils.c testutils.h -interfacexml2xmltest_LDADD =3D $(LDADDS) - -cputest_SOURCES =3D \ - cputest.c \ - testutils.c testutils.h -cputest_LDADD =3D $(LIBXML_LIBS) -if WITH_QEMU -cputest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) -else ! WITH_QEMU -cputest_LDADD +=3D $(LDADDS) -endif ! WITH_QEMU - -metadatatest_SOURCES =3D \ - metadatatest.c \ - testutils.c testutils.h -metadatatest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) - -virerrortest_SOURCES =3D \ - virerrortest.c \ - testutils.c testutils.h -virerrortest_LDADD =3D $(LDADDS) - -vshtabletest_SOURCES =3D \ - vshtabletest.c \ - testutils.c testutils.h -vshtabletest_LDADD =3D \ - $(LDADDS) \ - ../tools/libvirt_shell.la - -virshtest_SOURCES =3D \ - virshtest.c \ - testutils.c testutils.h -virshtest_LDADD =3D $(LDADDS) - -virconftest_SOURCES =3D \ - virconftest.c testutils.h testutils.c -virconftest_LDADD =3D $(LDADDS) - -virhostcputest_SOURCES =3D \ - virhostcputest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c -virhostcputest_LDADD =3D $(LDADDS) - -commandtest_SOURCES =3D \ - commandtest.c testutils.h testutils.c -commandtest_LDADD =3D $(LDADDS) - -virkmodtest_SOURCES =3D \ - virkmodtest.c testutils.h testutils.c -virkmodtest_LDADD =3D $(LDADDS) - -vircapstest_SOURCES =3D \ - vircapstest.c testutils.h testutils.c -if WITH_LXC -vircapstest_SOURCES +=3D testutilslxc.c testutilslxc.h -endif WITH_LXC -if WITH_QEMU -vircapstest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -endif WITH_QEMU -vircapstest_LDADD =3D -if WITH_QEMU -vircapstest_LDADD +=3D ../src/libvirt_driver_qemu_impl.la -if WITH_DTRACE_PROBES -vircapstest_LDADD +=3D ../src/libvirt_qemu_probes.lo -endif WITH_DTRACE_PROBES -endif WITH_QEMU -if WITH_LXC -vircapstest_LDADD +=3D ../src/libvirt_driver_lxc_impl.la -endif WITH_LXC -vircapstest_LDADD +=3D $(LDADDS) - -domaincapstest_SOURCES =3D \ - domaincapstest.c testutils.h testutils.c \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -domaincapstest_LDADD =3D $(LDADDS) - -if WITH_QEMU -domaincapstest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -domaincapstest_LDADD +=3D libqemutestdriver.la -endif WITH_QEMU - -if WITH_LIBXL -domaincapstest_SOURCES +=3D testutilsxen.c testutilsxen.h -domaincapstest_LDADD +=3D libxltestdriver.la -endif WITH_LIBXL - -if WITH_BHYVE -domaincapstest_LDADD +=3D ../src/libvirt_driver_bhyve_impl.la -endif WITH_BHYVE - virnetmessagetest_SOURCES =3D \ virnetmessagetest.c testutils.h testutils.c virnetmessagetest_LDADD =3D $(LDADDS) @@ -788,18 +588,6 @@ virnettlssessiontest_SOURCES +=3D pkix_asn1_tab.c virnettlssessiontest_LDADD +=3D -ltasn1 endif ! HAVE_LIBTASN1 =20 -virtimetest_SOURCES =3D \ - virtimetest.c testutils.h testutils.c -virtimetest_LDADD =3D $(LDADDS) - -virschematest_SOURCES =3D \ - virschematest.c testutils.h testutils.c -virschematest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) - -virstringtest_SOURCES =3D \ - virstringtest.c testutils.h testutils.c -virstringtest_LDADD =3D $(LDADDS) - virstoragetest_SOURCES =3D \ virstoragetest.c testutils.h testutils.c virstoragetest_LDADD =3D $(LDADDS) \ @@ -816,42 +604,6 @@ viridentitytest_DEPENDENCIES =3D libsecurityselinuxhel= per.la \ ../src/libvirt.la endif WITH_SELINUX =20 -viriscsitest_SOURCES =3D \ - viriscsitest.c testutils.h testutils.c -viriscsitest_LDADD =3D $(LDADDS) - -virkeycodetest_SOURCES =3D \ - virkeycodetest.c testutils.h testutils.c -virkeycodetest_LDADD =3D $(LDADDS) - -virlockspacetest_SOURCES =3D \ - virlockspacetest.c testutils.h testutils.c -virlockspacetest_LDADD =3D $(LDADDS) - -virlogtest_SOURCES =3D \ - virlogtest.c testutils.h testutils.c -virlogtest_LDADD =3D $(LDADDS) - -virportallocatortest_SOURCES =3D \ - virportallocatortest.c testutils.h testutils.c -virportallocatortest_LDADD =3D $(LDADDS) - -vircgrouptest_SOURCES =3D \ - vircgrouptest.c testutils.h testutils.c -vircgrouptest_LDADD =3D $(LDADDS) - -vircryptotest_SOURCES =3D \ - vircryptotest.c testutils.h testutils.c -vircryptotest_LDADD =3D $(LDADDS) - -virhostdevtest_SOURCES =3D \ - virhostdevtest.c testutils.h testutils.c -virhostdevtest_LDADD =3D $(LDADDS) - -virpcitest_SOURCES =3D \ - virpcitest.c testutils.h testutils.c -virpcitest_LDADD =3D $(LDADDS) - if WITH_LINUX vircaps2xmltest_SOURCES =3D \ vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper= .c @@ -914,15 +666,6 @@ test_programs +=3D \ virnetdevopenvswitchtest endif ! WITH_YAJL =20 -virnetdevtest_SOURCES =3D \ - virnetdevtest.c testutils.h testutils.c -virnetdevtest_CFLAGS =3D $(AM_CFLAGS) $(LIBNL_CFLAGS) -virnetdevtest_LDADD =3D $(LDADDS) - -virrotatingfiletest_SOURCES =3D \ - virrotatingfiletest.c testutils.h testutils.c -virrotatingfiletest_LDADD =3D $(LDADDS) - if WITH_LINUX virusbtest_SOURCES =3D \ virusbtest.c testutils.h testutils.c @@ -950,22 +693,6 @@ virsystemdtest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD =3D $(LDADDS) $(DBUS_LIBS) endif ! WITH_DBUS =20 -viruritest_SOURCES =3D \ - viruritest.c testutils.h testutils.c -viruritest_LDADD =3D $(LDADDS) - -viralloctest_SOURCES =3D \ - viralloctest.c testutils.h testutils.c -viralloctest_LDADD =3D $(LDADDS) - -virauthconfigtest_SOURCES =3D \ - virauthconfigtest.c testutils.h testutils.c -virauthconfigtest_LDADD =3D $(LDADDS) - -seclabeltest_SOURCES =3D \ - seclabeltest.c testutils.h testutils.c -seclabeltest_LDADD =3D $(LDADDS) - if WITH_SECDRIVER_SELINUX if WITH_ATTR =20 @@ -986,43 +713,10 @@ endif WITH_QEMU endif WITH_ATTR endif WITH_SECDRIVER_SELINUX =20 -virbuftest_SOURCES =3D \ - virbuftest.c testutils.h testutils.c -virbuftest_LDADD =3D $(LDADDS) - -virhashtest_SOURCES =3D \ - virhashtest.c virhashdata.h testutils.h testutils.c -virhashtest_LDADD =3D $(LDADDS) - -virbitmaptest_SOURCES =3D \ - virbitmaptest.c testutils.h testutils.c -virbitmaptest_LDADD =3D $(LDADDS) - -virendiantest_SOURCES =3D \ - virendiantest.c testutils.h testutils.c -virendiantest_LDADD =3D $(LDADDS) - -virfiletest_SOURCES =3D \ - virfiletest.c testutils.h testutils.c -virfiletest_LDADD =3D $(LDADDS) - -virfilecachetest_SOURCES =3D \ - virfilecachetest.c testutils.h testutils.c -virfilecachetest_LDADD =3D $(LDADDS) - -virfirewalltest_SOURCES =3D \ - virfirewalltest.c testutils.h testutils.c -virfirewalltest_LDADD =3D $(LDADDS) $(DBUS_LIBS) -virfirewalltest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) - virjsontest_SOURCES =3D \ virjsontest.c testutils.h testutils.c virjsontest_LDADD =3D $(LDADDS) =20 -utiltest_SOURCES =3D \ - utiltest.c testutils.h testutils.c -utiltest_LDADD =3D $(LDADDS) - if WITH_LIBVIRTD virdrivermoduletest_SOURCES =3D \ virdrivermoduletest.c testutils.h testutils.c @@ -1039,33 +733,10 @@ eventtest_SOURCES =3D \ eventtest_LDADD =3D $(LDADDS) endif WITH_LIBVIRTD =20 -shunloadtest_SOURCES =3D \ - shunloadtest.c -shunloadtest_LDADD =3D $(THREAD_LIBS) $(DLOPEN_LIBS) -shunloadtest_DEPENDENCIES =3D libshunload.la - -sysinfotest_SOURCES =3D \ - sysinfotest.c testutils.h testutils.c -sysinfotest_LDADD =3D $(LDADDS) - -domainconftest_SOURCES =3D \ - domainconftest.c testutils.h testutils.c -domainconftest_LDADD =3D $(LDADDS) - fdstreamtest_SOURCES =3D \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD =3D $(LDADDS) =20 -objecteventtest_SOURCES =3D \ - objecteventtest.c \ - testutils.c testutils.h -objecteventtest_LDADD =3D $(LDADDS) - -virtypedparamtest_SOURCES =3D \ - virtypedparamtest.c testutils.h testutils.c -virtypedparamtest_LDADD =3D $(LDADDS) - - if WITH_LINUX fchosttest_SOURCES =3D \ fchosttest.c testutils.h testutils.c diff --git a/tests/meson.build b/tests/meson.build index 1fb332e7973..143b3126c43 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -240,9 +240,89 @@ executable( # * deps - additional dependencies (optional, default []) # * include - include_directories (optional, default []) # * link_with - compiled libraries to link with (optional, default []) - tests =3D [] =20 +cputest_link_with =3D [] +if conf.has('WITH_QEMU') + cputest_link_with +=3D [ test_utils_qemu_lib, test_utils_qemu_monitor_li= b, test_qemu_driver_lib ] +endif + +domaincapstest_link_with =3D [ test_file_wrapper_lib ] +if conf.has('WITH_BHYVE') + domaincapstest_link_with +=3D [ bhyve_driver_impl ] +endif +if conf.has('WITH_LIBXL') + domaincapstest_link_with +=3D [ test_utils_xen_lib, test_xen_driver_lib ] +endif +if conf.has('WITH_QEMU') + domaincapstest_link_with +=3D [ test_utils_qemu_lib, test_qemu_driver_li= b ] +endif + +vircapstest_link_with =3D [] +vircapstest_sources =3D [ 'vircapstest.c' ] +if conf.has('WITH_LXC') + vircapstest_link_with +=3D [ test_utils_lxc_lib, lxc_driver_impl_lib ] +endif +if conf.has('WITH_QEMU') + vircapstest_link_with +=3D [ test_utils_qemu_lib, qemu_driver_impl ] + vircapstest_sources +=3D [ qemu_dtrace_gen_objects ] +endif + +tests +=3D [ + { 'name': 'commandtest' }, + { 'name': 'cputest', 'link_with': cputest_link_with }, + { 'name': 'domaincapstest', 'link_with': domaincapstest_link_with }, + { 'name': 'domainconftest' }, + { 'name': 'genericxml2xmltest' }, + { 'name': 'interfacexml2xmltest' }, + { 'name': 'metadatatest' }, + { 'name': 'networkxml2xmlupdatetest' }, + { 'name': 'nodedevxml2xmltest' }, + { 'name': 'nwfilterxml2xmltest' }, + { 'name': 'objecteventtest' }, + { 'name': 'seclabeltest' }, + { 'name': 'secretxml2xmltest' }, + { 'name': 'shunloadtest', 'deps': [ thread_dep ] }, + { 'name': 'sockettest' }, + { 'name': 'storagevolxml2xmltest' }, + { 'name': 'sysinfotest' }, + { 'name': 'utiltest' }, + { 'name': 'viralloctest' }, + { 'name': 'virauthconfigtest' }, + { 'name': 'virbitmaptest' }, + { 'name': 'virbuftest' }, + { 'name': 'vircapstest', 'sources': vircapstest_sources, 'link_with': vi= rcapstest_link_with }, + { 'name': 'vircgrouptest' }, + { 'name': 'virconftest' }, + { 'name': 'vircryptotest' }, + { 'name': 'virendiantest' }, + { 'name': 'virerrortest' }, + { 'name': 'virfilecachetest' }, + { 'name': 'virfiletest' }, + { 'name': 'virfirewalltest', 'deps': [ dbus_dep ] }, + { 'name': 'virhashtest' }, + { 'name': 'virhostcputest', 'link_with': [ test_file_wrapper_lib ] }, + { 'name': 'virhostdevtest' }, + { 'name': 'viriscsitest' }, + { 'name': 'virkeycodetest' }, + { 'name': 'virkmodtest' }, + { 'name': 'virlockspacetest' }, + { 'name': 'virlogtest' }, + { 'name': 'virnetdevtest' }, + { 'name': 'virnetworkportxml2xmltest' }, + { 'name': 'virnwfilterbindingxml2xmltest' }, + { 'name': 'virpcitest' }, + { 'name': 'virportallocatortest' }, + { 'name': 'virrotatingfiletest' }, + { 'name': 'virschematest' }, + { 'name': 'virshtest' }, + { 'name': 'virstringtest' }, + { 'name': 'virtimetest' }, + { 'name': 'virtypedparamtest' }, + { 'name': 'viruritest' }, + { 'name': 'vshtabletest', 'link_with': [ libvirt_shell_lib ] }, +] + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894248; cv=none; d=zohomail.com; s=zohoarc; b=Fl6ZFn3KZ0nhsuC6Szsj4wGqFYcbDovrEeGld8Zmx8YZZHBxXXT9RwyoouxVxiXrzhbPYZ6bRJI2GH/BEvm9d06vYINFMirLw/9N13SwGzXZGHfChObgwaK1jnr7NYhHgK/h9iB2/r/7dieSjSqzSY5tKceW85uscClo108E9og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894248; 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=tz2m3AzGLAp6rbicpp59Tv7oKnL2nV0vRXXbbK4VLkc=; b=aNjmnkYtN2iK9nuqHmeDVem9IH75v9eXILgp17iWo7Y6GterSlYeQgfsA4OH/oaIK+xstJeiDshxlk1b7L+e7A41YoLYHs63p79o7OUd7Y604cdptOSSu3M97AhFm7b/Hu0szjUBlVhHQnAzN3QCQmIFZvC0Aocovst7LReYlgM= 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 1594894248602168.19841977059878; Thu, 16 Jul 2020 03:10:48 -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-371-YwDaK5_POZuOk7ebBROY1Q-1; Thu, 16 Jul 2020 06:10:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2D041090; Thu, 16 Jul 2020 10:10:36 +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 8B46E72AF4; Thu, 16 Jul 2020 10:10:36 +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 595A2180476C; Thu, 16 Jul 2020 10:10:36 +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 06GA6lGb019879 for ; Thu, 16 Jul 2020 06:06:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id D1E7F2B6DC; Thu, 16 Jul 2020 10:06:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C1012B6DB for ; Thu, 16 Jul 2020 10:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894247; 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=tz2m3AzGLAp6rbicpp59Tv7oKnL2nV0vRXXbbK4VLkc=; b=aw38/CRKdC4WLQcf+AQiGyUPeXIx5Az7YLPr9QFyn6G4J6cD41FYHjbXouRtWEC4eoUtRs iStc/oictrye8KXS4+5UYVNccj2GfTDbdcKppDclq5Ja0/kKtnV3W1Fwi1t30LocHyRVco a68ADjACTEi+Mhb8josg6dZ/4YB3tO8= X-MC-Unique: YwDaK5_POZuOk7ebBROY1Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 287/351] meson: tests: add linux specific tests Date: Thu, 16 Jul 2020 11:58:43 +0200 Message-Id: <1967bc31e18b8dc68f440272899c3856b42afa6b.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.15 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 --- tests/Makefile.am | 53 ----------------------------------------------- tests/meson.build | 12 +++++++++++ 2 files changed, 12 insertions(+), 53 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a7f7fd88a44..c3d77d16a07 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,13 +27,6 @@ test_programs +=3D \ $(NULL) endif WITH_REMOTE =20 -if WITH_LINUX -test_programs +=3D fchosttest -test_programs +=3D scsihosttest -test_programs +=3D vircaps2xmltest -test_programs +=3D virresctrltest -endif WITH_LINUX - if WITH_LIBVIRTD test_programs +=3D fdstreamtest endif WITH_LIBVIRTD @@ -139,10 +132,6 @@ if WITH_STORAGE_FS test_programs +=3D virstoragetest endif WITH_STORAGE_FS =20 -if WITH_LINUX -test_programs +=3D virscsitest -endif WITH_LINUX - if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest test_programs +=3D nsstest nssguesttest @@ -152,12 +141,6 @@ if WITH_NODE_DEVICES test_programs +=3D nodedevmdevctltest endif WITH_NODE_DEVICES =20 -if WITH_LINUX -test_programs +=3D virusbtest \ - virnetdevbandwidthtest \ - $(NULL) -endif WITH_LINUX - test_scripts =3D libvirtd_test_scripts =3D \ libvirtd-fail \ @@ -604,16 +587,6 @@ viridentitytest_DEPENDENCIES =3D libsecurityselinuxhel= per.la \ ../src/libvirt.la endif WITH_SELINUX =20 -if WITH_LINUX -vircaps2xmltest_SOURCES =3D \ - vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper= .c -vircaps2xmltest_LDADD =3D $(LDADDS) - -virresctrltest_SOURCES =3D \ - virresctrltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c -virresctrltest_LDADD =3D $(LDADDS) -endif ! WITH_LINUX - if WITH_NSS nsstest_SOURCES =3D \ nsstest.c testutils.h testutils.c @@ -666,16 +639,6 @@ test_programs +=3D \ virnetdevopenvswitchtest endif ! WITH_YAJL =20 -if WITH_LINUX -virusbtest_SOURCES =3D \ - virusbtest.c testutils.h testutils.c -virusbtest_LDADD =3D $(LDADDS) - -virnetdevbandwidthtest_SOURCES =3D \ - virnetdevbandwidthtest.c testutils.h testutils.c -virnetdevbandwidthtest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) -endif ! WITH_LINUX - if WITH_DBUS virdbustest_SOURCES =3D \ virdbustest.c testutils.h testutils.c @@ -736,19 +699,3 @@ endif WITH_LIBVIRTD fdstreamtest_SOURCES =3D \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD =3D $(LDADDS) - -if WITH_LINUX -fchosttest_SOURCES =3D \ - fchosttest.c testutils.h testutils.c -fchosttest_LDADD =3D $(LDADDS) - -scsihosttest_SOURCES =3D \ - scsihosttest.c testutils.h testutils.c -scsihosttest_LDADD =3D $(LDADDS) -endif ! WITH_LINUX - -if WITH_LINUX -virscsitest_SOURCES =3D \ - virscsitest.c testutils.h testutils.c -virscsitest_LDADD =3D $(LDADDS) -endif ! WITH_LINUX diff --git a/tests/meson.build b/tests/meson.build index 143b3126c43..ed0731ecc42 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -323,6 +323,18 @@ tests +=3D [ { 'name': 'vshtabletest', 'link_with': [ libvirt_shell_lib ] }, ] =20 +if host_machine.system() =3D=3D 'linux' + tests +=3D [ + { 'name': 'fchosttest' }, + { 'name': 'scsihosttest' }, + { 'name': 'vircaps2xmltest', 'link_with': [ test_file_wrapper_lib ] }, + { 'name': 'virnetdevbandwidthtest' }, + { 'name': 'virresctrltest', 'link_with': [ test_file_wrapper_lib ] }, + { 'name': 'virscsitest' }, + { 'name': 'virusbtest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894168; cv=none; d=zohomail.com; s=zohoarc; b=DKfGz8RvDs/TMS01ykVGhOWJelF83PGRD5XxZJkz4RHCIHbFx+RNkf5OzCPQPufb6VavvKOlqPQQGWrRszEPK8vpTQOzU91F4NscpkngPj+/5ZaCiFnMOf+Rqycfdhv3DFWTP4b8lgtMNQK9hrQhRlcLMhBTLnxSs5G8QPvj/+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894168; 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=4ZtmC4XrlWiwn9LXvSiJhsXdzSP3/PfMvpwVX626Mxs=; b=VLpcTkyR3Dj9sPibR24Day8NAA57YnqjOki0iFlMEZ8QY6il4ANGstSvmD7Vx8BBj0yI5WhESo7U9QUkpxYh/8x5rupQu913G5EOa70yp324EnjvheQBorb/pljNZN60OYjUD+JvizkmVi7fX7UXICoFSj09FiHrE7m4TtOKWCY= 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 1594894168123480.9824140001157; Thu, 16 Jul 2020 03:09:28 -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-233-EPFLZ_ngMCqUiOkicoTqSg-1; Thu, 16 Jul 2020 06:09:23 -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 B6C08100AA2A; Thu, 16 Jul 2020 10:09:16 +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 97BEF7B41F; Thu, 16 Jul 2020 10:09:16 +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 656F3181A6D2; Thu, 16 Jul 2020 10:09:16 +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 06GA6m9v019891 for ; Thu, 16 Jul 2020 06:06:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id B98E52B6E2; Thu, 16 Jul 2020 10:06:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 351D32B6DB for ; Thu, 16 Jul 2020 10:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894165; 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=4ZtmC4XrlWiwn9LXvSiJhsXdzSP3/PfMvpwVX626Mxs=; b=ae+NTIhAzwTChw7G/SthCGMfWkX7Fjosd29drZ7lqSWwVzl0gfpln1Rj1uIRawrBSlvOXI Rh7Gm2LLM8dscOm5/jj1jCcUPNOLTJR/1tMjy1apAzgNR0pp3quCgkIwp1rbRt1Kmb6/Mb lpVKYbtzdo0Y0mxl5s6mUBQoeAG8HPg= X-MC-Unique: EPFLZ_ngMCqUiOkicoTqSg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 288/351] meson: tests: add bhyve specific tests Date: Thu, 16 Jul 2020 11:58:44 +0200 Message-Id: <2d327ea24d088fb404253df5e274c6848cc0a34e.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.13 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 --- tests/Makefile.am | 25 ------------------------- tests/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c3d77d16a07..a436f9e0645 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -95,10 +95,6 @@ if WITH_VMWARE test_programs +=3D vmwarevertest endif WITH_VMWARE =20 -if WITH_BHYVE -test_programs +=3D bhyvexml2argvtest bhyvexml2xmltest bhyveargv2xmltest -endif WITH_BHYVE - if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL @@ -425,27 +421,6 @@ vmwarevertest_SOURCES =3D \ vmwarevertest_LDADD =3D $(LDADDS) endif ! WITH_VMWARE =20 -if WITH_BHYVE -bhyve_LDADDS =3D \ - ../src/libvirt_driver_bhyve_impl.la \ - $(LDADDS) \ - $(NULL) -bhyvexml2argvtest_SOURCES =3D \ - bhyvexml2argvtest.c \ - testutils.c testutils.h -bhyvexml2argvtest_LDADD =3D $(bhyve_LDADDS) - -bhyvexml2xmltest_SOURCES =3D \ - bhyvexml2xmltest.c \ - testutils.c testutils.h -bhyvexml2xmltest_LDADD =3D $(bhyve_LDADDS) - -bhyveargv2xmltest_SOURCES =3D \ - bhyveargv2xmltest.c \ - testutils.c testutils.h -bhyveargv2xmltest_LDADD =3D $(bhyve_LDADDS) -endif ! WITH_BHYVE - if WITH_NETWORK networkxml2xmltest_SOURCES =3D \ networkxml2xmltest.c \ diff --git a/tests/meson.build b/tests/meson.build index ed0731ecc42..fe4d252c640 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -335,6 +335,14 @@ if host_machine.system() =3D=3D 'linux' ] endif =20 +if conf.has('WITH_BHYVE') + tests +=3D [ + { 'name': 'bhyveargv2xmltest', 'link_with': [ bhyve_driver_impl ] }, + { 'name': 'bhyvexml2argvtest', 'link_with': [ bhyve_driver_impl ] }, + { 'name': 'bhyvexml2xmltest', 'link_with': [ bhyve_driver_impl ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894251; cv=none; d=zohomail.com; s=zohoarc; b=DzMBF28LSkDtSUvRvecWrmu0de4TzSM1PAIeTQCjj9ZuEEJtS0DVvnxuzQMXZQd7Hzl4D/3N63FWvi04ew25bERw8O5hjOsosmJWq5J+MiG6gg7dae79mXjp59p7dzjjgsJKqP/eYcVKH5px39+joa9xxi62w5doEhRam8cFSe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894251; 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=xXoOi3kyjXO9DMK8OqS3JzvscCZfOhHamr79ctpagYQ=; b=gSK/a4nQ0DkBqzjNvRudaEr9Kc1FdSSZ399t0s+43SYomyLtvmWsYeHeL/zuqbt6YoIAxJfw5krEwwBGbUKPuC/TKpcXVZSE0g7QXWr/zJPp23jkSgGTSpIfZ90eSrQIGpOuqrx3aN3ZP8jIQEZMq1dG5/UJIDDUnh9jWV6BG18= 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 1594894251664212.48661446109213; Thu, 16 Jul 2020 03:10:51 -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-489-aZjocmucP3mKYVsCppzLrg-1; Thu, 16 Jul 2020 06:10:48 -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 30D518027E2; Thu, 16 Jul 2020 10:10:39 +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 0BCAB6FEFD; Thu, 16 Jul 2020 10:10:39 +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 D04E6A370D; Thu, 16 Jul 2020 10:10: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 06GA6nIT019901 for ; Thu, 16 Jul 2020 06:06:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id A20392B6DC; Thu, 16 Jul 2020 10:06:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D2E82B6DB for ; Thu, 16 Jul 2020 10:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894250; 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=xXoOi3kyjXO9DMK8OqS3JzvscCZfOhHamr79ctpagYQ=; b=QH3aDR7ahDofH/Z7NMf+GzA/lFCQQX+qj3zrmKAunAXa/GIxix3gB2b9sUgjJEIJtV18cj FEWgYXOw5qGUrrGQjnd6ldVDn6PXgwWDjcSh03aNyAdPAMiczJossuNShMZYS+RBFYzTkD TuKuT0VFHEG67L/mIoP4pWalxxhbQ9g= X-MC-Unique: aZjocmucP3mKYVsCppzLrg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 289/351] meson: tests: add dbus specific tests Date: Thu, 16 Jul 2020 11:58:45 +0200 Message-Id: <0e1f1622259dff67fd57533d035e2961d680401e.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 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 --- tests/Makefile.am | 26 -------------------------- tests/meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a436f9e0645..b721b135cfd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,15 +31,6 @@ if WITH_LIBVIRTD test_programs +=3D fdstreamtest endif WITH_LIBVIRTD =20 -if WITH_DBUS -test_programs +=3D virdbustest \ - virsystemdtest \ - $(NULL) -if WITH_POLKIT -test_programs +=3D virpolkittest -endif WITH_POLKIT -endif WITH_DBUS - if WITH_SECDRIVER_SELINUX if WITH_ATTR test_programs +=3D securityselinuxtest \ @@ -614,23 +605,6 @@ test_programs +=3D \ virnetdevopenvswitchtest endif ! WITH_YAJL =20 -if WITH_DBUS -virdbustest_SOURCES =3D \ - virdbustest.c testutils.h testutils.c -virdbustest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) -virdbustest_LDADD =3D $(LDADDS) $(DBUS_LIBS) - -virpolkittest_SOURCES =3D \ - virpolkittest.c testutils.h testutils.c -virpolkittest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) -virpolkittest_LDADD =3D $(LDADDS) $(DBUS_LIBS) - -virsystemdtest_SOURCES =3D \ - virsystemdtest.c testutils.h testutils.c -virsystemdtest_CFLAGS =3D $(AM_CFLAGS) $(DBUS_CFLAGS) -virsystemdtest_LDADD =3D $(LDADDS) $(DBUS_LIBS) -endif ! WITH_DBUS - if WITH_SECDRIVER_SELINUX if WITH_ATTR =20 diff --git a/tests/meson.build b/tests/meson.build index fe4d252c640..86f12a58f7b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -343,6 +343,19 @@ if conf.has('WITH_BHYVE') ] endif =20 +if conf.has('WITH_DBUS') + tests +=3D [ + { 'name': 'virdbustest', 'deps': [ dbus_dep ] }, + { 'name': 'virsystemdtest', 'deps': [ dbus_dep ] }, + ] + + if conf.has('WITH_POLKIT') + tests +=3D [ + { 'name': 'virpolkittest', 'deps': [ dbus_dep ] }, + ] + endif +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894926; cv=none; d=zohomail.com; s=zohoarc; b=BnYR0u6SxDPgzNDhRMsurzSVNt6ewYKt83eIE7sAVfVZErUS6pjt3w3bsK2y5VB0EUzhMKbjR4w2rZ0sZV1AksR+hUeJBGwPO+awr4sWVl9qbUrSnHoOttGWNWuT/7l7PJn46PQBZtA7mZ15x3CEiCZfInxmeMSA9WrRR2OcvQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894926; 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=KpayMhgyz2ouN51WhyuaorH93Ct7M3g29UTXo0soa3s=; b=U2WpacJoMUi75SxXrb5RRjYatr9AsCvhi3IdG6VmlvReq+DS9Lq6x5UuvBFjkZW0DZuQ62b/w/Nl3dMbOj09P70WLKY8nbcBDX/f2TYr3Bc+vfN6cKzw/V6xf2eOP7fkDDVPH6LrReeyujkDSxiTJqDSNLkfzCNuqLuPFpFDRug= 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 1594894926635153.59674315661175; Thu, 16 Jul 2020 03:22:06 -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-258-iD1aaAoSMeevh_4PoOhkxg-1; Thu, 16 Jul 2020 06:14:25 -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 4A3311009613; Thu, 16 Jul 2020 10:14:20 +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 2596610023A7; Thu, 16 Jul 2020 10:14:20 +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 E6E289624C; Thu, 16 Jul 2020 10:14:19 +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 06GA6oie019911 for ; Thu, 16 Jul 2020 06:06:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B1522B6DC; Thu, 16 Jul 2020 10:06:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 058792B6DB for ; Thu, 16 Jul 2020 10:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894925; 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=KpayMhgyz2ouN51WhyuaorH93Ct7M3g29UTXo0soa3s=; b=ZSIbm8Xh8a0GRl/Cs255ArPKS1Zt/FgXWAI22ePQPDvsRWdvHuVutsopIfjbq5ORgf43dn 53FyxxPn1TTL7Z7gAQJFtO7I1N7xQYXTgbxRKrKEZRltjrKVsGWqtVrpAFHFRkuLjkez0e PdpNOwze5tcrGYpM8k+CRo/uQCxUJmY= X-MC-Unique: iD1aaAoSMeevh_4PoOhkxg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 290/351] meson: tests: add ESX specific tests Date: Thu, 16 Jul 2020 11:58:46 +0200 Message-Id: <6f57684e55cd1cf4bf9bc16c2ee654382960b857.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/esx/meson.build | 2 ++ tests/Makefile.am | 14 -------------- tests/meson.build | 6 ++++++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/esx/meson.build b/src/esx/meson.build index 1718411d759..469c2044c63 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -63,3 +63,5 @@ if conf.has('WITH_ESX') else sym_files +=3D 'libvirt_esx.syms' endif + +esx_inc_dir =3D include_directories('.') diff --git a/tests/Makefile.am b/tests/Makefile.am index b721b135cfd..55369717cd9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -70,10 +70,6 @@ if WITH_OPENVZ test_programs +=3D openvzutilstest endif WITH_OPENVZ =20 -if WITH_ESX -test_programs +=3D esxutilstest -endif WITH_ESX - if WITH_VBOX test_programs +=3D vboxsnapshotxmltest endif WITH_VBOX @@ -375,16 +371,6 @@ openvzutilstest_LDADD =3D $(LDADDS) \ ../src/libvirt_driver_openvz.la endif ! WITH_OPENVZ =20 -if WITH_ESX -esxutilstest_SOURCES =3D \ - esxutilstest.c \ - testutils.c testutils.h -esxutilstest_LDADD =3D $(LDADDS) -esxutilstest_CFLAGS =3D \ - -I$(top_builddir)/src/esx \ - $(AM_CFLAGS) -endif ! WITH_ESX - if WITH_VBOX vboxsnapshotxmltest_SOURCES =3D \ vboxsnapshotxmltest.c \ diff --git a/tests/meson.build b/tests/meson.build index 86f12a58f7b..1eded8454f1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -356,6 +356,12 @@ if conf.has('WITH_DBUS') endif endif =20 +if conf.has('WITH_ESX') + tests +=3D [ + { 'name': 'esxutilstest', 'include': [ esx_inc_dir ], 'deps': [ dbus_d= ep ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894702; cv=none; d=zohomail.com; s=zohoarc; b=nByxI/+IwuHeYDfciqjL0QNqy1mPkTDcrDl36mJFX4l2Z0JiPLKd/JBhVg9m3uFjKBdivOd1kNxYa4CqZ3qIgymz+kOhGSN4y/RM+na3cs6JqkqMtMH0yXyKmZclGLyorWcXzrHMwGBG6G097ACZHo23bJeU87syBgS8I6AQgwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894702; 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=QSAeTu64+KT9oKHLn04XpmRfJQislc7of1C2tTPD5MM=; b=CvvoDU8M9qy08IB5xo7bG7h5q+Jh4E1bxa+xpb6LSi0bmf+AzAWKuT1Nm+luNfWCO+CkgwGV5ADwSWTolEUcEfv63AhUtk7EUiFo8Ckee/aPitiyDR52GiFBD2FG0Y7QDqRDbh04D5OxYHWQYx6ePFlifvkIjlgf6VJ9LbbC5V0= 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 1594894702381881.7819616711635; Thu, 16 Jul 2020 03:18:22 -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-80-TpopMda9Pxm_yNubu16ASg-1; Thu, 16 Jul 2020 06:14:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C1601888AA8; Thu, 16 Jul 2020 10:14:22 +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 690FF78A59; Thu, 16 Jul 2020 10:14:22 +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 3A546181D0AF; Thu, 16 Jul 2020 10:14:22 +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 06GA6pri019921 for ; Thu, 16 Jul 2020 06:06:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 72F3D2DE69; Thu, 16 Jul 2020 10:06:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E23FD2B6DB for ; Thu, 16 Jul 2020 10:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894701; 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=QSAeTu64+KT9oKHLn04XpmRfJQislc7of1C2tTPD5MM=; b=MwOth1B/7vXqpXu4SU12ki1Y2SgLqDauA0uQH+vYgZkE+igeXco8pyoVwtP3PiAMTa2kda UJYmZAjonDq46eSwekVItpk8ortUEDt/98Do3UNt4UipQFKqCDg2lZ+5iZwdgMIcb70XxI 7s8SYLGXHBtFP83rtNH19RJK+TzlDd4= X-MC-Unique: TpopMda9Pxm_yNubu16ASg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 291/351] meson: tests: add libvirtd specific tests Date: Thu, 16 Jul 2020 11:58:47 +0200 Message-Id: <5278353e16a7459b08d4fb76502a316f4b18c575.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.14 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 --- tests/Makefile.am | 29 ----------------------------- tests/meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 55369717cd9..a927c0cb2fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,10 +27,6 @@ test_programs +=3D \ $(NULL) endif WITH_REMOTE =20 -if WITH_LIBVIRTD -test_programs +=3D fdstreamtest -endif WITH_LIBVIRTD - if WITH_SECDRIVER_SELINUX if WITH_ATTR test_programs +=3D securityselinuxtest \ @@ -148,11 +144,6 @@ libvirtd_test_scripts =3D \ =20 if WITH_LIBVIRTD test_scripts +=3D $(libvirtd_test_scripts) - -test_programs +=3D \ - eventtest \ - virdrivermoduletest \ - virdriverconnvalidatetest endif ! WITH_LIBVIRTD =20 if WITH_SECDRIVER_APPARMOR @@ -614,23 +605,3 @@ endif WITH_SECDRIVER_SELINUX virjsontest_SOURCES =3D \ virjsontest.c testutils.h testutils.c virjsontest_LDADD =3D $(LDADDS) - -if WITH_LIBVIRTD -virdrivermoduletest_SOURCES =3D \ - virdrivermoduletest.c testutils.h testutils.c -virdrivermoduletest_LDADD =3D $(LDADDS) - -virdriverconnvalidatetest_SOURCES =3D \ - virdriverconnvalidatetest.c testutils.h testutils.c -virdriverconnvalidatetest_LDADD =3D $(LDADDS) -endif WITH_LIBVIRTD - -if WITH_LIBVIRTD -eventtest_SOURCES =3D \ - eventtest.c testutils.h testutils.c -eventtest_LDADD =3D $(LDADDS) -endif WITH_LIBVIRTD - -fdstreamtest_SOURCES =3D \ - fdstreamtest.c testutils.h testutils.c -fdstreamtest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 1eded8454f1..cc1b830d72b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -362,6 +362,15 @@ if conf.has('WITH_ESX') ] endif =20 +if conf.has('WITH_LIBVIRTD') + tests +=3D [ + { 'name': 'eventtest', 'deps': [ thread_dep ] }, + { 'name': 'fdstreamtest' }, + { 'name': 'virdriverconnvalidatetest' }, + { 'name': 'virdrivermoduletest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895156; cv=none; d=zohomail.com; s=zohoarc; b=R2/4kOUs2eNpIJLcoYRcE+aO2AT6Dn56ok9XdfLj4temjbxoJZSqdbTaZYjr+nbF6UnCn6S/2rYIRC3adHmfz8dvLrFluggbBGbLMqWcMYA9NjZYEjArgadnsMs8q5BwwKWOjZaLwjU4tEpcGAuelT/qTWoz/ELfIHlHiIW6aEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895156; 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=mQjszcTUAOHFCoiYrUQEZgz6Ddf4DbOZQ4Axm3KY4oY=; b=leFRhSmHVLoOShv7V7QSqoMNxS8JRyhi/6D6V6pwd74NnjH7zFVr+kHYknWfgHlLKvypHzjd6BxQwakM6x43eqbH3ldd/+sXP/Z/6TbhGv6szApIbMeNYf4p1imGklVebsmjKSkYv9Cw3v/Po4rcZ31RrIGGULawtwjdc8bDzSs= 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 1594895156352338.9233115760744; Thu, 16 Jul 2020 03:25:56 -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-159-o68p0XPtNOy3OROPPuRHow-1; Thu, 16 Jul 2020 06:09:26 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11CD21888AA8; Thu, 16 Jul 2020 10:09:19 +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 E770278A53; Thu, 16 Jul 2020 10:09:18 +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 B97D99A321; Thu, 16 Jul 2020 10:09:18 +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 06GA6qiP019932 for ; Thu, 16 Jul 2020 06:06:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5BEEA2B6E6; Thu, 16 Jul 2020 10:06:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA69B2B6DB for ; Thu, 16 Jul 2020 10:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895155; 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=mQjszcTUAOHFCoiYrUQEZgz6Ddf4DbOZQ4Axm3KY4oY=; b=LAEFUqFdL9PdQFV27kKyEtF///AEsjqhvvuECy85nEPPj0YU9P0MDrgUVYfnzUFVls57ak MANPufOEJ/sfwkzueyEvlgBPaXK9qQd2AMBsoNARok9lb4Nf5x9JbRjSabLqTo8z008ObO U5PYUE2bVIrf19F3y67eHgbknHZ86FM= X-MC-Unique: o68p0XPtNOy3OROPPuRHow-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 292/351] meson: tests: add libxl specific tests Date: Thu, 16 Jul 2020 11:58:48 +0200 Message-Id: <7b6afa349423779924d297e52b811415f224536f.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.14 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 --- tests/Makefile.am | 30 ------------------------------ tests/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a927c0cb2fd..ec57dd5543b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,11 +37,6 @@ endif WITH_QEMU endif WITH_ATTR endif WITH_SECDRIVER_SELINUX =20 -if WITH_LIBXL -test_programs +=3D xlconfigtest \ - xmconfigtest libxlxml2domconfigtest -endif WITH_LIBXL - if WITH_QEMU test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ qemudomaincheckpointxml2xmltest qemudomainsnapshotxml2xmltest \ @@ -178,31 +173,6 @@ VALGRIND =3D valgrind --quiet --leak-check=3Dfull --tr= ace-children=3Dyes \ valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" =20 -if WITH_LIBXL -libxl_LDADDS =3D \ - ../src/libvirt_driver_libxl_impl.la \ - $(LDADDS) \ - $(NULL) - -xlconfigtest_SOURCES =3D \ - xlconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xlconfigtest_LDADD =3D libxltestdriver.la \ - $(libxl_LDADDS) - -xmconfigtest_SOURCES =3D \ - xmconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xmconfigtest_LDADD =3D libxltestdriver.la \ - $(libxl_LDADDS) - -libxlxml2domconfigtest_SOURCES =3D \ - libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -libxlxml2domconfigtest_LDADD =3D libxltestdriver.la \ - $(libxl_LDADDS) $(LIBXML_LIBS) -endif ! WITH_LIBXL - if WITH_QEMU =20 qemu_LDADDS =3D ../src/libvirt_driver_qemu_impl.la diff --git a/tests/meson.build b/tests/meson.build index cc1b830d72b..3b5938abfc4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -371,6 +371,14 @@ if conf.has('WITH_LIBVIRTD') ] endif =20 +if conf.has('WITH_LIBXL') + tests +=3D [ + { 'name': 'libxlxml2domconfigtest', 'link_with': [ test_utils_xen_lib,= test_xen_driver_lib ], 'deps': [ libxl_dep ] }, + { 'name': 'xlconfigtest', 'link_with': [ test_utils_xen_lib, test_xen_= driver_lib ] }, + { 'name': 'xmconfigtest', 'link_with': [ test_utils_xen_lib, test_xen_= driver_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894253; cv=none; d=zohomail.com; s=zohoarc; b=bkaHQag9yq4Ww6GRyxP85hLnEP2eNDN97gxGm8RFR5FiFK5sAw2edFVXSqbD9Tm0DMABR462lMK+hUie76QUfeSZ0SGlkOOWMbJKDeyK0cAtwYtkqJ8cPzDRKkwO08NzhOC0Z3qQZvMqpWELuCJCdBQ7O/ZejQ8XSrqggdc1tvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894253; 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=n5fjrsHxGJ9ES1AkFrDm5C594///bSt15H77B4SYKqk=; b=f0jAC21DYasb0yKveFMC3jsw10uguKq9pP2eeeFSAxTkH0hYYEry6QP0SlEy75GzxIxghM/ripiOFN9+DsKGAYXO42ffJKMqWRdmJpJiiPwSOZC/N0JSNjoQdvA8mKUITe45MF6JrIL1O9SWCNPfBh5Yap8RZ2YAGxhnxlA7X7s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894253298149.94487458752883; Thu, 16 Jul 2020 03:10:53 -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-434-ial2dyguN7W895NQsaoWYw-1; Thu, 16 Jul 2020 06:10:50 -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 92F78100AA26; Thu, 16 Jul 2020 10:10:41 +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 6EDDD10098A1; Thu, 16 Jul 2020 10:10:41 +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 3AF7BA3711; Thu, 16 Jul 2020 10:10:41 +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 06GA6rap019939 for ; Thu, 16 Jul 2020 06:06:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4494B2DE69; Thu, 16 Jul 2020 10:06:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B39A12B6DB for ; Thu, 16 Jul 2020 10:06:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894252; 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=n5fjrsHxGJ9ES1AkFrDm5C594///bSt15H77B4SYKqk=; b=bFro7iAoHjF/Swx748Tcthzsu3idyn3kRg+fQt5a+EVTBmwJYB3B5pguWfhHtm5+YVNHOm 2dRdXBFxwqSAiRsQwHB2D9nesy6Nv3ALI/B8BIQoFDGJU9i5WZ9PcgIgP8zGLvTF3En1mH b03okBSevKVPqQmnV4SpTdqdfjD3/us= X-MC-Unique: ial2dyguN7W895NQsaoWYw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 293/351] meson: tests: add lxc specific tests Date: Thu, 16 Jul 2020 11:58:49 +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.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 --- tests/Makefile.am | 22 ---------------------- tests/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ec57dd5543b..44f02da7af6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,10 +53,6 @@ test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_LXC -test_programs +=3D lxcxml2xmltest lxcconf2xmltest -endif WITH_LXC - if WITH_OPENVZ test_programs +=3D openvzutilstest endif WITH_OPENVZ @@ -306,24 +302,6 @@ qemuvhostusertest_SOURCES =3D \ qemuvhostusertest_LDADD =3D $(qemu_LDADDS) endif ! WITH_QEMU =20 -if WITH_LXC - -lxc_LDADDS =3D \ - ../src/libvirt_driver_lxc_impl.la \ - $(LDADDS) \ - $(NULL) - -lxcxml2xmltest_SOURCES =3D \ - lxcxml2xmltest.c testutilslxc.c testutilslxc.h \ - testutils.c testutils.h -lxcxml2xmltest_LDADD =3D $(lxc_LDADDS) - -lxcconf2xmltest_SOURCES =3D \ - lxcconf2xmltest.c testutilslxc.c testutilslxc.h \ - testutils.c testutils.h -lxcconf2xmltest_LDADD =3D $(lxc_LDADDS) -endif ! WITH_LXC - if WITH_OPENVZ openvzutilstest_SOURCES =3D \ openvzutilstest.c \ diff --git a/tests/meson.build b/tests/meson.build index 3b5938abfc4..439d95401ef 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -379,6 +379,13 @@ if conf.has('WITH_LIBXL') ] endif =20 +if conf.has('WITH_LXC') + tests +=3D [ + { 'name': 'lxcconf2xmltest', 'link_with': [ test_utils_lxc_lib, lxc_dr= iver_impl_lib ] }, + { 'name': 'lxcxml2xmltest', 'link_with': [ test_utils_lxc_lib, lxc_dri= ver_impl_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594895105; cv=none; d=zohomail.com; s=zohoarc; b=UEcPqO1jG6M6u1XmHnqdtIKmDt+nYgVqg4GBWnIUS94waBlNkqb9tUe7VAgrA9hEzY0olM9pA9pFxzraCS69oOX0AU959Ti5K97/KxFISVx0ndQ8ZImbMqa4RI5FqjJjS9fDRfyaYD2Zct/AO8Fg4v0rTqBZ6oQtFRkVY7XdgZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895105; 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=sGXYLuuDcowMHtJlIwlD05ay5Ps5Eh8V06WY129ybPg=; b=ey2Cu0FzIV5smpGoYYQa3BYAl6uJ1pj1Qn94DK7CsDP/3E6LSRL5YMjTeht9XJSq3KLdAwFmSynwZ7zUp01kHhn4xf0GnHp0xSyzYgxd4JSON2gkQJnKmeh91wtg2FhBdErUXJp+o/yz62o9lHhRSqqXJSinKVHv8Z7kXiIMkCQ= 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 1594895105385136.4473012275114; Thu, 16 Jul 2020 03:25:05 -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-340-yNk3zV4dMOmH_fyDqokI5Q-1; Thu, 16 Jul 2020 06:14:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 758BB8027F8; Thu, 16 Jul 2020 10:14:25 +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 57A2178471; Thu, 16 Jul 2020 10:14:25 +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 29C049A302; Thu, 16 Jul 2020 10:14:25 +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 06GA6vNX019989 for ; Thu, 16 Jul 2020 06:06:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D5342B6DB; Thu, 16 Jul 2020 10:06:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9C052B6DC for ; Thu, 16 Jul 2020 10:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895104; 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=sGXYLuuDcowMHtJlIwlD05ay5Ps5Eh8V06WY129ybPg=; b=AB9r9m2ryE22LT2yzYyBRYp24kokN8107nuT45vlYcH1sx3vS2cdO8z7vM6JNtpC6jVkTK GSSRB47BXQpHbckMf7uZb/3qTtG8N4XRdbKTED3IoSGjm1JppxV+97RZNRYi+PesqkrMCE x+8aaxXyVzbTXYghLUbzF7aEvztYUGc= X-MC-Unique: yNk3zV4dMOmH_fyDqokI5Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 294/351] meson: tests: add network specific tests Date: Thu, 16 Jul 2020 11:58:50 +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.11 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 --- tests/Makefile.am | 25 ------------------------- tests/meson.build | 8 ++++++++ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 44f02da7af6..ad8bc21fd8d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,14 +73,6 @@ if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL =20 -if WITH_NETWORK -test_programs +=3D \ - networkxml2xmltest \ - networkxml2conftest \ - networkxml2firewalltest \ - $(NULL) -endif WITH_NETWORK - if WITH_STORAGE_SHEEPDOG test_programs +=3D storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG @@ -337,23 +329,6 @@ vmwarevertest_SOURCES =3D \ vmwarevertest_LDADD =3D $(LDADDS) endif ! WITH_VMWARE =20 -if WITH_NETWORK -networkxml2xmltest_SOURCES =3D \ - networkxml2xmltest.c \ - testutils.c testutils.h -networkxml2xmltest_LDADD =3D ../src/libvirt_driver_network_impl.la $(LDADD= S) - -networkxml2conftest_SOURCES =3D \ - networkxml2conftest.c \ - testutils.c testutils.h -networkxml2conftest_LDADD =3D ../src/libvirt_driver_network_impl.la $(LDAD= DS) - -networkxml2firewalltest_SOURCES =3D \ - networkxml2firewalltest.c \ - testutils.c testutils.h -networkxml2firewalltest_LDADD =3D ../src/libvirt_driver_network_impl.la $(= LDADDS) -endif ! WITH_NETWORK - if WITH_STORAGE_SHEEPDOG storagebackendsheepdogtest_SOURCES =3D \ storagebackendsheepdogtest.c \ diff --git a/tests/meson.build b/tests/meson.build index 439d95401ef..4fc8c170c0a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -386,6 +386,14 @@ if conf.has('WITH_LXC') ] endif =20 +if conf.has('WITH_NETWORK') + tests +=3D [ + { 'name': 'networkxml2conftest', 'link_with': [ network_driver_impl ] = }, + { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_imp= l ] }, + { 'name': 'networkxml2xmltest', 'link_with': [ network_driver_impl ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894170; cv=none; d=zohomail.com; s=zohoarc; b=G4JNRkRm4zkFDNUVieeO/yPCPNhpX9CBDstl5VgZ0mJHpBTBqahLmNCKBhr/e2iKJg5xaKwZCttz2TCTgApTWT244BY9YJ2LW4vS1EuwCx4HcRNQzeWWpR4jogHgYXfgVtuK6woW+GJoPiQp6gKrWlYtIVMdsl2acGHIgfhyDFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894170; 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=JBZEjWlXKaCFOf/Q4zLzmRBzkiOA9JB4TFvDTUQMZXg=; b=RRlQgmnTlemCRgohn4ypk5fRZgp1jDXfnkjKg9tbXlMZAbihy4eILKqYlqZ2GdXPMVtDHaAAYzt2VO5r7y6s9WppZwr4+VlOK/AY9+mFF1vKcz5joIfz+RtX3e5Sc7UjfKP/uygddJSuiGnmch6q3YP8iMFWxvtfKNd1nbUHBCU= 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 1594894170088595.8986479400256; Thu, 16 Jul 2020 03:09:30 -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-209-OtfDbOnrOsaEYLvi4fShSg-1; Thu, 16 Jul 2020 06:09:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69C5E1888AD0; Thu, 16 Jul 2020 10:09:21 +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 491E172ADF; Thu, 16 Jul 2020 10:09:21 +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 0B8A9181A7BA; Thu, 16 Jul 2020 10:09:21 +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 06GA6wf9020022 for ; Thu, 16 Jul 2020 06:06:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 36AAF2B6DC; Thu, 16 Jul 2020 10:06:58 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2B372B6DB for ; Thu, 16 Jul 2020 10:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894168; 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=JBZEjWlXKaCFOf/Q4zLzmRBzkiOA9JB4TFvDTUQMZXg=; b=jDPj5qJCmLrr2eKjskNDOmoY+2Ev2GE8D910EOOqj1JdbnNB6PqR/SIr7T6Mjn0OoRW5UH F0SNohD3BdQRiQM0SGZlrBwVKoZp1ACWtr92+FcS7aaUbC3wXd4WFkZNyuv0pbv17v11Ov pwLqeJDauvVEPGmATE/hIcjGiywhDHM= X-MC-Unique: OtfDbOnrOsaEYLvi4fShSg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 295/351] meson: tests: add node device specific tests Date: Thu, 16 Jul 2020 11:58:51 +0200 Message-Id: <7f211b60483eb03a181ef3a21c9c2e19067205d4.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.15 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 --- tests/Makefile.am | 14 -------------- tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ad8bc21fd8d..a8a3996bab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -99,10 +99,6 @@ test_helpers +=3D nsslinktest nssguestlinktest test_programs +=3D nsstest nssguesttest endif WITH_NSS =20 -if WITH_NODE_DEVICES -test_programs +=3D nodedevmdevctltest -endif WITH_NODE_DEVICES - test_scripts =3D libvirtd_test_scripts =3D \ libvirtd-fail \ @@ -392,16 +388,6 @@ storagepoolcapstest_SOURCES =3D \ storagepoolcapstest_LDADD =3D $(LDADDS) endif ! WITH_STORAGE =20 -if WITH_NODE_DEVICES -nodedevmdevctltest_SOURCES =3D \ - nodedevmdevctltest.c \ - testutils.c testutils.h - -nodedevmdevctltest_LDADD =3D \ - ../src/libvirt_driver_nodedev_impl.la \ - $(LDADDS) -endif WITH_NODE_DEVICES - virnetmessagetest_SOURCES =3D \ virnetmessagetest.c testutils.h testutils.c virnetmessagetest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 4fc8c170c0a..e8154810b05 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -394,6 +394,12 @@ if conf.has('WITH_NETWORK') ] endif =20 +if conf.has('WITH_NODE_DEVICES') + tests +=3D [ + { 'name': 'nodedevmdevctltest', 'link_with': [ node_device_driver_impl= ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894341; cv=none; d=zohomail.com; s=zohoarc; b=KYC+OD/E4QeUt3LyhwoVsNR5xqowEAlwnWR0yuwZ34B2kyhJmCMLqNjwuKo2kAA63tmTe9KCMT7ZLYg1jL/JjSjfIZg4mFKQKZmF11Rh3Z9VTTV2KcaWjIr92K5A39HtlP15DKAV8JN2dEw7QQmOTrhJAv8LEffYk8kRGslEbVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894341; 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=2H0YuLhcpKS7TP0ZLEoxXfbg/vPhzquNRBMR9p17PEQ=; b=cLtV5hshupba99VOOc/Esd0E/n16anV6k+ShH1CCE3h85xBPn7NCvMSHCLAaLmJMMANpnw/P2xWuj+I4aOXiDHSare0ZMSu8v9e2z+PHkKevePbVZpumwFLxbWqQhONhKFEcSzAnxzkfaDlSkcT7e6R2GZ7ZpsDxuYNEJC6Nkm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894341645313.27564436015393; Thu, 16 Jul 2020 03:12:21 -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-334-Ss7D9PPfNCC4944szOU3xQ-1; Thu, 16 Jul 2020 06:10:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ECD93100AA28; Thu, 16 Jul 2020 10:10:43 +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 CB14279500; Thu, 16 Jul 2020 10:10:43 +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 967DB1806B0D; Thu, 16 Jul 2020 10:10:43 +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 06GA6xFm020043 for ; Thu, 16 Jul 2020 06:06:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FF772B6DB; Thu, 16 Jul 2020 10:06:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F0C02DE69 for ; Thu, 16 Jul 2020 10:06:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894340; 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=2H0YuLhcpKS7TP0ZLEoxXfbg/vPhzquNRBMR9p17PEQ=; b=CZzBLGSUWeHi+Ur+a/cI/mjE5f9efM5hGcCdS5cw5amlzupmBDwAQ6fHeJkZuUdVI+OrAq aM+iSE9CJL0bTkde02Zrl72WGIgQ2ujFuBK4xf5zM7U17XXjnPsEh/cFtOgOv58Uogs24N hFdA5sUZlffTl4VwgFlgoKIFwBT0Kc8= X-MC-Unique: Ss7D9PPfNCC4944szOU3xQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 296/351] meson: tests: add nss specific tests Date: Thu, 16 Jul 2020 11:58:52 +0200 Message-Id: <34bbef8452e9eea3804a41df9e38af7caa0f59e9.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.14 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 --- tests/Makefile.am | 20 -------------------- tests/meson.build | 17 +++++++++++++++++ tools/nss/meson.build | 2 ++ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a8a3996bab1..816d7ec8a64 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -96,7 +96,6 @@ endif WITH_STORAGE_FS =20 if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest -test_programs +=3D nsstest nssguesttest endif WITH_NSS =20 test_scripts =3D @@ -440,25 +439,6 @@ viridentitytest_DEPENDENCIES =3D libsecurityselinuxhel= per.la \ endif WITH_SELINUX =20 if WITH_NSS -nsstest_SOURCES =3D \ - nsstest.c testutils.h testutils.c -nsstest_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nsstest_LDADD =3D \ - $(LDADDS) \ - ../tools/nss/libnss_libvirt_impl.la - -nssguesttest_SOURCES =3D \ - nsstest.c testutils.h testutils.c -nssguesttest_CFLAGS =3D \ - -DLIBVIRT_NSS_GUEST \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nssguesttest_LDADD =3D \ - $(LDADDS) \ - ../tools/nss/libnss_libvirt_guest_impl.la - ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. nsslinktest_SOURCES =3D nsslinktest.c diff --git a/tests/meson.build b/tests/meson.build index e8154810b05..0b503bca720 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -400,6 +400,23 @@ if conf.has('WITH_NODE_DEVICES') ] endif =20 +if conf.has('WITH_NSS') + tests +=3D [ + { + 'name': 'nsstest', + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_impl ], + }, + { + 'name': 'nssguesttest', + 'sources': [ 'nsstest.c' ], + 'c_args': [ '-DLIBVIRT_NSS_GUEST' ], + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_guest_impl ], + }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( diff --git a/tools/nss/meson.build b/tools/nss/meson.build index b07bfa4be8b..cf3eec9b24a 100644 --- a/tools/nss/meson.build +++ b/tools/nss/meson.build @@ -88,3 +88,5 @@ nss_libvirt_guest_lib =3D shared_library( install: true, install_dir: libdir, ) + +nss_inc_dir =3D include_directories('.') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894256; cv=none; d=zohomail.com; s=zohoarc; b=cl7uf7PFvbhRkKTgklKxwT2Xz/pHu2Ow0jfLvgtCRpHd5L/Mc0YFxdPrfkOWXaWETr3A7N5+cMzbjUut9mfqkKQuwhDcm7sGIaQdbxRJcyYKaIJ7AmE05yXzNg5kWbYaNw/3SjV/NlSZnIcywJLtt6aY49LRdiJ7sxR0Vs9bIr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894256; 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=SNi4ttXMziedcnh9dezK7n1fwwhWihwZrALbi8GjKyc=; b=BDbTiBRYfEEgmlcLs5l52CYt66QQwYmWDu4DqdTmr9hyjAmFcSrYQi09wKJSD15XBtZwaFcDchWFxYGFh3OUk0g0qvWL3vncEFk9Wb2aGUR3C9wZUPEn1jn13V/+LDpaHDsiuh5psDFQ3gCPxc2AShTUBiUc8I1ogA03fzU4ezM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894256403908.9521851144663; Thu, 16 Jul 2020 03:10:56 -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-134-QUc-6WX3MBWWT2igciDsAA-1; Thu, 16 Jul 2020 06:10:52 -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 6B9A2802812; Thu, 16 Jul 2020 10:10:46 +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 4062270104; Thu, 16 Jul 2020 10:10:46 +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 0809BA3713; Thu, 16 Jul 2020 10:10:46 +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 06GA70RP020074 for ; Thu, 16 Jul 2020 06:07:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 089652B6DC; Thu, 16 Jul 2020 10:07:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7740A2B6DB for ; Thu, 16 Jul 2020 10:06:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894255; 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=SNi4ttXMziedcnh9dezK7n1fwwhWihwZrALbi8GjKyc=; b=cFYaOdtlYlcTtOSwnBt8S9Yt6QWFLsiMV0dVo0imbvYZTSuUeMy9K7YJ+aZfSwRFr2JQD2 0o7IYNazenEQ1tGnWZrFXl+rTa6YckwFnN0gmF7LSdnCdGVd1DOi5ILXd3JWTbwcIaL6/V bi9acU2GDGNOdPwBvK3YgxULjJrZOhc= X-MC-Unique: QUc-6WX3MBWWT2igciDsAA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 297/351] meson: tests: add nwfilter specific tests Date: Thu, 16 Jul 2020 11:58:53 +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.12 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 --- tests/Makefile.am | 18 ------------------ tests/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 816d7ec8a64..6a217cd92e7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -77,11 +77,6 @@ if WITH_STORAGE_SHEEPDOG test_programs +=3D storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG =20 -if WITH_NWFILTER -test_programs +=3D nwfilterebiptablestest -test_programs +=3D nwfilterxml2firewalltest -endif WITH_NWFILTER - if WITH_STORAGE test_programs +=3D storagevolxml2argvtest test_programs +=3D storagepoolxml2argvtest @@ -334,19 +329,6 @@ storagebackendsheepdogtest_LDADD =3D \ $(LDADDS) endif ! WITH_STORAGE_SHEEPDOG =20 -if WITH_NWFILTER -nwfilterebiptablestest_SOURCES =3D \ - nwfilterebiptablestest.c \ - testutils.c testutils.h -nwfilterebiptablestest_LDADD =3D ../src/libvirt_driver_nwfilter_impl.la $(= LDADDS) - -nwfilterxml2firewalltest_SOURCES =3D \ - nwfilterxml2firewalltest.c \ - testutils.c testutils.h -nwfilterxml2firewalltest_LDADD =3D \ - ../src/libvirt_driver_nwfilter_impl.la $(LDADDS) -endif WITH_NWFILTER - if WITH_STORAGE virstorageutiltest_SOURCES =3D \ virstorageutiltest.c \ diff --git a/tests/meson.build b/tests/meson.build index 0b503bca720..916b6de10f9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -417,6 +417,13 @@ if conf.has('WITH_NSS') ] endif =20 +if conf.has('WITH_NWFILTER') + tests +=3D [ + { 'name': 'nwfilterebiptablestest', 'link_with': [ nwfilter_driver_imp= l ] }, + { 'name': 'nwfilterxml2firewalltest', 'link_with': [ nwfilter_driver_i= mpl ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894257; cv=none; d=zohomail.com; s=zohoarc; b=N8tjdeiAXqYhTCxcRuGShOj1qjC8yDaWCBDPXaRGw2GEN5X1z0JZF0jhTrIF6Nfh/6P4xVf/fsLgMzWrpB6tr0n4T0isMzBPXQ4k0tf0Y+kbVa0p/cxkf87s5K53tvar2SWxaEkK7YuXVTYLuSNpWtSFQdvLNrrhE0/3Tgmn1no= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894257; 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=AmBSGPod/3bY/tuvQKe8PulcSWlwk4829xDx+B219Qs=; b=CPCoR/PO6RwxOq+6Q0Kkv3TGERkqujYYKgHgRTPvg8hMH3dsU1sWK7RKM/oqmiuKXjllgw3vFbL6OgyF1+rrgGq7gSe8+VRPzd8VDp+njXoQ69AjxQ+xomwMpQClgRQzXDiSTH935veaqoUrcAxjTELDyW0T7eBmdPO0MmGQ7uE= 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 1594894257307683.5904423230485; Thu, 16 Jul 2020 03:10:57 -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-205-70C14ErmOxagPDoxG1yDGg-1; Thu, 16 Jul 2020 06:10:54 -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 B9A898027FB; Thu, 16 Jul 2020 10:10:48 +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 987B21053B03; Thu, 16 Jul 2020 10:10:48 +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 69F12A3717; Thu, 16 Jul 2020 10:10:48 +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 06GA700d020096 for ; Thu, 16 Jul 2020 06:07:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E57D42B6DC; Thu, 16 Jul 2020 10:07:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 604422B6DB for ; Thu, 16 Jul 2020 10:07:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894256; 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=AmBSGPod/3bY/tuvQKe8PulcSWlwk4829xDx+B219Qs=; b=i3s6LnkTmCZQpKRuEayr96cXJ5fzARI8CKVdkTQNGCX7f/49xLkG3D/ToYJZ90orM/7JOY 5Y48xsISwV8KufHtXI3GFeo/+q/4XDBipceTwwWQGMX4sJcqWbwagTGF73W+zhKOj28wXx rgCoSExNmFWnD+K4V74U6u87TgcooOs= X-MC-Unique: 70C14ErmOxagPDoxG1yDGg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 298/351] meson: tests: add openvz specific tests Date: Thu, 16 Jul 2020 11:58:54 +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.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 --- tests/Makefile.am | 12 ------------ tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6a217cd92e7..9e436512fef 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,10 +53,6 @@ test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_OPENVZ -test_programs +=3D openvzutilstest -endif WITH_OPENVZ - if WITH_VBOX test_programs +=3D vboxsnapshotxmltest endif WITH_VBOX @@ -284,14 +280,6 @@ qemuvhostusertest_SOURCES =3D \ qemuvhostusertest_LDADD =3D $(qemu_LDADDS) endif ! WITH_QEMU =20 -if WITH_OPENVZ -openvzutilstest_SOURCES =3D \ - openvzutilstest.c \ - testutils.c testutils.h -openvzutilstest_LDADD =3D $(LDADDS) \ - ../src/libvirt_driver_openvz.la -endif ! WITH_OPENVZ - if WITH_VBOX vboxsnapshotxmltest_SOURCES =3D \ vboxsnapshotxmltest.c \ diff --git a/tests/meson.build b/tests/meson.build index 916b6de10f9..6dd926e96b8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -424,6 +424,12 @@ if conf.has('WITH_NWFILTER') ] endif =20 +if conf.has('WITH_OPENVZ') + tests +=3D [ + { 'name': 'openvzutilstest', 'link_with': [ openvz_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894866; cv=none; d=zohomail.com; s=zohoarc; b=IHF4e7w3Zqe5DJoZVyGIimdFRpsqU5RVuVyoTgp2Gcmhp5W5wrrEAfyi/gfvQe0JR+jY2dpi2liHBmopMHtOuEH5RtDiJTY0F/3/N+OWt5lrHKhgT/gIBIVNrkTDLVkO0ytZxjEmXh31QAlTFTbOhhW2tzpDiQTKH5XNHWPFkR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894866; 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=ZKI7P0torD234DxmkPIiOY8mHyeZy8QTDfd668v+uUQ=; b=lxIjVfT2tvIcp9c9aoEwGLp1EN8V15JGi3nE/CDeCfDu8HI7nrMyxJuiHQJ7NXdTIyEVo6HdNo/VoNX8Jt8kwd08lK+7ZDKq2WkuNv4KhyVf0kWTOl949GImNyIBioWgSqcQZi/WrUXP+T1helkGuALtuKQ/DGRUTJYeT78H/rY= 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 1594894866578306.95351828591185; Thu, 16 Jul 2020 03:21:06 -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-19-w7FeabbzNfmuMwP-psxcLA-1; Thu, 16 Jul 2020 06:10:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DFB91888AA2; Thu, 16 Jul 2020 10:10:52 +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 E09B96FED1; Thu, 16 Jul 2020 10:10:51 +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 B1B751804769; Thu, 16 Jul 2020 10:10:50 +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 06GA71dA020126 for ; Thu, 16 Jul 2020 06:07:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D10502B6DC; Thu, 16 Jul 2020 10:07:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AE522B6DB for ; Thu, 16 Jul 2020 10:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894865; 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=ZKI7P0torD234DxmkPIiOY8mHyeZy8QTDfd668v+uUQ=; b=IdspBmZu5CzYKuHGZ3EHYOJQWLY+4oYn5qyuaIW7mXkfJAWnfAgqwOnK3h49E6MsAgQwgu 5y3gmsH6kS5i4/OIyNcHJ17aTovofxBztK+EqHtbTzLG3gFaWbaPX829Eu6aYbd+0VoFIh N1IPiXchyMa/XgD7HiIDngRjtwLv3oc= X-MC-Unique: w7FeabbzNfmuMwP-psxcLA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 299/351] meson: tests: add qemu specific tests Date: Thu, 16 Jul 2020 11:58:55 +0200 Message-Id: <082f84b8b74be0dc3f8d4d10f381daa766fea650.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.11 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 --- tests/Makefile.am | 138 ---------------------------------------------- tests/meson.build | 21 +++++++ 2 files changed, 21 insertions(+), 138 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e436512fef..a821b0e0af7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,18 +38,6 @@ endif WITH_ATTR endif WITH_SECDRIVER_SELINUX =20 if WITH_QEMU -test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ - qemudomaincheckpointxml2xmltest qemudomainsnapshotxml2xmltest \ - qemumonitorjsontest qemuhotplugtest \ - qemuagenttest qemucapabilitiestest qemucaps2xmltest \ - qemumemlocktest \ - qemucommandutiltest \ - qemublocktest \ - qemumigparamstest \ - qemusecuritytest \ - qemufirmwaretest \ - qemuvhostusertest \ - $(NULL) test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 @@ -148,136 +136,10 @@ valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" =20 if WITH_QEMU - -qemu_LDADDS =3D ../src/libvirt_driver_qemu_impl.la -if WITH_DTRACE_PROBES -qemu_LDADDS +=3D ../src/libvirt_qemu_probes.lo -endif WITH_DTRACE_PROBES -qemu_LDADDS +=3D $(LDADDS) - -qemuxml2argvtest_SOURCES =3D \ - qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemuxml2argvtest_LDADD =3D libqemutestdriver.la libqemumonitortestutils.la= \ - $(LDADDS) $(LIBXML_LIBS) - -qemuxml2xmltest_SOURCES =3D \ - qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h \ - virfilewrapper.c virfilewrapper.h -qemuxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemumonitorjsontest_SOURCES =3D \ - qemumonitorjsontest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemumonitorjsontest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemucapabilitiestest_SOURCES =3D \ - qemucapabilitiestest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucapabilitiestest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - qemucapsprobe_SOURCES =3D \ qemucapsprobe.c qemucapsprobe_LDADD =3D \ libqemutestdriver.la $(LDADDS) - -qemucommandutiltest_SOURCES =3D \ - qemucommandutiltest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucommandutiltest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemucaps2xmltest_SOURCES =3D \ - qemucaps2xmltest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) - -qemuagenttest_SOURCES =3D \ - qemuagenttest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemuagenttest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) - -qemuhotplugtest_SOURCES =3D \ - qemuhotplugtest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemuhotplugtest_LDADD =3D \ - libqemutestdriver.la \ - libqemumonitortestutils.la \ - $(qemu_LDADDS) \ - $(NULL) - -qemublocktest_SOURCES =3D \ - qemublocktest.c \ - testutils.h testutils.c \ - testutilsqemu.h testutilsqemu.c \ - $(NULL) -qemublocktest_LDADD =3D \ - libqemumonitortestutils.la \ - ../src/libvirt.la \ - $(qemu_LDADDS) \ - $(NULL) - -qemudomaincheckpointxml2xmltest_SOURCES =3D \ - qemudomaincheckpointxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemudomaincheckpointxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemudomainsnapshotxml2xmltest_SOURCES =3D \ - qemudomainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemudomainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemumemlocktest_SOURCES =3D \ - qemumemlocktest.c \ - testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemumemlocktest_LDADD =3D $(qemu_LDADDS) - -qemumigparamstest_SOURCES =3D \ - qemumigparamstest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemumigparamstest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemusecuritytest_SOURCES =3D \ - qemusecuritytest.c qemusecuritytest.h \ - qemusecuritymock.c \ - testutils.h testutils.c \ - testutilsqemu.h testutilsqemu.c -qemusecuritytest_LDADD =3D $(qemu_LDADDS) - -qemufirmwaretest_SOURCES =3D \ - qemufirmwaretest.c \ - testutils.h testutils.c \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemufirmwaretest_LDADD =3D $(qemu_LDADDS) - -qemuvhostusertest_SOURCES =3D \ - qemuvhostusertest.c \ - testutils.h testutils.c \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemuvhostusertest_LDADD =3D $(qemu_LDADDS) endif ! WITH_QEMU =20 if WITH_VBOX diff --git a/tests/meson.build b/tests/meson.build index 6dd926e96b8..7a96d11e842 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -430,6 +430,27 @@ if conf.has('WITH_OPENVZ') ] endif =20 +if conf.has('WITH_QEMU') + tests +=3D [ + { 'name': 'qemuagenttest', 'link_with': [ test_utils_qemu_lib, test_qe= mu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemublocktest', 'link_with': [ test_utils_qemu_lib, test_qe= mu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemucapabilitiestest', 'link_with': [ test_utils_qemu_lib, = test_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemucaps2xmltest', 'link_with': [ test_utils_qemu_lib, test= _qemu_driver_lib ] }, + { 'name': 'qemucommandutiltest', 'link_with': [ test_utils_qemu_lib, t= est_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemudomaincheckpointxml2xmltest', 'link_with': [ test_utils= _qemu_lib, test_qemu_driver_lib ] }, + { 'name': 'qemudomainsnapshotxml2xmltest', 'link_with': [ test_utils_q= emu_lib, test_qemu_driver_lib ] }, + { 'name': 'qemufirmwaretest', 'link_with': [ test_qemu_driver_lib, tes= t_file_wrapper_lib ] }, + { 'name': 'qemuhotplugtest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemumemlocktest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib ] }, + { 'name': 'qemumigparamstest', 'link_with': [ test_utils_qemu_lib, tes= t_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemumonitorjsontest', 'link_with': [ test_utils_qemu_lib, t= est_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemu= securitymock.c' ], 'link_with': [ test_utils_qemu_lib, test_qemu_driver_lib= ] }, + { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib, te= st_file_wrapper_lib ] }, + { 'name': 'qemuxml2argvtest', 'link_with': [ test_utils_qemu_lib, test= _qemu_driver_lib, test_utils_qemu_monitor_lib, test_file_wrapper_lib ] }, + { 'name': 'qemuxml2xmltest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib, test_file_wrapper_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894512; cv=none; d=zohomail.com; s=zohoarc; b=CKAWi8qdTmWQYW24vgP2+mh2dE4EYK1fNERE6AghO6fjaCKxYnTv73fR922o5pEPlBmhdVffU0FB3ssgrSO9pVTayfSTvNLBxY7jj8Kj3oRPfnjc24Dr0lzZ7mZsty40h9xcsmg7UJ2UUVzvoqdvV0HZsnC2/DBOctEwvYSpoU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894512; 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=RJvWDxlbJoFfbb98O5vqW3m3mq7hRbkTSGYP4oJyFUY=; b=bpstc466LXkJXMzINceexg6ox0TekdRRP5XjT2KyHbwFPpD8s/dsvEs9qU2N4WYVDgEPdHZQz0tbufeq5ln8r1LkInmHwR6JPBUMkAnuwv6JJG/GVEcSiCU/2klotZO2tGFfbFBya+Mp9TBf8HUeBJh3Lkfz70E2J1YupxAVVQI= 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 1594894512870642.5041339014532; Thu, 16 Jul 2020 03:15: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-42-x9RElm_sPiK4FEAq3Z1Hrg-1; Thu, 16 Jul 2020 06:14:33 -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 B5A478027EF; Thu, 16 Jul 2020 10:14:27 +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 93DEB7B42A; Thu, 16 Jul 2020 10:14:27 +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 6190F181D0B3; Thu, 16 Jul 2020 10:14:27 +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 06GA72C5020146 for ; Thu, 16 Jul 2020 06:07:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC7152B6DB; Thu, 16 Jul 2020 10:07:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 342E52DE69 for ; Thu, 16 Jul 2020 10:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894511; 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=RJvWDxlbJoFfbb98O5vqW3m3mq7hRbkTSGYP4oJyFUY=; b=iCcnejO72rxhipY2bOf2SIYyKWOayL6e7rcrA0yx472ntWfd4Nn/KOM2KHlJYlKyrl3i5D bhiaMZ8+y0E8e2915XSPrPz1CQTN7rywQigUFwGaIIZbh1JFJv/iMESfPFq7X5nmUzZ8U+ zEB0PfsefbXFHYfo2Ieg1vGjoEBcmdU= X-MC-Unique: x9RElm_sPiK4FEAq3Z1Hrg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 300/351] meson: tests: add remote specific tests Date: Thu, 16 Jul 2020 11:58:56 +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 --- tests/Makefile.am | 46 ---------------------------------------------- tests/meson.build | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a821b0e0af7..ecc2a76a80f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,17 +16,6 @@ ## License along with this library. If not, see ## . =20 -if WITH_REMOTE -test_programs +=3D \ - virnetmessagetest \ - virnetsockettest \ - virnetdaemontest \ - virnetserverclienttest \ - virnettlscontexttest \ - virnettlssessiontest \ - $(NULL) -endif WITH_REMOTE - if WITH_SECDRIVER_SELINUX if WITH_ATTR test_programs +=3D securityselinuxtest \ @@ -219,41 +208,6 @@ storagepoolcapstest_SOURCES =3D \ storagepoolcapstest_LDADD =3D $(LDADDS) endif ! WITH_STORAGE =20 -virnetmessagetest_SOURCES =3D \ - virnetmessagetest.c testutils.h testutils.c -virnetmessagetest_LDADD =3D $(LDADDS) - -virnetsockettest_SOURCES =3D \ - virnetsockettest.c testutils.h testutils.c -virnetsockettest_LDADD =3D $(LDADDS) - -virnetdaemontest_SOURCES =3D \ - virnetdaemontest.c \ - testutils.h testutils.c -virnetdaemontest_LDADD =3D $(LDADDS) - -virnetserverclienttest_SOURCES =3D \ - virnetserverclienttest.c \ - testutils.h testutils.c -virnetserverclienttest_LDADD =3D $(LDADDS) - -virnettlscontexttest_SOURCES =3D \ - virnettlscontexttest.c \ - virnettlshelpers.h virnettlshelpers.c \ - testutils.h testutils.c -virnettlscontexttest_LDADD =3D $(LDADDS) $(GNUTLS_LIBS) -virnettlssessiontest_SOURCES =3D \ - virnettlssessiontest.c \ - virnettlshelpers.h virnettlshelpers.c \ - testutils.h testutils.c -virnettlssessiontest_LDADD =3D $(LDADDS) $(GNUTLS_LIBS) -if HAVE_LIBTASN1 -virnettlscontexttest_SOURCES +=3D pkix_asn1_tab.c -virnettlscontexttest_LDADD +=3D -ltasn1 -virnettlssessiontest_SOURCES +=3D pkix_asn1_tab.c -virnettlssessiontest_LDADD +=3D -ltasn1 -endif ! HAVE_LIBTASN1 - virstoragetest_SOURCES =3D \ virstoragetest.c testutils.h testutils.c virstoragetest_LDADD =3D $(LDADDS) \ diff --git a/tests/meson.build b/tests/meson.build index 7a96d11e842..4e01585da11 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -451,6 +451,27 @@ if conf.has('WITH_QEMU') ] endif =20 +if conf.has('WITH_REMOTE') + tests +=3D [ + { 'name': 'virnetdaemontest' }, + { 'name': 'virnetmessagetest' }, + { 'name': 'virnetserverclienttest' }, + { 'name': 'virnetsockettest' }, + ] + + nettls_sources =3D [ 'virnettlshelpers.c' ] + if conf.has('HAVE_LIBTASN1_H') + nettls_sources +=3D 'pkix_asn1_tab.c' + endif + + libtasn1_dep =3D cc.find_library('tasn1', required: false) + + tests +=3D [ + { 'name': 'virnettlscontexttest', 'sources': [ 'virnettlscontexttest.c= ', nettls_sources ], 'deps': [ libtasn1_dep, ] }, + { 'name': 'virnettlssessiontest', 'sources': [ 'virnettlssessiontest.c= ', nettls_sources ], 'deps': [ libtasn1_dep, ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894328; cv=none; d=zohomail.com; s=zohoarc; b=QWQ0hJY+yEKUHsSAu02IzsciQNEllG2QxWsE308b7rVT6gvdtcDdPSs5D8Y8HO/N43P2UBiI0q8FImfcKXmA3mfQ/r9zQud4trOE+Z8gvgoWk9QxFwzNEM0sgpLQhMt/sN1VvM4zJGsQqFJb8lN62hIth20TLfmT+UbEiY4BzK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894328; 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=ouHYM7RcyfRQMd2AdX+xJyEil429m7PJlOwIZ8PyII8=; b=g5XMAySfEFUQcaK6EMoZd4T7dFcNNxa1rvMgPnK8sY7rOkuZS4KFrF9dUX/9OBzbQe+7FNLBundi2ltYLAN/yEShNvEV5g3KmKgKUz5aIDYcjVfovVjKMWP5DGF5CCLpJH0ony0fhDap+zdtOOSv9KAdJj4GlUkOyiPxi+0ecSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948943282421008.7654605378293; Thu, 16 Jul 2020 03:12:08 -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-268-aG5tesBHMdyuOmja6OyyPA-1; Thu, 16 Jul 2020 06:09:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D982E100AA29; Thu, 16 Jul 2020 10:09:23 +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 B5A79710D7; Thu, 16 Jul 2020 10:09:23 +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 822869A328; Thu, 16 Jul 2020 10:09:23 +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 06GA73JI020177 for ; Thu, 16 Jul 2020 06:07:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4ECA2B6DC; Thu, 16 Jul 2020 10:07:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FC882B6DB for ; Thu, 16 Jul 2020 10:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894327; 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=ouHYM7RcyfRQMd2AdX+xJyEil429m7PJlOwIZ8PyII8=; b=ZJ3mfwhawOjLr2ASXwaTvDVreSAynXa8ohNRvZ9u/C95579f8dPTb00ruEhKACDhIar+3C Uf+YrzwsTMUkOk3R9qooVNw4ExF0vO0nnZyooWLSr5toX65Wf4IcIOICocLpKdtahH3FS7 lcijQffuj8tXNuFklcz0xf5jp/Orlnw= X-MC-Unique: aG5tesBHMdyuOmja6OyyPA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 301/351] meson: tests: add selinux specific tests Date: Thu, 16 Jul 2020 11:58:57 +0200 Message-Id: <8501c3a9bc760584a42a72d1a15c273ead1fa005.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.15 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 --- tests/Makefile.am | 39 --------------------------------------- tests/meson.build | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ecc2a76a80f..7b2cba16eff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,16 +16,6 @@ ## License along with this library. If not, see ## . =20 -if WITH_SECDRIVER_SELINUX -if WITH_ATTR -test_programs +=3D securityselinuxtest \ - viridentitytest -if WITH_QEMU -test_programs +=3D securityselinuxlabeltest -endif WITH_QEMU -endif WITH_ATTR -endif WITH_SECDRIVER_SELINUX - if WITH_QEMU test_helpers +=3D qemucapsprobe endif WITH_QEMU @@ -215,15 +205,6 @@ virstoragetest_LDADD =3D $(LDADDS) \ ../src/libvirt_driver_storage_impl.la \ $(NULL) =20 -viridentitytest_SOURCES =3D \ - viridentitytest.c testutils.h testutils.c -viridentitytest_LDADD =3D $(LDADDS) -if WITH_SELINUX -viridentitytest_LDADD +=3D $(SELINUX_LIBS) -viridentitytest_DEPENDENCIES =3D libsecurityselinuxhelper.la \ - ../src/libvirt.la -endif WITH_SELINUX - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. @@ -257,26 +238,6 @@ test_programs +=3D \ virnetdevopenvswitchtest endif ! WITH_YAJL =20 -if WITH_SECDRIVER_SELINUX -if WITH_ATTR - -securityselinuxtest_SOURCES =3D \ - securityselinuxtest.c testutils.h testutils.c -securityselinuxtest_LDADD =3D $(LDADDS) $(SELINUX_LIBS) -securityselinuxtest_DEPENDENCIES =3D libsecurityselinuxhelper.la \ - ../src/libvirt.la - -if WITH_QEMU -securityselinuxlabeltest_SOURCES =3D \ - securityselinuxlabeltest.c testutils.h testutils.c \ - testutilsqemu.h testutilsqemu.c -securityselinuxlabeltest_LDADD =3D $(qemu_LDADDS) $(SELINUX_LIBS) -securityselinuxlabeltest_DEPENDENCIES =3D libsecurityselinuxhelper.la \ - ../src/libvirt.la -endif WITH_QEMU -endif WITH_ATTR -endif WITH_SECDRIVER_SELINUX - virjsontest_SOURCES =3D \ virjsontest.c testutils.h testutils.c virjsontest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 4e01585da11..67b9cd11d1c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -472,6 +472,21 @@ if conf.has('WITH_REMOTE') ] endif =20 +if conf.has('WITH_SECDRIVER_SELINUX') + if conf.has('WITH_ATTR') + tests +=3D [ + { 'name': 'securityselinuxtest' }, + { 'name': 'viridentitytest' }, + ] + + if conf.has('WITH_QEMU') + tests +=3D [ + { 'name': 'securityselinuxlabeltest', 'link_with': [ test_utils_qe= mu_lib ] }, + ] + endif + endif +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894647; cv=none; d=zohomail.com; s=zohoarc; b=Xt3WHVKCSdAHuH701DOhsbUGRcOWRh82LRu0FZdjmRB+L3i/EMzVQBhWAgZkQMkdUNarCXCBKR8vASdBb0rrcXG9Uj9hjt33oGwUZPnwJ2KG0iJnEO/zbrkLMMBNpQLB9fMhTKye5BJ9HJcQmLecCAJPoZndm0TlCjw/BmNxwTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894647; 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=XUzDNC9IW5IqdvWWrl/3pN43APdoHyytDZ6sK0MVnio=; b=Zb/j+wEV/GpJEEZ+h/+waXHuNcyN5QkJlrZ/h+6vQ0K8pgPM62K+vRYt0ruoPdNmNdlzw6inJb/1+TguvXUnf82izqB5WKKyWtP5C0fDNP293/+6nILqbpxVjKPL4Ex4ofLifezLdrMx7gBrEexBmCKEgizqY53XgODFo5JHlDE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894647828848.1520652578072; Thu, 16 Jul 2020 03:17:27 -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-385-2yiYH9KXNk6qjvJwuX3fbA-1; Thu, 16 Jul 2020 06:10:58 -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 87A3D8015FB; Thu, 16 Jul 2020 10:10:53 +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 643EA18A6E; Thu, 16 Jul 2020 10:10:53 +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 35934A3719; Thu, 16 Jul 2020 10:10:53 +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 06GA74ST020192 for ; Thu, 16 Jul 2020 06:07:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D9802B6DC; Thu, 16 Jul 2020 10:07:04 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0826B2B6DB for ; Thu, 16 Jul 2020 10:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894645; 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=XUzDNC9IW5IqdvWWrl/3pN43APdoHyytDZ6sK0MVnio=; b=AluB2fMN5buk5gguUhdqDumAT/A2uMZp6+11c10dk0xGL1WzruEQfNowWS5K9fipqZ22Wj iLtbSfrJe4RNIP+IjihQWXMGUAgoVZ/MX+aO2KHuA9xywClzEW/MRAf38sySsKDiqSEEyD U83E1UO3A5M05zK520FbdQoMDs+XXSI= X-MC-Unique: 2yiYH9KXNk6qjvJwuX3fbA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 302/351] meson: tests: add storage specific tests Date: Thu, 16 Jul 2020 11:58:58 +0200 Message-Id: <78a40d82755f17f7742de06715f3fd29e853396d.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 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 --- tests/Makefile.am | 48 ----------------------------------------------- tests/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 48 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7b2cba16eff..83b8e979df4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -40,14 +40,6 @@ if WITH_STORAGE_SHEEPDOG test_programs +=3D storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG =20 -if WITH_STORAGE -test_programs +=3D storagevolxml2argvtest -test_programs +=3D storagepoolxml2argvtest -test_programs +=3D virstorageutiltest -test_programs +=3D storagepoolxml2xmltest -test_programs +=3D storagepoolcapstest -endif WITH_STORAGE - if WITH_STORAGE_FS test_programs +=3D virstoragetest endif WITH_STORAGE_FS @@ -158,46 +150,6 @@ storagebackendsheepdogtest_LDADD =3D \ $(LDADDS) endif ! WITH_STORAGE_SHEEPDOG =20 -if WITH_STORAGE -virstorageutiltest_SOURCES =3D \ - virstorageutiltest.c \ - testutils.c \ - testutils.h \ - $(NULL) -virstorageutiltest_LDADD =3D \ - ../src/libvirt_driver_storage_impl.la \ - $(LDADDS) \ - $(NULL) - -storagevolxml2argvtest_SOURCES =3D \ - storagevolxml2argvtest.c \ - testutils.c testutils.h -storagevolxml2argvtest_LDADD =3D \ - $(LIBXML_LIBS) \ - ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt.la \ - $(LDADDS) - -storagepoolxml2argvtest_SOURCES =3D \ - storagepoolxml2argvtest.c \ - testutils.c testutils.h -storagepoolxml2argvtest_LDADD =3D \ - $(LIBXML_LIBS) \ - ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt.la \ - $(LDADDS) - -storagepoolxml2xmltest_SOURCES =3D \ - storagepoolxml2xmltest.c \ - testutils.c testutils.h -storagepoolxml2xmltest_LDADD =3D $(LDADDS) \ - ../src/libvirt_driver_storage_impl.la - -storagepoolcapstest_SOURCES =3D \ - storagepoolcapstest.c testutils.h testutils.c -storagepoolcapstest_LDADD =3D $(LDADDS) -endif ! WITH_STORAGE - virstoragetest_SOURCES =3D \ virstoragetest.c testutils.h testutils.c virstoragetest_LDADD =3D $(LDADDS) \ diff --git a/tests/meson.build b/tests/meson.build index 67b9cd11d1c..344df91a381 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -487,6 +487,16 @@ if conf.has('WITH_SECDRIVER_SELINUX') endif endif =20 +if conf.has('WITH_STORAGE') + tests +=3D [ + { 'name': 'storagepoolcapstest' }, + { 'name': 'storagepoolxml2argvtest', 'link_with': [ storage_driver_imp= l_lib ] }, + { 'name': 'storagepoolxml2xmltest', 'link_with': [ storage_driver_impl= _lib ] }, + { 'name': 'storagevolxml2argvtest', 'link_with': [ storage_driver_impl= _lib ] }, + { 'name': 'virstorageutiltest', 'link_with': [ storage_driver_impl_lib= ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894632; cv=none; d=zohomail.com; s=zohoarc; b=GcbgzFWmTsvNNWTS2ryy23X8RvsFjDGaEsJehXewSyq6PaNCDd0HMyzRJ89bI7sYg927aH2jX01/LN4oWCpQAcaAztmBWJBW9kyhd9cwPXBPKSy2MzXsQpy4c5o7SsVEzRuZS8eKdp9OUlme7mq8ns2L3ci5O/q19kC4ZLFUnoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894632; 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=so4NH1BV6jUut0W9qFJwjRnZuodqA2pbjUTSQbh5PJE=; b=BZPCDOP7Xl1qGaPbWDA1V5Syqh4fLuIo8wBxb+9cCTuwWxPtMnsa89bdgfWRvloKNwYvVoAnqWVCTCh2blcpJZhiqhqbS4eUYA7foA09awF7TRaZFHxlrZxv0udB51cisVbIc7GwnjvmeTrGsPwk66Z38VpA6yjoOjFtgPdf2aI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894632841600.0519172481296; Thu, 16 Jul 2020 03:17: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-203-stSWC54fNdmd1jdOIf20AA-1; Thu, 16 Jul 2020 06:14:36 -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 220A2100AA24; Thu, 16 Jul 2020 10:14:30 +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 F2D887B42A; Thu, 16 Jul 2020 10:14:29 +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 C2E279A306; Thu, 16 Jul 2020 10:14:29 +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 06GA75iW020214 for ; Thu, 16 Jul 2020 06:07:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 754ED2B6DC; Thu, 16 Jul 2020 10:07:05 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E49BD2B6DB for ; Thu, 16 Jul 2020 10:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894631; 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=so4NH1BV6jUut0W9qFJwjRnZuodqA2pbjUTSQbh5PJE=; b=hnwnVrqc21U3Fw0JbiB0kcvBwiV4XXnO+9/huoMwcMBEcf11UNjrk5ht8S4c3IEsXe3cAw r2fMnjVQ66S/ywHtFmViekyiPS84TyJgo1KModOFgeCtecxFd28DhpWt1L/CJLZVYrlBWZ dcsoLAq+I3ebxnYlqV62T/PkDzmkExw= X-MC-Unique: stSWC54fNdmd1jdOIf20AA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 303/351] meson: tests: add storage_fs specific tests Date: Thu, 16 Jul 2020 11:58:59 +0200 Message-Id: <2b23e5f642392dc2e03b494b01568996c91f3402.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.13 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 --- tests/Makefile.am | 11 ----------- tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 83b8e979df4..4fb27e0b85d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -40,10 +40,6 @@ if WITH_STORAGE_SHEEPDOG test_programs +=3D storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG =20 -if WITH_STORAGE_FS -test_programs +=3D virstoragetest -endif WITH_STORAGE_FS - if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest endif WITH_NSS @@ -150,13 +146,6 @@ storagebackendsheepdogtest_LDADD =3D \ $(LDADDS) endif ! WITH_STORAGE_SHEEPDOG =20 -virstoragetest_SOURCES =3D \ - virstoragetest.c testutils.h testutils.c -virstoragetest_LDADD =3D $(LDADDS) \ - ../src/libvirt.la \ - ../src/libvirt_driver_storage_impl.la \ - $(NULL) - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. diff --git a/tests/meson.build b/tests/meson.build index 344df91a381..b47580057ed 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -497,6 +497,12 @@ if conf.has('WITH_STORAGE') ] endif =20 +if conf.has('WITH_STORAGE_FS') + tests +=3D [ + { 'name': 'virstoragetest', 'link_with': [ storage_driver_impl_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894756; cv=none; d=zohomail.com; s=zohoarc; b=OWbGcpk5uLshO+H5ozmZ6IJbeLn4OKPHw/ej/JSIWeDXR6fDAGhks44wbrF4hVwAorvA4v0WMIRhisgJX75aQRlsD1WJbweqKld8XENCPhO+N0cOySHoez4LVIaT8NrPZaUDumrp0SC34s1nrNII4ESDitIAl/DOMVhyei0QlPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894756; 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=1k6qFEZYTn1ZepCwiHrjV8k7e0cG+9G47wB6aaQ/hOc=; b=TRS29pnt/JR5/3vBBgFUM8X7Q6nKv0LkHRcmAOe+bx073prRaKS9hYbsFnxh+Gr+J2rkmgUq0MYKQJExGU5eSAYzkvPG3z7dPz2u70IDKMR9xtEZAZMSdSLbf8FKHijajJGfKOFY8mkviJrWVKRbMvJDaJwf0tGfZSsY6scrhi0= 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 1594894756229695.707064929878; Thu, 16 Jul 2020 03:19:16 -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-98-zVrp7gGuMUOwM1zwhKSdyw-1; Thu, 16 Jul 2020 06:09:33 -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 E8E4E80BCA0; Thu, 16 Jul 2020 10:09:26 +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 C597C61982; Thu, 16 Jul 2020 10:09:26 +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 973BB9A32C; Thu, 16 Jul 2020 10:09:26 +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 06GA76s8020245 for ; Thu, 16 Jul 2020 06:07:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5DDBB2B6DC; Thu, 16 Jul 2020 10:07:06 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCB322B6DB for ; Thu, 16 Jul 2020 10:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894755; 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=1k6qFEZYTn1ZepCwiHrjV8k7e0cG+9G47wB6aaQ/hOc=; b=T5JEcBRbCeve06y6xNY+ux/lWjbOXxCMdZvtStWuBb2BT7LwDjiEFbew0WZqmVjbIOlU6m Y8bS/oKxbkJMr8wWwuj3SwtIKZbzXxH/pu8ajCv21shBgZ1ErnlAxxqK6pzel5DKatOOBJ /Zoi26M9e1c1kG5wfyorSHJWlsCm4Hs= X-MC-Unique: zVrp7gGuMUOwM1zwhKSdyw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 304/351] meson: tests: add storage_sheepdog specific tests Date: Thu, 16 Jul 2020 11:59:00 +0200 Message-Id: <14f0a6667ce2758162a5fa75a836216445083871.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 --- tests/Makefile.am | 14 -------------- tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4fb27e0b85d..b696d3434fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,10 +36,6 @@ if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL =20 -if WITH_STORAGE_SHEEPDOG -test_programs +=3D storagebackendsheepdogtest -endif WITH_STORAGE_SHEEPDOG - if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest endif WITH_NSS @@ -136,16 +132,6 @@ vmwarevertest_SOURCES =3D \ vmwarevertest_LDADD =3D $(LDADDS) endif ! WITH_VMWARE =20 -if WITH_STORAGE_SHEEPDOG -storagebackendsheepdogtest_SOURCES =3D \ - storagebackendsheepdogtest.c \ - testutils.c testutils.h -storagebackendsheepdogtest_LDADD =3D \ - ../src/libvirt_storage_backend_sheepdog_priv.la \ - ../src/libvirt_driver_storage_impl.la \ - $(LDADDS) -endif ! WITH_STORAGE_SHEEPDOG - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. diff --git a/tests/meson.build b/tests/meson.build index b47580057ed..e9a6cd72cc7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -503,6 +503,12 @@ if conf.has('WITH_STORAGE_FS') ] endif =20 +if conf.has('WITH_STORAGE_SHEEPDOG') + tests +=3D [ + { 'name': 'storagebackendsheepdogtest', 'link_with': [ storage_driver_= impl_lib, storage_backend_sheepdog_priv_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894393; cv=none; d=zohomail.com; s=zohoarc; b=AAg6it9KZRrAQ6wibM/ka0Z8HOBctFYx3vZen46i7QBd2IdEpkKFbbmBmdzLKtKL1pfeUMX2/KKK7GlhjsWH3lyw7ro0ma/XxpzvldJz+j7WeisYjP1X5MT6IKsr7TR44CMCyOdbAn3DlYMHid/vzJjjXXieJXCCnfCb1ctD9FY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894393; 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=Nffu/aLjpP1pLlLZjv8t/rKb+LeCzfafn5ZPuifahiE=; b=CvJmPAIQktTrYT9OFfm2VjMGoUieFPV1VEOyOgzeAtI/qiT+XJoOxkIUMQfmWAlkgWqq0Ca5FfmY9lWcjX1pNT2sbVbkwP7s2JJD3lpmQnnF5z4T2NXsBb5Xgx16ubty+gQvJMCJl49g8qNCzplsWoo/FcH9B/LygdECkV0lINQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894393128792.8462036726708; Thu, 16 Jul 2020 03:13:13 -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-463-y95eqkKAOFmCEdxqtbW_Pw-1; Thu, 16 Jul 2020 06:09:35 -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 3DDDA100AA25; Thu, 16 Jul 2020 10:09:29 +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 1C70860E3E; Thu, 16 Jul 2020 10:09:29 +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 DE271181A880; Thu, 16 Jul 2020 10:09:28 +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 06GA77sv020264 for ; Thu, 16 Jul 2020 06:07:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 467802DE6D; Thu, 16 Jul 2020 10:07:07 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B57812B6DB for ; Thu, 16 Jul 2020 10:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894392; 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=Nffu/aLjpP1pLlLZjv8t/rKb+LeCzfafn5ZPuifahiE=; b=WLmJv55qPi3KXTl2U2dPyK3yKaclaXbVxrhSDxBx/uhzm3nEZDv+/6Lppp1uPFePjO4RmT /nGlmitRDiqQnmVcmfBuvlCQa12H7ZR5C06XZtGqYxL2pInCAOasRdxQcxeYM9DpxVnjBn FdeTtpUW3u+ZdT8RFPQg0Se69MUbrcA= X-MC-Unique: y95eqkKAOFmCEdxqtbW_Pw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 305/351] meson: tests: add vbox specific tests Date: Thu, 16 Jul 2020 11:59:01 +0200 Message-Id: <10bae88ecb886f64a3ab387a671b317d3d779c7e.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 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 --- tests/Makefile.am | 12 ------------ tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b696d3434fe..ab45bdd6da4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,10 +20,6 @@ if WITH_QEMU test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_VBOX -test_programs +=3D vboxsnapshotxmltest -endif WITH_VBOX - if WITH_VMX test_programs +=3D vmx2xmltest xml2vmxtest endif WITH_VMX @@ -105,14 +101,6 @@ qemucapsprobe_LDADD =3D \ libqemutestdriver.la $(LDADDS) endif ! WITH_QEMU =20 -if WITH_VBOX -vboxsnapshotxmltest_SOURCES =3D \ - vboxsnapshotxmltest.c \ - testutils.c testutils.h -vbox_LDADDS =3D ../src/libvirt_driver_vbox_impl.la -vboxsnapshotxmltest_LDADD =3D $(LDADDS) $(vbox_LDADDS) -endif ! WITH_VBOX - if WITH_VMX vmx2xmltest_SOURCES =3D \ vmx2xmltest.c \ diff --git a/tests/meson.build b/tests/meson.build index e9a6cd72cc7..7f93d816b44 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -509,6 +509,12 @@ if conf.has('WITH_STORAGE_SHEEPDOG') ] endif =20 +if conf.has('WITH_VBOX') + tests +=3D [ + { 'name': 'vboxsnapshotxmltest', 'link_with': [ vbox_driver_impl ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894449; cv=none; d=zohomail.com; s=zohoarc; b=YtqgfTEJyZ94vGjvyRpMVsmRwFP8EufAXP/ELr5sl0FiFdSK8U0oHAc+6e5uuES+71eALpQrgkrw99QEw1yG4W+R+LC5PGqJ8IPih5Pw+qhRdma8mSLIkPyRgJwNaSoiLuzVukYrvPf5QhLW4zLR5d2IDfxnPP9Ii/fJ7+nbuZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894449; 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=MOP1cObQX67VAFpM2iHNIx+TMrWh8AbIgnvwGBxbvwU=; b=IMiad4nxpOVVeYvRL4KNSBWDcUsIvS4O7p8M6o45F3vYrD6ypAVkl1bEoGjm05xnp1JV9Pa8s+nkd6QagnMSpukgvNj/R+dtYoo9hQI9h0Af20zmx46OE1+OeVWSEZKDP+pToNaI5BZm09N4NU4U+6cAkeowDK9BiZqfydehUGk= 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 1594894449984910.8240474793448; Thu, 16 Jul 2020 03:14: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-204-Ao4V7HX0NMG2lT2Ao8HVNQ-1; Thu, 16 Jul 2020 06:11:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9078100AA2B; Thu, 16 Jul 2020 10:10:55 +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 B83317848E; Thu, 16 Jul 2020 10:10:55 +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 8823DA371E; Thu, 16 Jul 2020 10:10:55 +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 06GA782g020287 for ; Thu, 16 Jul 2020 06:07:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 31D052B6DB; Thu, 16 Jul 2020 10:07:08 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A02962E047 for ; Thu, 16 Jul 2020 10:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894448; 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=MOP1cObQX67VAFpM2iHNIx+TMrWh8AbIgnvwGBxbvwU=; b=iDSHvlAoVHDLcVzRMGIXhFj+mPj2UaWLre5uu6xFFWTIrpcghdzaPdonU7312bLTxcMiui zJSIrp6CkSc3ng/YkJvieY8BSa6JqwGLGxeTV9eiSl+Mk8ny6WcbvQuNaW3VwjboQ5cu9t 4gkidW6qEasoYrWtZ3WsaQMAdEr2AzY= X-MC-Unique: Ao4V7HX0NMG2lT2Ao8HVNQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 306/351] meson: tests: add vmware specific tests Date: Thu, 16 Jul 2020 11:59:02 +0200 Message-Id: <84c034817972b57bf7faf1768b85b9ab89e17490.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.11 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 --- tests/Makefile.am | 11 ----------- tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ab45bdd6da4..69506b31a3e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,10 +24,6 @@ if WITH_VMX test_programs +=3D vmx2xmltest xml2vmxtest endif WITH_VMX =20 -if WITH_VMWARE -test_programs +=3D vmwarevertest -endif WITH_VMWARE - if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL @@ -113,13 +109,6 @@ xml2vmxtest_SOURCES =3D \ xml2vmxtest_LDADD =3D $(LDADDS) endif ! WITH_VMX =20 -if WITH_VMWARE -vmwarevertest_SOURCES =3D \ - vmwarevertest.c \ - testutils.c testutils.h -vmwarevertest_LDADD =3D $(LDADDS) -endif ! WITH_VMWARE - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. diff --git a/tests/meson.build b/tests/meson.build index 7f93d816b44..38f3823cff6 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -515,6 +515,12 @@ if conf.has('WITH_VBOX') ] endif =20 +if conf.has('WITH_VMWARE') + tests +=3D [ + { 'name': 'vmwarevertest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894695; cv=none; d=zohomail.com; s=zohoarc; b=AaWmF5LbSKK4eNY1tqiijq4a/MuRUwTAfeJ5EVo5Ic0jlz9syUw4Njm+DXwPskkKyJYjaWOadojaKGcjoChCITz1NVhGcPHUWTi65jkzU8G7FpOTs9eneCbcOh4aaBiYmzRbRkRAtkigOF/m08E4GWxh82sQ5KMRr2SoBVpvK04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894695; 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=gCB3amihYQEzoAg5rtlSd2OwcU5G/idAibzpKtgRu9g=; b=XB5Iyms1Mu7zz2LrKqh3ZEiA7csdxnWLawIS4fFcCVM/j3B8nI9Mt9BWxJnvJXHTTmzLpPWnM2frZhJXpnz/WJ2jYpybymygG30fAxffHR9dzNsKSrehW8++vJsObjBmyohXiLNztkprVU4e0dFCNgfidizmpL//54NIZymFSFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894695968125.64169431783148; Thu, 16 Jul 2020 03:18: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-71-HMfduYVvPX6IYVFdt1UgKQ-1; Thu, 16 Jul 2020 06:14:38 -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 BE484100AA38; Thu, 16 Jul 2020 10:14:32 +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 53EC870108; Thu, 16 Jul 2020 10:14:32 +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 1D6549A30D; Thu, 16 Jul 2020 10:14:32 +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 06GA79WW020312 for ; Thu, 16 Jul 2020 06:07:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 196712DE6D; Thu, 16 Jul 2020 10:07:09 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 886A62DE69 for ; Thu, 16 Jul 2020 10:07:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894694; 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=gCB3amihYQEzoAg5rtlSd2OwcU5G/idAibzpKtgRu9g=; b=ge8yXAKwoypcbTcVLjdh7GQ6u28jotArXD/FFR0nk40aIc1WShV2Mlm6Kia4bEugmle/PJ uLjRYsUhk+caXr+UwLYXvxqNcZ8QweinXJhHmp5Vxyp4kNKkpQu+zk+se8/VBNNhJPlm8m T9Rfhweq03pPmkVZH48BzTHQGYMLW6E= X-MC-Unique: HMfduYVvPX6IYVFdt1UgKQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 307/351] meson: tests: add vmx specific tests Date: Thu, 16 Jul 2020 11:59:03 +0200 Message-Id: <4d741bcf706a8aab56d784efcc27de6fb3246296.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 --- tests/Makefile.am | 16 ---------------- tests/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 69506b31a3e..f30fc379077 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,10 +20,6 @@ if WITH_QEMU test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_VMX -test_programs +=3D vmx2xmltest xml2vmxtest -endif WITH_VMX - if WITH_YAJL test_programs +=3D virjsontest endif WITH_YAJL @@ -97,18 +93,6 @@ qemucapsprobe_LDADD =3D \ libqemutestdriver.la $(LDADDS) endif ! WITH_QEMU =20 -if WITH_VMX -vmx2xmltest_SOURCES =3D \ - vmx2xmltest.c \ - testutils.c testutils.h -vmx2xmltest_LDADD =3D $(LDADDS) - -xml2vmxtest_SOURCES =3D \ - xml2vmxtest.c \ - testutils.c testutils.h -xml2vmxtest_LDADD =3D $(LDADDS) -endif ! WITH_VMX - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. diff --git a/tests/meson.build b/tests/meson.build index 38f3823cff6..65a1f2b31c4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -521,6 +521,13 @@ if conf.has('WITH_VMWARE') ] endif =20 +if conf.has('WITH_VMX') + tests +=3D [ + { 'name': 'vmx2xmltest' }, + { 'name': 'xml2vmxtest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894626; cv=none; d=zohomail.com; s=zohoarc; b=e4MMjA+Lz1HdmjEVEbpfQFF93XVH+685pA8c67MJBQiPt2lmftnAOiEYo2RZ7bLpLYnweqTfKM0hHvVNM8+BR3RPDTgYSaovANWsY1e35o5AGk/yW1wILdr9m/Vkz/1UKez9ksnWnnUnJBdQKbIwAnN9vvRnBWCzHRUXmzrgBPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894626; 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=t5kgJmveHPLYquACkL3AaPBSWxxVhIs8mPaeW48+rns=; b=Z/L6nZWgNCFz8Nc4tf8ILnbJ7eIKdnDstWmEkgbbhRXap9E2E/CYYSVvPozPMDnvC4AmbbqLSM47n/MSmhH3GFqUw0yyoZXbgj59pExUrNRV/L+M5G4Lt6cGmN3Lpd0pKkQctSqmhyqbtlVPR0gW1+JERMkVAlHZ6kCMgv5WFn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894626315624.6999755322106; Thu, 16 Jul 2020 03:17:06 -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-29-TgPkpA-INsm4BZZIaPjFBw-1; Thu, 16 Jul 2020 06:14:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABB0C1009600; Thu, 16 Jul 2020 10:14:34 +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 8D6F05C1C3; Thu, 16 Jul 2020 10:14:34 +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 5B866181D0B8; Thu, 16 Jul 2020 10:14:34 +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 06GA7AkP020343 for ; Thu, 16 Jul 2020 06:07:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 018962DE69; Thu, 16 Jul 2020 10:07:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 707E02DE72 for ; Thu, 16 Jul 2020 10:07:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894624; 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=t5kgJmveHPLYquACkL3AaPBSWxxVhIs8mPaeW48+rns=; b=eGUuczguoGWQ+EJ1+IPj+BnIUnDz1fqBjYpOAzU4VYn1JcGjnncSO8PfrfyFo0PaenfDOR 0NBfT5L0iNokoZiYrXy6ra2Apl/2Odrqirw6zkEOFYuFIvoB76Qe2kSzLmN/7KNBWrcF4t m1vrmFR1dN+DlsuMh06meB7I13WuGxQ= X-MC-Unique: TgPkpA-INsm4BZZIaPjFBw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 308/351] meson: tests: add yajl specific tests Date: Thu, 16 Jul 2020 11:59:04 +0200 Message-Id: <827e6f438d8ea4196ec0802e490cb79f6e99ae89.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.16 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 --- tests/Makefile.am | 29 +++-------------------------- tests/meson.build | 8 ++++++++ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f30fc379077..498655d4776 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,10 +20,6 @@ if WITH_QEMU test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 -if WITH_YAJL -test_programs +=3D virjsontest -endif WITH_YAJL - if WITH_NSS test_helpers +=3D nsslinktest nssguestlinktest endif WITH_NSS @@ -72,13 +68,12 @@ file-access-clean: endif WITH_LINUX =20 if WITH_TESTS -noinst_PROGRAMS =3D $(test_programs) $(test_helpers) +noinst_PROGRAMS =3D $(test_helpers) else ! WITH_TESTS -check_PROGRAMS =3D $(test_programs) $(test_helpers) +check_PROGRAMS =3D $(test_helpers) endif ! WITH_TESTS =20 -TESTS =3D $(test_programs) \ - $(test_scripts) +TESTS =3D $(test_scripts) =20 VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ @@ -111,21 +106,3 @@ nssguestlinktest_CFLAGS =3D \ nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDFLAGS =3D $(NULL) endif ! WITH_NSS - -if WITH_YAJL -virmacmaptest_SOURCES =3D \ - virmacmaptest.c testutils.h testutils.c -virmacmaptest_LDADD =3D $(LDADDS) - -virnetdevopenvswitchtest_SOURCES =3D \ - virnetdevopenvswitchtest.c testutils.h testutils.c -virnetdevopenvswitchtest_LDADD =3D $(LDADDS) - -test_programs +=3D \ - virmacmaptest \ - virnetdevopenvswitchtest -endif ! WITH_YAJL - -virjsontest_SOURCES =3D \ - virjsontest.c testutils.h testutils.c -virjsontest_LDADD =3D $(LDADDS) diff --git a/tests/meson.build b/tests/meson.build index 65a1f2b31c4..40acbcee6cd 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -528,6 +528,14 @@ if conf.has('WITH_VMX') ] endif =20 +if conf.has('WITH_YAJL') + tests +=3D [ + { 'name': 'virjsontest' }, + { 'name': 'virmacmaptest' }, + { 'name': 'virnetdevopenvswitchtest' }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894267; cv=none; d=zohomail.com; s=zohoarc; b=LTWHvv/BE6bczEmFsBtIW2K0RmQQt5dzdfxsMyvrh9ncEZvqWE2YwhY7FyRZQpxXwQrS57e4q3s2vJ1RSy/k5vbEBIC5turyPTsJCBJWCXGBQokhM988o3Za4K2aGHxRoSETQOVceGtjB3rCvKq8j+RbIOQJSMuy9ljtkT5DP24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894267; 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=2JP2ATNKVZbfxVDibEyadjGHrVhFkhP7cHr/nck5hEo=; b=HSMrv1mGWPOboazClvTiNeBwNXc0uJrN1uGrmPE0muQOF7KN+nPvoEr4vApRKf6hS5NaQCg9+8IyM8zhK1LW3bc0V+GlU0hQ13JiB8Cw2W/B4Y8tDCSVZO9d4ey9+E3IOCAaFk7lfsJmE5Av7DG9mLg9QAaqDGj/E48r/QsmcBs= 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 1594894267626657.9733657009654; Thu, 16 Jul 2020 03:11:07 -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-443-ONhWChV7OXy7YRnHHaBbJQ-1; Thu, 16 Jul 2020 06:11:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D5E48027F2; Thu, 16 Jul 2020 10:10: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 1A7D779501; Thu, 16 Jul 2020 10:10: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 DBD7C10480D; Thu, 16 Jul 2020 10:10:57 +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 06GA7AoX020374 for ; Thu, 16 Jul 2020 06:07:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDBFC2DE69; Thu, 16 Jul 2020 10:07:10 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5892A2DE72 for ; Thu, 16 Jul 2020 10:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894266; 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=2JP2ATNKVZbfxVDibEyadjGHrVhFkhP7cHr/nck5hEo=; b=R3HOaGf+pY+7bKcUXGXH3W/7QK+5wK+95znbsRGEoa3KOJPmsy8A1he5uo2Q/rqv2RkLQ9 b3ym59hC+F4V99vfXGcPv26zib2y/hLhsLouT+SqDn5BWPvHn6RJ8way5UH6jW0pcj4A60 jb3SEa8IeBZewtnRw3/dQ6OXSl7xkTs= X-MC-Unique: ONhWChV7OXy7YRnHHaBbJQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 309/351] meson: tests: add helper binaries build support Date: Thu, 16 Jul 2020 11:59:05 +0200 Message-Id: <54ff52e0e78ddd590a9a59918099a5fccb11e5e1.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.14 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 --- tests/meson.build | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/meson.build b/tests/meson.build index 40acbcee6cd..ebf53891ec7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -566,3 +566,37 @@ foreach data : tests ) test(data['name'], test_bin, env: tests_env) endforeach + + +# helpers: +# each entry is a dictionary with following items: +# * name - name of the test which is also used as default source file na= me (required) +# * sources - override default sources based on name (optional, default = [ '$name.c' ]) +# * c_args - args used by test (optional, default []) +# * include - include_directories (optional, default []) +# * link_with - compiled libraries to link with (optional, default []) + +helpers =3D [] + +foreach data : helpers + helper_sources =3D '@0@.c'.format(data['name']) + helper_bin =3D executable( + data['name'], + [ + data.get('sources', helper_sources), + ], + c_args: [ + data.get('c_args', []), + ], + dependencies: [ + tests_dep, + ], + include_directories: [ + data.get('include', []), + ], + link_with: [ + data['link_with'], + ], + export_dynamic: true, + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894703; cv=none; d=zohomail.com; s=zohoarc; b=eDY95oWslqf5qcZn+8hYAZAnozaMzViv+4ImiqD1n0BNjoiDE2ANas9R1Qg1RGOoOXzrSnb8pvnSnPciCycFCVMITIKQaOtOhjRr2VpHwPWXUH74jrpfGyFlfl4/Jfy7t0LXqEJu3hInlsvcNixzbl20zGjDPp7cnxos4VdhNN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894703; 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=MON3v3If4rzp7NkL9iguujHmfw1vMmtzTuQrvRZwyHI=; b=LFXShRfpW7XjLi0rwpEr0GeFy5i+JVWfcFRc7cSAFcnobKY8WDFpriFlx7UXznpHUSppSUfJOjjuPaJa4RP1ji8TUyS4kMNhFPBzI766PlNV8whk+bVD7j52ag1Sc8rtBEN+l428FYmRr0NNcpXvMla1phZAcLpp4UpwOM15OVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894703297782.7388692020088; Thu, 16 Jul 2020 03:18:23 -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-170-4pjSiF8BOyCJn49I9cCArQ-1; Thu, 16 Jul 2020 06:14:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08640100AA2D; Thu, 16 Jul 2020 10:14:37 +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 DDC1B5C1C3; Thu, 16 Jul 2020 10:14:36 +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 AE2C8180530D; Thu, 16 Jul 2020 10:14:36 +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 06GA7BKa020398 for ; Thu, 16 Jul 2020 06:07:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5EF72DE69; Thu, 16 Jul 2020 10:07:11 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40ECD2DE72 for ; Thu, 16 Jul 2020 10:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894702; 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=MON3v3If4rzp7NkL9iguujHmfw1vMmtzTuQrvRZwyHI=; b=YLP3cXVvrvQBaSwtJcGVvDZEy6qwnPlj9jDYZ4gZ4ktuKtpqdjoYEI3xEXsrf3h4pnHZcz wz3dEIhRXtHdFmXfnIBUxzSUUCuDcVf1bGYRgDVMiPLPduntYWvm+15qSa29TTDGfmCjf/ xGaywGmgdpAJ8/lI42W5jywj5LcLR5g= X-MC-Unique: 4pjSiF8BOyCJn49I9cCArQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 310/351] meson: tests: build helper binaries Date: Thu, 16 Jul 2020 11:59:06 +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.16 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 --- tests/Makefile.am | 39 --------------------------------------- tests/meson.build | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 498655d4776..939d97a9985 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,14 +16,6 @@ ## License along with this library. If not, see ## . =20 -if WITH_QEMU -test_helpers +=3D qemucapsprobe -endif WITH_QEMU - -if WITH_NSS -test_helpers +=3D nsslinktest nssguestlinktest -endif WITH_NSS - test_scripts =3D libvirtd_test_scripts =3D \ libvirtd-fail \ @@ -67,11 +59,6 @@ file-access-clean: > test_file_access.txt endif WITH_LINUX =20 -if WITH_TESTS -noinst_PROGRAMS =3D $(test_helpers) -else ! WITH_TESTS -check_PROGRAMS =3D $(test_helpers) -endif ! WITH_TESTS =20 TESTS =3D $(test_scripts) =20 @@ -80,29 +67,3 @@ VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trac= e-children=3Dyes \ --suppressions=3D$(abs_srcdir)/.valgrind.supp valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" - -if WITH_QEMU -qemucapsprobe_SOURCES =3D \ - qemucapsprobe.c -qemucapsprobe_LDADD =3D \ - libqemutestdriver.la $(LDADDS) -endif ! WITH_QEMU - -if WITH_NSS -## Intentionaly not linking with anything else. -## See the test source for more detailed explanation. -nsslinktest_SOURCES =3D nsslinktest.c -nsslinktest_CFLAGS =3D \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nsslinktest_LDADD =3D ../tools/nss/libnss_libvirt_impl.la -nsslinktest_LDFLAGS =3D $(NULL) - -nssguestlinktest_SOURCES =3D nsslinktest.c -nssguestlinktest_CFLAGS =3D \ - -DLIBVIRT_NSS_GUEST \ - $(AM_CFLAGS) \ - -I$(top_srcdir)/tools/nss -nssguestlinktest_LDADD =3D ../tools/nss/libnss_libvirt_guest_impl.la -nssguestlinktest_LDFLAGS =3D $(NULL) -endif ! WITH_NSS diff --git a/tests/meson.build b/tests/meson.build index ebf53891ec7..5df9973ccf9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -578,6 +578,34 @@ endforeach =20 helpers =3D [] =20 +if conf.has('WITH_NSS') + helpers +=3D [ + # Intentionaly not linking with anything else. + # See the test source for more detailed explanation. + { + 'name': 'nsslinktest', + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_impl ], + }, + { + 'name': 'nssguestlinktest', + 'sources': [ 'nsslinktest.c' ], + 'c_args': [ '-DLIBVIRT_NSS_GUEST' ], + 'include': [ nss_inc_dir ], + 'link_with': [ nss_libvirt_guest_impl ], + }, + ] +endif + +if conf.has('WITH_QEMU') + helpers +=3D [ + { + 'name': 'qemucapsprobe', + 'link_with': [ test_qemu_driver_lib, libvirt_lib ], + }, + ] +endif + foreach data : helpers helper_sources =3D '@0@.c'.format(data['name']) helper_bin =3D executable( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894743; cv=none; d=zohomail.com; s=zohoarc; b=k7KGqAO/bE3U6PJZpc7dDNBvkbsb6YOxUVeGgogGPNer2HIAf5Y41qynL6ET3SIk61ULsk+Qh5j1z3aUhDer2BT1j2wcctxLblRTrmevBuvqnxA1nhB5/RjaMJAve9Hx1ZG8iOK4smxEOb3pvmj6lJ/iu8Cpif1rOYSdEcDg/xA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894743; 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=zoNv/9riOE5/4mR25bbJIRrfM1rB2abV8glt8IF7Tm0=; b=R4SXLBzWGelOARnp0BehvKJ54ApkHzLCtylm9Qg4MCHE8TFTtr7y+GKbUgPb48FfRFkFzGE34yGOpiTJcXd/TaK65h63+aXz9pC+xFucJQp3Mnah0kz/UaxHyxM6pIdTNnvlbGVRyqH9NpkeEpoyoAFUmK37BacaFYsVJiwcXAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894743972823.0875570318647; Thu, 16 Jul 2020 03:19:03 -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-245-jMj3ModROoaq4FOwZi_q_g-1; Thu, 16 Jul 2020 06:09:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EEAE1888AAA; Thu, 16 Jul 2020 10:09:31 +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 6F7F572ACF; Thu, 16 Jul 2020 10:09:31 +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 3C5FF9A332; Thu, 16 Jul 2020 10:09:31 +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 06GA7Fas020454 for ; Thu, 16 Jul 2020 06:07:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 82B202DE73; Thu, 16 Jul 2020 10:07:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F21EA2DE6D for ; Thu, 16 Jul 2020 10:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894742; 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=zoNv/9riOE5/4mR25bbJIRrfM1rB2abV8glt8IF7Tm0=; b=ZOoq2WpVQ+mIsGJvVaaiy3/n5NvLDEaVh+EXQJVYtRgMiVrRv8usFIvxnsPGbPqUROi/qh TcdWN447K4cKM8OnKizu6QvBmt/vGtKeiNvy/cI9IOEa9/TOyJXYyUpktb7FwBEmQB8yoa 9PM/DGLM14EgHD+WJAIm1PWkYIB/4C0= X-MC-Unique: jMj3ModROoaq4FOwZi_q_g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 311/351] meson: tests: add test scripts Date: Thu, 16 Jul 2020 11:59:07 +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.15 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 --- tests/Makefile.am | 34 ---------------------------------- tests/meson.build | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 939d97a9985..641ed7b390b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,38 +16,6 @@ ## License along with this library. If not, see ## . =20 -test_scripts =3D -libvirtd_test_scripts =3D \ - libvirtd-fail \ - libvirtd-pool \ - virsh-auth \ - virsh-cpuset \ - virsh-define-dev-segfault \ - virsh-int-overflow \ - virsh-optparse \ - virsh-read-bufsiz \ - virsh-read-non-seekable \ - virsh-schedinfo \ - virsh-self-test \ - virt-admin-self-test \ - virsh-checkpoint \ - virsh-snapshot \ - virsh-start \ - virsh-undefine \ - virsh-uriprecedence \ - virsh-vcpupin \ - $(NULL) - -if WITH_LIBVIRTD -test_scripts +=3D $(libvirtd_test_scripts) -endif ! WITH_LIBVIRTD - -if WITH_SECDRIVER_APPARMOR -if WITH_LIBVIRTD -test_scripts +=3D virt-aa-helper-test -endif WITH_LIBVIRTD -endif WITH_SECDRIVER_APPARMOR - if WITH_LINUX check-access: file-access-clean VIR_TEST_FILE_ACCESS=3D1 $(MAKE) $(AM_MAKEFLAGS) check @@ -60,8 +28,6 @@ file-access-clean: endif WITH_LINUX =20 =20 -TESTS =3D $(test_scripts) - VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ --suppressions=3D$(abs_srcdir)/.valgrind.supp diff --git a/tests/meson.build b/tests/meson.build index 5df9973ccf9..d6e0d2805d7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -628,3 +628,40 @@ foreach data : helpers export_dynamic: true, ) endforeach + + +# test_scripts: +# list of test scripts to run +test_scripts =3D [] + +if conf.has('WITH_LIBVIRTD') + test_scripts +=3D [ + 'libvirtd-fail', + 'libvirtd-pool', + 'virsh-auth', + 'virsh-checkpoint', + 'virsh-cpuset', + 'virsh-define-dev-segfault', + 'virsh-int-overflow', + 'virsh-optparse', + 'virsh-read-bufsiz', + 'virsh-read-non-seekable', + 'virsh-schedinfo', + 'virsh-self-test', + 'virsh-snapshot', + 'virsh-start', + 'virsh-undefine', + 'virsh-uriprecedence', + 'virsh-vcpupin', + 'virt-admin-self-test', + ] + + if conf.has('WITH_SECDRIVER_APPARMOR') + test_scripts +=3D 'virt-aa-helper-test' + endif +endif + +foreach name : test_scripts + script =3D find_program(name) + test(name, script, env: tests_env) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894487; cv=none; d=zohomail.com; s=zohoarc; b=muHtXZXie46/T45DokSI9MaACWvRJ6uIT2/sWuPvvdrTuzz/g7w1zONGLvfl0aNZSxYeSob6ecOazQtFLxeWNuLMPFNB/31BrbFX6LnOr0IB5dBhJQaMe4OByh1Pstx0b9xCyjMOlpNTw8BPJ6hxVBmubVxbndVujQpVoIztzo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894487; 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=pojoJJEdTP9K1cjSJtHIjKwiDa7dpp3EgOi4WHEboj4=; b=XVpPxiNy418PW8AxmfFbd/G81xInad7D53RkoEjbOi6yD1H9CWcGn3GOp+PTzZE4+SaUVZeqqGKGjTifufQYE9qflMLGaKZuzuQWIZ8VnBiKP9jUOwhPPj4W0CEdnwewpmjE2/eT4HcmgVMMF0p0b8hdaaT5Qs/wtlcScmMWhnY= 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 1594894487739879.9180693989673; Thu, 16 Jul 2020 03:14:47 -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-65-ofgsR9zLO2G7oudN66vqAA-1; Thu, 16 Jul 2020 06:14:44 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6168A8015F4; Thu, 16 Jul 2020 10:14:39 +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 4249E5FC2C; Thu, 16 Jul 2020 10:14:39 +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 10A6F9A30F; Thu, 16 Jul 2020 10:14:39 +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 06GA7GFd020503 for ; Thu, 16 Jul 2020 06:07:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6BA832DE6D; Thu, 16 Jul 2020 10:07:16 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DABCD2DE69 for ; Thu, 16 Jul 2020 10:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894486; 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=pojoJJEdTP9K1cjSJtHIjKwiDa7dpp3EgOi4WHEboj4=; b=Txfq+59ey77uTa9HD/ZZtZ0ylE/QdkJhgdGxS7aS5Cpw9juHyda2NJR4Vu5rqeVGwteXUT 6LufCW64Isqb8XAm0CowHUlfISKocXbGPoQon6VG3uhwDfszdPSI+QF9zlGZlONteiG6nd ZMufe0qUtUHyfhVPO3xY9teeMJkqH+E= X-MC-Unique: ofgsR9zLO2G7oudN66vqAA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 312/351] meson: tests: add file access test setup Date: Thu, 16 Jul 2020 11:59:08 +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.16 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" We need to modify check-file-access.py to be usable as wrapper for libvirt tests. This way we can run the tests using this command: meson test --setup access which will run all tests using check-file-access.py as a wrapper. With autotools all file access are written into single file for all tests and compared once the whole test suite is done. With Meson we will compare the file access after every single test because it is used as wrapper now. That requires writing the file access into separate files for every single test as they are executed in parallel. Since the wrapper is used for all tests in Meson including tests outside of tests directory we have to check for presence of the output file. We should also cleanup after ourselves. Signed-off-by: Pavel Hrdina --- Makefile.am | 3 --- scripts/check-file-access.py | 24 +++++++++++++++++++----- tests/Makefile.am | 12 ------------ tests/meson.build | 8 ++++++++ tests/virtestmock.c | 2 +- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 363c5cf66fd..d05a0c1a85a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,6 @@ srpm: clean =20 check-local: all tests =20 -check-access: all - @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) - dist-hook: gen-AUTHORS =20 .PHONY: gen-AUTHORS diff --git a/scripts/check-file-access.py b/scripts/check-file-access.py index aa120cafacf..f0e98f4b652 100755 --- a/scripts/check-file-access.py +++ b/scripts/check-file-access.py @@ -21,15 +21,27 @@ # # =20 +import os +import random import re +import string import sys =20 -if len(sys.argv) !=3D 3: - print("syntax: %s ACCESS-FILE PERMITTED-ACCESS-FILE") - sys.exit(1) +abs_builddir =3D os.environ.get('abs_builddir', '') +abs_srcdir =3D os.environ.get('abs_srcdir', '') =20 -access_file =3D sys.argv[1] -permitted_file =3D sys.argv[2] +filename =3D ''.join(random.choice(string.ascii_letters) for _ in range(16= )) +access_file =3D os.path.join(abs_builddir, 'file-access-{0}.txt'.format(fi= lename)) +permitted_file =3D os.path.join(abs_srcdir, 'permitted_file_access.txt') + +os.environ['VIR_TEST_FILE_ACCESS_OUTPUT'] =3D access_file + +test =3D ' '.join(sys.argv[1:]) + +ret =3D os.system(test) + +if ret !=3D 0 or not os.is_file(access_file): + sys.exit(ret) =20 known_actions =3D ["open", "fopen", "access", "stat", "lstat", "connect"] =20 @@ -120,6 +132,8 @@ for file in files: print(": %s" % file["testname"], end=3D"") print("") =20 +os.remove(access_file) + if err: sys.exit(1) sys.exit(0) diff --git a/tests/Makefile.am b/tests/Makefile.am index 641ed7b390b..04c37ccda2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,18 +16,6 @@ ## License along with this library. If not, see ## . =20 -if WITH_LINUX -check-access: file-access-clean - VIR_TEST_FILE_ACCESS=3D1 $(MAKE) $(AM_MAKEFLAGS) check - $(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-file-access.py \ - $(abs_builddir)/test_file_access.txt \ - $(abs_srcdir)/permitted_file_access.txt | sort -u - -file-access-clean: - > test_file_access.txt -endif WITH_LINUX - - VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ --suppressions=3D$(abs_srcdir)/.valgrind.supp diff --git a/tests/meson.build b/tests/meson.build index d6e0d2805d7..cf848678505 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -665,3 +665,11 @@ foreach name : test_scripts script =3D find_program(name) test(name, script, env: tests_env) endforeach + +add_test_setup( + 'access', + env: [ + 'VIR_TEST_FILE_ACCESS=3D1', + ], + exe_wrapper: [ meson_python_prog, check_file_access_prog ], +) diff --git a/tests/virtestmock.c b/tests/virtestmock.c index e5dccae2a87..776493f0c5d 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -69,7 +69,7 @@ printFile(const char *file, output =3D VIR_FILE_ACCESS_DEFAULT; } =20 - if (!(fp =3D real_fopen(output, "a"))) { + if (!(fp =3D real_fopen(output, "w"))) { fprintf(stderr, "Unable to open %s: %s\n", output, g_strerror(errn= o)); abort(); } --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894270; cv=none; d=zohomail.com; s=zohoarc; b=f2d3CF/ctm5ZjZMlCHH/vShOCY5NjRJjDKsyd5Eu145ld5jVksqgUdQSo0G2BGalDRbmpMV39et74Cmj6DFBw+HtDsjUTdABy4HU7bkWI1dbaqkvObd3ltIFrimN/W+3Ur9fUhjSXu9Yp7A7s5h5Zw+9Q0SGRu00BZU4cgC1JaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894270; 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=hqxCTzlBdIJfmxMaDdzSfNqomiihGDzOzioTp8Qks9g=; b=lUeud8+mWsuGZTtcLsEmci3qdkjl/dy8+aKakbV5NUC95Ey6rffFKmEuresRT+mEcGxRD/8nZLmAjbQObXv+mJJpM1AU6XhudUNZVXTQ1XaCyQmwQhQYkV00LWd9VQ6ZKuopibBw2uc31UwfDnm8EErGD9JMNbH3EDM5FbyFtxg= 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 1594894270011915.1301542243383; Thu, 16 Jul 2020 03:11:10 -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-47-Od4382Z1N6iNKaMpmkoxXw-1; Thu, 16 Jul 2020 06:11:06 -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 003631080; Thu, 16 Jul 2020 10:11:01 +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 CCE566FEF4; Thu, 16 Jul 2020 10:11:00 +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 97F111804746; Thu, 16 Jul 2020 10:11:00 +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 06GA7HAN020562 for ; Thu, 16 Jul 2020 06:07:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5AC532B6DB; Thu, 16 Jul 2020 10:07:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3F8E2DE71 for ; Thu, 16 Jul 2020 10:07:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894268; 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=hqxCTzlBdIJfmxMaDdzSfNqomiihGDzOzioTp8Qks9g=; b=dCTalEv6C86jAhsCqpb4R2vxs+eqPnCNX9nfJrk7+2wgEmDJm7SD5M6zjRu4llb9sbriqo l0NT++7peGrzHrbGiHx/Rhyl4Htf9FgoFV41CGgqugmZALPezPsxde2TRjfgylNEUu9bH3 91KE+CN525a6o5N3yK0AV3u3FiTHadY= X-MC-Unique: Od4382Z1N6iNKaMpmkoxXw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 313/351] meson: tests: add valgrind test setup Date: Thu, 16 Jul 2020 11:59:09 +0200 Message-Id: <875f1c42d6d4fb3e179d5bc6ec3345da35165d00.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 --- Makefile.am | 4 +--- configure.ac | 3 +-- tests/Makefile.am | 23 ----------------------- tests/meson.build | 11 +++++++++++ 4 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index d05a0c1a85a..549ade3db20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 SUBDIRS =3D . docs \ - tests po examples + po examples =20 XZ_OPT ?=3D -v -T0 export XZ_OPT @@ -35,8 +35,6 @@ rpm: clean srpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) =20 -check-local: all tests - dist-hook: gen-AUTHORS =20 .PHONY: gen-AUTHORS diff --git a/configure.ac b/configure.ac index 20926ee9f19..78676d73d2b 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,5 @@ AC_CONFIG_FILES([\ libvirt-admin.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile \ - examples/Makefile \ - tests/Makefile]) + examples/Makefile]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 04c37ccda2e..00000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2019 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -VALGRIND =3D valgrind --quiet --leak-check=3Dfull --trace-children=3Dyes \ - --trace-children-skip=3D"*/tools/virsh","*/tests/commandhelper","/usr/bin= /*" \ - --suppressions=3D$(abs_srcdir)/.valgrind.supp -valgrind: - $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" diff --git a/tests/meson.build b/tests/meson.build index cf848678505..1510d6ef3f3 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -673,3 +673,14 @@ add_test_setup( ], exe_wrapper: [ meson_python_prog, check_file_access_prog ], ) + +add_test_setup( + 'valgrind', + exe_wrapper: [ + 'valgrind', '--quiet', '--leak-check=3Dfull', '--trace-children=3Dyes', + '--trace-children-skip=3D"*/tools/virsh,*/tests/commandhelper,/usr/bin= /*"', + '--suppressions=3D@0@'.format(meson.current_source_dir() / '.valgrind.= supp'), + '--error-exitcode=3D1', + ], + timeout_multiplier: 4, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894816; cv=none; d=zohomail.com; s=zohoarc; b=PqsirHIC0wPenKWuyBluxKFy6gJb7TvRglnDsg9B0ImkrnnO/614r+ghNLnRbsete4dYNf90wVWvuDRsg+lRYFGk6AUDI5HI3Hrx4norT0yyhoQy3yivf3bBNW7NKH2uRc/JiFe3ytIWclq94rdKWShxcOYSBr7BWTDqcMGTihs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894816; 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=aqn2g3EcHj5wmj88RgMDC58L6Aose8oZF3899jmfl98=; b=nURDzbbw+9TsI9w8XyTnOMuvEVT/m8Z3MdmJE8VxAF81zLOWrvNrMYTtsxk0jxozlVH8el6Kz3gi4CHwvDcqtevlKZvmLbnf6qySKWtt1NzWpd5Fo/mKPB+e74PX69zvEywZNdDLGE19YG90fsEwazQxeyCQLuQuLjzuWMlfPdE= 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 1594894816663262.9130567961; Thu, 16 Jul 2020 03:20:16 -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-104-cBFghd-aNPG4wZsKSgvcgA-1; Thu, 16 Jul 2020 06:11:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DA69100AA29; Thu, 16 Jul 2020 10:11:03 +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 8070E7848E; Thu, 16 Jul 2020 10:11:03 +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 4B210A371F; Thu, 16 Jul 2020 10:11:03 +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 06GA7Itr020583 for ; Thu, 16 Jul 2020 06:07:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 419EB2DE6D; Thu, 16 Jul 2020 10:07:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B124C2B6DB for ; Thu, 16 Jul 2020 10:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894815; 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=aqn2g3EcHj5wmj88RgMDC58L6Aose8oZF3899jmfl98=; b=b6H0LnH3ueccZgQcj1CvmEoWW49gJX3hM6O/QFvrw9/lH0cjibGKnoTMu7qD6QsfbWoHr5 nfcdn1k3HWuG7SQrrr3AFOTM7LA9SIxHZ4BKRFtovXQdBwNj6LeWeybGXEio1yC+nlxYMy PoszhoGJijEtYbNX34IMGfzE71UWai8= X-MC-Unique: cBFghd-aNPG4wZsKSgvcgA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 314/351] meson: examples: build and install example files Date: Thu, 16 Jul 2020 11:59:10 +0200 Message-Id: <2711c21b8b9528dcd830c223b0fa7eb10dd6f1db.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.11 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 --- Makefile.am | 2 +- configure.ac | 3 +- examples/Makefile.am | 127 ------------------------------- examples/c/admin/meson.build | 27 +++++++ examples/c/domain/meson.build | 24 ++++++ examples/c/meson.build | 3 + examples/c/misc/meson.build | 22 ++++++ examples/meson.build | 7 ++ examples/polkit/meson.build | 1 + examples/sh/meson.build | 1 + examples/systemtap/meson.build | 9 +++ examples/xml/meson.build | 2 + examples/xml/storage/meson.build | 15 ++++ examples/xml/test/meson.build | 14 ++++ meson.build | 2 + 15 files changed, 129 insertions(+), 130 deletions(-) delete mode 100644 examples/Makefile.am create mode 100644 examples/c/admin/meson.build create mode 100644 examples/c/domain/meson.build create mode 100644 examples/c/meson.build create mode 100644 examples/c/misc/meson.build create mode 100644 examples/meson.build create mode 100644 examples/polkit/meson.build create mode 100644 examples/sh/meson.build create mode 100644 examples/systemtap/meson.build create mode 100644 examples/xml/meson.build create mode 100644 examples/xml/storage/meson.build create mode 100644 examples/xml/test/meson.build diff --git a/Makefile.am b/Makefile.am index 549ade3db20..4b3abc82728 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 SUBDIRS =3D . docs \ - po examples + po =20 XZ_OPT ?=3D -v -T0 export XZ_OPT diff --git a/configure.ac b/configure.ac index 78676d73d2b..4f7ad909468 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,5 @@ AC_CONFIG_FILES([\ libvirt-lxc.pc \ libvirt-admin.pc \ libvirt.spec mingw-libvirt.spec \ - po/Makefile \ - examples/Makefile]) + po/Makefile]) AC_OUTPUT diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 15ff897cf1f..00000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,127 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2016 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -ADMIN_EXAMPLES =3D \ - $(wildcard $(srcdir)/c/admin/*.c) \ - $(NULL) - -DOMAIN_EXAMPLES =3D \ - $(wildcard $(srcdir)/c/domain/*.c) \ - $(NULL) - -MISC_EXAMPLES =3D \ - $(wildcard $(srcdir)/c/misc/*.c) \ - $(NULL) - -POLKIT_EXAMPLES =3D \ - $(wildcard $(srcdir)/polkit/*.rules) \ - $(NULL) - -SH_EXAMPLES =3D \ - $(wildcard $(srcdir)/sh/*) \ - $(NULL) - -STORAGE_XML_EXAMPLES =3D \ - $(wildcard $(srcdir)/xml/storage/*.xml) \ - $(NULL) - -SYSTEMTAP_EXAMPLES =3D \ - $(wildcard $(srcdir)/systemtap/*.stp) \ - $(NULL) - -TEST_XML_EXAMPLES =3D \ - $(wildcard $(srcdir)/xml/test/*.xml) \ - $(NULL) - -AM_CPPFLAGS =3D \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - $(NULL) - -AM_CFLAGS =3D \ - $(WARN_CFLAGS) \ - $(NULL) - -AM_LDFLAGS =3D \ - $(STATIC_BINARIES) \ - $(NULL) - -LDADD =3D \ - $(top_builddir)/src/libvirt.la \ - $(top_builddir)/src/libvirt-admin.la \ - $(NULL) - -noinst_PROGRAMS =3D \ - c/admin/client_close \ - c/admin/client_info \ - c/admin/client_limits \ - c/admin/list_clients \ - c/admin/list_servers \ - c/admin/logging \ - c/admin/threadpool_params \ - c/domain/dommigrate \ - c/domain/domtop \ - c/domain/info1 \ - c/domain/rename \ - c/domain/suspend \ - c/misc/event-test \ - c/misc/hellolibvirt \ - c/misc/openauth \ - $(NULL) - -c_admin_client_close_SOURCES =3D c/admin/client_close.c -c_admin_client_info_SOURCES =3D c/admin/client_info.c -c_admin_client_limits_SOURCES =3D c/admin/client_limits.c -c_admin_list_clients_SOURCES =3D c/admin/list_clients.c -c_admin_list_servers_SOURCES =3D c/admin/list_servers.c -c_admin_logging_SOURCES =3D c/admin/logging.c -c_admin_threadpool_params_SOURCES =3D c/admin/threadpool_params.c -c_domain_dommigrate_SOURCES =3D c/domain/dommigrate.c -c_domain_domtop_SOURCES =3D c/domain/domtop.c -c_domain_info1_SOURCES =3D c/domain/info1.c -c_domain_rename_SOURCES =3D c/domain/rename.c -c_domain_suspend_SOURCES =3D c/domain/suspend.c -c_misc_event_test_SOURCES =3D c/misc/event-test.c -c_misc_hellolibvirt_SOURCES =3D c/misc/hellolibvirt.c -c_misc_openauth_SOURCES =3D c/misc/openauth.c - -examplesdir =3D $(docdir)/examples - -adminexamplesdir =3D $(examplesdir)/c/admin -adminexamples_DATA =3D $(ADMIN_EXAMPLES) - -domainexamplesdir =3D $(examplesdir)/c/domain -domainexamples_DATA =3D $(DOMAIN_EXAMPLES) - -miscexamplesdir =3D $(examplesdir)/c/misc -miscexamples_DATA =3D $(MISC_EXAMPLES) - -polkitexamplesdir =3D $(examplesdir)/polkit -polkitexamples_DATA =3D $(POLKIT_EXAMPLES) - -shexamplesdir =3D $(examplesdir)/sh -shexamples_DATA =3D $(SH_EXAMPLES) - -storagexmlexamplesdir =3D $(examplesdir)/xml/storage -storagexmlexamples_DATA =3D $(STORAGE_XML_EXAMPLES) - -systemtapexamplesdir =3D $(examplesdir)/systemtap -systemtapexamples_DATA =3D $(SYSTEMTAP_EXAMPLES) - -testxmlexamplesdir =3D $(examplesdir)/xml/test -testxmlexamples_DATA =3D $(TEST_XML_EXAMPLES) diff --git a/examples/c/admin/meson.build b/examples/c/admin/meson.build new file mode 100644 index 00000000000..094408a63c2 --- /dev/null +++ b/examples/c/admin/meson.build @@ -0,0 +1,27 @@ +example_admin_files =3D [ + 'client_close', + 'client_info', + 'client_limits', + 'list_clients', + 'list_servers', + 'logging', + 'threadpool_params', +] + +foreach name : example_admin_files + source_file =3D '@0@.c'.format(name) + executable( + name, + [ + source_file, + ], + include_directories: [ + libvirt_inc, + ], + link_with: [ + libvirt_lib, + libvirt_admin_lib, + ], + ) + install_data(source_file, install_dir: example_dir / 'c' / 'admin') +endforeach diff --git a/examples/c/domain/meson.build b/examples/c/domain/meson.build new file mode 100644 index 00000000000..51cd03afc85 --- /dev/null +++ b/examples/c/domain/meson.build @@ -0,0 +1,24 @@ +example_domain_files =3D [ + 'dommigrate', + 'domtop', + 'info1', + 'rename', + 'suspend', +] + +foreach name : example_domain_files + source_file =3D '@0@.c'.format(name) + executable( + name, + [ + source_file, + ], + include_directories: [ + libvirt_inc, + ], + link_with: [ + libvirt_lib, + ], + ) + install_data(source_file, install_dir: example_dir / 'c' / 'domain') +endforeach diff --git a/examples/c/meson.build b/examples/c/meson.build new file mode 100644 index 00000000000..727e4caafaa --- /dev/null +++ b/examples/c/meson.build @@ -0,0 +1,3 @@ +subdir('admin') +subdir('domain') +subdir('misc') diff --git a/examples/c/misc/meson.build b/examples/c/misc/meson.build new file mode 100644 index 00000000000..b106467912f --- /dev/null +++ b/examples/c/misc/meson.build @@ -0,0 +1,22 @@ +example_misc_files =3D [ + 'event-test', + 'hellolibvirt', + 'openauth', +] + +foreach name : example_misc_files + source_file =3D '@0@.c'.format(name) + executable( + name, + [ + source_file, + ], + include_directories: [ + libvirt_inc, + ], + link_with: [ + libvirt_lib, + ], + ) + install_data(source_file, install_dir: example_dir / 'c' / 'misc') +endforeach diff --git a/examples/meson.build b/examples/meson.build new file mode 100644 index 00000000000..a57820aaed5 --- /dev/null +++ b/examples/meson.build @@ -0,0 +1,7 @@ +example_dir =3D docdir / 'examples' + +subdir('c') +subdir('polkit') +subdir('sh') +subdir('systemtap') +subdir('xml') diff --git a/examples/polkit/meson.build b/examples/polkit/meson.build new file mode 100644 index 00000000000..d57c5a19868 --- /dev/null +++ b/examples/polkit/meson.build @@ -0,0 +1 @@ +install_data('libvirt-acl.rules', install_dir: example_dir / 'polkit') diff --git a/examples/sh/meson.build b/examples/sh/meson.build new file mode 100644 index 00000000000..0cdbe17c677 --- /dev/null +++ b/examples/sh/meson.build @@ -0,0 +1 @@ +install_data('virt-lxc-convert', install_dir: example_dir / 'sh') diff --git a/examples/systemtap/meson.build b/examples/systemtap/meson.build new file mode 100644 index 00000000000..f31187e1877 --- /dev/null +++ b/examples/systemtap/meson.build @@ -0,0 +1,9 @@ +install_data( + [ + 'rpc-monitor.stp', + 'qemu-monitor.stp', + 'lock-debug.stp', + 'events.stp', + ], + install_dir: example_dir / 'systemtap', +) diff --git a/examples/xml/meson.build b/examples/xml/meson.build new file mode 100644 index 00000000000..650d6a15d27 --- /dev/null +++ b/examples/xml/meson.build @@ -0,0 +1,2 @@ +subdir('storage') +subdir('test') diff --git a/examples/xml/storage/meson.build b/examples/xml/storage/meson.= build new file mode 100644 index 00000000000..c142bb1e08d --- /dev/null +++ b/examples/xml/storage/meson.build @@ -0,0 +1,15 @@ +install_data( + [ + 'pool-dir.xml', + 'pool-fs.xml', + 'pool-logical.xml', + 'pool-netfs.xml', + 'vol-cow.xml', + 'vol-qcow.xml', + 'vol-qcow2.xml', + 'vol-raw.xml', + 'vol-sparse.xml', + 'vol-vmdk.xml', + ], + install_dir: example_dir / 'xml' / 'storage', +) diff --git a/examples/xml/test/meson.build b/examples/xml/test/meson.build new file mode 100644 index 00000000000..89ebf03a7bc --- /dev/null +++ b/examples/xml/test/meson.build @@ -0,0 +1,14 @@ +install_data( + [ + 'testdev.xml', + 'testnodeinline.xml', + 'testdomfc4.xml', + 'testdomfv0.xml', + 'testnode.xml', + 'testnetdef.xml', + 'testvol.xml', + 'testnetpriv.xml', + 'testpool.xml', + ], + install_dir: example_dir / 'xml' / 'test', +) diff --git a/meson.build b/meson.build index 2e894df1ab2..caee54a5818 100644 --- a/meson.build +++ b/meson.build @@ -2207,6 +2207,8 @@ subdir('tools') =20 subdir('tests') =20 +subdir('examples') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894490; cv=none; d=zohomail.com; s=zohoarc; b=K+qQxv+An5d6rJt8GFziGndI/GKWvnS0X1g2NiM1BBLwmQw8J5OfbsuXK2ymonezcjz3g5xwplFhdCvTlSCtT0QKl7vm4IwgLc2mBnGKggCKkBa+MWUinUli1NHKT43f8UudwSdSkLIDORPsQt+Gag3k/udQ1FbIkMYSqrnFgLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894490; 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=Q6Cal4ikC/I4dDng1qQrMamaS2CTeCL7gTYbli9X7vI=; b=kiADxGEzmEd5q3mdK2XqoB0RfK/HYaAS3/WJR5XaP7BPOmfGRCX8KEdLsGJ2TtGb27lzHPTdUFM6w/cHEumymBP3MQ+MKy2RYXRnlU6bYoMsekjX59usv2Rvs7RQTClUsQKFLwlKOog8NbyII/x/dAqHZgvbKGDqPf13PUTNf40= 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 1594894490164675.0875564292306; Thu, 16 Jul 2020 03:14:50 -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-485-Txlb3U2OPkqcn4YEWttuKQ-1; Thu, 16 Jul 2020 06:14:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A21AD108F; Thu, 16 Jul 2020 10:14:41 +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 8008A2DE79; Thu, 16 Jul 2020 10:14:41 +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 508F4730FE; Thu, 16 Jul 2020 10:14:41 +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 06GA7JvY020633 for ; Thu, 16 Jul 2020 06:07:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A6322DE6D; Thu, 16 Jul 2020 10:07:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 983602B6DB for ; Thu, 16 Jul 2020 10:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894489; 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=Q6Cal4ikC/I4dDng1qQrMamaS2CTeCL7gTYbli9X7vI=; b=BxhAgU/LqEw9T7hF2ZzYoZbeAq7+3JowDaTTjMcpgBBu3Em27gvNWfMlZU0tgvY660irRL 6NH7ReV2U31RDwb2U+LGCWcwNebPhn1pABsvfO/Tdg++rFQtiyzg7qpTCs7q3e3NrmWT3S c8fVnDOnPefwjNFAkcaH5BzhoR9Yqbg= X-MC-Unique: Txlb3U2OPkqcn4YEWttuKQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 315/351] meson: po: introduce libvirt translation Date: Thu, 16 Jul 2020 11:59:11 +0200 Message-Id: <2c4969e4b94736d32e611feab070f9e70d17108b.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.23 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 --- Makefile.am | 3 +- configure.ac | 3 +- meson.build | 2 ++ po/Makefile.am | 87 -------------------------------------------------- po/meson.build | 35 ++++++++++++++++++++ 5 files changed, 39 insertions(+), 91 deletions(-) delete mode 100644 po/Makefile.am create mode 100644 po/meson.build diff --git a/Makefile.am b/Makefile.am index 4b3abc82728..fca0c1f5c29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . docs \ - po +SUBDIRS =3D . docs =20 XZ_OPT ?=3D -v -T0 export XZ_OPT diff --git a/configure.ac b/configure.ac index 4f7ad909468..91ba0c2af4e 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,5 @@ AC_CONFIG_FILES([\ libvirt-qemu.pc \ libvirt-lxc.pc \ libvirt-admin.pc \ - libvirt.spec mingw-libvirt.spec \ - po/Makefile]) + libvirt.spec mingw-libvirt.spec]) AC_OUTPUT diff --git a/meson.build b/meson.build index caee54a5818..8b434929825 100644 --- a/meson.build +++ b/meson.build @@ -2209,6 +2209,8 @@ subdir('tests') =20 subdir('examples') =20 +subdir('po') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) diff --git a/po/Makefile.am b/po/Makefile.am deleted file mode 100644 index ff73ead6f72..00000000000 --- a/po/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -DOMAIN =3D $(PACKAGE_NAME) -COPYRIGHT_HOLDER =3D The Libvirt authors -MSGID_BUGS_ADDRESS =3D https://libvirt.org/bugs.html - -LANGS :=3D $(shell cat $(srcdir)/LINGUAS) - -POTFILES_IN =3D $(srcdir)/POTFILES.in -POTFILES: $(POTFILES_IN) - $(AM_V_GEN) cat $(POTFILES_IN) | \ - $(SED) 's|[@]SRCDIR[@]||' | \ - $(SED) 's|[@]BUILDDIR[@]||' > $@ -POTFILE_DEPS =3D $(shell cat POTFILES) -POTFILE :=3D $(DOMAIN).pot -POFILES :=3D $(LANGS:%=3D%.po) -GMOFILES :=3D $(LANGS:%=3D%.gmo) - -if HAVE_GNU_GETTEXT_TOOLS - -XGETTEXT_ARGS =3D \ - --default-domain=3D$(DOMAIN) \ - --from-code=3Dutf-8 \ - --add-comments=3DTRANSLATORS: \ - --keyword=3D_ --keyword=3DN_ \ - --copyright-holder=3D'$(COPYRIGHT_HOLDER)' \ - --package-name=3D"$(PACKAGE_NAME)" \ - --package-version=3D"$(PACKAGE_VERSION)" \ - --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ - --directory=3D"$(top_srcdir)" \ - --directory=3D"$(top_builddir)" \ - --sort-output \ - $(NULL) - -SED_PO_FIXUP_ARGS =3D \ - -e "s|text/plain; charset=3DCHARSET|text/plain; charset=3DUTF-8|g" \ - -e "s|SOME DESCRIPTIVE TITLE|Libvirt package strings|g" \ - -e "s|Copyright (C) YEAR|Copyright (C) $$(date +'%Y')|" \ - $(NULL) - -update-gmo: $(GMOFILES) - -# The results of this target should not be committed to Git. The Weblate -# service is responsible for updating .po files when the .pot is changed. -update-po: $(POTFILE) - cd $(srcdir) && \ - for lang in $(LANGS); do \ - echo "Minimizing $$lang content" && \ - $(MSGMERGE) --no-location --no-fuzzy-matching --sort-output \ - $$lang.po $(POTFILE) | \ - $(SED) $(SED_PO_FIXUP_ARGS) > $$lang.po-t && \ - mv $$lang.po-t $$lang.po ; \ - done - -$(POTFILE): POTFILES - $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ - --files-from=3D$(abs_builddir)/POTFILES - $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $(srcdir)/$@ - rm -f $@-t - -%.gmo: %.po - rm -f $@ $@-t - $(MSGFMT) -c -o $@-t $< - mv $@-t $@ - -.PHONY: $(POTFILE) - -endif HAVE_GNU_GETTEXT_TOOLS - -if ENABLE_NLS - -# Cannot use 'localedir' since this conflicts with autoconf. -langinstdir =3D $(datadir)/locale - -install-data-hook: $(GMOFILES) - mkdir -p $(DESTDIR)$(langinstdir) - for lang in $(LANGS); do \ - d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ - mkdir -p $$d; \ - install -m 0644 $$lang.gmo $$d/$(DOMAIN).mo; \ - done - -uninstall-hook: - for lang in $(LANGS); do \ - d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ - rm -f $$d/$(DOMAIN).mo; \ - done - -endif ENABLE_NLS diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 00000000000..f9677408ec9 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,35 @@ +i18n =3D import('i18n') + +potfiles_conf =3D configuration_data() +potfiles_conf.set('SRCDIR', '') +potfiles_conf.set('BUILDDIR', '') + +potfiles =3D configure_file( + input: 'POTFILES.in', + output: 'POTFILES', + configuration: potfiles_conf, +) + +i18n.gettext( + meson.project_name(), + args: [ + '--add-comments=3DTRANSLATORS:', + '--directory=3D@0@'.format(meson.source_root()), + '--directory=3D@0@'.format(meson.build_root()), + '--files-from=3D@0@'.format(meson.current_build_dir() / 'POTFILES'), + '--msgid-bugs-address=3Dhttps://libvirt.org/bugs.html', + '--package-version=3D@0@'.format(meson.project_version()), + '--sort-output', + ], + preset: 'glib', +) + +potfiles_dep =3D [ + access_gen_sources, + admin_client_generated, + admin_driver_generated, + remote_driver_generated, + remote_daemon_generated, +] + +alias_target('libvirt-pot-dep', potfiles_dep) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894276; cv=none; d=zohomail.com; s=zohoarc; b=jEGLkRpKEZ2pkK51nvtb2yY6cUApn5J41swfR19wLlNZ+NKeJ1VDlC1f7crbJupbk1pGm1/Bn+/fV2FTDn/bsj5x52hSDqsUH8fwrEkOYPqkWyBFm7QkF7CwEQrPKGQTgG1dBDF+AYiSn4G0GJLsH7xOPMqFCTKTpHoFeROgT4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894276; 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=qwsMBCvhzZaGMYAQdXJpOn89kk83rvb5JVtRGp8+8hM=; b=MimWrbtoty93Z5ls2i8/6XrPFxT4p2JTYhiUweAbsvr2r9ZmjnEID7weNHugVKfGo28YzjXEkecfXV9CBc75QtPjdMR4BIlN15JmBM237KP4sGHxlD1JPqFotSYV+CnVqq+gjJvC+1lcG8yfFFKHznVmSmWfO1bSkFipR84btEI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894276256355.07466096266273; Thu, 16 Jul 2020 03:11:16 -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-402-WsHXQCskODaZ368z4KleQw-1; Thu, 16 Jul 2020 06:11:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12E998064D1; Thu, 16 Jul 2020 10:11:06 +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 E580378494; Thu, 16 Jul 2020 10:11:05 +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 B578D730C7; Thu, 16 Jul 2020 10:11:05 +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 06GA7KNt020664 for ; Thu, 16 Jul 2020 06:07:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 123D92DE6D; Thu, 16 Jul 2020 10:07:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81D462B6DB for ; Thu, 16 Jul 2020 10:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894275; 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=qwsMBCvhzZaGMYAQdXJpOn89kk83rvb5JVtRGp8+8hM=; b=HDoAAOrmqcFdh6Rq4SOM9QNVCyjEcLCFR3S7z5UHSKGqnJCz/xLaPQpuXW93kvG9tkQtjK 9Zyko1hbtw0GarxAyAMi7kRv1BlNxv5qlfHs9+ItESduru6RgHDlmdCJgVNedJjyhNmcWD uAhQz7B9OQTnitE1Ej//OU6tU38casQ= X-MC-Unique: WsHXQCskODaZ368z4KleQw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 316/351] meson: docs: introduce docs directory Date: Thu, 16 Jul 2020 11:59:12 +0200 Message-Id: <014eccbf6aef248175f10a1120251d344179c142.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.11 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 --- docs/Makefile.am | 31 +------------------------------ docs/meson.build | 30 ++++++++++++++++++++++++++++++ meson.build | 2 ++ 3 files changed, 33 insertions(+), 30 deletions(-) create mode 100644 docs/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 6d4fcdc831a..6d97ed55c5b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,8 +16,6 @@ ## License along with this library. If not, see ## . =20 -HTML_DIR =3D $(docdir)/html - modules =3D \ libvirt-common \ libvirt-domain \ @@ -140,33 +138,6 @@ logofiles =3D \ logofilesdir =3D $(HTML_DIR)/logos logofiles_DATA =3D $(logofiles) =20 -assets =3D \ - android-chrome-192x192.png \ - android-chrome-256x256.png \ - apple-touch-icon.png \ - architecture.gif \ - browserconfig.xml \ - favicon.ico \ - favicon-16x16.png \ - favicon-32x32.png \ - generic.css \ - libvirt.css \ - libvirt-daemon-arch.png \ - libvirt-driver-arch.png \ - libvirt-object-model.png \ - libvirt-virConnect-example.png \ - main.css \ - manifest.json \ - migration-managed-direct.png \ - migration-managed-p2p.png \ - migration-native.png \ - migration-tunnel.png \ - migration-unmanaged-direct.png \ - mobile.css \ - mstile-150x150.png \ - node.gif \ - $(NULL) - internals_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_rst =3D \ @@ -324,7 +295,7 @@ dot_html =3D \ $(dot_rst_html_in:%.html.in=3D%.html) =20 htmldir =3D $(HTML_DIR) -html_DATA =3D $(assets) $(dot_html) +html_DATA =3D $(dot_html) =20 apidir =3D $(pkgdatadir)/api api_DATA =3D \ diff --git a/docs/meson.build b/docs/meson.build new file mode 100644 index 00000000000..529a1c003a7 --- /dev/null +++ b/docs/meson.build @@ -0,0 +1,30 @@ +docs_html_dir =3D docdir / 'html' + +docs_assets =3D [ + 'android-chrome-192x192.png', + 'android-chrome-256x256.png', + 'apple-touch-icon.png', + 'architecture.gif', + 'browserconfig.xml', + 'favicon.ico', + 'favicon-16x16.png', + 'favicon-32x32.png', + 'generic.css', + 'libvirt.css', + 'libvirt-daemon-arch.png', + 'libvirt-driver-arch.png', + 'libvirt-object-model.png', + 'libvirt-virConnect-example.png', + 'main.css', + 'manifest.json', + 'migration-managed-direct.png', + 'migration-managed-p2p.png', + 'migration-native.png', + 'migration-tunnel.png', + 'migration-unmanaged-direct.png', + 'mobile.css', + 'mstile-150x150.png', + 'node.gif', +] + +install_data(docs_assets, install_dir: docs_html_dir) diff --git a/meson.build b/meson.build index 8b434929825..65843ed574d 100644 --- a/meson.build +++ b/meson.build @@ -2211,6 +2211,8 @@ subdir('examples') =20 subdir('po') =20 +subdir('docs') + =20 # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894495; cv=none; d=zohomail.com; s=zohoarc; b=HwbCeTZPKwaR2Ocj5iW6LAmkxX3dlUV9nHdJQf7lkjCXaZLw/d2HhnQ3j6cKSKo36yQu6dBRe/9nwa51xerYjkI+SNtFcVROavc+BDQf+QAHNXAseUNqjyy9RPEw1H212WzpNKz3prIl7N5t/WubXTNQ+IGzrYIjKNCn+PkbpBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894495; 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=4Ji6L6E+fp015xcjm6b4oGAl5xUw5AmLQr/fSX1xPGg=; b=koYs9//6A3WdXqftLGP8Z8ZgbsdvZjBjCziPTH6rriV0DhAvtoojWS57+SAjJweicn5mZs3q2GHNbUQTDQDT/esZj4UK8STG3O/gAmGix10S4h92ZW/4R6WbtPz9jrdMtiQADFjbUp2erCzn33tyt2w1ChmuhWtG/kb59DsWx0w= 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 1594894495959157.3332183105416; Thu, 16 Jul 2020 03:14:55 -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-265-LPoJISOXNYigoNWX0v1I6Q-1; Thu, 16 Jul 2020 06:14:49 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD33F800E23; Thu, 16 Jul 2020 10:14:43 +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 BDC265C1C3; Thu, 16 Jul 2020 10:14:43 +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 8D9699625E; Thu, 16 Jul 2020 10:14:43 +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 06GA7KMa020709 for ; Thu, 16 Jul 2020 06:07:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id EFABD2DE6F; Thu, 16 Jul 2020 10:07:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69C792B6DB for ; Thu, 16 Jul 2020 10:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894493; 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=4Ji6L6E+fp015xcjm6b4oGAl5xUw5AmLQr/fSX1xPGg=; b=bNp88bT9A0dLwrgsrfewGLpdcLP3iu73qmazQ/Yr2xV9C/FD+jtVAvWtzkSb3qNwKLtvqx cOXIZZPFOKt8aV+xoLpIzoqrfS68Yz+EEdvrj4Su6YlzSFd0WE1kSik7MMcaakBNVT7H2V WKFgS8PjxA9nPI3Pwrra2MIvAM48YjI= X-MC-Unique: LPoJISOXNYigoNWX0v1I6Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 317/351] meson: docs: build api XML files Date: Thu, 16 Jul 2020 11:59:13 +0200 Message-Id: <4a03d04a954f80301786dc32f80c668fd3c896ae.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.16 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 --- docs/Makefile.am | 55 --------------------------------------------- docs/meson.build | 32 ++++++++++++++++++++++++++ scripts/apibuild.py | 26 +++++++++++++-------- src/meson.build | 16 +++++++++---- 4 files changed, 61 insertions(+), 68 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 6d97ed55c5b..1237b4c47cc 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -297,13 +297,6 @@ dot_html =3D \ htmldir =3D $(HTML_DIR) html_DATA =3D $(dot_html) =20 -apidir =3D $(pkgdatadir)/api -api_DATA =3D \ - libvirt-api.xml \ - libvirt-qemu-api.xml \ - libvirt-lxc-api.xml \ - libvirt-admin-api.xml - schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 @@ -392,51 +385,3 @@ check-html: $(XMLLINT) --nonet --noout html/*.html =20 check-local: check-html - -python_generated_files =3D $(api_DATA) - -APIBUILD=3D$(top_srcdir)/scripts/apibuild.py -APIBUILD_STAMP=3Dapibuild.py.stamp - -$(python_generated_files): $(APIBUILD_STAMP) - -$(APIBUILD_STAMP): $(top_srcdir)/scripts/apibuild.py \ - $(top_srcdir)/include/libvirt/libvirt.h \ - $(top_srcdir)/include/libvirt/libvirt-common.h.in \ - $(top_srcdir)/include/libvirt/libvirt-domain-checkpoint.h \ - $(top_srcdir)/include/libvirt/libvirt-domain-snapshot.h \ - $(top_srcdir)/include/libvirt/libvirt-domain.h \ - $(top_srcdir)/include/libvirt/libvirt-event.h \ - $(top_srcdir)/include/libvirt/libvirt-host.h \ - $(top_srcdir)/include/libvirt/libvirt-interface.h \ - $(top_srcdir)/include/libvirt/libvirt-network.h \ - $(top_srcdir)/include/libvirt/libvirt-nodedev.h \ - $(top_srcdir)/include/libvirt/libvirt-nwfilter.h \ - $(top_srcdir)/include/libvirt/libvirt-secret.h \ - $(top_srcdir)/include/libvirt/libvirt-storage.h \ - $(top_srcdir)/include/libvirt/libvirt-stream.h \ - $(top_srcdir)/include/libvirt/libvirt-lxc.h \ - $(top_srcdir)/include/libvirt/libvirt-qemu.h \ - $(top_srcdir)/include/libvirt/libvirt-admin.h \ - $(top_srcdir)/include/libvirt/virterror.h \ - $(top_srcdir)/src/libvirt.c \ - $(top_srcdir)/src/libvirt-domain-checkpoint.c \ - $(top_srcdir)/src/libvirt-domain-snapshot.c \ - $(top_srcdir)/src/libvirt-domain.c \ - $(top_srcdir)/src/libvirt-host.c \ - $(top_srcdir)/src/libvirt-interface.c \ - $(top_srcdir)/src/libvirt-network.c \ - $(top_srcdir)/src/libvirt-nodedev.c \ - $(top_srcdir)/src/libvirt-nwfilter.c \ - $(top_srcdir)/src/libvirt-secret.c \ - $(top_srcdir)/src/libvirt-storage.c \ - $(top_srcdir)/src/libvirt-stream.c \ - $(top_srcdir)/src/libvirt-lxc.c \ - $(top_srcdir)/src/libvirt-qemu.c \ - $(top_srcdir)/src/admin/libvirt-admin.c \ - $(top_srcdir)/src/util/virerror.c \ - $(top_srcdir)/src/util/virevent.c \ - $(top_srcdir)/src/util/virtypedparam-public.c - $(AM_V_GEN)srcdir=3D$(srcdir) builddir=3D$(builddir) \ - $(RUNUTF8) $(PYTHON) $(APIBUILD) - touch $@ diff --git a/docs/meson.build b/docs/meson.build index 529a1c003a7..c67e114751e 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -28,3 +28,35 @@ docs_assets =3D [ ] =20 install_data(docs_assets, install_dir: docs_html_dir) + +docs_api_generated =3D custom_target( + 'generate-api', + output: [ + 'libvirt-api.xml', + 'libvirt-lxc-api.xml', + 'libvirt-qemu-api.xml', + 'libvirt-admin-api.xml', + ], + command: [ + meson_python_prog, + apibuild_prog, + meson.current_source_dir(), + meson.current_build_dir(), + ], + install: true, + install_dir: pkgdatadir / 'api', + depend_files: [ + libvirt_common_h_in, + libvirt_include, + driver_sources, + libvirt_qemu_sources, + libvirt_lxc_sources, + admin_sources, + util_public_sources, + ], +) + +docs_api_xml =3D docs_api_generated[0] +docs_lxc_api_xml =3D docs_api_generated[1] +docs_qemu_api_xml =3D docs_api_generated[2] +docs_admin_api_xml =3D docs_api_generated[3] diff --git a/scripts/apibuild.py b/scripts/apibuild.py index 7cac9b136b4..58ae76d29cf 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -12,6 +12,7 @@ import os import sys import glob import re +import argparse =20 quiet =3D True warnings =3D 0 @@ -2404,13 +2405,11 @@ class app: warnings =3D warnings + 1 print(msg) =20 - def rebuild(self, name): + def rebuild(self, name, srcdir, builddir): if name not in ["libvirt", "libvirt-qemu", "libvirt-lxc", "libvirt= -admin"]: self.warning("rebuild() failed, unknown module %s" % name) return None builder =3D None - srcdir =3D os.path.abspath((os.environ["srcdir"])) - builddir =3D os.path.abspath((os.environ["builddir"])) if glob.glob(srcdir + "/../src/libvirt.c") !=3D []: if not quiet: print("Rebuilding API description for %s" % name) @@ -2438,15 +2437,24 @@ class app: =20 =20 if __name__ =3D=3D "__main__": + parser =3D argparse.ArgumentParser(description=3D"XML API builder") + parser.add_argument("srcdir", type=3Dstr, help=3D"path to docs source = dir") + parser.add_argument("builddir", type=3Dstr, help=3D"path to docs build= dir") + parser.add_argument("-d", "--debug", type=3Dstr, help=3D"path to sourc= e file") + + args =3D parser.parse_args() + app =3D app() - if len(sys.argv) > 1: + + if args.debug: debug =3D 1 - app.parse(sys.argv[1]) + app.parse(args.debug) else: - app.rebuild("libvirt") - app.rebuild("libvirt-qemu") - app.rebuild("libvirt-lxc") - app.rebuild("libvirt-admin") + app.rebuild("libvirt", args.srcdir, args.builddir) + app.rebuild("libvirt-qemu", args.srcdir, args.builddir) + app.rebuild("libvirt-lxc", args.srcdir, args.builddir) + app.rebuild("libvirt-admin", args.srcdir, args.builddir) + if warnings > 0: sys.exit(2) else: diff --git a/src/meson.build b/src/meson.build index 946c124079a..b8ad300e558 100644 --- a/src/meson.build +++ b/src/meson.build @@ -271,7 +271,7 @@ subdir('vmware') subdir('vz') =20 =20 -driver_sources =3D [ +driver_sources =3D files( 'driver.c', 'libvirt.c', 'libvirt-domain.c', @@ -285,7 +285,7 @@ driver_sources =3D [ 'libvirt-secret.c', 'libvirt-storage.c', 'libvirt-stream.c', -] + ) =20 driver_headers =3D [ 'driver-hypervisor.h', @@ -415,9 +415,13 @@ libvirt_qemu_syms_flags =3D '@0@@1@'.format( libvirt_qemu_syms_path, ) =20 +libvirt_qemu_sources =3D files( + 'libvirt-qemu.c', +) + libvirt_qemu_lib =3D shared_library( 'virt-qemu', - 'libvirt-qemu.c', + libvirt_qemu_sources, dependencies: [ src_dep, ], @@ -463,9 +467,13 @@ libvirt_lxc_syms_flags =3D '@0@@1@'.format( libvirt_lxc_syms_path, ) =20 +libvirt_lxc_sources =3D files( + 'libvirt-lxc.c', +) + libvirt_lxc_lib =3D shared_library( 'virt-lxc', - 'libvirt-lxc.c', + libvirt_lxc_sources, dependencies: [ apparmor_dep, selinux_dep, --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894184; cv=none; d=zohomail.com; s=zohoarc; b=nJbQqCG/Dnzqd8+aUBWdz3mSsMhL9wX5XV1uPyuLhZO9fObKLWmJV+d4BmmAmgHSFoPBqHl9oVUq1gx0ICa2VURXyfFoN0MI7g/4tUTG7a+fArtkT/UTHTyZjwgx2UulUeDuGeNL5BEN+bEm3/7s1JlIo/cZiKzIBDh/T21F7lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894184; 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=BzItEvgqJew0JvbX5lLrFdVo7UIEZ1dX0T5wkWjGYPI=; b=mWiA7NBI3IzLSzLHop6wWhDji3wK6wGkX/OW09JsezlfTYZILpZ+SgBrnJ3pYslB+jYyXxAcXtaJmc2gpc8NjngzK/OtIkBNDn3dlmiSAMWWSrR1AboqvdoCtkg+nPn3mchyIqEeV1AZjLMi7q8L1TRHLJxCH2MvV6t388cdMWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894184219400.04707718151417; Thu, 16 Jul 2020 03:09:44 -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-176-LjKhWMCjNomoMvYxXqWTcg-1; Thu, 16 Jul 2020 06:09:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DFFB9100AA27; Thu, 16 Jul 2020 10:09:33 +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 BF6D978482; Thu, 16 Jul 2020 10:09:33 +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 8FFAF9A335; Thu, 16 Jul 2020 10:09:33 +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 06GA7LhD020729 for ; Thu, 16 Jul 2020 06:07:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id D75492B6DB; Thu, 16 Jul 2020 10:07:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 524F72DE72 for ; Thu, 16 Jul 2020 10:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894183; 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=BzItEvgqJew0JvbX5lLrFdVo7UIEZ1dX0T5wkWjGYPI=; b=HUFX9ba928DUjBQD2zP98aRtByztpWC4kCYPyDseeHoY30PToPHAPno2P+3EP4LG92eSg1 1IKhzT9/xTOmO7aSjOpM48DzKnOmnrqwKHGC8RPTONIbi0fE5MicpzCCKdV56gtUmJnv+t 54fIk8w23d2qEUKe13jYtMcSsOtstgc= X-MC-Unique: LjKhWMCjNomoMvYxXqWTcg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 318/351] meson: docs: generate docs timestamp Date: Thu, 16 Jul 2020 11:59:14 +0200 Message-Id: <7744fdbbf148e9698b08b37a15b4d60b7336814b.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.11 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 --- docs/Makefile.am | 7 ------- docs/meson.build | 2 ++ scripts/meson-timestamp.sh | 8 ++++++++ scripts/meson.build | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100755 scripts/meson-timestamp.sh diff --git a/docs/Makefile.am b/docs/Makefile.am index 1237b4c47cc..f54336cf35d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -306,13 +306,6 @@ aclperms.htmlinc: $(top_srcdir)/src/access/viraccesspe= rm.h \ $(top_srcdir)/scripts/genaclperms.py Makefile.am $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/genaclperms.py $< >= $@ =20 -timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ - then \ - date -u --date=3D"@$$SOURCE_DATE_EPOCH"; \ - else \ - date -u; \ - fi)" - hvsupport.html: hvsupport.html.in =20 hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $(api_DATA) \ diff --git a/docs/meson.build b/docs/meson.build index c67e114751e..8a0b459f598 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -29,6 +29,8 @@ docs_assets =3D [ =20 install_data(docs_assets, install_dir: docs_html_dir) =20 +docs_timestamp =3D run_command(meson_timestamp_prog).stdout() + docs_api_generated =3D custom_target( 'generate-api', output: [ diff --git a/scripts/meson-timestamp.sh b/scripts/meson-timestamp.sh new file mode 100755 index 00000000000..e68be1926cf --- /dev/null +++ b/scripts/meson-timestamp.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +if test -n "$SOURCE_DATE_EPOCH"; +then + date -u --date=3D"$SOURCE_DATE_EPOCH" +else + date -u +fi diff --git a/scripts/meson.build b/scripts/meson.build index 05bf6ff7231..12d18b8ce52 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -24,6 +24,7 @@ scripts =3D [ 'install-dirs.sh', 'install-symlink.sh', 'meson-python.sh', + 'meson-timestamp.sh', 'mock-noinline.py', 'prohibit-duplicate-header.py', 'test-wrap-argv.py', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894494; cv=none; d=zohomail.com; s=zohoarc; b=nNVYaXSBHh8VhXcEj7MFmUYjKHaygcPIwN77l8e6LwAnfPByanfWMcaG+BBgSkvy5XWxwZdJEBiv1a1Yo7z2mykyES4nQvE9KxP727BLE7L62CX0ilwG2QVv81wTX87NdZN4KZFf5W/6kXCkl2mZq4dMR77E53ZNL8GK10VoI/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894494; 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=8VjafEbFnQTU0OOqlK8bq9v3iMfNFnjkjhQYLvgxG3g=; b=durG/WLXLrI8l8IAyGMfQvV5Lm3Ve0H8z6X+6gu76eqgWioUuHxvcwzN48O57a+aliyjRURgE/xYFrs9jEnCAOq0FaWg59iVXTJcl22gEt9o7NDu8e2BmZ4+lJLeQNXc7qDD7GlZuEO9ENgKnoLQSCIytbu0uZBVjzDRaFlhMb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 159489449464663.667868018916465; Thu, 16 Jul 2020 03:14:54 -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-12-BhPrTFSBPzmSQsgKeTvhqg-1; Thu, 16 Jul 2020 06:14:51 -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 3083E1888AB5; Thu, 16 Jul 2020 10:14:46 +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 0DA4560E3E; Thu, 16 Jul 2020 10:14:46 +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 D0D711804759; Thu, 16 Jul 2020 10:14:45 +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 06GA7MQT020759 for ; Thu, 16 Jul 2020 06:07:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF1282B6DB; Thu, 16 Jul 2020 10:07:22 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A4072DE6F for ; Thu, 16 Jul 2020 10:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894493; 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=8VjafEbFnQTU0OOqlK8bq9v3iMfNFnjkjhQYLvgxG3g=; b=bV3U66FsY9GdD7XKWiZ0cIpB2RFTZhuDy76o6//RSUlMzexRTX8SjRSit90Giw6MFCxFIi /rpE2pnXW7c1Ihro/SWLgZbMmjqcBkUAAmpJpO263rlqgX4T0nM9W8pQWpmGWN9yYpfVay m/oRUzTha7hXLjP0HpMRev75v4e2LvE= X-MC-Unique: BhPrTFSBPzmSQsgKeTvhqg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 319/351] meson: docs: generate aclperms.htmlinc Date: Thu, 16 Jul 2020 11:59:15 +0200 Message-Id: <118b254e845623c5f004393ffec7c7d25f95e87c.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 --- docs/Makefile.am | 6 ------ docs/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index f54336cf35d..0584702f7a1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -300,12 +300,6 @@ html_DATA =3D $(dot_html) schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 -acl_generated =3D aclperms.htmlinc - -aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ - $(top_srcdir)/scripts/genaclperms.py Makefile.am - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/genaclperms.py $< >= $@ - hvsupport.html: hvsupport.html.in =20 hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $(api_DATA) \ diff --git a/docs/meson.build b/docs/meson.build index 8a0b459f598..bbe012491f3 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -29,6 +29,16 @@ docs_assets =3D [ =20 install_data(docs_assets, install_dir: docs_html_dir) =20 +aclperms_gen =3D custom_target( + 'aclperms.htmlinc', + input: access_perm_h, + output: 'aclperms.htmlinc', + command: [ + meson_python_prog, genaclperms_prog, '@INPUT@', + ], + capture: true, +) + docs_timestamp =3D run_command(meson_timestamp_prog).stdout() =20 docs_api_generated =3D custom_target( --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894278; cv=none; d=zohomail.com; s=zohoarc; b=ZjPxx0CEa9bUNDB6JbnzysInSdqRPU+eFRI/sXso9PHZKKsu0GqtHhBerg0kYShGD1G3lPxqxVRdSUBENqXydnuXegVgUCncIFThVMgPxnMvuiUjY3OyPR03dzcsvHxXm9sJhRQNDwWWNAh0cCHQfh0ihmA34r3BlKCLt1DARwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894278; 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=Q7IXevowKENIohaVEXatvRuw/aBKnRvp9AxCm26irJg=; b=lm/o5dy0KNPYZoiIsF9fPY2ER6pwtoAyhjsECAWAztT/O/DYSPOBZ7jfNpSnAUDuHjT2zKx6xUH/7rQalw/GryuqqcUqm8PQ/rO+KGRg/lrh9OGTYvtyfh3+z+Rm7UBYomOQ3d+EDYGxvL9a52t8pv/ww2fkJlS2Kh8JtpNnvQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894278934720.5695059757386; Thu, 16 Jul 2020 03:11:18 -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-28-eOCRP3ekNG-GYUH6crZqqQ-1; Thu, 16 Jul 2020 06:11:15 -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 5DC3E80572E; Thu, 16 Jul 2020 10:11:08 +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 35BC57B421; Thu, 16 Jul 2020 10:11:08 +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 F39051804776; Thu, 16 Jul 2020 10:11:07 +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 06GA7N9s020778 for ; Thu, 16 Jul 2020 06:07:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id A638E2B6DB; Thu, 16 Jul 2020 10:07:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 218C52DE72 for ; Thu, 16 Jul 2020 10:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894277; 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=Q7IXevowKENIohaVEXatvRuw/aBKnRvp9AxCm26irJg=; b=DfDl89ZtNKiEp1EkvkyID1od16D/FUrJ04YBCa3+j7iB3Bm96tcRAXzgGlxfjSLf2ZHU2l NrrZMyxzOePRoT01uliwG4UFJLVIOetRcKRDKbHiOYEmOOLbfngR8h4DMbVRm06XkH0Oam rYpnyLtQTRuzkWzDuJe5e48LHFz4Cf8= X-MC-Unique: eOCRP3ekNG-GYUH6crZqqQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 320/351] meson: docs: introduce docs_rst2html_gen generator Date: Thu, 16 Jul 2020 11:59:16 +0200 Message-Id: <0bf92a284b021b99398a2895aed2a84d796eeb44.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.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 --- docs/Makefile.am | 4 ---- docs/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0584702f7a1..a2fe2fbdc75 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -320,10 +320,6 @@ news.html.in: $(top_srcdir)/NEWS.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } =20 -%.html.in: %.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } - %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ $(acl_generated) $(AM_V_GEN)name=3D`echo $@ | sed -e 's/.tmp//'`; \ diff --git a/docs/meson.build b/docs/meson.build index bbe012491f3..b3f41a188ff 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -72,3 +72,10 @@ docs_api_xml =3D docs_api_generated[0] docs_lxc_api_xml =3D docs_api_generated[1] docs_qemu_api_xml =3D docs_api_generated[2] docs_admin_api_xml =3D docs_api_generated[3] + +docs_rst2html_gen =3D generator( + rst2html_prog, + output: '@BASENAME@.html.in', + arguments: [ '--strict', '@INPUT@' ], + capture: true, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894534; cv=none; d=zohomail.com; s=zohoarc; b=RLQUKFxMJKmFvmdRuYosZprHPg10yS/MUOnTLoW+7C66c7jvsb/d5K2KHkLpWbm6jeVfaH1wAb1thJqPOC8+/cgEbCGUQbLTa90hT/K3wi7a1qY3EtzP7JUGxcKKlYEk58w/G/QYO5VPQAOL8Cr/XQhLDEQWTYSJDtBWzkK2Atw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894534; 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=dGk4FUSe89xJ5+WNh4f+YrrcoKgkxi6+xjiFj+55yws=; b=OBfLjXXIiz3tNhCN152eXZ9lhvds7jSpcnYNODOsb7fUAJrHghVICi+Cy5F86736w0MHkbdc/jyd+YEz9eBVhi0FeejuntpN8voe8+JwfA/BabpM18/0reCGQmRgeAyK3wNAAmlpC6yQoNGv8xqi8FIrrp3Gfz8JCKpi6kWC8Ys= 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 1594894534738231.49346950728045; Thu, 16 Jul 2020 03:15:34 -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-291-JcDLBhveNO-MWwbG0qavWA-1; Thu, 16 Jul 2020 06:11:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E99D1100AA31; Thu, 16 Jul 2020 10:11:10 +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 C535A2DE79; Thu, 16 Jul 2020 10:11:10 +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 8FB36181AC92; Thu, 16 Jul 2020 10:11:10 +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 06GA7OIK020783 for ; Thu, 16 Jul 2020 06:07:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EBE82DE79; Thu, 16 Jul 2020 10:07:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09A032DE72 for ; Thu, 16 Jul 2020 10:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894533; 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=dGk4FUSe89xJ5+WNh4f+YrrcoKgkxi6+xjiFj+55yws=; b=QTA1zUY2UWVHk+lPyhq4ult5Znkrlq9K3o4aYTipAJluqJoiBJssii+qDKHm9L7qiE9PLO TVwT7RZgQpOT7pgVOzfzx/6BrXEIVsBXwsOA3lpJstYx1q6iBXcFDpd1ALIwkdSxGKEqWy 3wbHSjdlyhuWd965/n/gSBvqSfDtiG0= X-MC-Unique: JcDLBhveNO-MWwbG0qavWA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 321/351] meson: docs: introduce meson-html-gen.py helper Date: Thu, 16 Jul 2020 11:59:17 +0200 Message-Id: <34a4955a20ab2a8d139d0741c66eda48a00689db.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.23 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 --- docs/Makefile.am | 26 --------------------- scripts/meson-html-gen.py | 49 +++++++++++++++++++++++++++++++++++++++ scripts/meson.build | 1 + 3 files changed, 50 insertions(+), 26 deletions(-) create mode 100755 scripts/meson-html-gen.py diff --git a/docs/Makefile.am b/docs/Makefile.am index a2fe2fbdc75..0c42db2badb 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -320,32 +320,6 @@ news.html.in: $(top_srcdir)/NEWS.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } =20 -%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ - $(acl_generated) - $(AM_V_GEN)name=3D`echo $@ | sed -e 's/.tmp//'`; \ - genhtmlin=3D`echo $@ | sed -e 's/.tmp/.in/'`; \ - rst=3D`echo $@ | sed -e 's/.html.tmp/.rst/'`; \ - src=3D"$$genhtmlin"; \ - test -f "$$genhtmlin" && src=3D"$$rst"; \ - dir=3D`dirname $@` ; \ - if test "$$dir" =3D "."; \ - then \ - style=3Dsite.xsl; \ - else \ - $(MKDIR_P) $$dir; \ - style=3Dsubsite.xsl; \ - fi; \ - $(XSLTPROC) --stringparam pagename $$name \ - --stringparam pagesrc $$src \ - --stringparam builddir '$(abs_top_builddir)' \ - --stringparam timestamp $(timestamp) --nonet \ - $(top_srcdir)/docs/$$style $< > $@ \ - || { rm $@ && exit 1; } - -%.html: %.html.tmp - $(AM_V_GEN)$(XMLLINT) --nonet --format $< > $@ \ - || { rm $@ && exit 1; } - $(apihtml_generated): html/index.html $(apiadminhtml_generated): html/index-admin.html $(apiqemuhtml_generated): html/index-qemu.html diff --git a/scripts/meson-html-gen.py b/scripts/meson-html-gen.py new file mode 100755 index 00000000000..9ac649a9ef7 --- /dev/null +++ b/scripts/meson-html-gen.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 + +import argparse +import os +import subprocess + +parser =3D argparse.ArgumentParser() +parser.add_argument("xsltproc", type=3Dstr, help=3D"path to xsltproc bin") +parser.add_argument("xmllint", type=3Dstr, help=3D"path to xmllint bin") +parser.add_argument("builddir", type=3Dstr, help=3D"build root dir path") +parser.add_argument("timestamp", type=3Dstr, help=3D"docs timestamp") +parser.add_argument("style", type=3Dstr, help=3D"XSL stile file") +parser.add_argument("infile", type=3Dstr, help=3D"path to source HTML file= ") +parser.add_argument("htmlfile", type=3Dstr, help=3D"path to generated HTML= file") +args =3D parser.parse_args() + +name =3D os.path.basename(args.htmlfile).replace('.html', '') + +pagesrc =3D args.infile +rstfile =3D pagesrc.replace('.html.in', '.rst') +if os.path.exists(rstfile): + pagesrc =3D rstfile + +with open(args.infile, 'rb') as infile: + html_in_data =3D infile.read() + +html_tmp =3D subprocess.run( + [ + args.xsltproc, + '--stringparam', 'pagename', name, + '--stringparam', 'pagesrc', pagesrc, + '--stringparam', 'builddir', args.builddir, + '--stringparam', 'timestamp', args.timestamp, + '--nonet', args.style, '-', + ], + input=3Dhtml_in_data, + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.PIPE, +) + +html =3D subprocess.run( + [args.xmllint, '--nonet', '--format', '-'], + input=3Dhtml_tmp.stdout, + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.PIPE, +) + +with open(args.htmlfile, 'wb') as outfile: + outfile.write(html.stdout) diff --git a/scripts/meson.build b/scripts/meson.build index 12d18b8ce52..3bcd6e85ce5 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -23,6 +23,7 @@ scripts =3D [ 'hyperv_wmi_generator.py', 'install-dirs.sh', 'install-symlink.sh', + 'meson-html-gen.py', 'meson-python.sh', 'meson-timestamp.sh', 'mock-noinline.py', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894497; cv=none; d=zohomail.com; s=zohoarc; b=efxMbTCaaV2yb2vlCEBUGBdInyiAPN0CCo4HiCsDARbG0Zd92nK3mDG/rP+RuDtSKi5NUKrqnxdqreHThjCWz2/XEzTJN4F63Fa0GkO5KgG+p/02BMNeQFcXZq6wmmWTHRx0+y9eY5+1IVCZz0kjuFJMYmhD60CHD5JCb+pu7F0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894497; 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=jeYYD3Vv8qcawGmt2ObqDhQcGr9Amvk26aKRlX4S7yY=; b=R6J7LQ7+ZIKbHXndLrT7TkO1FzNCFdGBN2G47T25XkUOsfS3oQNtNJqnJ2mAvIxutJXtZxjgezUVG7c+B1uh4gEJpF9qGIxbjww1fx0JkozeJceXgmWAgxVk+eLOtPxPkhQnHvlOO5PYVAy1rFRkYhCGHqhGJulF/DkzHqUNAmI= 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 1594894497124829.9522440980014; Thu, 16 Jul 2020 03:14:57 -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-285-9fGfIcTPMw-dSsYpOcY19Q-1; Thu, 16 Jul 2020 06:14:54 -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 915588015FB; Thu, 16 Jul 2020 10:14:48 +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 6027870102; Thu, 16 Jul 2020 10:14:48 +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 2936C180531E; Thu, 16 Jul 2020 10:14:48 +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 06GA7PGM020804 for ; Thu, 16 Jul 2020 06:07:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 766292DE79; Thu, 16 Jul 2020 10:07:25 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5F6B2DE72 for ; Thu, 16 Jul 2020 10:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894495; 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=jeYYD3Vv8qcawGmt2ObqDhQcGr9Amvk26aKRlX4S7yY=; b=gxLf82n1T6odtDIM6Xb35CmakjkFVOKSTWvvU/BETSUXCoMLFeCUON63PXqk2p75kwjN+t wJRn6wjW86OWGJAEFf6copnirYviny/PgfXIUTE+BrpyYByW8yJ/LcjNArn2b8Yj3QuW4H oQpGDyFq9IFDz3qavR6hgOAc2L+NQqk= X-MC-Unique: 9fGfIcTPMw-dSsYpOcY19Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 322/351] meson: docs: introduce XSL files Date: Thu, 16 Jul 2020 11:59:18 +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.12 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 --- docs/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/meson.build b/docs/meson.build index b3f41a188ff..fa6b1f940fe 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -41,6 +41,11 @@ aclperms_gen =3D custom_target( =20 docs_timestamp =3D run_command(meson_timestamp_prog).stdout() =20 +site_xsl =3D files('site.xsl') +subsite_xsl =3D files('subsite.xsl') +page_xsl =3D files('page.xsl') +newapi_xsl =3D files('newapi.xsl') + docs_api_generated =3D custom_target( 'generate-api', output: [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894499; cv=none; d=zohomail.com; s=zohoarc; b=TsGvrdLyP+D7jPj4hjxt1qnHx+i/hv4+IWnRwV4B4qK/yEUKlYGNoTrnEYoRXPh2kNLhyceH+wdpIrwGOIJV/QtMK9x1GG5J7/lnFa+vlR7OCBiDGT1uqf7qgRJsiD6306IhLNZdlOl5NHH+CgiEPmNfnzHXH+iT4xe5S32+p+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894499; 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=n6hD3qN/dvE7wms55fjxjUHtCdEaUf8ZtiHzb8e29ic=; b=ZzimsKFTDSV5XwU1QCGN4JObg9WmWuQkoe3MWoJwuViUC1HSPWAMKnra4gBJd5oV20xPR7F/NWqufiG/GGh5KSJOCBYd93QBenc0B+NYmepMayhRxDK02ULhdvBZJYBQiyyuNm8aNqbdPEhZFC+xaBxL1dELjisrW/xjP+pvUU8= 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 1594894499550107.3832918798048; Thu, 16 Jul 2020 03:14:59 -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-397-L6gJcznFPReG5C4tfdI4eA-1; Thu, 16 Jul 2020 06:14:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB1321091; Thu, 16 Jul 2020 10:14: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 C9FAC17D04; Thu, 16 Jul 2020 10:14: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 9793A18184AE; Thu, 16 Jul 2020 10:14:50 +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 06GA7Qf6020832 for ; Thu, 16 Jul 2020 06:07:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F2572DE72; Thu, 16 Jul 2020 10:07:26 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDD152DE81 for ; Thu, 16 Jul 2020 10:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894498; 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=n6hD3qN/dvE7wms55fjxjUHtCdEaUf8ZtiHzb8e29ic=; b=VS7Yw1gq+DzjGjkQhs/msaRaeAewG0x3b41PXErlqiP7yBgdUXdBTmwevoy4Tim2vaQ5jo hCRm4WB6MDKfFcSRaWPanOvNinqX3RBZfamxaSwWQ5f5afKtKE2+F+gw8aQermA5suvefb FQTGckZB9Nn3DGvTjQGazEuEx/bM0fs= X-MC-Unique: L6gJcznFPReG5C4tfdI4eA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 323/351] meson: docs: build *.html files from *.html.in files Date: Thu, 16 Jul 2020 11:59:19 +0200 Message-Id: <8cd09f030fd8df15bc0382a707103ff5772fb6a4.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.14 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 --- docs/Makefile.am | 2 - docs/meson.build | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0c42db2badb..4e69f9ae7fa 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -281,8 +281,6 @@ manpages_DATA =3D $(manpages_html) dot_html_generated_in =3D \ hvsupport.html.in \ $(NULL) -dot_html_in =3D \ - $(notdir $(wildcard $(srcdir)/*.html.in)) dot_rst =3D \ $(notdir $(wildcard $(srcdir)/*.rst)) dot_rst_html_in =3D \ diff --git a/docs/meson.build b/docs/meson.build index fa6b1f940fe..36fd2388b69 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -27,6 +27,84 @@ docs_assets =3D [ 'node.gif', ] =20 +docs_html_in_files =3D [ + '404', + 'acl', + 'aclpolkit', + 'api_extension', + 'api', + 'apps', + 'architecture', + 'auditlog', + 'auth', + 'bindings', + 'bugs', + 'cgroups', + 'compiling', + 'contact', + 'contribute', + 'csharp', + 'dbus', + 'devguide', + 'docs', + 'downloads', + 'drivers', + 'drvbhyve', + 'drvesx', + 'drvhyperv', + 'drvlxc', + 'drvnodedev', + 'drvopenvz', + 'drvqemu', + 'drvremote', + 'drvsecret', + 'drvtest', + 'drvvbox', + 'drvvirtuozzo', + 'drvvmware', + 'drvxen', + 'errors', + 'firewall', + 'formatcaps', + 'formatdomaincaps', + 'formatdomain', + 'format', + 'formatnetwork', + 'formatnetworkport', + 'formatnode', + 'formatnwfilter', + 'formatsecret', + 'formatsnapshot', + 'formatstoragecaps', + 'formatstorageencryption', + 'formatstorage', + 'goals', + 'governance', + 'hooks', + 'index', + 'internals', + 'java', + 'kbase', + 'logging', + 'migration', + 'nss', + 'pci-hotplug', + 'php', + 'python', + 'remote', + 'securityprocess', + 'storage', + 'strategy', + 'support', + 'testapi', + 'testsuites', + 'testtck', + 'tlscerts', + 'uri', + 'virshcmdref', + 'windows', +] + install_data(docs_assets, install_dir: docs_html_dir) =20 aclperms_gen =3D custom_target( @@ -84,3 +162,29 @@ docs_rst2html_gen =3D generator( arguments: [ '--strict', '@INPUT@' ], capture: true, ) + +foreach name : docs_html_in_files + html_in_file =3D '@0@.html.in'.format(name) + html_file =3D '@0@.html'.format(name) + + custom_target( + html_file, + input: html_in_file, + output: html_file, + command: [ + meson_python_prog, + meson_html_gen_prog, + xsltproc_prog.path(), + xmllint_prog.path(), + meson.build_root(), + docs_timestamp, + site_xsl, + '@INPUT@', + '@OUTPUT@', + ], + depends: [ aclperms_gen ], + depend_files: [ page_xsl ], + install: true, + install_dir: docs_html_dir, + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894329; cv=none; d=zohomail.com; s=zohoarc; b=PTzQvswL1/Qtrz0YO2nO3t+A7sLJm+aI9evZ6ClpAFdLmK/pfGiNi742dDdAQihDITqrpUrAPijVg64E4RpcdfPGbMcvl2mxJPnwY1P2qovVGEjr++78PWjFsHyKAbyRJiJIyXj+MhGdJdgFoeURIT0rVx0uhyN9qyEhLXqhFpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894329; 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=3Kpj6or08Y1yB+k5fPF1FAnIChqjgOzpg37l32nI9YE=; b=QQrhsKVLHrpEvCMrod1mGDBKofH3Rt3DZUXwozcfnrih3T02+HF/Bs2gLUqfDBMzkLuPGcg7d6lcf1vIZF2J5W1lakCub/U4nBCgbHOP6i2tc/zzYZcQhI8z/hp/SWSb/58eEEsCYkNvm7fHgGWPP6w7r/1qn/GQxqJsRDHnFi0= 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 1594894329886717.0742054829606; Thu, 16 Jul 2020 03:12: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-171-xQKO872-ON2GrSkZOu4yoA-1; Thu, 16 Jul 2020 06:09:42 -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 805CD80BCAB; Thu, 16 Jul 2020 10:09:36 +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 5F8717B414; Thu, 16 Jul 2020 10:09:36 +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 2B1BA1804766; Thu, 16 Jul 2020 10:09:36 +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 06GA7R96020852 for ; Thu, 16 Jul 2020 06:07:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48A4D2DE79; Thu, 16 Jul 2020 10:07:27 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B61672DE72 for ; Thu, 16 Jul 2020 10:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894328; 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=3Kpj6or08Y1yB+k5fPF1FAnIChqjgOzpg37l32nI9YE=; b=YnvOA2S3i38Z4VYfNDYdNqwETM/9EiKqn0UdDQ2gGv7iyLFKeRSk9ufSdh2OitiGyaxrqH lUQoaSsBllCStSil7BPtektLIY7H4l2NpiOGKRtGq+e0aaO7gMHVouFmVXPyaU4vE2RbLq IX+xb9CPi8Sf2MUq+jZ6lgoOtZbdfvY= X-MC-Unique: xQKO872-ON2GrSkZOu4yoA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 324/351] meson: docs: build *.html files from *.rst files Date: Thu, 16 Jul 2020 11:59:20 +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 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 --- docs/Makefile.am | 3 --- docs/meson.build | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 4e69f9ae7fa..f1ac68f1d50 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -281,10 +281,7 @@ manpages_DATA =3D $(manpages_html) dot_html_generated_in =3D \ hvsupport.html.in \ $(NULL) -dot_rst =3D \ - $(notdir $(wildcard $(srcdir)/*.rst)) dot_rst_html_in =3D \ - $(dot_rst:%.rst=3D%.html.in) \ news.html.in \ $(NULL) dot_html =3D \ diff --git a/docs/meson.build b/docs/meson.build index 36fd2388b69..2da051e75ed 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -105,6 +105,27 @@ docs_html_in_files =3D [ 'windows', ] =20 +docs_rst_files =3D [ + 'advanced-tests', + 'best-practices', + 'ci', + 'coding-style', + 'committer-guidelines', + 'daemons', + 'developer-tooling', + 'formatbackup', + 'formatcheckpoint', + 'hacking', + 'libvirt-go', + 'libvirt-go-xml', + 'newreposetup', + 'pci-addresses', + 'platforms', + 'programming-languages', + 'styleguide', + 'submitting-patches', +] + install_data(docs_assets, install_dir: docs_html_dir) =20 aclperms_gen =3D custom_target( @@ -188,3 +209,43 @@ foreach name : docs_html_in_files install_dir: docs_html_dir, ) endforeach + + +# docs_html_in_gen: +# each entry is a dictionary with following items: +# name - base file name (required) +# file - generated file (required) +docs_html_in_gen =3D [] + +foreach name : docs_rst_files + rst_file =3D '@0@.rst'.format(name) + docs_html_in_gen +=3D { + 'name': name, + 'file': docs_rst2html_gen.process(rst_file), + } +endforeach + +foreach data : docs_html_in_gen + html_file =3D '@0@.html'.format(data['name']) + + custom_target( + html_file, + input: data['file'], + output: html_file, + command: [ + meson_python_prog, + meson_html_gen_prog, + xsltproc_prog.path(), + xmllint_prog.path(), + meson.build_root(), + docs_timestamp, + site_xsl, + '@INPUT@', + '@OUTPUT@', + ], + depends: [ aclperms_gen ], + depend_files: [ page_xsl ], + install: true, + install_dir: docs_html_dir, + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894502; cv=none; d=zohomail.com; s=zohoarc; b=KRc4bqTsZXLZe3LONbJ7+6YTQWAU/IyIEVesuLccGYKBYYdnygJFoM1PJwDyPPVcZ+JKdRHBBJlqHQBMpGTLVs16EZGu1P4rgXhATpTqvw4VpAReI0ICIpRCQmAd/NSsZMLVMhuRyI+Y8Sg/AiaZMiPpxvwrb7CB+v1WX531vM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894502; 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=UftL38gNC1uUnqz23yP5PwfF3Q2ILeoC4iVv8tnJIUk=; b=k9/5Nt+mpatklg+/Bns7mAeDeDBY7wvGA72SYatzo6KZIHGqMxP1+/AQVfMshNNVob8Vfd+z2neioevQIZfBV5i3w4OZl6tNc8rTfkse5mY4W4uMjAXrUhTbtes5ufrHwJ85a7C3hLiN+T786swrw8vN2P6PHuRK+xFYWYHFm2g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948945021921001.670918056733; Thu, 16 Jul 2020 03:15:02 -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-226-KRwMdaDnOleYIzaF1noByQ-1; Thu, 16 Jul 2020 06:14:58 -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 4A96D1888AA2; Thu, 16 Jul 2020 10:14:53 +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 27A9A6FEF6; Thu, 16 Jul 2020 10:14:53 +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 E9D9E181D0BA; Thu, 16 Jul 2020 10:14:52 +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 06GA7SRS020880 for ; Thu, 16 Jul 2020 06:07:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 304D12DE86; Thu, 16 Jul 2020 10:07:28 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F60A2DE8F for ; Thu, 16 Jul 2020 10:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894501; 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=UftL38gNC1uUnqz23yP5PwfF3Q2ILeoC4iVv8tnJIUk=; b=Sp4dQ5sodOXYjFErCVRZLDiF2XJfsPESjj/F8wmOgSeNJ8o6UbDfmWQxPqh6s1CGXBkTap 6s0DInKkSGD/R6v8Ug4y77QSRQP6+n9MUbB2tCsf+CxSqAS8gDNvcsC069QGSMr8OOdeA9 tPQ/WwHuYE88oe2/6i9BvnyJbSQTrp8= X-MC-Unique: KRwMdaDnOleYIzaF1noByQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 325/351] meson: docs: build hvsupport.html Date: Thu, 16 Jul 2020 11:59:21 +0200 Message-Id: <99f0c9d6f85946203710e8f21c5d5a5df1fccca4.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 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 --- docs/Makefile.am | 13 ------------- docs/meson.build | 25 +++++++++++++++++++++++++ src/meson.build | 4 +++- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index f1ac68f1d50..73d3d26422a 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -277,10 +277,6 @@ manpages/virkeyname-%.rst: $(top_srcdir)/src/keycodema= pdb/data/keymaps.csv \ manpagesdir =3D $(HTML_DIR)/manpages manpages_DATA =3D $(manpages_html) =20 -# Generate hvsupport.html first, since it takes one extra step. -dot_html_generated_in =3D \ - hvsupport.html.in \ - $(NULL) dot_rst_html_in =3D \ news.html.in \ $(NULL) @@ -295,15 +291,6 @@ html_DATA =3D $(dot_html) schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 -hvsupport.html: hvsupport.html.in - -hvsupport.html.in: $(top_srcdir)/scripts/hvsupport.py $(api_DATA) \ - $(top_srcdir)/src/libvirt_public.syms \ - $(top_srcdir)/src/libvirt_qemu.syms $(top_srcdir)/src/libvirt_lxc.syms \ - $(top_srcdir)/src/driver.h - $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/hvsupport.py \ - $(top_srcdir) $(top_builddir) > $@ || { rm $@ && exit 1; } - manpages/%.html.in: manpages/%.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^:Manual ' < $< | \ diff --git a/docs/meson.build b/docs/meson.build index 2da051e75ed..252f16262be 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -225,6 +225,31 @@ foreach name : docs_rst_files } endforeach =20 +hvsupport_html_in =3D custom_target( + 'hvsupport.html.in', + output: 'hvsupport.html.in', + command: [ + meson_python_prog, + hvsupport_prog, + meson.source_root(), + meson.build_root(), + ], + capture: true, + depend_files: [ + public_sym_file, + libvirt_qemu_syms, + libvirt_lxc_syms, + driver_header, + ], + depends: [ + docs_api_generated, + ], +) +docs_html_in_gen +=3D { + 'name': 'hvsupport', + 'file': hvsupport_html_in, +} + foreach data : docs_html_in_gen html_file =3D '@0@.html'.format(data['name']) =20 diff --git a/src/meson.build b/src/meson.build index b8ad300e558..66aa6201550 100644 --- a/src/meson.build +++ b/src/meson.build @@ -80,7 +80,7 @@ rpc_probe_files =3D [] =20 # symbol files =20 -public_sym_file =3D 'libvirt_public.syms' +public_sym_file =3D files('libvirt_public.syms') =20 used_sym_files =3D [ 'libvirt_private.syms', @@ -299,6 +299,8 @@ driver_headers =3D [ 'driver-stream.h', ] =20 +driver_header =3D files('driver.h') + driver_lib =3D static_library( 'virt_driver', [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894447; cv=none; d=zohomail.com; s=zohoarc; b=Vf7shBa6Sq8YUJdDIFeMm9hy3jTQH9LL2feD24cpAlWz3LeHjhArlI81bzAFDFBpWtSBltcCguzWb1ATZf993PM0YaL3ROz6FxayvCIsAZyPeTUHFh2hwxIqU++6lgT6399taZzP7Z/rgPDoFbz2ZiBpKWuNTeApQAxCjb/+miQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894447; 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=IXlgDsePl1/NgIBGm/884v5hnw28k2eVm2SN29/Jbbg=; b=gpYwhrtPtFcsgMeHs8FW4B0AylfKSxBoze2I6B0Wtyrg/A38f2yA5OLWY8icE9+0IuHmxezpFvLlsk6aR5zKNFbtDD/EOJORwYApzCXolUQIaUzrTRREQZOccFxm2zm5nCTcjxZWzen5mYbhYUXCOOTWp5H3ZjaVmq3DMXVvNRM= 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 159489444702918.332461299652323; Thu, 16 Jul 2020 03:14:07 -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-356-IWka6-ujPyiLrKOH-_2Htw-1; Thu, 16 Jul 2020 06:11:19 -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 7A9068027F5; Thu, 16 Jul 2020 10:11:13 +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 572E1101F69D; Thu, 16 Jul 2020 10:11:13 +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 222ED730C9; Thu, 16 Jul 2020 10:11:13 +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 06GA7Tmw020931 for ; Thu, 16 Jul 2020 06:07:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 184C22DE8A; Thu, 16 Jul 2020 10:07:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 878D22DE86 for ; Thu, 16 Jul 2020 10:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894445; 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=IXlgDsePl1/NgIBGm/884v5hnw28k2eVm2SN29/Jbbg=; b=WQ6OktXDQZGcxLJBPQOkomtvKMiIlh2iIvXnHrN/g2uclWDUQFuzSuUqwyxZx4oitU5rSK +U/XfTIuSI2VjTBJJTSAbz4hTFd8FfWQ6nlEFEfIhF4BOkHt6gXD553UdtTLc2tmTdeKtN ApwzFRQgeuP4CmwXMW2U2TEazAML/9A= X-MC-Unique: IWka6-ujPyiLrKOH-_2Htw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 326/351] meson: docs: build news.html from news.xml Date: Thu, 16 Jul 2020 11:59: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.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 --- docs/Makefile.am | 15 --------------- docs/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 73d3d26422a..1a5ae23b0ae 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -277,17 +277,6 @@ manpages/virkeyname-%.rst: $(top_srcdir)/src/keycodema= pdb/data/keymaps.csv \ manpagesdir =3D $(HTML_DIR)/manpages manpages_DATA =3D $(manpages_html) =20 -dot_rst_html_in =3D \ - news.html.in \ - $(NULL) -dot_html =3D \ - $(dot_html_generated_in:%.html.in=3D%.html) \ - $(dot_html_in:%.html.in=3D%.html) \ - $(dot_rst_html_in:%.html.in=3D%.html) - -htmldir =3D $(HTML_DIR) -html_DATA =3D $(dot_html) - schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 @@ -298,10 +287,6 @@ manpages/%.html.in: manpages/%.rst -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ $(RST2HTML) --strict > $@ || { rm $@ && exit 1; } =20 -news.html.in: $(top_srcdir)/NEWS.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } - $(apihtml_generated): html/index.html $(apiadminhtml_generated): html/index-admin.html $(apiqemuhtml_generated): html/index-qemu.html diff --git a/docs/meson.build b/docs/meson.build index 252f16262be..463caa5e3e1 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -250,6 +250,12 @@ docs_html_in_gen +=3D { 'file': hvsupport_html_in, } =20 +news_html_in =3D docs_rst2html_gen.process(meson.source_root() / 'NEWS.rst= ') +docs_html_in_gen +=3D { + 'name': 'news', + 'file': news_html_in, +} + foreach data : docs_html_in_gen html_file =3D '@0@.html'.format(data['name']) =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894188; cv=none; d=zohomail.com; s=zohoarc; b=al86Esr0Egj63vWRLe9FDI0N75p2nIWdsvOQ5u42EbUNeWDi8pb2eZIEEBpwOPBCBsyFzlfErDGPxjDzThcxYKZFC77FxFri3ZQop9u6ExLQ/QQ1EyTUtFUMtnJMdDAgZo4MYo1JO429JLh73z39dcFKcpyQZsNvAJrz5mgrL+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894188; 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=xwxvpoUtwvw8TDrvoTiI7DIJV6xfamcrHHOMiKzaTcs=; b=Qi/sw9jJvnpZ9w1p0+600bckmH6runndCynI5a5JdPa/1vDsSvIft/mhQrh5NJx/qHoQQOzHE/JN5/tf4wyfdusz1NjL/2Rg1B3C9qKLevq0PWZ2IR8C8H63Ib0F0sdlGFERL0o2nMP+kZJ+Af01FdnU09unDuql72cC66dBoYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894188474671.5703685346418; Thu, 16 Jul 2020 03:09:48 -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-462-s4Ylbk8ON4GlrBY2kwtXwQ-1; Thu, 16 Jul 2020 06:09:45 -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 DC4508005B0; 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 BB31B7B408; 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 899F19A33B; 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 06GA7Uia020944 for ; Thu, 16 Jul 2020 06:07:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id F3D3C2DE86; Thu, 16 Jul 2020 10:07:29 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ED752DE8A for ; Thu, 16 Jul 2020 10:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894187; 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=xwxvpoUtwvw8TDrvoTiI7DIJV6xfamcrHHOMiKzaTcs=; b=Zqi5a7FTfnXkFwvxvKNFn1CqNPFVnq44oMynaL53VCM8OLMzZf8iNyo9vPuJvv7BYO+VQR uMNuxnAZKGhozFD/i8FsNFf8+o2fvVmQEvOHWK46ZokWi9oMHAjN34dtyY/06EKu+9ROcv kthag51MENbhcucyx8Rs0jkYV0VK0VI= X-MC-Unique: s4Ylbk8ON4GlrBY2kwtXwQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 327/351] meson: docs: copy asset data to build dir Date: Thu, 16 Jul 2020 11:59:23 +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 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 --- docs/Makefile.am | 4 ---- docs/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 1a5ae23b0ae..ae504358d26 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -46,10 +46,6 @@ vpathhack: do \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done - @for file in $(assets); \ - do \ - test -e $$file || ln -s $(srcdir)/$$file $$file ; \ - done =20 apihtml =3D \ html/index.html \ diff --git a/docs/meson.build b/docs/meson.build index 463caa5e3e1..bc9524eb69e 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -280,3 +280,10 @@ foreach data : docs_html_in_gen install_dir: docs_html_dir, ) endforeach + + +# This hack enables us to view the web pages +# from within the uninstalled build tree +foreach file : docs_assets + configure_file(input: file, output: file, copy: true) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894190; cv=none; d=zohomail.com; s=zohoarc; b=HTENkD6Eg3goiwgxYNrmcpb5svwVUI90PeqVZwdGqP+K9t18Mw76mdoO4opArIVtRfCpcbHINQXOz8VWbqisXuii60M1SQg2YCfTrmQC8aSa3NmlEBDfdPfMm2KJ2wifecvDyTQYeuRbAvw8o2r7PCw3WIQuDw937ZFPB3OMoiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894190; 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=Deq2qSsxDZi0Zy0Md60eJ/Sje5EaReHYR1VztCsKjMg=; b=IiH6Y5QRwcSjCX35UVFCwcgiYBjyDT8+bnZp+hT7UksfyvVXjYeTFnWDjuOKyDi+hTkGGp3jo9RnE8bnDvaGGTM6HFiQOV/Vq+pBbVqMGC8ecMalJVmYAJf3vC7mi2Oat+shhsyoqeC7f+yt21JI4BrbENahqzUikU1NZL16C6c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894190436202.17418037042808; Thu, 16 Jul 2020 03:09:50 -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-504-nLovFzBgMFaFxihkcQ2USA-1; Thu, 16 Jul 2020 06:09:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5073D80BCBE; Thu, 16 Jul 2020 10:09:41 +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 1B44272AE6; Thu, 16 Jul 2020 10:09:41 +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 CBB111805315; Thu, 16 Jul 2020 10:09:40 +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 06GA7Xho021037 for ; Thu, 16 Jul 2020 06:07:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id C260B2DE8F; Thu, 16 Jul 2020 10:07:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BFDD2DE8A for ; Thu, 16 Jul 2020 10:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894189; 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=Deq2qSsxDZi0Zy0Md60eJ/Sje5EaReHYR1VztCsKjMg=; b=MKAwxm9aajBYG1vDC0JEJiEbP/mFdRRpiYNL7yQSEcw8tqBGfdemVPI+WasDQZTmq90VuD 35toi9P0VCWM5cQTSdzQ3w2i7Be5FThl5mIWq5oTWBCrVxXF9BEWwj0MIUBXcii1mtHiHl 1Xei0HKmyAIc2qKE3TtVUil2rY2/uS8= X-MC-Unique: nLovFzBgMFaFxihkcQ2USA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 328/351] meson: docs/fonts: install font files Date: Thu, 16 Jul 2020 11:59:24 +0200 Message-Id: <996f272950c0a7ed0ff800c9b379532776de515c.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.15 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 --- docs/Makefile.am | 19 +------------------ docs/fonts/meson.build | 22 ++++++++++++++++++++++ docs/meson.build | 2 ++ 3 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 docs/fonts/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index ae504358d26..7398628b6c0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -42,7 +42,7 @@ all: vpathhack # This hack enables us to view the web pages # from within the uninstalled build tree vpathhack: - @for dir in fonts js logos; \ + @for dir in js logos; \ do \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done @@ -95,23 +95,6 @@ javascript =3D \ javascriptdir =3D $(HTML_DIR)/js javascript_DATA =3D $(javascript) =20 -fonts =3D \ - fonts/LICENSE.rst \ - fonts/stylesheet.css \ - fonts/overpass-bold-italic.woff \ - fonts/overpass-bold.woff \ - fonts/overpass-italic.woff \ - fonts/overpass-light-italic.woff \ - fonts/overpass-light.woff \ - fonts/overpass-mono-bold.woff \ - fonts/overpass-mono-light.woff \ - fonts/overpass-mono-regular.woff \ - fonts/overpass-mono-semibold.woff \ - fonts/overpass-regular.woff - -fontsdir =3D $(HTML_DIR)/fonts -fonts_DATA =3D $(fonts) - logofiles =3D \ logos/logo-base.svg \ logos/logo-square.svg \ diff --git a/docs/fonts/meson.build b/docs/fonts/meson.build new file mode 100644 index 00000000000..8c0a2f1554d --- /dev/null +++ b/docs/fonts/meson.build @@ -0,0 +1,22 @@ +fonts =3D [ + 'LICENSE.rst', + 'stylesheet.css', + 'overpass-bold-italic.woff', + 'overpass-bold.woff', + 'overpass-italic.woff', + 'overpass-light-italic.woff', + 'overpass-light.woff', + 'overpass-mono-bold.woff', + 'overpass-mono-light.woff', + 'overpass-mono-regular.woff', + 'overpass-mono-semibold.woff', + 'overpass-regular.woff', +] + +install_data(fonts, install_dir: docs_html_dir / 'fonts') + +# This hack enables us to view the web pages +# from within the uninstalled build tree +foreach file : fonts + configure_file(input: file, output: file, copy: true) +endforeach diff --git a/docs/meson.build b/docs/meson.build index bc9524eb69e..7dc2bbdc42a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -281,6 +281,8 @@ foreach data : docs_html_in_gen ) endforeach =20 +subdir('fonts') + =20 # This hack enables us to view the web pages # from within the uninstalled build tree --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894288; cv=none; d=zohomail.com; s=zohoarc; b=GhAqOmC1TTazINzNpjItzH+LiyDff69Zo4o9DoIpvp21TaPj4zju0ST8YCkuSA/IvX89OYeGs+GoX0lR4viEM9djqOnbCdeykIPMHVVUTxP8ucNVEdjnQZj60TJx9PaVORYShOOh2sv/F2aWQWHPzaYUOzIdPiR1NX8EZiu4hds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894288; 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=INb46D1Bs6/1ThoNfPkmrH8TEGtMm8zc70MGkzPL9S8=; b=OFprN5UdaUgxZOft4b8nwtNaatlRFl1XYY/K+oQmG2cR0Nczx/8Om1oumVmDEYFg5CuEb9qFTHoKIoRM24lgPwSflXwSnFznGgsaEc3jjtpPrDpN5/qXYbii6W/Yj+uLcpLVV+BFahis029vkOPgFAT2VE8GDmmOMduLiDdGCuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894288282509.15714940952967; Thu, 16 Jul 2020 03:11:28 -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-228-VbRNNS3fN5q3XjDLx_eurQ-1; Thu, 16 Jul 2020 06:11:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD3B108C; Thu, 16 Jul 2020 10:11:15 +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 BC0F278483; Thu, 16 Jul 2020 10:11:15 +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 868DF18045C1; Thu, 16 Jul 2020 10:11:15 +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 06GA7YN7021048 for ; Thu, 16 Jul 2020 06:07:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB8F52DE8F; Thu, 16 Jul 2020 10:07:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 255042DE8A for ; Thu, 16 Jul 2020 10:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894287; 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=INb46D1Bs6/1ThoNfPkmrH8TEGtMm8zc70MGkzPL9S8=; b=AM/pmVKCcZ8h5NQCaYPl0RCWwtb/9UyL4/5s06I8Z+zZYMiDmUjbsy97PD7NWJahiVlMCw BmGkjXjzawSaftYaWSQXjeU18I9Vf1q3MZ8GWPFs2IeSWGYwHsBifoYUdnFmpM0eMNgcuX rQDsNlfcYtpemRJ73s+VTSOncoF9EsE= X-MC-Unique: VbRNNS3fN5q3XjDLx_eurQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 329/351] meson: docs/html: generate libvirt API documentation Date: Thu, 16 Jul 2020 11:59:25 +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.11 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 --- docs/Makefile.am | 39 +------------------------------------- docs/html/meson.build | 44 +++++++++++++++++++++++++++++++++++++++++++ docs/meson.build | 4 ++++ 3 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 docs/html/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 7398628b6c0..7c30d75b997 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,23 +16,6 @@ ## License along with this library. If not, see ## . =20 -modules =3D \ - libvirt-common \ - libvirt-domain \ - libvirt-domain-checkpoint \ - libvirt-domain-snapshot \ - libvirt-event \ - libvirt-host \ - libvirt-interface \ - libvirt-network \ - libvirt-nodedev \ - libvirt-nwfilter \ - libvirt-secret \ - libvirt-storage \ - libvirt-stream \ - virterror \ - $(NULL) - modules_admin =3D libvirt-admin modules_qemu =3D libvirt-qemu modules_lxc =3D libvirt-lxc @@ -47,14 +30,6 @@ vpathhack: test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done =20 -apihtml =3D \ - html/index.html \ - $(apihtml_generated) - -apihtml_generated =3D \ - $(addprefix html/libvirt-,$(addsuffix .html,$(modules))) \ - $(NULL) - apiadminhtml =3D \ html/index-admin.html \ $(apiadminhtml_generated) @@ -79,14 +54,8 @@ apilxchtml_generated =3D \ $(addprefix html/libvirt-,$(addsuffix .html,$(modules_lxc))) \ $(NULL) =20 -apipng =3D \ - html/left.png \ - html/up.png \ - html/home.png \ - html/right.png - apirefdir =3D $(HTML_DIR)/html -apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(= apipng) +apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) =20 javascript =3D \ js/main.js \ @@ -271,12 +240,6 @@ $(apiadminhtml_generated): html/index-admin.html $(apiqemuhtml_generated): html/index-qemu.html $(apilxchtml_generated): html/index-lxc.html =20 -html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) - $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ - --stringparam builddir '$(abs_top_builddir)' \ - --stringparam timestamp $(timestamp) \ - $(srcdir)/newapi.xsl libvirt-api.xml - html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ --stringparam builddir '$(abs_top_builddir)' \ diff --git a/docs/html/meson.build b/docs/html/meson.build new file mode 100644 index 00000000000..67356c7d657 --- /dev/null +++ b/docs/html/meson.build @@ -0,0 +1,44 @@ +apipng =3D [ + 'home.png', + 'left.png', + 'right.png', + 'up.png', +] + +install_data(apipng, install_dir: docs_html_dir / 'html') + +custom_target( + 'index-api', + input: [ + newapi_xsl, + docs_api_xml, + ], + output: [ + 'index.html', + 'libvirt-libvirt-common.html', + 'libvirt-libvirt-domain.html', + 'libvirt-libvirt-domain-checkpoint.html', + 'libvirt-libvirt-domain-snapshot.html', + 'libvirt-libvirt-event.html', + 'libvirt-libvirt-host.html', + 'libvirt-libvirt-interface.html', + 'libvirt-libvirt-network.html', + 'libvirt-libvirt-nodedev.html', + 'libvirt-libvirt-nwfilter.html', + 'libvirt-libvirt-secret.html', + 'libvirt-libvirt-storage.html', + 'libvirt-libvirt-stream.html', + 'libvirt-virterror.html', + ], + command: [ + xsltproc_prog, '--nonet', '-o', docs_builddir, + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '@INPUT@', + ], + install: true, + install_dir: docs_html_dir / 'html', + depend_files: [ + page_xsl, + ], +) diff --git a/docs/meson.build b/docs/meson.build index 7dc2bbdc42a..d6944ad642a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,5 +1,8 @@ docs_html_dir =3D docdir / 'html' =20 +# xsltproc requires that the -o path ends with '/' +docs_builddir =3D meson.current_build_dir() / '' + docs_assets =3D [ 'android-chrome-192x192.png', 'android-chrome-256x256.png', @@ -282,6 +285,7 @@ foreach data : docs_html_in_gen endforeach =20 subdir('fonts') +subdir('html') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894401; cv=none; d=zohomail.com; s=zohoarc; b=XU4/Pxsa4iX3MCZYJpNEJWqExn9kH5C7zDrAWpJfTxIhiu7uhE6AbQDSsEyCOqFLGTUGYgaoRZ8fVhqDaq/zO43VlCbp3k1+UKaJVM0ogJC4UrW+w9QS47Q6rXbYhGV3zT2aO5LjqGLT1abfcobSfHqylHAOnmJwPijW3rOKCWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894401; 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=JRQ0u2+X3nDS+lmYBrjmrU9IdpgvEmYQrwiZIoxgHd0=; b=nzT+FeFQc8YXJWgzS8/rYSvDTxuXlrvDEpCEEHTNLhQao8AgvvHH5tT5b6Nd7i77qijNNkBPLQWjJ7/utKmA9TotLArpwvkecZvXJKxeHyyGeWuSft1hezXn6Q7yJP8JrPS5vsFWq86zaO3ktPyrH0JqQe8+CAQ4XFROM2+rGKE= 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 1594894401061321.1819575846313; Thu, 16 Jul 2020 03:13:21 -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-355-vZp8H_npNz6cHROuDslomg-1; Thu, 16 Jul 2020 06:11:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54C711800D42; Thu, 16 Jul 2020 10:11:18 +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 35CF461478; Thu, 16 Jul 2020 10:11:18 +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 02BCA181B9E0; Thu, 16 Jul 2020 10:11:18 +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 06GA7ZI8021060 for ; Thu, 16 Jul 2020 06:07:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 948E52DE8A; Thu, 16 Jul 2020 10:07:35 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FCF62DE86 for ; Thu, 16 Jul 2020 10:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894400; 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=JRQ0u2+X3nDS+lmYBrjmrU9IdpgvEmYQrwiZIoxgHd0=; b=dVDCiZDF1Ij/3ZfD7IBafXUWrlCnLmHZRMNUURsCOBj8b6Xd8ebt6ac7LMKNR6CBLqmB1q +sWbKmZPiUH/UE6OKxO6t7R1rH7ZRrtae6WoQFBFhS94MbCTCey50Ib81orwycKnluIqFY Gewvrnt39earit5GXrmUrKHh7klhkAE= X-MC-Unique: vZp8H_npNz6cHROuDslomg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 330/351] meson: docs/html: generate admin, lxc and qemu API documentation Date: Thu, 16 Jul 2020 11:59:26 +0200 Message-Id: <370f9095e24ec5357a78b8681b7ffd0e8f637c67.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.16 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 --- docs/Makefile.am | 43 ------------------------------------------- docs/html/meson.build | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 7c30d75b997..9e3479f010e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,10 +16,6 @@ ## License along with this library. If not, see ## . =20 -modules_admin =3D libvirt-admin -modules_qemu =3D libvirt-qemu -modules_lxc =3D libvirt-lxc - all: vpathhack =20 # This hack enables us to view the web pages @@ -30,33 +26,6 @@ vpathhack: test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done =20 -apiadminhtml =3D \ - html/index-admin.html \ - $(apiadminhtml_generated) - -apiadminhtml_generated =3D \ - $(addprefix html/libvirt-,$(addsuffix .html,$(modules_admin))) \ - $(NULL) - -apiqemuhtml =3D \ - html/index-qemu.html \ - $(apiqemuhtml_generated) - -apiqemuhtml_generated =3D \ - $(addprefix html/libvirt-,$(addsuffix .html,$(modules_qemu))) \ - $(NULL) - -apilxchtml =3D \ - html/index-lxc.html \ - $(apilxchtml_generated) - -apilxchtml_generated =3D \ - $(addprefix html/libvirt-,$(addsuffix .html,$(modules_lxc))) \ - $(NULL) - -apirefdir =3D $(HTML_DIR)/html -apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) - javascript =3D \ js/main.js \ $(NULL) @@ -235,18 +204,6 @@ manpages/%.html.in: manpages/%.rst -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ $(RST2HTML) --strict > $@ || { rm $@ && exit 1; } =20 -$(apihtml_generated): html/index.html -$(apiadminhtml_generated): html/index-admin.html -$(apiqemuhtml_generated): html/index-qemu.html -$(apilxchtml_generated): html/index-lxc.html - -html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) - $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ - --stringparam builddir '$(abs_top_builddir)' \ - --stringparam timestamp $(timestamp) \ - --stringparam indexfile $(@:html/%=3D%) \ - $(srcdir)/newapi.xsl $< - check-html: $(XMLLINT) --nonet --noout html/*.html =20 diff --git a/docs/html/meson.build b/docs/html/meson.build index 67356c7d657..7be5abe5fe5 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -42,3 +42,29 @@ custom_target( page_xsl, ], ) + +foreach name : [ 'admin', 'lxc', 'qemu' ] + custom_target( + 'index-@0@-api'.format(name), + input: [ + newapi_xsl, + get_variable('docs_@0@_api_xml'.format(name)), + ], + output: [ + 'index-@0@.html'.format(name), + 'libvirt-libvirt-@0@.html'.format(name), + ], + command: [ + xsltproc_prog, '--nonet', '-o', docs_builddir, + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '--stringparam', 'indexfile', 'index-@0@.html'.format(name), + '@INPUT@', + ], + install: true, + install_dir: docs_html_dir / 'html', + depend_files: [ + page_xsl, + ], + ) +endforeach --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894585; cv=none; d=zohomail.com; s=zohoarc; b=ib1sMCEWAbALQvSJ2nU99Sjrj8wgIXtObHwtWM12jJROyFHyhSdI7xBqUHuCwA5A3Cl1MKsjvnEiV5hv4YxJzg5l6Qedhj7RBfusDh1MzzttwYvh64YUrM/KyQ57Hw0fWxv8R/1Pymshp8PNXtH5ZkLN1tdWtHDWQlpMB31DoBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894585; 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=tHGkOcoTVVn2NHRavYKij1WYYtIv6dQvzQ6kUspPw8Q=; b=nJeivGtebQ3qpiKDg7XMBeSxZg1qoosxkBrfYDUzCjsU5ryXQYYCUlosECG+aYF6cAE6sSNyn+nr6nVUAtgxmzkUdJh2HICF8rMfDHBXsu46znGUj29p+Xpt6eR/NmyTJy5iVXvGkx1WIw569/GZEnDgmuLrjLvyQfGN6MwuU60= 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 1594894585699241.93952157163028; Thu, 16 Jul 2020 03:16:25 -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-206-NszoBjysMU-G0qARNdp_rA-1; Thu, 16 Jul 2020 06:15:01 -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 524E7802808; Thu, 16 Jul 2020 10:14:56 +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 E2EA11053B01; Thu, 16 Jul 2020 10:14:55 +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 B52BF9A311; Thu, 16 Jul 2020 10:14:55 +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 06GA7aRY021074 for ; Thu, 16 Jul 2020 06:07:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D29A2DE86; Thu, 16 Jul 2020 10:07:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB6492DE93 for ; Thu, 16 Jul 2020 10:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894584; 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=tHGkOcoTVVn2NHRavYKij1WYYtIv6dQvzQ6kUspPw8Q=; b=ahgye3zrmPr9h/ZWdSI/ml4RsGXEybs9kyYJdebb0YIAa3q8rldfHdz75PDIsPC5FB6vT9 3Onx4CaxjDJ8tICR5RqgqWOD4p5hsDVRRzQsG0Sz6MF74L3F40c/wDj9FABuXwfBNz2doK 3qBVP3Frss5Z8dEi9RswOlRZkGJVJmM= X-MC-Unique: NszoBjysMU-G0qARNdp_rA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 331/351] meson: docs/internals: build html files Date: Thu, 16 Jul 2020 11:59:27 +0200 Message-Id: <34b6d32098b5eb8dae45db926b228e43bda3ef3d.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 --- docs/Makefile.am | 13 ------------- docs/internals/meson.build | 32 ++++++++++++++++++++++++++++++++ docs/meson.build | 1 + 3 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 docs/internals/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 9e3479f010e..0e59b00961c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -55,19 +55,6 @@ logofiles =3D \ logofilesdir =3D $(HTML_DIR)/logos logofiles_DATA =3D $(logofiles) =20 -internals_html_in =3D \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) -internals_rst =3D \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.rst)) -internals_rst_html_in =3D \ - $(internals_rst:%.rst=3D%.html.in) -internals_html =3D \ - $(internals_html_in:%.html.in=3D%.html) \ - $(internals_rst_html_in:%.html.in=3D%.html) - -internalsdir =3D $(HTML_DIR)/internals -internals_DATA =3D $(internals_html) - kbase_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) kbase_rst =3D \ diff --git a/docs/internals/meson.build b/docs/internals/meson.build new file mode 100644 index 00000000000..944903ae27f --- /dev/null +++ b/docs/internals/meson.build @@ -0,0 +1,32 @@ +internals_in_files =3D [ + 'command', + 'eventloop', + 'locking', + 'rpc', +] + +foreach name : internals_in_files + html_in_file =3D '@0@.html.in'.format(name) + html_file =3D '@0@.html'.format(name) + + custom_target( + html_file, + input: html_in_file, + output: html_file, + command: [ + meson_python_prog, + meson_html_gen_prog, + xsltproc_prog.path(), + xmllint_prog.path(), + meson.build_root(), + docs_timestamp, + site_xsl, + '@INPUT@', + '@OUTPUT@', + ], + depends: [ aclperms_gen ], + depend_files: [ page_xsl ], + install: true, + install_dir: docs_html_dir / 'internals', + ) +endforeach diff --git a/docs/meson.build b/docs/meson.build index d6944ad642a..b211a377f59 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -286,6 +286,7 @@ endforeach =20 subdir('fonts') subdir('html') +subdir('internals') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894192; cv=none; d=zohomail.com; s=zohoarc; b=MeN57EbRVrWTV2aGrNHc1MCOE56XqK5agMF6n0oNVAqfWpHnbCw1Ds3SgtswaqkRwrtKJOYFilMT17jt37a7V6Ed5asIYa9b5rw+Z2fpqBrZ2IC4X4LpAuKE2SZ8Z7G8/jW7CadSFw9ondWkRa4gL5XaFn8w0OG4234gWY7QMfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894192; 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=vl/sKZiVWmspaDHrlZznz/psyP47jKieZy1wmQTq4z0=; b=MLfpfCOyA3mtvU6HLLveHJVDKsPoTtdYfemFzo0ASrLHfo3YlPkBcGa/pZ//ta3W+o9Ancl7XlUJEEjhBzW8G494glNXkFIxBNoeKMQpauviZc40tz9s6PPhVliIHyhXNnC5+2q6VHnvVMpRyb3GIkpbvm5A6xIkhIt3NMpUilY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894192922894.4548586556682; Thu, 16 Jul 2020 03:09:52 -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-458-DnvpjoVWPBuYN5fsWfUlUw-1; Thu, 16 Jul 2020 06:09:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EA5F10059C8; Thu, 16 Jul 2020 10:09:43 +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 6DFEF78492; Thu, 16 Jul 2020 10:09:43 +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 3BA0696244; Thu, 16 Jul 2020 10:09:43 +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 06GA7bfQ021090 for ; Thu, 16 Jul 2020 06:07:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 650212DE8A; Thu, 16 Jul 2020 10:07:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D48252DE86 for ; Thu, 16 Jul 2020 10:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894191; 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=vl/sKZiVWmspaDHrlZznz/psyP47jKieZy1wmQTq4z0=; b=WxN9IrgrLkBAAkyhoKTAPj7Zs3tWI7xcd5jBuUht368u2eLM+bvWuQ0u7xuuz9gKvOeThx 7QpRBV2TtNa5I5JEBN2uSpc68PM6df+/pG5Ud5crSlz04MtVHOMzv7tMDQzKt3vtWieCYs koKbKC84jvq+LrbkRquxM3FQGiVzui0= X-MC-Unique: DnvpjoVWPBuYN5fsWfUlUw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 332/351] meson: docs/js: install javascript files Date: Thu, 16 Jul 2020 11:59:28 +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.11 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 --- docs/Makefile.am | 9 +-------- docs/js/meson.build | 11 +++++++++++ docs/meson.build | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 docs/js/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 0e59b00961c..6b2ee2747e2 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -21,18 +21,11 @@ all: vpathhack # This hack enables us to view the web pages # from within the uninstalled build tree vpathhack: - @for dir in js logos; \ + @for dir in logos; \ do \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done =20 -javascript =3D \ - js/main.js \ - $(NULL) - -javascriptdir =3D $(HTML_DIR)/js -javascript_DATA =3D $(javascript) - logofiles =3D \ logos/logo-base.svg \ logos/logo-square.svg \ diff --git a/docs/js/meson.build b/docs/js/meson.build new file mode 100644 index 00000000000..da90cbf96e1 --- /dev/null +++ b/docs/js/meson.build @@ -0,0 +1,11 @@ +docs_js_files =3D [ + 'main.js', +] + +install_data(docs_js_files, install_dir: docs_html_dir / 'js') + +# This hack enables us to view the web pages +# from within the uninstalled build tree +foreach file : docs_js_files + configure_file(input: file, output: file, copy: true) +endforeach diff --git a/docs/meson.build b/docs/meson.build index b211a377f59..bbd6faaa786 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -287,6 +287,7 @@ endforeach subdir('fonts') subdir('html') subdir('internals') +subdir('js') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894513; cv=none; d=zohomail.com; s=zohoarc; b=G7zohCbfwDM9Ccd/LCXNVjQLOUrqf7FS29GgoMDOreZy+RLZb7NyTmB8kRkV4KNuVfEVsUVPTkO7jEl5XgMkaqweJGrEZxu2oJp+SmY+v+Iva5xUW0snld/j1eandK009DbzkUtKHXlzb0lz3hTSDcvx16ZwGGUw3p1XCzs29/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894513; 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=tkugmXlgdN55r2b0MJj3BCAlmBeDyDKUnIjZg5+sqyY=; b=Sc+pZgT//+oQzIJhoAgimp6swe0hiqM7KMBEXvZ7J/JGJ11iu4/Og5Z6muidxmSuk+xoMCvZjO+HbYgSp5cvriTvH5juudjfJlw1B6+dlT2ZK3jnxVbPiaMLNdOSAQnnLmergPRzLXKYZkYYsdjeXCm9dgUhRLSbIbu/wv6mjLg= 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 1594894513163952.4058896424085; Thu, 16 Jul 2020 03:15:13 -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-22-R5JDUIOnMWyIr5C8WbtySQ-1; Thu, 16 Jul 2020 06:09:51 -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 CB96710059BA; Thu, 16 Jul 2020 10:09:45 +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 A87ED60C47; Thu, 16 Jul 2020 10:09:45 +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 7964396255; Thu, 16 Jul 2020 10:09:45 +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 06GA7cP7021104 for ; Thu, 16 Jul 2020 06:07:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D1582DE8A; Thu, 16 Jul 2020 10:07:38 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB8C62DE86 for ; Thu, 16 Jul 2020 10:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894512; 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=tkugmXlgdN55r2b0MJj3BCAlmBeDyDKUnIjZg5+sqyY=; b=N0QJw7Fp5McB4/u2XMKjMbkFa3Gdidm0AZpRrtFAU+0U4qD3YZUvCnJzWhcDC6EYlf2uGy i7L3iwQYnnH1W1Dx6GBM+dxwtzLyxYZJUWhewv4U7YEImWf6h3VfywEq5Jr3LymmHnydA+ xoJgORlhaGUKjC7NhCco82ujLrGMwss= X-MC-Unique: R5JDUIOnMWyIr5C8WbtySQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 333/351] meson: docs/kbase: build html files Date: Thu, 16 Jul 2020 11:59:29 +0200 Message-Id: <5503c512872fc2e17165b7ea0bcd82e745ac83a0.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 --- docs/Makefile.am | 13 ------------- docs/kbase/meson.build | 41 +++++++++++++++++++++++++++++++++++++++++ docs/meson.build | 1 + 3 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 docs/kbase/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 6b2ee2747e2..a25fe49b6b7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -48,19 +48,6 @@ logofiles =3D \ logofilesdir =3D $(HTML_DIR)/logos logofiles_DATA =3D $(logofiles) =20 -kbase_html_in =3D \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) -kbase_rst =3D \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.rst)) -kbase_rst_html_in =3D \ - $(kbase_rst:%.rst=3D%.html.in) -kbase_html =3D \ - $(kbase_html_in:%.html.in=3D%.html) \ - $(kbase_rst_html_in:%.html.in=3D%.html) - -kbasedir =3D $(HTML_DIR)/kbase -kbase_DATA =3D $(kbase_html) - # Sync with src/util/ KEYCODES =3D linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES =3D linux osx win32 diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build new file mode 100644 index 00000000000..6a17d674436 --- /dev/null +++ b/docs/kbase/meson.build @@ -0,0 +1,41 @@ +docs_kbase_files =3D [ + 'backing_chains', + 'domainstatecapture', + 'launch_security_sev', + 'locking-lockd', + 'locking', + 'locking-sanlock', + 'migrationinternals', + 'qemu-passthrough-security', + 'rpm-deployment', + 'secureusage', + 'virtiofs', +] + +foreach name : docs_kbase_files + rst_file =3D '@0@.rst'.format(name) + html_file =3D '@0@.html'.format(name) + + html_in =3D docs_rst2html_gen.process(rst_file) + + custom_target( + html_file, + input: html_in, + output: html_file, + command: [ + meson_python_prog, + meson_html_gen_prog, + xsltproc_prog.path(), + xmllint_prog.path(), + meson.build_root(), + docs_timestamp, + site_xsl, + '@INPUT@', + '@OUTPUT@', + ], + depends: [ aclperms_gen ], + depend_files: [ page_xsl ], + install: true, + install_dir: docs_html_dir / 'kbase', + ) +endforeach diff --git a/docs/meson.build b/docs/meson.build index bbd6faaa786..069778ce890 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -288,6 +288,7 @@ subdir('fonts') subdir('html') subdir('internals') subdir('js') +subdir('kbase') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894633; cv=none; d=zohomail.com; s=zohoarc; b=NmxQ1JQMgVVmxmdlDtYmydOPc+2KX4oddNU7hTktxbxfju/uiYwH1WTSjhPcgA+pU/8YUXM6bXbqgt22MTYjDLphD31ia37mV6ONJotHNDsvlMN3EvZzQlFG92nbEFGo7rBdSgVbjIQdb0A8iWRMsvhEddlpd/ozNDIJUyoZ0U4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894633; 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=volOKPjpPVXfWOdCB9x+J9Y4O7Y4ZgCedudhKfZ736E=; b=fFuMUfLDvkdrO7Q30SEM4t2LNeJeptdhVN2riCnC4YxRbSmNljPIcoPqhHrc0T77Sdjay6pViYUwNU0vJzF1Ma8G3QHegZCf0dQsP/MCEEm2w+/IExvj7sol7cMGXIiXz34HAj0blF996AKYl3bJgFOkM765DYE2KUcZYVlUyPE= 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 1594894633675103.49606255760602; Thu, 16 Jul 2020 03:17:13 -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-318-FKZjHkQNM3mQl-o0bF6aJA-1; Thu, 16 Jul 2020 06:11:27 -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 815811888AA4; Thu, 16 Jul 2020 10:11:21 +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 5F74379D1F; Thu, 16 Jul 2020 10:11:21 +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 2F63D730D1; Thu, 16 Jul 2020 10:11:21 +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 06GA7d8Z021116 for ; Thu, 16 Jul 2020 06:07:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 358172DE8A; Thu, 16 Jul 2020 10:07:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A49402DE86 for ; Thu, 16 Jul 2020 10:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894632; 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=volOKPjpPVXfWOdCB9x+J9Y4O7Y4ZgCedudhKfZ736E=; b=hKsY4iy5v2INkNVKxUTbiFRG1i0ejKsLz7s7PqMSMZPq/CaBm2/dKBUic9MpKmWLR3wv7P 1MtlW96sQ418gpPYwXwfKKMlpsTJST13W7AONQxxtathDGXTQO/FEACxicHh6eE4wBPW8i ktj46duG6fV6LWkj9h9p5jXJcAbIDog= X-MC-Unique: FKZjHkQNM3mQl-o0bF6aJA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 334/351] meson: docs/logos: install logo files Date: Thu, 16 Jul 2020 11:59:30 +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 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 --- docs/Makefile.am | 32 -------------------------------- docs/logos/meson.build | 29 +++++++++++++++++++++++++++++ docs/meson.build | 1 + 3 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 docs/logos/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index a25fe49b6b7..d17455f135e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,38 +16,6 @@ ## License along with this library. If not, see ## . =20 -all: vpathhack - -# This hack enables us to view the web pages -# from within the uninstalled build tree -vpathhack: - @for dir in logos; \ - do \ - test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ - done - -logofiles =3D \ - logos/logo-base.svg \ - logos/logo-square.svg \ - logos/logo-square-powered.svg \ - logos/logo-banner-dark.svg \ - logos/logo-banner-light.svg \ - logos/logo-square-96.png \ - logos/logo-square-128.png \ - logos/logo-square-192.png \ - logos/logo-square-256.png \ - logos/logo-square-powered-96.png \ - logos/logo-square-powered-128.png \ - logos/logo-square-powered-192.png \ - logos/logo-square-powered-256.png \ - logos/logo-banner-dark-256.png \ - logos/logo-banner-dark-800.png \ - logos/logo-banner-light-256.png \ - logos/logo-banner-light-800.png - -logofilesdir =3D $(HTML_DIR)/logos -logofiles_DATA =3D $(logofiles) - # Sync with src/util/ KEYCODES =3D linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES =3D linux osx win32 diff --git a/docs/logos/meson.build b/docs/logos/meson.build new file mode 100644 index 00000000000..da92c397cde --- /dev/null +++ b/docs/logos/meson.build @@ -0,0 +1,29 @@ +docs_logo_files =3D [ + 'logo-banner-dark-256.png', + 'logo-banner-dark-800.png', + 'logo-banner-dark.svg', + 'logo-banner-light-256.png', + 'logo-banner-light-800.png', + 'logo-banner-light.svg', + 'logo-base.svg', + 'logo-square-128.png', + 'logo-square-192.png', + 'logo-square-256.png', + 'logo-square-96.png', + 'logo-square-powered-128.png', + 'logo-square-powered-192.png', + 'logo-square-powered-256.png', + 'logo-square-powered-96.png', + 'logo-square-powered.svg', + 'logo-square.svg', + 'logo-sticker-hexagon.svg', + 'logo-sticker-square.svg', +] + +install_data(docs_logo_files, install_dir: docs_html_dir / 'logos') + +# This hack enables us to view the web pages +# from within the uninstalled build tree +foreach file : docs_logo_files + configure_file(input: file, output: file, copy: true) +endforeach diff --git a/docs/meson.build b/docs/meson.build index 069778ce890..17c8f956870 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -289,6 +289,7 @@ subdir('html') subdir('internals') subdir('js') subdir('kbase') +subdir('logos') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894446; cv=none; d=zohomail.com; s=zohoarc; b=JWD4G34CgDL3nze65qE38emKL9Q0AMRoPt1Llo5kTnsPOESDLDWHZBUFbK1E3yrfMkZIn3t54Cq3K9u33+LXcZgZBcw+b5r3hzvCChH8XfWHt1jw/aEVNebrgz4e3RISUj0BPuUIoN4gcf3+Z4SPGvbOI9idoxZmXqt4mktGTf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894446; 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=fCKzgvDA2JzZtMaNlxb7F5VVHXH7ebn5LrJLkj5+RaY=; b=W63qOnbCE11YZ7P0NEa1EB4QJsi93A+Az2e6pSuQtcIKiAykjVhbNvzsmxg0xFDlz1ay7L8hbqGPRbo7PjxEY5657WpXShOY+829zQDSemjPP6yvNaofcbCSBOywLO+1r/U3eTDKOTFmx7cfNvtZleglvEyJskict98s3S5ZjEY= 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 159489444613110.415977773577424; Thu, 16 Jul 2020 03:14:06 -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-32-ZSj5Z6i5NXiQLm043bqi2A-1; Thu, 16 Jul 2020 06:11:29 -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 EE84C1888AA0; Thu, 16 Jul 2020 10:11:23 +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 C77A71001B07; Thu, 16 Jul 2020 10:11:23 +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 9053E181B9F7; Thu, 16 Jul 2020 10:11:23 +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 06GA7eFg021126 for ; Thu, 16 Jul 2020 06:07:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F60F2DE96; Thu, 16 Jul 2020 10:07:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D5222DE6B for ; Thu, 16 Jul 2020 10:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894444; 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=fCKzgvDA2JzZtMaNlxb7F5VVHXH7ebn5LrJLkj5+RaY=; b=Mwkr/Z2QZ2613VtOLeqWCsfzSUBHhvKs5PdKfmn2YGOsLQU/F/5HWuiUh8Zu8kePa6/Fwx whHfO4ghj+cS1ks8ZhbmAr0YZyw7+ix/PCVutkGoCCXsgHVrjJFt/VjWQ4NITbyRhUGq5d CiWERtb+Srs/f1zQc4okMzgT2m5Msk4= X-MC-Unique: ZSj5Z6i5NXiQLm043bqi2A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 335/351] meson: docs/manpages: install man pages Date: Thu, 16 Jul 2020 11:59:31 +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.84 on 10.5.11.22 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 --- docs/Makefile.am | 120 ----------------- docs/manpages/{index.rst =3D> index.rst.in} | 0 .../{libvirtd.rst =3D> libvirtd.rst.in} | 0 docs/manpages/meson.build | 126 ++++++++++++++++++ docs/manpages/{virsh.rst =3D> virsh.rst.in} | 0 .../{virt-admin.rst =3D> virt-admin.rst.in} | 0 ...validate.rst =3D> virt-host-validate.rst.in} | 0 ...ogin-shell.rst =3D> virt-login-shell.rst.in} | 0 ...-validate.rst =3D> virt-pki-validate.rst.in} | 0 ...virt-qemu-run.rst =3D> virt-qemu-run.rst.in} | 0 ...leanup.rst =3D> virt-sanlock-cleanup.rst.in} | 0 ...-validate.rst =3D> virt-xml-validate.rst.in} | 0 .../{virtlockd.rst =3D> virtlockd.rst.in} | 0 .../{virtlogd.rst =3D> virtlogd.rst.in} | 0 docs/meson.build | 1 + 15 files changed, 127 insertions(+), 120 deletions(-) rename docs/manpages/{index.rst =3D> index.rst.in} (100%) rename docs/manpages/{libvirtd.rst =3D> libvirtd.rst.in} (100%) create mode 100644 docs/manpages/meson.build rename docs/manpages/{virsh.rst =3D> virsh.rst.in} (100%) rename docs/manpages/{virt-admin.rst =3D> virt-admin.rst.in} (100%) rename docs/manpages/{virt-host-validate.rst =3D> virt-host-validate.rst.i= n} (100%) rename docs/manpages/{virt-login-shell.rst =3D> virt-login-shell.rst.in} (= 100%) rename docs/manpages/{virt-pki-validate.rst =3D> virt-pki-validate.rst.in}= (100%) rename docs/manpages/{virt-qemu-run.rst =3D> virt-qemu-run.rst.in} (100%) rename docs/manpages/{virt-sanlock-cleanup.rst =3D> virt-sanlock-cleanup.r= st.in} (100%) rename docs/manpages/{virt-xml-validate.rst =3D> virt-xml-validate.rst.in}= (100%) rename docs/manpages/{virtlockd.rst =3D> virtlockd.rst.in} (100%) rename docs/manpages/{virtlogd.rst =3D> virtlogd.rst.in} (100%) diff --git a/docs/Makefile.am b/docs/Makefile.am index d17455f135e..8fe0959bc2d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,129 +16,9 @@ ## License along with this library. If not, see ## . =20 -# Sync with src/util/ -KEYCODES =3D linux osx atset1 atset2 atset3 xtkbd usb win32 qnum -KEYNAMES =3D linux osx win32 - -manpages_rst =3D \ - manpages/index.rst \ - $(NULL) -manpages1_rst =3D \ - manpages/virt-pki-validate.rst \ - manpages/virt-xml-validate.rst \ - manpages/virt-admin.rst \ - manpages/virsh.rst \ - $(NULL) -manpages7_rst =3D \ - $(KEYCODES:%=3Dmanpages/virkeycode-%.rst) \ - $(KEYNAMES:%=3Dmanpages/virkeyname-%.rst) \ - $(NULL) -manpages8_rst =3D $(NULL) -manpages_rst +=3D \ - $(manpages1_rst) \ - $(manpages7_rst) \ - $(manpages8_rst) \ - $(NULL) -if WITH_LIBVIRTD -manpages8_rst +=3D \ - manpages/libvirtd.rst \ - manpages/virtlockd.rst \ - manpages/virtlogd.rst \ - $(NULL) -else ! WITH_LIBVIRTD -manpages_rst +=3D \ - manpages/libvirtd.rst \ - manpages/virtlockd.rst \ - manpages/virtlogd.rst \ - $(NULL) -endif ! WITH_LIBVIRTD -if WITH_HOST_VALIDATE - manpages1_rst +=3D manpages/virt-host-validate.rst -else ! WITH_HOST_VALIDATE - manpages_rst +=3D manpages/virt-host-validate.rst -endif ! WITH_HOST_VALIDATE -if WITH_LOGIN_SHELL - manpages1_rst +=3D manpages/virt-login-shell.rst -else ! WITH_LOGIN_SHELL - manpages_rst +=3D manpages/virt-login-shell.rst -endif ! WITH_LOGIN_SHELL -if WITH_SANLOCK - manpages8_rst +=3D manpages/virt-sanlock-cleanup.rst -else ! WITH_SANLOCK - manpages_rst +=3D manpages/virt-sanlock-cleanup.rst -endif ! WITH_SANLOCK -if WITH_QEMU - manpages1_rst +=3D manpages/virt-qemu-run.rst -else ! WITH_QEMU - manpages_rst +=3D manpages/virt-qemu-run.rst -endif ! WITH_QEMU -manpages_rst_html_in =3D \ - $(manpages_rst:%.rst=3D%.html.in) -manpages_html =3D \ - $(manpages_rst_html_in:%.html.in=3D%.html) - -man1_MANS =3D $(manpages1_rst:%.rst=3D%.1) -man7_MANS =3D $(manpages7_rst:%.rst=3D%.7) -man8_MANS =3D $(manpages8_rst:%.rst=3D%.8) - -%.1: %.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - grep -v '^\.\. contents::' < $< | \ - sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ - -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) --strict > $@ || { rm $@ && exit 1; } - -%.7: %.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - grep -v '^\.\. contents::' < $< | \ - sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ - -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) --strict > $@ || { rm $@ && exit 1; } - -%.8: %.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - grep -v '^\.\. contents::' < $< | \ - sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ - -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) --strict > $@ || { rm $@ && exit 1; } - -manpages/virkeycode-%.rst: $(top_srcdir)/src/keycodemapdb/data/keymaps.csv= \ - $(top_srcdir)/src/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=3D`echo $@ | \ - sed -e 's,manpages/virkeycode-,,' -e 's,\.rst,,'` && \ - $(MKDIR_P) manpages/ && \ - $(RUNUTF8) $(PYTHON) $(top_srcdir)/src/keycodemapdb/tools/keymap-gen \ - code-docs \ - --lang rst \ - --title "virkeycode-$$NAME" \ - --subtitle "Key code values for $$NAME" \ - $(top_srcdir)/src/keycodemapdb/data/keymaps.csv $$NAME > $@ - -manpages/virkeyname-%.rst: $(top_srcdir)/src/keycodemapdb/data/keymaps.csv= \ - $(top_srcdir)/src/keycodemapdb/tools/keymap-gen Makefile.am - $(AM_V_GEN)export NAME=3D`echo $@ | \ - sed -e 's,manpages/virkeyname-,,' -e 's,\.rst,,'` && \ - $(MKDIR_P) manpages/ && \ - $(RUNUTF8) $(PYTHON) $(top_srcdir)/src/keycodemapdb/tools/keymap-gen \ - name-docs \ - --lang rst \ - --title "virkeyname-$$NAME" \ - --subtitle "Key name values for $$NAME" \ - $(top_srcdir)/src/keycodemapdb/data/keymaps.csv $$NAME > $@ - -manpagesdir =3D $(HTML_DIR)/manpages -manpages_DATA =3D $(manpages_html) - schemadir =3D $(pkgdatadir)/schemas schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) =20 -manpages/%.html.in: manpages/%.rst - $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - grep -v '^:Manual ' < $< | \ - sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ - -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2HTML) --strict > $@ || { rm $@ && exit 1; } - check-html: $(XMLLINT) --nonet --noout html/*.html =20 diff --git a/docs/manpages/index.rst b/docs/manpages/index.rst.in similarity index 100% rename from docs/manpages/index.rst rename to docs/manpages/index.rst.in diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst.in similarity index 100% rename from docs/manpages/libvirtd.rst rename to docs/manpages/libvirtd.rst.in diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build new file mode 100644 index 00000000000..72d362e92d8 --- /dev/null +++ b/docs/manpages/meson.build @@ -0,0 +1,126 @@ +# docs_man_files +# each entry is a dictionary with following items: +# name - man page name (required) +# section - man page section (required) +# install - whether to build and install the man page (required) +# file - generated RST file (optional, default none) + +docs_man_files =3D [ + { 'name': 'index', 'section': '', 'install': false }, + + { 'name': 'virsh', 'section': '1', 'install': true }, + { 'name': 'virt-admin', 'section': '1', 'install': true }, + { 'name': 'virt-host-validate', 'section': '1', 'install': conf.has('WIT= H_HOST_VALIDATE') }, + { 'name': 'virt-login-shell', 'section': '1', 'install': conf.has('WITH_= LOGIN_SHELL') }, + { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, + { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEM= U') }, + { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, + + { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD= ') }, + { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': sanlock_dep= .found() }, + { 'name': 'virtlockd', 'section': '8', 'install': conf.has('WITH_LIBVIRT= D') }, + { 'name': 'virtlogd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD= ') }, +] + +foreach name : keycode_list + rst_file =3D custom_target( + 'virkeycode-@0@.rst'.format(name), + input: keymap_src_file, + output: 'virkeycode-@0@.rst'.format(name), + command: [ + meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs', + '--lang', 'rst', + '--title', 'virkeycode-@0@'.format(name), + '--subtitle', 'Key code values for @0@'.format(name), + '@INPUT@', name, + ], + capture: true, + build_by_default: true, + ) + + docs_man_files +=3D { + 'name': 'virkeycode-@0@'.format(name), 'section': '7', 'install': true= , 'file': rst_file, + } +endforeach + +foreach name : keyname_list + rst_file =3D custom_target( + 'virkeyname-@0@.rst'.format(name), + input: keymap_src_file, + output: 'virkeyname-@0@.rst'.format(name), + command: [ + meson_python_prog, python3_prog, keymap_gen_prog, 'name-docs', + '--lang', 'rst', + '--title', 'virkeyname-@0@'.format(name), + '--subtitle', 'Key name values for @0@'.format(name), + '@INPUT@', name, + ], + capture: true, + build_by_default: true, + ) + + docs_man_files +=3D { + 'name': 'virkeyname-@0@'.format(name), 'section': '7', 'install': true= , 'file': rst_file, + } +endforeach + +docs_man_conf =3D configuration_data() +docs_man_conf.set('SYSCONFDIR', sysconfdir) +docs_man_conf.set('RUNSTATEDIR', runstatedir) + +foreach data : docs_man_files + rst_in_file =3D '@0@.rst.in'.format(data['name']) + html_in_file =3D '@0@.html.in'.format(data['name']) + html_file =3D '@0@.html'.format(data['name']) + + if data.has_key('file') + rst_file =3D data['file'] + else + rst_file =3D configure_file( + input: rst_in_file, + output: '@0@.rst'.format(data['name']), + configuration: docs_man_conf, + ) + endif + + if data['install'] + man_file =3D '@0@.@1@'.format(data['name'], data['section']) + man_page =3D custom_target( + man_file, + input: rst_file, + output: man_file, + command: [ rst2man_prog, '--strict', '@INPUT@', '@OUTPUT@' ], + install: true, + install_dir: mandir / 'man@0@'.format(data['section']), + ) + endif + + html_in =3D custom_target( + html_in_file, + input: rst_file, + output: html_in_file, + command: [ rst2html_prog, '--strict', '@INPUT@' ], + capture: true, + ) + + custom_target( + html_file, + input: html_in, + output: html_file, + command: [ + meson_python_prog, + meson_html_gen_prog, + xsltproc_prog.path(), + xmllint_prog.path(), + meson.build_root(), + docs_timestamp, + site_xsl, + '@INPUT@', + '@OUTPUT@', + ], + depends: [ aclperms_gen ], + depend_files: [ page_xsl ], + install: true, + install_dir: docs_html_dir / 'manpages', + ) +endforeach diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst.in similarity index 100% rename from docs/manpages/virsh.rst rename to docs/manpages/virsh.rst.in diff --git a/docs/manpages/virt-admin.rst b/docs/manpages/virt-admin.rst.in similarity index 100% rename from docs/manpages/virt-admin.rst rename to docs/manpages/virt-admin.rst.in diff --git a/docs/manpages/virt-host-validate.rst b/docs/manpages/virt-host= -validate.rst.in similarity index 100% rename from docs/manpages/virt-host-validate.rst rename to docs/manpages/virt-host-validate.rst.in diff --git a/docs/manpages/virt-login-shell.rst b/docs/manpages/virt-login-= shell.rst.in similarity index 100% rename from docs/manpages/virt-login-shell.rst rename to docs/manpages/virt-login-shell.rst.in diff --git a/docs/manpages/virt-pki-validate.rst b/docs/manpages/virt-pki-v= alidate.rst.in similarity index 100% rename from docs/manpages/virt-pki-validate.rst rename to docs/manpages/virt-pki-validate.rst.in diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.= rst.in similarity index 100% rename from docs/manpages/virt-qemu-run.rst rename to docs/manpages/virt-qemu-run.rst.in diff --git a/docs/manpages/virt-sanlock-cleanup.rst b/docs/manpages/virt-sa= nlock-cleanup.rst.in similarity index 100% rename from docs/manpages/virt-sanlock-cleanup.rst rename to docs/manpages/virt-sanlock-cleanup.rst.in diff --git a/docs/manpages/virt-xml-validate.rst b/docs/manpages/virt-xml-v= alidate.rst.in similarity index 100% rename from docs/manpages/virt-xml-validate.rst rename to docs/manpages/virt-xml-validate.rst.in diff --git a/docs/manpages/virtlockd.rst b/docs/manpages/virtlockd.rst.in similarity index 100% rename from docs/manpages/virtlockd.rst rename to docs/manpages/virtlockd.rst.in diff --git a/docs/manpages/virtlogd.rst b/docs/manpages/virtlogd.rst.in similarity index 100% rename from docs/manpages/virtlogd.rst rename to docs/manpages/virtlogd.rst.in diff --git a/docs/meson.build b/docs/meson.build index 17c8f956870..a03beb86b77 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -290,6 +290,7 @@ subdir('internals') subdir('js') subdir('kbase') subdir('logos') +subdir('manpages') =20 =20 # This hack enables us to view the web pages --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894196; cv=none; d=zohomail.com; s=zohoarc; b=OFw8y2KT+lPrbz1TdJ/jvu5By/9Yy2uFeyuU/Lkm/FZfvp9lCPY6wNvGO8V75oow9VVSwnb4H85rxYaWobsENmJVh93JNBAbInNp5d/+WUrqRaez45J/6Oo63k0vkrqjilWoj+6MU/DBLZ2oCEfGS27NCOEA77iHqVaPDlKi9mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894196; 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=q98UT1ANd4TMLzb939F9D3mI/XkSr3dYQXQV1HEJZaY=; b=MwfNNsIgQZh45yLNIYy/+vd3RxhLb+Urs9u1Whvo7oJ7oZ4a8DTeUYVxZ2Mpya7H+LO1+Wx4KOWo9T4UGYXRLIIlWPdQp7yAKfBMFwhHvlycogxRbsNlhxyHXO0IQkVHfGkH3hQzXeKCYIFijc851hlAOCV0tLmvdsv9DM+Jy60= 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 1594894196568749.565009483995; Thu, 16 Jul 2020 03:09:56 -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-381-FS7AQqgtPMm7S2Ek9ndf5Q-1; Thu, 16 Jul 2020 06:09:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11CD91888AB6; Thu, 16 Jul 2020 10:09:48 +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 E74DA72ACF; Thu, 16 Jul 2020 10:09:47 +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 B8C939625D; Thu, 16 Jul 2020 10:09:47 +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 06GA7fAY021145 for ; Thu, 16 Jul 2020 06:07:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07BE52DE96; Thu, 16 Jul 2020 10:07:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 764BB2DE6B for ; Thu, 16 Jul 2020 10:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894195; 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=q98UT1ANd4TMLzb939F9D3mI/XkSr3dYQXQV1HEJZaY=; b=Gp7NfBLg6OYlaei5UTdigZSMvWXn0aOfTcsSvWZopkPFoFsjuavDi7eLUNpRSI7r0NLkIp P3H39l5DA4DyEwcCxnrF9DOECkwAETG26vp4c3NBS/RAvFM/UhJdU+BHD9247RMApOBh6+ 2dSy34NpaHaHJxXsk3YCZvnim8vTA3M= X-MC-Unique: FS7AQqgtPMm7S2Ek9ndf5Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 336/351] meson: docs/schemas: install RNG schemas Date: Thu, 16 Jul 2020 11:59:32 +0200 Message-Id: <7821ffb0d35863d47a0f01b6adafe332ba524040.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.15 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 --- docs/Makefile.am | 3 --- docs/meson.build | 1 + docs/schemas/meson.build | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 docs/schemas/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 8fe0959bc2d..40b4d224d71 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,9 +16,6 @@ ## License along with this library. If not, see ## . =20 -schemadir =3D $(pkgdatadir)/schemas -schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) - check-html: $(XMLLINT) --nonet --noout html/*.html =20 diff --git a/docs/meson.build b/docs/meson.build index a03beb86b77..6d3d002fd7c 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -291,6 +291,7 @@ subdir('js') subdir('kbase') subdir('logos') subdir('manpages') +subdir('schemas') =20 =20 # This hack enables us to view the web pages diff --git a/docs/schemas/meson.build b/docs/schemas/meson.build new file mode 100644 index 00000000000..7fc7ff05038 --- /dev/null +++ b/docs/schemas/meson.build @@ -0,0 +1,26 @@ +docs_schema_files =3D [ + 'basictypes.rng', + 'capability.rng', + 'cputypes.rng', + 'domainbackup.rng', + 'domaincaps.rng', + 'domaincheckpoint.rng', + 'domaincommon.rng', + 'domain.rng', + 'domainsnapshot.rng', + 'interface.rng', + 'networkcommon.rng', + 'networkport.rng', + 'network.rng', + 'nodedev.rng', + 'nwfilterbinding.rng', + 'nwfilter_params.rng', + 'nwfilter.rng', + 'secret.rng', + 'storagecommon.rng', + 'storagepoolcaps.rng', + 'storagepool.rng', + 'storagevol.rng', +] + +install_data(docs_schema_files, install_dir: pkgdatadir / 'schemas') --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894987; cv=none; d=zohomail.com; s=zohoarc; b=jrxxJ//ZGhvfftTdrBn1NJZO/66dT8ZomUDSmoFrqvdFlz9qd3NBNByaMBfnY9qbTUFw6nT51oRmMdPkJ0EPuuAtaw+ibxd3v9geW4ij2zYMoRpMecgboUOgDmyNaoGm8rh59IZo3Kjb7XfgHrZ+F0RDEi0k2gETu+QFy07MkAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894987; 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=6zH0UMgnY1qeUGr7WveUzGIrZKzI5yzM/CWZfKgl3aw=; b=M7faLmuvfxWXRkyCdXXzB/HKktQjKaylMqrCulRL8tNPMDNSrHNgzsD6QXcdNOaQAvwB/UVs3INCzXM5MZUQH2xFehvJhPneqTDVBMNaJeDLEpRRz5I0h4gPccKFz+XK8jXbA6I41SedETBNm/yytyWcoBqD4dgsAEK5HS2fI3o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894987120316.2151888650652; Thu, 16 Jul 2020 03:23:07 -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-217-0DfDtZjMM4e0w3EwOfwr8Q-1; Thu, 16 Jul 2020 06:09:55 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5630A80BCA0; Thu, 16 Jul 2020 10:09:50 +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 371CB72ACF; Thu, 16 Jul 2020 10:09: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 066AEA36E1; Thu, 16 Jul 2020 10:09:50 +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 06GA7fM9021156 for ; Thu, 16 Jul 2020 06:07:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3CF42DE6B; Thu, 16 Jul 2020 10:07:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E9752DE9E for ; Thu, 16 Jul 2020 10:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894986; 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=6zH0UMgnY1qeUGr7WveUzGIrZKzI5yzM/CWZfKgl3aw=; b=cerCLimvDgRf6Ah6+LG9VGInfg/hlJnOo3RukyOILuit6YwqVuVxTvTHiCkzRyGmZ9OM4m hOdV5NfUnKOeQ11F0yPAuGAILNFF1sPdi0KCDJua4RZxKQ4OBMShwc1NZmIdCWbj/74ahJ 3iP/+cmJk+zuChXKavTnFySels8Th/s= X-MC-Unique: 0DfDtZjMM4e0w3EwOfwr8Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 337/351] meson: docs/html: add html test Date: Thu, 16 Jul 2020 11:59:33 +0200 Message-Id: <2c6231edd2bb19b6c452ad39c2c0726af875a160.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.15 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 --- Makefile.am | 2 +- configure.ac | 2 +- docs/Makefile.am | 22 ---------------------- docs/html/meson.build | 28 ++++++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 docs/Makefile.am diff --git a/Makefile.am b/Makefile.am index fca0c1f5c29..d538d037eb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . docs +SUBDIRS =3D . =20 XZ_OPT ?=3D -v -T0 export XZ_OPT diff --git a/configure.ac b/configure.ac index 91ba0c2af4e..06e7f7491e4 100644 --- a/configure.ac +++ b/configure.ac @@ -106,7 +106,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile docs/Makefile \ + Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 40b4d224d71..00000000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2016 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -check-html: - $(XMLLINT) --nonet --noout html/*.html - -check-local: check-html diff --git a/docs/html/meson.build b/docs/html/meson.build index 7be5abe5fe5..c87cc9f7ea2 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -7,7 +7,10 @@ apipng =3D [ =20 install_data(apipng, install_dir: docs_html_dir / 'html') =20 -custom_target( +docs_html_gen =3D [] +docs_html_dep =3D [] + +index_api_gen =3D custom_target( 'index-api', input: [ newapi_xsl, @@ -43,8 +46,11 @@ custom_target( ], ) =20 +docs_html_gen +=3D index_api_gen.to_list() +docs_html_dep +=3D index_api_gen + foreach name : [ 'admin', 'lxc', 'qemu' ] - custom_target( + index_api_gen =3D custom_target( 'index-@0@-api'.format(name), input: [ newapi_xsl, @@ -67,4 +73,22 @@ foreach name : [ 'admin', 'lxc', 'qemu' ] page_xsl, ], ) + + docs_html_gen +=3D index_api_gen.to_list() + docs_html_dep +=3D index_api_gen endforeach + +docs_html_paths =3D [] + +foreach file : docs_html_gen + docs_html_paths +=3D file.full_path() +endforeach + +test( + 'check-html', + xmllint_prog, + args: [ + '--nonet', '--noout', docs_html_paths, + ], + depends: docs_html_dep, +) --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894333; cv=none; d=zohomail.com; s=zohoarc; b=fxuV0dzqAoL1APt/4t4++ggpjnpHYWDCJ8VCHnD4yTr/VNqUQ2MPl4slps5Orrs70Br9bLLOszJwFSIu17oNOEsyiZhWoZoefnM0Tm4ldqGHM+YmzbtrTWTCyTRqWCc1GmjTPkACTi9ex+2eUIR9kjoUdfx3QKsXQLqq492zB8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894333; 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=QBobqzgtzhes8YT1er0RAL41p1uvaIBfNLzQwjug1DY=; b=MD0OIgZ8QFPOwuhiVBxSzVFomrAeaECiCxbSbOlVvTlczHxCi2o8wQWAm/ujbueuSKgSLgeMMhfFRSSwDqP7ECwuf7saOKuJOx2gXxER8b7k9EFZPObqTNY72Wq560/X/la5XWblJZo0baGptQXo82XTZ5ey7gREPfSHp8y0zkM= 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 1594894333708195.1217033118046; Thu, 16 Jul 2020 03:12:13 -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-139-KQ520SeFOGiHuYlAcQAXsw-1; Thu, 16 Jul 2020 06:09:58 -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 B586C802806; Thu, 16 Jul 2020 10:09:52 +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 9365C6FEFD; Thu, 16 Jul 2020 10:09:52 +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 63415181AAC0; Thu, 16 Jul 2020 10:09:52 +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 06GA7gNu021169 for ; Thu, 16 Jul 2020 06:07:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id CCE7B2DE6B; Thu, 16 Jul 2020 10:07:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46C3F2DE9D for ; Thu, 16 Jul 2020 10:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894332; 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=QBobqzgtzhes8YT1er0RAL41p1uvaIBfNLzQwjug1DY=; b=D+O7HXTcgoGxp4OOYffskrMHC2GdOW44OgnsUw2MO6eZPR9X85jaH0WbZ3UbPCF2hJk7rB bWAlwClBzM0zpB7on0SbzuU+6PNDhA0OsZiPVm4ndQlBZ9cLsg1xk1qgQ0ztHL2HFEQgtd 3rgdJhRGkB9M5PcDF6aQRbjZ9kNJ+MY= X-MC-Unique: KQ520SeFOGiHuYlAcQAXsw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 338/351] meson: install pkgconfig files Date: Thu, 16 Jul 2020 11:59:34 +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.12 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 --- Makefile.am | 3 --- configure.ac | 4 ---- meson.build | 29 +++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index d538d037eb0..e6a37deb4a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,6 @@ SUBDIRS =3D . XZ_OPT ?=3D -v -T0 export XZ_OPT =20 -pkgconfigdir =3D $(libdir)/pkgconfig -pkgconfig_DATA =3D libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin= .pc - rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) =20 diff --git a/configure.ac b/configure.ac index 06e7f7491e4..b0a6cad178a 100644 --- a/configure.ac +++ b/configure.ac @@ -109,9 +109,5 @@ AC_CONFIG_FILES([\ Makefile \ .color_coded \ .ycm_extra_conf.py \ - libvirt.pc \ - libvirt-qemu.pc \ - libvirt-lxc.pc \ - libvirt-admin.pc \ libvirt.spec mingw-libvirt.spec]) AC_OUTPUT diff --git a/meson.build b/meson.build index 65843ed574d..7b858797388 100644 --- a/meson.build +++ b/meson.build @@ -2214,6 +2214,35 @@ subdir('po') subdir('docs') =20 =20 +# install pkgconfig files +pkgconfig_files =3D [ + 'libvirt.pc.in', + 'libvirt-qemu.pc.in', + 'libvirt-lxc.pc.in', + 'libvirt-admin.pc.in', +] + +pkgconfig_conf =3D configuration_data() +pkgconfig_conf.set('VERSION', meson.project_version()) +pkgconfig_conf.set('datadir', datadir) +pkgconfig_conf.set('datarootdir', datadir) +pkgconfig_conf.set('exec_prefix', prefix) +pkgconfig_conf.set('includedir', includedir) +pkgconfig_conf.set('libdir', libdir) +pkgconfig_conf.set('prefix', prefix) + +pkgconfig_dir =3D libdir / 'pkgconfig' + +foreach file : pkgconfig_files + configure_file( + input: file, + output: '@BASENAME@', + configuration: pkgconfig_conf, + install: true, + install_dir: pkgconfig_dir, + ) +endforeach + # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894604; cv=none; d=zohomail.com; s=zohoarc; b=Hrr+NT5Brg2oRjj/x+8qYUkKnmsrXrqzrBUfSt1zXHl4yzPn4VBg1kdlg2VUGYh49CCNDlLWxoIS5a0ChHq1V7SZmzXiZg02uwCKq3UvZWLd8gcaVB+EKg1//h5f6pBWiSlQeALJmpM4OLrq6F1/idpFKl2l3APX1pRuuLDMJTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894604; 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=0AFjOdfd8YspkCaneCsAOW8dGprX1WibSJ86/refH54=; b=M+rsKsZ1lgJgQQaIFo/YtcQMEwEii3D7JiGMgIZRVy964wU/IxB80mHZOwVMy45rGXFvDCjHGqzTonpZcZUjUXVYjO0bHBVzGJB6B2a+2f/r+VW8w/ea00l9vNl/WG7M1Mypc9lt8VSkB1K0VW6OcKq8g4QhI7p5ulBX86+ceGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894604884951.4529851153573; Thu, 16 Jul 2020 03:16:44 -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-256-MSzrnxdAObOCT_iWjdRMTg-1; Thu, 16 Jul 2020 06:15:03 -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 3D3F280572E; Thu, 16 Jul 2020 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 178D961982; Thu, 16 Jul 2020 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 DD1899A120; Thu, 16 Jul 2020 10:14:57 +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 06GA7hkf021180 for ; Thu, 16 Jul 2020 06:07:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4F062DE96; Thu, 16 Jul 2020 10:07:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FD872DE6B for ; Thu, 16 Jul 2020 10:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894603; 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=0AFjOdfd8YspkCaneCsAOW8dGprX1WibSJ86/refH54=; b=ZQhLjOGqrkTLH+JdOdlJGiiu5OZaXTkljfO92YRgzoCwnzg5+3RTN5tTedQ/0TBDeuI4wN ggHpU+SUXR4A5lwpR3G1gjOqw2Y4/GsObW7hyREaQxEReiPPRzjEZHio5ljUdjYdple88T zokSEYGMXW6hs8wi4uZ7zn7WvzJ3dgQ= X-MC-Unique: MSzrnxdAObOCT_iWjdRMTg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 339/351] meson: generate and distribute spec files and AUTHORS Date: Thu, 16 Jul 2020 11:59:35 +0200 Message-Id: <52c3224cbe72ec7c326c32c2237f36ed658729ce.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 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 --- Makefile.am | 19 --------------- configure.ac | 3 +-- meson.build | 45 ++++++++++++++++++++++++++++++++++++ scripts/meson-dist.sh | 6 +++++ scripts/meson-gen-authors.sh | 4 ++++ scripts/meson.build | 2 ++ 6 files changed, 58 insertions(+), 21 deletions(-) create mode 100755 scripts/meson-dist.sh create mode 100755 scripts/meson-gen-authors.sh diff --git a/Makefile.am b/Makefile.am index e6a37deb4a5..7490acbcfba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,24 +31,5 @@ rpm: clean srpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) =20 -dist-hook: gen-AUTHORS - -.PHONY: gen-AUTHORS -gen-AUTHORS: - $(AM_V_GEN)\ - if test -d $(srcdir)/.git; then \ - ( \ - cd $(srcdir) && \ - git log --pretty=3Dformat:'%aN <%aE>' | sort -u \ - ) > all.list && \ - sort -u $(srcdir)/AUTHORS.in > maint.list && \ - comm -23 all.list maint.list > contrib.list && \ - contrib=3D"`cat contrib.list`" && \ - perl -p -e "s/#contributorslist#// and print '$$contrib'" \ - < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ - mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \ - rm -f all.list maint.list contrib.list; \ - fi - ci-%: $(MAKE) -C $(srcdir)/ci/ $@ diff --git a/configure.ac b/configure.ac index b0a6cad178a..b70aa17cb23 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,5 @@ AC_CONFIG_FILES([run], AC_CONFIG_FILES([\ Makefile \ .color_coded \ - .ycm_extra_conf.py \ - libvirt.spec mingw-libvirt.spec]) + .ycm_extra_conf.py]) AC_OUTPUT diff --git a/meson.build b/meson.build index 7b858797388..9d0a0c1665b 100644 --- a/meson.build +++ b/meson.build @@ -2243,6 +2243,51 @@ foreach file : pkgconfig_files ) endforeach =20 + +# generate dist files + +if git + spec_files =3D [ + 'libvirt.spec.in', + 'mingw-libvirt.spec.in', + ] + + spec_conf =3D configuration_data() + spec_conf.set('VERSION', meson.project_version()) + + foreach file : spec_files + configure_file( + input: file, + output: '@BASENAME@', + configuration: spec_conf, + ) + endforeach + + authors =3D run_command(meson_gen_authors_prog) + authors_file =3D 'AUTHORS.in' + + authors_conf =3D configuration_data() + authors_conf.set('contributorslist', authors.stdout()) + + configure_file( + input: authors_file, + output: '@BASENAME@', + configuration: authors_conf, + ) + + # Using return values from configure_file in add_dist_script is possible= since 0.55.0 + dist_files =3D [ + 'libvirt.spec', + 'mingw-libvirt.spec', + 'AUTHORS', + ] + + foreach file : dist_files + meson.add_dist_script(meson_dist_prog.path(), meson.build_root(), file) + endforeach +endif + + # generate meson-config.h file configure_file(output: 'meson-config.h', configuration: conf) =20 diff --git a/scripts/meson-dist.sh b/scripts/meson-dist.sh new file mode 100755 index 00000000000..fdcc0154e02 --- /dev/null +++ b/scripts/meson-dist.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +MESON_BUILD_ROOT=3D$1 +FILE=3D$2 + +cp $MESON_BUILD_ROOT/$FILE $MESON_DIST_ROOT/$FILE diff --git a/scripts/meson-gen-authors.sh b/scripts/meson-gen-authors.sh new file mode 100755 index 00000000000..bf0a3b63886 --- /dev/null +++ b/scripts/meson-gen-authors.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd $MESON_SOURCE_ROOT +git log --pretty=3Dformat:'* %aN <%aE>' | sort -u diff --git a/scripts/meson.build b/scripts/meson.build index 3bcd6e85ce5..fa2ed57c99d 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -23,6 +23,8 @@ scripts =3D [ 'hyperv_wmi_generator.py', 'install-dirs.sh', 'install-symlink.sh', + 'meson-dist.sh', + 'meson-gen-authors.sh', 'meson-html-gen.py', 'meson-python.sh', 'meson-timestamp.sh', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894627; cv=none; d=zohomail.com; s=zohoarc; b=MsJG5T9uAjdM0Tqplm3udmzB0TFhTsnqBcICRAL/aAWzsUidzn9wTaMWrGFgQ+QkL+Ko6XTG8+vcQFHmpGV/9Nle0s1c6TGO80ZMOxtRLkO7r5lenhjhZWh+RdFkl6+JjOJA+YPtO/a2WxGM5apIXfAvWk4+42JuMDCnKVRZXwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894627; 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=+HMKz3ekpDJdGMNNLqJB3hKQBVqJi1F7Dliwr20xJho=; b=nUbsUuqO7P2JZ1ySt47QpKD9ZRE6SWFHdQNPXJ6aflhravVY0jNAgLy/vJb7ylfInuQdw5/3oItw2Hqj1cgqSEGfPJjNqd92A3Oj5KfKnAssp9qkrGbeMUjkfopZ5MabmJ+6WxjT5rxl3fsEkzDpHLZFTfo5nMYzUQF+Ni18nSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894627075764.5589484575844; Thu, 16 Jul 2020 03:17:07 -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-47-65UUdogWNbitJdw_cUgjng-1; Thu, 16 Jul 2020 06:15:07 -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 1CBA31888AA5; Thu, 16 Jul 2020 10:15:01 +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 EB8C56FEF7; Thu, 16 Jul 2020 10:15:00 +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 BC62D9A125; Thu, 16 Jul 2020 10:15:00 +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 06GA7iKA021191 for ; Thu, 16 Jul 2020 06:07:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9C4D12DE6B; Thu, 16 Jul 2020 10:07:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17B272DE9C for ; Thu, 16 Jul 2020 10:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894625; 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=+HMKz3ekpDJdGMNNLqJB3hKQBVqJi1F7Dliwr20xJho=; b=E4RYsuneBd5x1tp5qHARAYyCTgQU2LRP/MNvTWgDwgzc0s+XUsXj3XyGFc2i7/Lfwl4rVF q0Qqijv3Tt0I6JV3ksf89EuVPOfBk1Gu7owH0trfN5xdwxoslDpizRw0if793dCYrA1/I2 ArmNxdEkrYUfrtgze+ArVS5MIvhhnCo= X-MC-Unique: 65UUdogWNbitJdw_cUgjng-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 340/351] meson: generate run helper Date: Thu, 16 Jul 2020 11:59:36 +0200 Message-Id: <00475d7d8ba0b2626a5949af414b302cf096a25e.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 --- configure.ac | 2 -- meson.build | 11 +++++++++++ run.in | 2 +- scripts/meson-change-perms.sh | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 scripts/meson-change-perms.sh diff --git a/configure.ac b/configure.ac index b70aa17cb23..64d4f56b509 100644 --- a/configure.ac +++ b/configure.ac @@ -103,8 +103,6 @@ m4_if(m4_version_compare([2.61a.100], [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=3D$GNUmakefile])]) =20 -AC_CONFIG_FILES([run], - [chmod +x,-w run]) AC_CONFIG_FILES([\ Makefile \ .color_coded \ diff --git a/meson.build b/meson.build index 9d0a0c1665b..2519b48b63f 100644 --- a/meson.build +++ b/meson.build @@ -2292,6 +2292,17 @@ endif configure_file(output: 'meson-config.h', configuration: conf) =20 =20 +# generate run helper +run_conf =3D configuration_data() +run_conf.set('abs_builddir', meson.build_root()) +configure_file( + input: 'run.in', + output: 'run', + configuration: run_conf, +) +run_command('scripts/meson-change-perms.sh', 'a+x', 'run') + + # print configuration summary =20 driver_summary =3D { diff --git a/run.in b/run.in index 1a0dee4d9ee..73bebbf805f 100644 --- a/run.in +++ b/run.in @@ -71,4 +71,4 @@ random_val=3D"$(awk 'BEGIN{srand(); print 1+int(255*rand(= ))}' < /dev/null)" export MALLOC_PERTURB_=3D$random_val =20 # Run the program. -exec $b/libtool --mode=3Dexecute "$@" +exec "$@" diff --git a/scripts/meson-change-perms.sh b/scripts/meson-change-perms.sh new file mode 100644 index 00000000000..b366d80077e --- /dev/null +++ b/scripts/meson-change-perms.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +perms=3D$1 +file=3D$2 + +chmod $perms $MESON_BUILD_ROOT/$file --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594894296; cv=none; d=zohomail.com; s=zohoarc; b=V0Gwy0PQmVrtgThTtVk3WhxQiUjnhSk65q/WN3NJJkZHdrfQDzrA2SjxTiWTgGPcfKaW/wUlHDwVgH+NPglzc4gG2didypk/qXOUY4NEq1/0OvI7Myd1igMaSF5hczMu/nh0HjfcFUBv2yucci22BOkm+5NLzN/YU9WKF3u5HnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894296; 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=yL/t8mfcLokWWNp4D0sDYpYoPuSMEUIyma5rWMp03OQ=; b=kRj+KPv98tfpkRblmDE5LMVup9WQZ7Orgyk+CN60QO2r/dVnn4pCTjhRPVBcx6UOFK1HMI+BKMLovE0v9tUFfe1O4PqnfHfThWSSwLKHQKKRWTOq7DQqOGahhJeguATQ0fTHevfeocM3omniYptJle6ASZQOzDyjvpRn0HQBWi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594894296128165.58040727117236; Thu, 16 Jul 2020 03:11:36 -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-292-EbERkzuXPIK_UAgTnMz16w-1; Thu, 16 Jul 2020 06:11:32 -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 4A9781888AA5; Thu, 16 Jul 2020 10:11:27 +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 28050101F69D; Thu, 16 Jul 2020 10:11:27 +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 E81FB730D3; Thu, 16 Jul 2020 10:11:26 +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 06GA7jDd021203 for ; Thu, 16 Jul 2020 06:07:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84F122DE96; Thu, 16 Jul 2020 10:07:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3BB62DE6B for ; Thu, 16 Jul 2020 10:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894294; 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=yL/t8mfcLokWWNp4D0sDYpYoPuSMEUIyma5rWMp03OQ=; b=SManNm5TskGuOaiePxqZi5TvFjxaavQK1f4fmSFRmPvhbqABlVX+2hQR2xTfog15Gph1zc v5hhUKgQA31+F62HoUwSmMeaL6xsW3oIqnCzrQQP9xgw4FinaPTshCHqvxpsTwlnO3iLiO 3tha8qlE5yMsJgMuss4aIUxq1NijW4A= X-MC-Unique: EbERkzuXPIK_UAgTnMz16w-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 341/351] meson: generate developer tooling files Date: Thu, 16 Jul 2020 11:59:37 +0200 Message-Id: <831abe4e4a34f3496c39ea6d611c32145219f870.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 --- configure.ac | 4 +--- meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 64d4f56b509..4ba70bb43b5 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,5 @@ m4_if(m4_version_compare([2.61a.100], [GNUmakefile=3D$GNUmakefile])]) =20 AC_CONFIG_FILES([\ - Makefile \ - .color_coded \ - .ycm_extra_conf.py]) + Makefile]) AC_OUTPUT diff --git a/meson.build b/meson.build index 2519b48b63f..d14223829e2 100644 --- a/meson.build +++ b/meson.build @@ -2303,6 +2303,25 @@ configure_file( run_command('scripts/meson-change-perms.sh', 'a+x', 'run') =20 =20 +# generate developer tooling files +tooling_files =3D [ + '.color_coded.in', + '.ycm_extra_conf.py.in', +] + +tooling_conf =3D configuration_data() +tooling_conf.set('abs_top_builddir', meson.build_root()) +tooling_conf.set('abs_top_srcdir', meson.source_root()) + +foreach file : tooling_files + configure_file( + input: file, + output: '@BASENAME@', + configuration: tooling_conf, + ) +endforeach + + # print configuration summary =20 driver_summary =3D { --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894882; cv=none; d=zohomail.com; s=zohoarc; b=Sunhc45dDadkQPSfLcsRHbprSLnwxwAh2EZLGDS9rYyBcoLpebwAHMQYOCBvC9n29+WR65+x2LfNTXEZeW+0vUsuAzo3Nd+bkNCXeQdVDtrSlh4FKjFk52SYF1QoCtMo0uon5/LNaTjlKs7E8dNPsCXwLUFZVui64TaniIgt8fc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894882; 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=CUbkXs1tfXe+AnNccyQMRMuzaHWH3SCHSbxJeVDJQtY=; b=evNDbr0pd3hgFUpoYOcvksdPbYuIBS4zGyPavsJOko7TFo8L9h7+SzD/sjCXn3j2vZpFNnewexPiEjDYtaD4xC8u4sh+B7K0UD7eqz1Ca1AtMecTb5RL4f1ayd2210/WG7zxooLHnCfIFvLldj8EmLsSQIar1JKwqcf27NUX4sM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894882943146.38400439253348; Thu, 16 Jul 2020 03:21:22 -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-251-ldbqH9VONC2djxNVhx-Xeg-1; Thu, 16 Jul 2020 06:15:10 -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 A847A8015F7; Thu, 16 Jul 2020 10:15:03 +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 86A967B421; Thu, 16 Jul 2020 10:15:03 +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 53CE59A128; Thu, 16 Jul 2020 10:15:03 +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 06GA7krT021214 for ; Thu, 16 Jul 2020 06:07:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6DC3F2DE96; Thu, 16 Jul 2020 10:07:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC1F72DE6B for ; Thu, 16 Jul 2020 10:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894881; 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=CUbkXs1tfXe+AnNccyQMRMuzaHWH3SCHSbxJeVDJQtY=; b=dn2Ycndr+oNr0V7BTuRcXm5cvDI5yZ1rleO3ej8f+zv4YpEXG+yLcRIbioatJ/Alp2Dut6 UGBnrIFLvE/MG0J3XC1C78t/JTQmnoi9VVyQgSA3fcmYxAJIRsCyELHNvI+4OyplZfH70Z XIRB2aQ9C3J7ia9j4rdXAMT2ShjvDlk= X-MC-Unique: ldbqH9VONC2djxNVhx-Xeg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 342/351] meson: add syntax-check Date: Thu, 16 Jul 2020 11:59:38 +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 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 --- build-aux/Makefile.in | 9 +++ .../Makefile.nonreentrant | 0 build-aux/meson.build | 30 +++++++++ build-aux/syntax-check.mk | 62 +++++++++---------- meson.build | 2 + 5 files changed, 72 insertions(+), 31 deletions(-) create mode 100644 build-aux/Makefile.in rename Makefile.nonreentrant =3D> build-aux/Makefile.nonreentrant (100%) create mode 100644 build-aux/meson.build diff --git a/build-aux/Makefile.in b/build-aux/Makefile.in new file mode 100644 index 00000000000..601f1ad7a19 --- /dev/null +++ b/build-aux/Makefile.in @@ -0,0 +1,9 @@ +# define variables + +top_srcdir =3D @top_srcdir@ +top_builddir =3D @top_builddir@ +FLAKE8 =3D @flake8_path@ +RUNUTF8 =3D @runutf8@ + +# include syntax-check.mk file +include $(top_srcdir)/build-aux/syntax-check.mk diff --git a/Makefile.nonreentrant b/build-aux/Makefile.nonreentrant similarity index 100% rename from Makefile.nonreentrant rename to build-aux/Makefile.nonreentrant diff --git a/build-aux/meson.build b/build-aux/meson.build new file mode 100644 index 00000000000..de916793cad --- /dev/null +++ b/build-aux/meson.build @@ -0,0 +1,30 @@ +syntax_check_conf =3D configuration_data() +syntax_check_conf.set('top_srcdir', meson.source_root()) +syntax_check_conf.set('top_builddir', meson.build_root()) + +flake8_path =3D '' +if flake8_prog.found() + flake8_path =3D flake8_prog.path() +endif +syntax_check_conf.set('flake8_path', flake8_path) +syntax_check_conf.set('runutf8', ' '.join(runutf8)) + +configure_file( + input: 'Makefile.in', + output: '@BASENAME@', + configuration: syntax_check_conf, +) + +make_prog =3D find_program('make') + +# There is no way how to pass value to -j using run_target so let's use +# it without any value to run all tests in parallel. +run_target( + 'syntax-check', + command: [ + make_prog, '-C', meson.current_build_dir(), '-j', 'syntax-check', + ], + depends: [ + potfiles_dep, + ], +) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 3d7b644f01f..1fe2da4e637 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -21,7 +21,7 @@ =20 # This is reported not to work with make-3.79.1 # ME :=3D $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -ME :=3D $(_build-aux)/syntax-check.mk +ME :=3D build-aux/syntax-check.mk =20 # These variables ought to be defined through the configure.ac section # of the module description. But some packages import this file directly, @@ -42,29 +42,29 @@ _equal =3D $(and $(findstring $(1),$(2)),$(findstring $= (2),$(1))) GIT =3D git VC =3D $(GIT) =20 -VC_LIST =3D $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) +VC_LIST =3D $(top_srcdir)/build-aux/vc-list-files -C $(top_srcdir) =20 # You can override this variable in syntax-check.mk to set your own regexp # matching files to ignore. VC_LIST_ALWAYS_EXCLUDE_REGEX ?=3D ^$$ =20 # This is to preprocess robustly the output of $(VC_LIST), so that even -# when $(srcdir) is a pathological name like "....", the leading sed comma= nd +# when $(top_srcdir) is a pathological name like "....", the leading sed c= ommand # removes only the intended prefix. -_dot_escaped_srcdir =3D $(subst .,\.,$(srcdir)) -_dot_escaped_builddir =3D $(subst .,\.,$(builddir)) +_dot_escaped_srcdir =3D $(subst .,\.,$(top_srcdir)) +_dot_escaped_builddir =3D $(subst .,\.,$(top_builddir)) =20 -# Post-process $(VC_LIST) output, prepending $(srcdir)/, but only -# when $(srcdir) is not ".". -ifeq ($(srcdir),.) +# Post-process $(VC_LIST) output, prepending $(top_srcdir)/, but only +# when $(top_srcdir) is not ".". +ifeq ($(top_srcdir),.) _prepend_srcdir_prefix =3D else - _prepend_srcdir_prefix =3D | $(SED) 's|^|$(srcdir)/|' + _prepend_srcdir_prefix =3D | $(SED) 's|^|$(top_srcdir)/|' endif =20 # In order to be able to consistently filter "."-relative names, -# (i.e., with no $(srcdir) prefix), this definition is careful to -# remove any $(srcdir) prefix, and to restore what it removes. +# (i.e., with no $(top_srcdir) prefix), this definition is careful to +# remove any $(top_srcdir) prefix, and to restore what it removes. _sc_excl =3D \ $(or $(exclude_file_name_regexp--$@),^$$) VC_LIST_EXCEPT =3D \ @@ -84,11 +84,11 @@ export LC_ALL =3D C ## Sanity checks. ## ## --------------- ## =20 -_cfg_mk :=3D $(wildcard $(srcdir)/$(_build-aux)/syntax-check.mk) +_cfg_mk :=3D $(wildcard $(top_srcdir)/build-aux/syntax-check.mk) =20 # Collect the names of rules starting with 'sc_'. syntax-check-rules :=3D $(sort $(shell $(SED) -n \ - 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(srcdir)/$(ME) $(_cfg_mk))) + 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(top_srcdir)/$(ME) $(_cfg_mk))) .PHONY: $(syntax-check-rules) =20 ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0) @@ -333,11 +333,11 @@ sc_flags_debug: # than d). The existence of long long, and of documentation about # flags, makes the regex in the third test slightly harder. sc_flags_usage: - @test "$$(cat $(srcdir)/include/libvirt/libvirt-domain.h \ - $(srcdir)/include/libvirt/virterror.h \ - $(srcdir)/include/libvirt/libvirt-qemu.h \ - $(srcdir)/include/libvirt/libvirt-lxc.h \ - $(srcdir)/include/libvirt/libvirt-admin.h \ + @test "$$(cat $(top_srcdir)/include/libvirt/libvirt-domain.h \ + $(top_srcdir)/include/libvirt/virterror.h \ + $(top_srcdir)/include/libvirt/libvirt-qemu.h \ + $(top_srcdir)/include/libvirt/libvirt-lxc.h \ + $(top_srcdir)/include/libvirt/libvirt-admin.h \ | $(GREP) -c '\(long\|unsigned\) flags')" !=3D 4 && \ { echo '$(ME): new API should use "unsigned int flags"' 1>&2; \ exit 1; } || : @@ -496,7 +496,7 @@ sc_prohibit_PATH_MAX: halt=3D'dynamically allocate paths, do not use PATH_MAX' \ $(_sc_search_regexp) =20 -include $(srcdir)/Makefile.nonreentrant +include $(top_srcdir)/build-aux/Makefile.nonreentrant sc_prohibit_nonreentrant: @prohibit=3D"\\<(${NON_REENTRANT_RE}) *\\(" \ halt=3D"use re-entrant functions (usually ending with _r)" \ @@ -833,7 +833,7 @@ sc_prohibit_gettext_markup: =20 # Our code is divided into modular subdirectories for a reason, and # lower-level code must not include higher-level headers. -cross_dirs=3D$(patsubst $(srcdir)/src/%.,%,$(wildcard $(srcdir)/src/*/.)) +cross_dirs=3D$(patsubst $(top_srcdir)/src/%.,%,$(wildcard $(top_srcdir)/sr= c/*/.)) cross_dirs_re=3D($(subst / ,/|,$(cross_dirs))) mid_dirs=3Daccess|admin|conf|cpu|locking|logging|rpc|security sc_prohibit_cross_inclusion: @@ -1177,7 +1177,7 @@ sc_prohibit_dirent_d_type: # grep-E-style regexp selecting the files to check. For in_vc_files, # the regexp is used to select matching files from the list of all # version-controlled files; for in_files, it's from the names printed -# by "find $(srcdir)". When neither is specified, use all files that +# by "find $(top_srcdir)". When neither is specified, use all files t= hat # are under version control. # # containing | non_containing @@ -1249,7 +1249,7 @@ define _sc_search_regexp \ : Filter by file name; \ if test -n "$$in_files"; then \ - files=3D$$(find $(srcdir) | $(GREP) -E "$$in_files" \ + files=3D$$(find $(top_srcdir) | $(GREP) -E "$$in_files" \ | $(GREP) -Ev '$(_sc_excl)'); \ else \ files=3D$$($(VC_LIST_EXCEPT)); \ @@ -1293,7 +1293,7 @@ sc_avoid_if_before_free: @$(VC_LIST_EXCEPT) \ | $(GREP) -v useless-if-before-free \ | xargs \ - $(srcdir)/$(_build-aux)/useless-if-before-free \ + $(top_srcdir)/build-aux/useless-if-before-free \ $(useless_free_options) \ && { printf '$(ME): found useless "if"' \ ' before "free" above\n' 1>&2; \ @@ -1781,9 +1781,6 @@ sc_const_long_option: halt=3D'add "const" to the above declarations' \ $(_sc_search_regexp) =20 -gen_source_files: - $(MAKE) -C src generated-sources - fix_po_file_diag =3D \ 'you have changed the set of files with translatable diagnostics;\n\ apply the above patch\n' @@ -1805,26 +1802,26 @@ perl_translatable_files_list_ =3D \ =20 # Verify that all source files using _() (more specifically, files that # match $(_gl_translatable_string_re)) are listed in po/POTFILES.in. -po_file ?=3D $(srcdir)/po/POTFILES.in +po_file ?=3D $(top_srcdir)/po/POTFILES.in =20 # List of additional files that we want to pick up in our POTFILES.in # This is all generated files for RPC code. generated_files =3D \ - $(builddir)/src/*.[ch] \ - $(builddir)/src/*/*.[ch] + $(top_builddir)/src/*.[ch] \ + $(top_builddir)/src/*/*.[ch] =20 _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) =20 # sc_po_check can fail if generated files are not built first -sc_po_check: gen_source_files +sc_po_check: @if test -f $(po_file); then \ $(GREP) -E -v '^(#|$$)' $(po_file) \ | $(GREP) -v '^src/false\.c$$' | sort > $@-1; \ { $(VC_LIST_EXCEPT); echo $(generated_files); } \ | xargs perl $(perl_translatable_files_list_) \ | xargs $(GREP) -E -l '$(_gl_translatable_string_re)' \ - | $(SED) 's|^$(_dot_escaped_srcdir)/|@SRCDIR@|' \ | $(SED) 's|^$(_dot_escaped_builddir)/|@BUILDDIR@|' \ + | $(SED) 's|^$(_dot_escaped_srcdir)/|@SRCDIR@|' \ | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ @@ -2074,3 +2071,6 @@ exclude_file_name_regexp--sc_prohibit_backslash_align= ment =3D \ =20 exclude_file_name_regexp--sc_prohibit_select =3D \ ^build-aux/syntax-check\.mk|src/util/vireventglibwatch\.c$$ + +exclude_file_name_regexp--sc_prohibit_config_h_in_headers =3D \ + ^config\.h$$ diff --git a/meson.build b/meson.build index d14223829e2..587e05a02da 100644 --- a/meson.build +++ b/meson.build @@ -2213,6 +2213,8 @@ subdir('po') =20 subdir('docs') =20 +subdir('build-aux') + =20 # install pkgconfig files pkgconfig_files =3D [ --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594895236; cv=none; d=zohomail.com; s=zohoarc; b=c/9pwOH3NIwI+JhN7SMPwFaPo89nroemtdEB//pC0gAGJm6U28VX9Fwb1zfiX+DEXUDP3pmUv9/EcxmMXJqKOXH+KixKd3m5MSqAtiM6COrnRt41uNPJtK3JyKecFvh5lL8HFMsCG9auod+i5NgKKtrs3FXN/W+LYOHs50QwWSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594895236; 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=0Lb8u6dVKvHLBbxS4pF/5tRVbW+aY+LzxHhL4cu/o6I=; b=d5uEhunq5ZjGJ2XHUSeJ4fQknaW6yQPvipRBqcn16bk/LJAdp5u0t+HIDc4sZca2kWJ2E+g3LNz3EJgKa85Tq65omDWvZHdw4rae1zFvq8po6npXW5R8md9qzMbfCNP2thG/0zm9f2SC2OT7Qo5s6PXVur5ZpQ5r1jL+fPREoZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594895236501926.0437197484006; Thu, 16 Jul 2020 03:27:16 -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-132-a6F51FONPhmWNGQbARc-kQ-1; Thu, 16 Jul 2020 06:15:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22C56800FF1; Thu, 16 Jul 2020 10:15:07 +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 00C9178482; Thu, 16 Jul 2020 10:15:06 +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 BDD6C181D0BC; Thu, 16 Jul 2020 10:15:06 +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 06GA7lSJ021230 for ; Thu, 16 Jul 2020 06:07:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 56BE52DE9C; Thu, 16 Jul 2020 10:07:47 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4EEA2DE6B for ; Thu, 16 Jul 2020 10:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594895235; 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=0Lb8u6dVKvHLBbxS4pF/5tRVbW+aY+LzxHhL4cu/o6I=; b=CawL5QRAtnbWd6lkPlDVIFLK63Jl4st/Ze22o16sDhC8Sb1UQaPrc+VaB5UrqTgmJIR47f 9iKEtFKKDJIXPXUcW5oMk4OEhtf/E1yRqWZubUcC0RhRIOKjlMNM+L3ih/pk4RmLu4xhlM 7d9l9THtXhKFv8lddsBroAvlqQJiPnY= X-MC-Unique: a6F51FONPhmWNGQbARc-kQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 343/351] meson: update spec file to use meson Date: Thu, 16 Jul 2020 11:59:39 +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.11 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 --- libvirt.spec.in | 203 +++++++++++++++++++++--------------------------- meson.build | 1 - 2 files changed, 89 insertions(+), 115 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 522e36b6a51..94c8715faa1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -12,11 +12,6 @@ %define supported_platform 0 %endif =20 -# Default to skipping autoreconf. Distros can change just this one line -# (or provide a command-line override) if they backport any patches that -# touch configure.ac or Makefile.am. -%{!?enable_autotools:%global enable_autotools 0} - # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} @@ -203,9 +198,9 @@ # compiler warning into errors without being worried about frequent # changes in reported warnings %if 0%{?rhel} - %define enable_werror --enable-werror + %define enable_werror -Dwerror=3Dtrue %else - %define enable_werror --disable-werror + %define enable_werror -Dwerror=3Dfalse %endif =20 %if 0%{?rhel} =3D=3D 7 @@ -257,12 +252,7 @@ Requires: libvirt-libs =3D %{version}-%{release} =20 # All build-time requirements. Run-time requirements are # listed against each sub-RPM -%if 0%{?enable_autotools} -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: libtool -%endif %if 0%{?rhel} =3D=3D 7 BuildRequires: python36-docutils %else @@ -1006,219 +996,209 @@ exit 1 %endif =20 %if %{with_qemu} - %define arg_qemu --with-qemu + %define arg_qemu -Ddriver_qemu=3Denabled %else - %define arg_qemu --without-qemu + %define arg_qemu -Ddriver_qemu=3Ddisabled %endif =20 %if %{with_openvz} - %define arg_openvz --with-openvz + %define arg_openvz -Ddriver_openvz=3Denabled %else - %define arg_openvz --without-openvz + %define arg_openvz -Ddriver_openvz=3Ddisabled %endif =20 %if %{with_lxc} - %define arg_lxc --with-lxc - %define arg_login_shell --with-login-shell + %define arg_lxc -Ddriver_lxc=3Denabled + %define arg_login_shell -Dlogin_shell=3Denabled %else - %define arg_lxc --without-lxc - %define arg_login_shell --without-login-shell + %define arg_lxc -Ddriver_lxc=3Ddisabled + %define arg_login_shell -Dlogin_shell=3Ddisabled %endif =20 %if %{with_vbox} - %define arg_vbox --with-vbox + %define arg_vbox -Ddriver_vbox=3Denabled %else - %define arg_vbox --without-vbox + %define arg_vbox -Ddriver_vbox=3Ddisabled %endif =20 %if %{with_libxl} - %define arg_libxl --with-libxl + %define arg_libxl -Ddriver_libxl=3Denabled %else - %define arg_libxl --without-libxl + %define arg_libxl -Ddriver_libxl=3Ddisabled %endif =20 %if %{with_esx} - %define arg_esx --with-esx + %define arg_esx -Ddriver_esx=3Denabled %else - %define arg_esx --without-esx + %define arg_esx -Ddriver_esx=3Ddisabled %endif =20 %if %{with_hyperv} - %define arg_hyperv --with-hyperv + %define arg_hyperv -Ddriver_hyperv=3Denabled %else - %define arg_hyperv --without-hyperv + %define arg_hyperv -Ddriver_hyperv=3Ddisabled %endif =20 %if %{with_vmware} - %define arg_vmware --with-vmware + %define arg_vmware -Ddriver_vmware=3Denabled %else - %define arg_vmware --without-vmware + %define arg_vmware -Ddriver_vmware=3Ddisabled %endif =20 %if %{with_storage_rbd} - %define arg_storage_rbd --with-storage-rbd + %define arg_storage_rbd -Dstorage_rbd=3Denabled %else - %define arg_storage_rbd --without-storage-rbd + %define arg_storage_rbd -Dstorage_rbd=3Ddisabled %endif =20 %if %{with_storage_sheepdog} - %define arg_storage_sheepdog --with-storage-sheepdog + %define arg_storage_sheepdog -Dstorage_sheepdog=3Denabled %else - %define arg_storage_sheepdog --without-storage-sheepdog + %define arg_storage_sheepdog -Dstorage_sheepdog=3Ddisabled %endif =20 %if %{with_storage_gluster} - %define arg_storage_gluster --with-storage-gluster + %define arg_storage_gluster -Dstorage_gluster=3Denabled %else - %define arg_storage_gluster --without-storage-gluster + %define arg_storage_gluster -Dstorage_gluster=3Ddisabled %endif =20 %if %{with_storage_zfs} - %define arg_storage_zfs --with-storage-zfs + %define arg_storage_zfs -Dstorage_zfs=3Denabled %else - %define arg_storage_zfs --without-storage-zfs + %define arg_storage_zfs -Dstorage_zfs=3Ddisabled %endif =20 %if %{with_numactl} - %define arg_numactl --with-numactl + %define arg_numactl -Dnumactl=3Denabled %else - %define arg_numactl --without-numactl + %define arg_numactl -Dnumactl=3Ddisabled %endif =20 %if %{with_numad} - %define arg_numad --with-numad + %define arg_numad -Dnumad=3Denabled %else - %define arg_numad --without-numad + %define arg_numad -Dnumad=3Ddisabled %endif =20 %if %{with_fuse} - %define arg_fuse --with-fuse + %define arg_fuse -Dfuse=3Denabled %else - %define arg_fuse --without-fuse + %define arg_fuse -Dfuse=3Ddisabled %endif =20 %if %{with_sanlock} - %define arg_sanlock --with-sanlock + %define arg_sanlock -Dsanlock=3Denabled %else - %define arg_sanlock --without-sanlock + %define arg_sanlock -Dsanlock=3Ddisabled %endif =20 %if %{with_firewalld} - %define arg_firewalld --with-firewalld + %define arg_firewalld -Dfirewalld=3Denabled %else - %define arg_firewalld --without-firewalld + %define arg_firewalld -Dfirewalld=3Ddisabled %endif =20 %if %{with_firewalld_zone} - %define arg_firewalld_zone --with-firewalld-zone + %define arg_firewalld_zone -Dfirewalld_zone=3Denabled %else - %define arg_firewalld_zone --without-firewalld-zone + %define arg_firewalld_zone -Dfirewalld_zone=3Ddisabled %endif =20 %if %{with_wireshark} - %define arg_wireshark --with-wireshark-dissector + %define arg_wireshark -Dwireshark_dissector=3Denabled %else - %define arg_wireshark --without-wireshark-dissector + %define arg_wireshark -Dwireshark_dissector=3Ddisabled %endif =20 %if %{with_storage_iscsi_direct} - %define arg_storage_iscsi_direct --with-storage-iscsi-direct + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Denabled %else - %define arg_storage_iscsi_direct --without-storage-iscsi-direct + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Ddisabled %endif =20 %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} -%define arg_packager --with-packager=3D"%{who}, %{when}, %{where}" -%define arg_packager_version --with-packager-version=3D"%{release}" +%define arg_packager -Dpackager=3D"%{who}, %{when}, %{where}" +%define arg_packager_version -Dpackager_version=3D"%{release}" =20 -%define arg_selinux_mount --with-selinux-mount=3D"/sys/fs/selinux" +%define arg_selinux_mount -Dselinux_mount=3D"/sys/fs/selinux" =20 # place macros above and build commands below this comment =20 export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) =20 -%if 0%{?enable_autotools} - autoreconf -if -%endif - -rm -f po/stamp-po - -%define _configure ../configure -mkdir %{_vpath_builddir} -cd %{_vpath_builddir} - -%configure --enable-dependency-tracking \ - --with-runstatedir=3D%{_rundir} \ +%meson \ + -Drunstatedir=3D%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ %{?arg_vbox} \ %{?arg_libxl} \ - --with-sasl \ - --with-polkit \ - --with-libvirtd \ + -Dsasl=3Denabled \ + -Dpolkit=3Denabled \ + -Ddriver_libvirtd=3Denabled \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ - --without-vz \ - --without-bhyve \ - --with-remote-default-mode=3Dlegacy \ - --with-interface \ - --with-network \ - --with-storage-fs \ - --with-storage-lvm \ - --with-storage-iscsi \ + -Ddriver_vz=3Ddisabled \ + -Ddriver_bhyve=3Ddisabled \ + -Dremote_default_mode=3Dlegacy \ + -Ddriver_interface=3Denabled \ + -Ddriver_network=3Denabled \ + -Dstorage_fs=3Denabled \ + -Dstorage_lvm=3Denabled \ + -Dstorage_iscsi=3Denabled \ %{?arg_storage_iscsi_direct} \ - --with-storage-scsi \ - --with-storage-disk \ - --with-storage-mpath \ + -Dstorage_scsi=3Denabled \ + -Dstorage_disk=3Denabled \ + -Dstorage_mpath=3Denabled \ %{?arg_storage_rbd} \ %{?arg_storage_sheepdog} \ %{?arg_storage_gluster} \ %{?arg_storage_zfs} \ - --without-storage-vstorage \ + -Dstorage_vstorage=3Ddisabled \ %{?arg_numactl} \ %{?arg_numad} \ - --with-capng \ + -Dcapng=3Denabled \ %{?arg_fuse} \ - --with-netcf \ - --with-selinux \ + -Dnetcf=3Denabled \ + -Dselinux=3Denabled \ %{?arg_selinux_mount} \ - --without-apparmor \ - --without-hal \ - --with-udev \ - --with-yajl \ + -Dapparmor=3Ddisabled \ + -Dsecdriver_apparmor=3Ddisabled \ + -Dhal=3Ddisabled \ + -Dudev=3Denabled \ + -Dyajl=3Denabled \ %{?arg_sanlock} \ - --with-libpcap \ - --with-macvtap \ - --with-audit \ - --with-dtrace \ - --with-driver-modules \ + -Dlibpcap=3Denabled \ + -Dmacvtap=3Denabled \ + -Daudit=3Denabled \ + -Ddtrace=3Denabled \ %{?arg_firewalld} \ %{?arg_firewalld_zone} \ %{?arg_wireshark} \ - --without-pm-utils \ - --with-nss-plugin \ + -Dpm_utils=3Ddisabled \ + -Dnss=3Denabled \ %{arg_packager} \ %{arg_packager_version} \ - --with-qemu-user=3D%{qemu_user} \ - --with-qemu-group=3D%{qemu_group} \ - --with-tls-priority=3D%{tls_priority} \ + -Dqemu_user=3D%{qemu_user} \ + -Dqemu_group=3D%{qemu_group} \ + -Dtls_priority=3D%{tls_priority} \ %{?enable_werror} \ - --enable-expensive-tests \ - --with-init-script=3Dsystemd \ + -Dexpensive_tests=3Denabled \ + -Dinit_script=3Dsystemd \ %{?arg_login_shell} -make %{?_smp_mflags} V=3D1 + +%meson_build =20 %install rm -fr %{buildroot} =20 export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_specdir}/%{name}.spec) =20 -cd %{_vpath_builddir} -%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=3D%{_unitdir} V=3D1 +%meson_install =20 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -1299,12 +1279,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvi= rt_qemu_probes.stp \ %endif =20 %check -cd %{_vpath_builddir} -if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=3D1 -then - cat tests/test-suite.log || true - exit 1 -fi +VIR_TEST_DEBUG=3D1 %meson_test =20 %post libs %if 0%{?rhel} =3D=3D 7 @@ -1511,7 +1486,7 @@ exit 0 =20 %files docs %doc AUTHORS ChangeLog NEWS.rst README README.rst -%doc %{_vpath_builddir}/libvirt-docs/* +%doc libvirt-docs/* =20 %files daemon =20 @@ -1884,7 +1859,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 -%files libs -f %{_vpath_builddir}/%{name}.lang +%files libs -f %{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf diff --git a/meson.build b/meson.build index 587e05a02da..69aead8a442 100644 --- a/meson.build +++ b/meson.build @@ -2280,7 +2280,6 @@ if git # Using return values from configure_file in add_dist_script is possible= since 0.55.0 dist_files =3D [ 'libvirt.spec', - 'mingw-libvirt.spec', 'AUTHORS', ] =20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894299; cv=none; d=zohomail.com; s=zohoarc; b=WkIm7Vr30sgWwgZfubSQJ0Aa7eS+ND2Aq0aXMaNyCsVY/OJEFyuDsRpwsT6RDLSfmZz2tO3UZxffmwalxvsjpmELj3z6dmWwMVnYEaARCHtGfp1lF+AoIEDkMQewnR1PHsub3he/ULCl9WCMOqke1swcyu59E5hyqFK4OnwzfTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894299; 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=5cO1+PTszHMH6L8uJZYjwkwq/86gSaIShUIhQ+fhl9w=; b=AKfbTuu4uYr4ba9pu7K45eM37zY0nu9sR+X8KCvzsK5LVHQwkEZKfqSAvI+/UnbVSrwpytq0WNj7HqAljsDXQSiP3pxTp1qHqM4XDQVHJxVU3pl6syI1QjqJxchfb0sBUhtLbY9CnHFiIlLZQlIxJ+FR7GuyqXpwnFTj0IiUX74= 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 1594894299036245.0979196672847; Thu, 16 Jul 2020 03:11:39 -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-145-U7rscFt1NDm9iaSLHkc74A-1; Thu, 16 Jul 2020 06:11:35 -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 A1B121888AAA; Thu, 16 Jul 2020 10:11:29 +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 80F9079D16; Thu, 16 Jul 2020 10:11:29 +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 50A2C181B9FD; Thu, 16 Jul 2020 10:11:29 +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 06GA7mBZ021242 for ; Thu, 16 Jul 2020 06:07:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E8F12DE96; Thu, 16 Jul 2020 10:07:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADB102DE6B for ; Thu, 16 Jul 2020 10:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894297; 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=5cO1+PTszHMH6L8uJZYjwkwq/86gSaIShUIhQ+fhl9w=; b=Z2egr/eAawhDFUhUY4GCvl9BLuyiZaSGr7S1nq2MlPXvODq6rAgrczLXFIN+ZLfOFyhNw5 GE20MiVs+2CZ7GR73IJ90VuAeA7vjnNCK67sx3hlDb0Ur5sMKQjT33cin3YF9nuiKppJHR V2vM/7HwmM9i1aEW5nnnxLbzYAUCeqA= X-MC-Unique: U7rscFt1NDm9iaSLHkc74A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 344/351] meson: add rule to build and install only web documentation Date: Thu, 16 Jul 2020 11:59:40 +0200 Message-Id: <3d4b7d3c7c312250bdb249a834732077652396e5.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.13 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 --- docs/fonts/meson.build | 6 ++++-- docs/html/meson.build | 7 +++++++ docs/internals/meson.build | 5 ++++- docs/js/meson.build | 6 ++++-- docs/kbase/meson.build | 5 ++++- docs/logos/meson.build | 6 ++++-- docs/manpages/meson.build | 5 ++++- docs/meson.build | 26 ++++++++++++++++++++++---- scripts/meson-install-web.py | 10 ++++++++++ scripts/meson.build | 1 + 10 files changed, 64 insertions(+), 13 deletions(-) create mode 100755 scripts/meson-install-web.py diff --git a/docs/fonts/meson.build b/docs/fonts/meson.build index 8c0a2f1554d..e4109c6e7dc 100644 --- a/docs/fonts/meson.build +++ b/docs/fonts/meson.build @@ -15,8 +15,10 @@ fonts =3D [ =20 install_data(fonts, install_dir: docs_html_dir / 'fonts') =20 -# This hack enables us to view the web pages -# from within the uninstalled build tree foreach file : fonts + # This hack enables us to view the web pages + # from within the uninstalled build tree configure_file(input: file, output: file, copy: true) + + install_web_files +=3D '@0@:@1@'.format(meson.current_source_dir() / fil= e, docs_html_dir / 'fonts') endforeach diff --git a/docs/html/meson.build b/docs/html/meson.build index c87cc9f7ea2..e194b5942c2 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -7,6 +7,10 @@ apipng =3D [ =20 install_data(apipng, install_dir: docs_html_dir / 'html') =20 +foreach file : apipng + install_web_files +=3D '@0@:@1@'.format(meson.current_source_dir() / fil= e, docs_html_dir / 'html') +endforeach + docs_html_gen =3D [] docs_html_dep =3D [] =20 @@ -80,8 +84,11 @@ endforeach =20 docs_html_paths =3D [] =20 +install_web_deps +=3D docs_html_dep + foreach file : docs_html_gen docs_html_paths +=3D file.full_path() + install_web_files +=3D '@0@:@1@'.format(file.full_path(), docs_html_dir = / 'html') endforeach =20 test( diff --git a/docs/internals/meson.build b/docs/internals/meson.build index 944903ae27f..e600c84af60 100644 --- a/docs/internals/meson.build +++ b/docs/internals/meson.build @@ -9,7 +9,7 @@ foreach name : internals_in_files html_in_file =3D '@0@.html.in'.format(name) html_file =3D '@0@.html'.format(name) =20 - custom_target( + out_file =3D custom_target( html_file, input: html_in_file, output: html_file, @@ -29,4 +29,7 @@ foreach name : internals_in_files install: true, install_dir: docs_html_dir / 'internals', ) + + install_web_deps +=3D out_file + install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'internals') endforeach diff --git a/docs/js/meson.build b/docs/js/meson.build index da90cbf96e1..cbf2dc2633c 100644 --- a/docs/js/meson.build +++ b/docs/js/meson.build @@ -4,8 +4,10 @@ docs_js_files =3D [ =20 install_data(docs_js_files, install_dir: docs_html_dir / 'js') =20 -# This hack enables us to view the web pages -# from within the uninstalled build tree foreach file : docs_js_files + # This hack enables us to view the web pages + # from within the uninstalled build tree configure_file(input: file, output: file, copy: true) + + install_web_files +=3D '@0@:@1@'.format(meson.current_source_dir() / f= ile, docs_html_dir / 'js') endforeach diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index 6a17d674436..d46289245b2 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -18,7 +18,7 @@ foreach name : docs_kbase_files =20 html_in =3D docs_rst2html_gen.process(rst_file) =20 - custom_target( + out_file =3D custom_target( html_file, input: html_in, output: html_file, @@ -38,4 +38,7 @@ foreach name : docs_kbase_files install: true, install_dir: docs_html_dir / 'kbase', ) + + install_web_deps +=3D out_file + install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'kbase') endforeach diff --git a/docs/logos/meson.build b/docs/logos/meson.build index da92c397cde..70ba67d71c7 100644 --- a/docs/logos/meson.build +++ b/docs/logos/meson.build @@ -22,8 +22,10 @@ docs_logo_files =3D [ =20 install_data(docs_logo_files, install_dir: docs_html_dir / 'logos') =20 -# This hack enables us to view the web pages -# from within the uninstalled build tree foreach file : docs_logo_files + # This hack enables us to view the web pages + # from within the uninstalled build tree configure_file(input: file, output: file, copy: true) + + install_web_files +=3D '@0@:@1@'.format(meson.current_source_dir() / fil= e, docs_html_dir / 'logos') endforeach diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 72d362e92d8..c53109c8d29 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -103,7 +103,7 @@ foreach data : docs_man_files capture: true, ) =20 - custom_target( + out_file =3D custom_target( html_file, input: html_in, output: html_file, @@ -123,4 +123,7 @@ foreach data : docs_man_files install: true, install_dir: docs_html_dir / 'manpages', ) + + install_web_deps +=3D out_file + install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'manpages') endforeach diff --git a/docs/meson.build b/docs/meson.build index 6d3d002fd7c..773e127ca74 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -129,6 +129,10 @@ docs_rst_files =3D [ 'submitting-patches', ] =20 +# list of web targets to build for docs/web rule +install_web_deps =3D [] +install_web_files =3D [] + install_data(docs_assets, install_dir: docs_html_dir) =20 aclperms_gen =3D custom_target( @@ -191,7 +195,7 @@ foreach name : docs_html_in_files html_in_file =3D '@0@.html.in'.format(name) html_file =3D '@0@.html'.format(name) =20 - custom_target( + out_file =3D custom_target( html_file, input: html_in_file, output: html_file, @@ -211,6 +215,9 @@ foreach name : docs_html_in_files install: true, install_dir: docs_html_dir, ) + + install_web_deps +=3D out_file + install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir) endforeach =20 =20 @@ -262,7 +269,7 @@ docs_html_in_gen +=3D { foreach data : docs_html_in_gen html_file =3D '@0@.html'.format(data['name']) =20 - custom_target( + out_file =3D custom_target( html_file, input: data['file'], output: html_file, @@ -282,6 +289,9 @@ foreach data : docs_html_in_gen install: true, install_dir: docs_html_dir, ) + + install_web_deps +=3D out_file + install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir) endforeach =20 subdir('fonts') @@ -294,8 +304,16 @@ subdir('manpages') subdir('schemas') =20 =20 -# This hack enables us to view the web pages -# from within the uninstalled build tree foreach file : docs_assets + # This hack enables us to view the web pages + # from within the uninstalled build tree configure_file(input: file, output: file, copy: true) + + install_web_files +=3D '@0@:@1@'.format(meson.current_source_dir() / fil= e, docs_html_dir) endforeach + +run_target( + 'install-web', + command: [ meson_python_prog, meson_install_web_prog.path(), install_web= _files ], + depends: install_web_deps, +) diff --git a/scripts/meson-install-web.py b/scripts/meson-install-web.py new file mode 100755 index 00000000000..a03f8523cd9 --- /dev/null +++ b/scripts/meson-install-web.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 + +import os +import shutil +import sys + +for desc in sys.argv[1:]: + inst =3D desc.split(':') + os.makedirs(inst[1], exist_ok=3DTrue) + shutil.copy(inst[0], inst[1]) diff --git a/scripts/meson.build b/scripts/meson.build index fa2ed57c99d..2f46ece59fb 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -26,6 +26,7 @@ scripts =3D [ 'meson-dist.sh', 'meson-gen-authors.sh', 'meson-html-gen.py', + 'meson-install-web.py', 'meson-python.sh', 'meson-timestamp.sh', 'mock-noinline.py', --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894303; cv=none; d=zohomail.com; s=zohoarc; b=c1Pn8q0tQ6RsQXR+ghMqzSZ1NBsQmFocRIvcZuVtrKx7GREScLhgncD9jSJjcnwCeBlZmBLkvcwUXlPFVoHZttXSNFxvMpGt6LjNOH3RWAwAkb2+hVySqLGj0/l722KDA9gNZud2DvQbnQuKRVodKEQ6lnQmYcXM1m3TeVb5nxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894303; 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=dvXFKqj0RT8NM64n32QVsgETozm4cWtU6iDrF2Pv+38=; b=dPApMebR6LThX+GCqbaMf7r7zoEXHqzZvywX4V2vgh5oTy26G1lHiYE6dMR5o+WnRtb11dzk+RUXmRkoyGqFqYXm7UWLgfOU0ea5r5JmkmXmrsn/QdLYt69QAFe+iZLMkPdz39qey23wUA3nTz6ZAqappEBHstZlbQRRGUiFVwQ= 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 1594894303104498.1640503369497; Thu, 16 Jul 2020 03:11:43 -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-253-3OuH8YSlMFyDXbiuGKXjxA-1; Thu, 16 Jul 2020 06:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE835800400; Thu, 16 Jul 2020 10:11:32 +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 BB8AE79501; Thu, 16 Jul 2020 10:11:32 +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 C0498181D0A6; Thu, 16 Jul 2020 10:11:31 +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 06GA7nR9021253 for ; Thu, 16 Jul 2020 06:07:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 27DA519C4F; Thu, 16 Jul 2020 10:07:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9657E2E024 for ; Thu, 16 Jul 2020 10:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894302; 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=dvXFKqj0RT8NM64n32QVsgETozm4cWtU6iDrF2Pv+38=; b=Wm5ZyQfNl//VMK6e3Kw175f/GLpuFcKX9aBgad8pCKN8DINGMVlKY0w0AQtVpNpyIcYGEp q+bWE1ZPyoOEoeqO/aBbuCdbLAEsPgZDF5zH6vB6rUJBDwpcpPxFvt5SPXTH19S/59LOkm UV9zFb8BTXwN29mugDbLu8puM3V4seI= X-MC-Unique: 3OuH8YSlMFyDXbiuGKXjxA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 345/351] meson: drop remaining bits from Makefile.am Date: Thu, 16 Jul 2020 11:59:41 +0200 Message-Id: <260130da10ba5449318bcd0e7b25928df70a511b.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.14 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" There is no alternative to DISTCHECK_CONFIGURE_FLAGS in Meson. We could enable -Werror unconditionally but that would affect all users. It is mainly used in our CI environment so we can run meson with --werror to enable it in configure time which will be picked up by meson dist as well. XZ_OPT is not relevant with meson since it uses shutil.make_archive which uses lzma python module to do the compression. Introducing rpm and srpm rules should be possible with Meson but we don't even use them in our CI and it's easy to run 'ninja dist' followed by rpmbuild manually. As for the ci rules that is simply not possible in the same way, we would have to have a lot of aliases for all the ci rules and that would be just insane. Signed-off-by: Pavel Hrdina --- Makefile.am | 35 ----------------------------------- configure.ac | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7490acbcfba..00000000000 --- a/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2013 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -# when building from tarball -Werror isn't auto enabled -# so force it explicitly -DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror - -SUBDIRS =3D . - -XZ_OPT ?=3D -v -T0 -export XZ_OPT - -rpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) - -srpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) - -ci-%: - $(MAKE) -C $(srcdir)/ci/ $@ diff --git a/configure.ac b/configure.ac index 4ba70bb43b5..3a88a0e0154 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,4 @@ m4_if(m4_version_compare([2.61a.100], [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=3D$GNUmakefile])]) =20 -AC_CONFIG_FILES([\ - Makefile]) AC_OUTPUT --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894210; cv=none; d=zohomail.com; s=zohoarc; b=bD38OaodAyt3ATyAijOsOyueUR6BeTBYfcE3AWzk71LWPSl7LMS+/cRq204khS4clx1ROhUs5ZTS/mASlZuoahmm8PLaYyrHrCW74YLJt7FjNp3DfUYwsBthAqX0Fr4jNehFTQXYDKsI0sQx8xbsz81v5jrTDo0Z1RtdKC/mZ+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894210; 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=+xraGen7SkqaTfJgy+WN6bqbsNrgWxxhtlqHKztnJeU=; b=mudu19BL35Iy9ZyEUR6KysR59LZD7OyPdiVdfQoZn9aCE3/DL8JAJauszDH2Ts9pwhDsKFg/nlfP7ds8Tnki60XmkFjRucEGs1kzL5nz5Zdeyldg8dFDWWGnpxx8yIfR/d/unNgKAL6VLIsCK4cEHLy8gaF235IVudel1mMcuE8= 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 1594894210115235.23512472917025; Thu, 16 Jul 2020 03:10:10 -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-31-LiD8tDBHO2y3o7Lb2w-nOg-1; Thu, 16 Jul 2020 06:10:01 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2187980BCB0; Thu, 16 Jul 2020 10:09:55 +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 029C861477; Thu, 16 Jul 2020 10:09:55 +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 C575D181AAC6; Thu, 16 Jul 2020 10:09:54 +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 06GA7rwn021306 for ; Thu, 16 Jul 2020 06:07:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BA8819C58; Thu, 16 Jul 2020 10:07:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A959F19C4F for ; Thu, 16 Jul 2020 10:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894208; 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=+xraGen7SkqaTfJgy+WN6bqbsNrgWxxhtlqHKztnJeU=; b=O/lLRFB+Y6ZqyyV8KjkosUFyOSQrtWWX+V5TZGVyFlPlZ66UcrlPsL/JjOmzYlRwGRhVrt rkbz9SHgFWJ12l0jOWf9ACvHnF3AQXjAICY3umx76olB2gr/f4CKTKOjDzyqt9HYkvpi/M ALHnHQxO/Pyc6uJF+L0yJ1g7aP4Lesg= X-MC-Unique: LiD8tDBHO2y3o7Lb2w-nOg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 346/351] meson: remove unused bits from GNUmakefile Date: Thu, 16 Jul 2020 11:59:42 +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.16 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" None of the directives from GNUmakefile are converted to meson as they don't make any sense. Signed-off-by: Pavel Hrdina --- GNUmakefile | 74 ---------------------------------------------------- configure.ac | 7 ----- 2 files changed, 81 deletions(-) delete mode 100644 GNUmakefile diff --git a/GNUmakefile b/GNUmakefile deleted file mode 100644 index 78d06751f6c..00000000000 --- a/GNUmakefile +++ /dev/null @@ -1,74 +0,0 @@ -# Having a separate GNUmakefile lets me 'include' the dynamically -# generated rules created via cfg.mk (package-local configuration) -# as well as maint.mk (generic maintainer rules). -# This makefile is used only if you run GNU Make. -# It is necessary if you want to build targets usually of interest -# only to the maintainer. - -# Copyright (C) 2001, 2003, 2006-2019 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -_build-aux ?=3D build-aux -_autoreconf ?=3D autoreconf -v - -# If the user runs GNU make but has not yet run ./configure, -# give them a diagnostic. -_gl-Makefile :=3D $(wildcard [M]akefile) -ifneq ($(_gl-Makefile),) - -# Make tar archive easier to reproduce. -export TAR_OPTIONS =3D --owner=3D0 --group=3D0 --numeric-owner - -# Allow the user to add to this in the Makefile. -ALL_RECURSIVE_TARGETS =3D - -include Makefile -include $(srcdir)/$(_build-aux)/syntax-check.mk - -else - -.DEFAULT_GOAL :=3D abort-due-to-no-makefile -srcdir =3D . - -# The package can override .DEFAULT_GOAL to run actions like autoreconf. -include $(srcdir)/$(_build-aux)/syntax-check.mk - -ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile) -$(MAKECMDGOALS): abort-due-to-no-makefile -endif - -abort-due-to-no-makefile: - @echo There seems to be no Makefile in this directory. 1>&2 - @echo "You must run ./configure before running 'make'." 1>&2 - @exit 1 - -endif - -# Tell version 3.79 and up of GNU make to not build goals in this -# directory in parallel, in case someone tries to build multiple -# targets, and one of them can cause a recursive target to be invoked. - -# Only set this if Automake doesn't provide it. -AM_RECURSIVE_TARGETS ?=3D $(RECURSIVE_TARGETS:-recursive=3D) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=3D) \ - dist distcheck tags ctags - -ALL_RECURSIVE_TARGETS +=3D $(AM_RECURSIVE_TARGETS) - -ifneq ($(word 2, $(MAKECMDGOALS)), ) -ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), ) -.NOTPARALLEL: -endif -endif diff --git a/configure.ac b/configure.ac index 3a88a0e0154..111992b3aae 100644 --- a/configure.ac +++ b/configure.ac @@ -96,11 +96,4 @@ test "$enable_shared" =3D no && lt_cv_objdir=3D. LV_LIBTOOL_OBJDIR=3D${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) =20 - -GNUmakefile=3DGNUmakefile -m4_if(m4_version_compare([2.61a.100], - m4_defn([m4_PACKAGE_VERSION])), [1], [], - [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], - [GNUmakefile=3D$GNUmakefile])]) - AC_OUTPUT --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894305; cv=none; d=zohomail.com; s=zohoarc; b=M0pwkjE/oGDgX5NUVlfiH1o2pv14sbJJp82ll6nK3w0DhdEIV4e88nN+g6AuH3BD3PgghdVyB8CX1vpyx9xJXVch7Greo3tyls6vCFO3ZqSkBEJ6EeIIxon3gi7PL05lFu2bWhLouPkvYn+3yE9kepgwUW6d4ZQfzghD131edhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894305; 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=omLxuIuxadl4aph3ncYXKKnw12CcDMhBTKO2XA7RZ2A=; b=YaY+kLug1nhOKsjstNLl9vzFCXBue29dZSakUaUT3qQx74GZWG2Y3lwIl7VWnQTUGnV9En6TdSx9oK269JCMIlR9WgIhnY6hNEWtVCs8XUp1umHnQ3f6mVUI/l2X+6HC3YAypshPmxxK+F+NJ7YmD2q323iDnT0x0QAU7OqLwzo= 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 159489430538825.360595376006586; Thu, 16 Jul 2020 03:11:45 -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-173-eQcNmaAwNEmYrSlcIc7ChQ-1; Thu, 16 Jul 2020 06:11:39 -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 6E578800FEB; Thu, 16 Jul 2020 10:11:34 +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 4BE4D60C47; Thu, 16 Jul 2020 10:11:34 +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 1EB41730DB; Thu, 16 Jul 2020 10:11:34 +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 06GA7sTw021325 for ; Thu, 16 Jul 2020 06:07:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2677819C4F; Thu, 16 Jul 2020 10:07:54 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 940832DE96 for ; Thu, 16 Jul 2020 10:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894304; 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=omLxuIuxadl4aph3ncYXKKnw12CcDMhBTKO2XA7RZ2A=; b=iMxn1X787URMdjExop+gcjK0Q38XD9d2DdfEmf7NSV02vfjN+EcQVlZYkFW8dvEpkdYGtt iXNjIH22Sw9OCQDGibLAlDhSPd9Ex+UaGvWd8vWpohtHbtUyGSq/YfiIi4dInL5yRXu+0m XOfIBqzh2wAqw9k8n0yn27WFc0K1o4c= X-MC-Unique: eQcNmaAwNEmYrSlcIc7ChQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 347/351] meson: drop all unused bits from configure.ac Date: Thu, 16 Jul 2020 11:59:43 +0200 Message-Id: <24f3e1107be3c183b18a7a2e84c296d759111d89.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 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" AC_CANONICAL_HOST adds --host option to configure which is provided automatically by Meson as --cross-file. All of the AC_PROG_CC, AC_PROG_INSTALL, AC_PROG_CPP, AM_PROG_CC_C_O, AM_PROG_LD, PKG_PROG_PKG_CONFIG are automatically checked by Meson. libtool is not used by meson so there is no need for that as well and the remaining directives are not relevant for Meson. Signed-off-by: Pavel Hrdina --- configure.ac | 99 ---------------------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 configure.ac diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 111992b3aae..00000000000 --- a/configure.ac +++ /dev/null @@ -1,99 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -dnl Copyright (C) 2005-2015 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . - -AC_CONFIG_AUX_DIR([build-aux]) -dnl Make automake keep quiet about wildcards & other GNUmake-isms -AM_INIT_AUTOMAKE([ - foreign - -Wno-portability - tar-pax - no-dist-gzip - dist-xz - subdir-objects - ]) -dnl older automake's default of ARFLAGS=3Dcru is noisy on newer binutils; -dnl we don't really need the 'u' even in older toolchains. Then there is -dnl older libtool, which spelled it AR_FLAGS -m4_divert_text([DEFAULTS], [: "${ARFLAGS=3Dcr} ${AR_FLAGS=3Dcr}"]) - -# Default to using the silent-rules feature when possible. Formatting -# chosen to bypass 'grep' checks that cause older automake to warn. -# Users (include rpm) can still change the default at configure time. -m4_ifndef([AM_SILENT_RULES], - [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes]) - -AC_CANONICAL_HOST - -dnl Checks for C compiler. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_CPP - -dnl get 64-int interfaces on 32-bit platforms -AC_SYS_LARGEFILE - -dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) -AC_LIBTOOL_WIN32_DLL - -m4_ifndef([LT_INIT], [ - AM_PROG_LIBTOOL -], [ - LT_INIT([shared disable-static]) -]) -AM_PROG_CC_C_O -AM_PROG_LD - -dnl Make some notes about which OS we're compiling for, as the lxc and qemu -dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter -dnl are also linux specific. The "network" and storage_fs drivers are kno= wn -dnl to not work on macOS presently, so we also make a note if compiling -dnl for that - -with_linux=3Dno with_macos=3Dno with_freebsd=3Dno with_win=3Dno -case $host in - *-*-linux*) with_linux=3Dyes ;; - *-*-darwin*) with_macos=3Dyes ;; - *-*-freebsd*) with_freebsd=3Dyes ;; - *-*-mingw* | *-*-msvc* ) with_win=3Dyes ;; -esac - -AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "yes"]) -AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) -AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) - - -dnl -dnl in case someone want to build static binaries -dnl STATIC_BINARIES=3D"-static" -dnl -STATIC_BINARIES=3D -AC_SUBST([STATIC_BINARIES]) - - -dnl Need to test if pkg-config exists -PKG_PROG_PKG_CONFIG - - -# Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether -# we're building shared libraries. This is the name of the directory -# in which .o files will be created. -test "$enable_shared" =3D no && lt_cv_objdir=3D. -LV_LIBTOOL_OBJDIR=3D${lt_cv_objdir-.} -AC_SUBST([LV_LIBTOOL_OBJDIR]) - -AC_OUTPUT --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894629; cv=none; d=zohomail.com; s=zohoarc; b=Wc7QQNg6Z4yROmsKyVzgteXcQNopB8CUXoLqBSsAv+bL4QFFGTRn45syTfnB4gEdyajzqYCAScOQ6Ykq+sZSU9qq4Zextq4Urb9poSa/eRD8SkXytkKfv215HOrx+NhzXnZHf4dGv35AJJaBGt8IfouiwmCtkQ609GC8CN2BEw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894629; 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=MrVzLoCPo0Xmc+6teSMurbrOlx9UJWIVurwk711EbFc=; b=aaTU7qYHwE6sU4TmLMe7YFpqkAySbVgiRjx5x7hfI1p8Nz6k6pAl7W5o2dY0NjPAaTjPXy05Z/lKpiMNE9nFzLReBt5H9RmhK3/DWW2W39gPmxMyzZk60Uw9t07ovUNZPI2sMnOs8mhjanO0pe+m+daYw257VJNqo+Bi7Mc5Kjg= 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 1594894629649137.61037155720112; Thu, 16 Jul 2020 03:17: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-162-90Nc4iXKMvqaIyP7lW9Tog-1; Thu, 16 Jul 2020 06:10:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D4A31888ABC; Thu, 16 Jul 2020 10:09:57 +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 5CC0A6FED1; Thu, 16 Jul 2020 10:09:57 +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 2B0FB181ABEB; Thu, 16 Jul 2020 10:09:57 +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 06GA7tWB021337 for ; Thu, 16 Jul 2020 06:07:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D58619C58; Thu, 16 Jul 2020 10:07:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C02719C4F for ; Thu, 16 Jul 2020 10:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894628; 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=MrVzLoCPo0Xmc+6teSMurbrOlx9UJWIVurwk711EbFc=; b=dadmL2utDRNRBT8yK2kfrK7mlEm4NLtjRSq0ZLbSgIvVQiWulEqGqpKeJdD89ipB4JzsTg qLI6YGfeH+WnEqEtMDSVGLgrUCP6OdX+7remje4HKh7syLR+9n9gSUwf66e4SGaOnczp8k UC1XOGclEvTcCvOq7R4WOBN9h4ZGD6o= X-MC-Unique: 90Nc4iXKMvqaIyP7lW9Tog-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 348/351] meson: now we can drop all autoconf related gitignore lines Date: Thu, 16 Jul 2020 11:59:44 +0200 Message-Id: <4e488607112cfe0da97602cb6ff6b8c2503474df.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.11 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 --- .gitignore | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.gitignore b/.gitignore index 6c167e423b1..405dacb7776 100644 --- a/.gitignore +++ b/.gitignore @@ -8,27 +8,6 @@ .#* *~ =20 -# autotools related ignores -!/m4/virt-*.m4 -*.cov -/AUTHORS -/INSTALL -/aclocal.m4 -/autom4te.cache -/build-aux/compile -/build-aux/config.guess -/build-aux/config.sub -/build-aux/depcomp -/build-aux/install-sh -/build-aux/ltmain.sh -/build-aux/missing -/build-aux/test-driver -/config.h.in -/config.log -/configure -/m4/* -Makefile.in - # git related ignores *.rej *.orig --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894320; cv=none; d=zohomail.com; s=zohoarc; b=jBO7qPxSktzjudccj1sqZpg4dIqczSgUJ/7TDKJowVRszYfkQWTBQRSECJmzN2TEPCTP/QIGhUladwLHFf4/x7Ek+PrU6OtQuSvv/nImGzMO78pWjoopRmrCHxyhmxS2Sx0UWnRWO3c1UVVjk+UXqsqKNx2odv8v/B6NsIQ3ylc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894320; 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=wR4fJNyoTPWS/445zcO3hhQw+s6ERewqwhXGFSeNEa8=; b=LN/ez75w3PgXVQuYS7sapup1ATrSuLjpVvRs26Vj84r8htugj80ixSaIQJxpPcTwLHxYP/xalKFwRjBIqAZsBfs4TasaV0zI+26704sXF1R/q3D+kNSBRXP7DjQ8dNw89WBs/z7ZVrM20PX36v13HRx9cG1pgYXGmKMSqaPXHcs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894320652724.428268886714; Thu, 16 Jul 2020 03:12:00 -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-168-PPzHM-jPO6KVf1tFnpKcFA-1; Thu, 16 Jul 2020 06:11:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 493181090; Thu, 16 Jul 2020 10:11:37 +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 2823779505; Thu, 16 Jul 2020 10:11:37 +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 EC3A8730E0; Thu, 16 Jul 2020 10:11:36 +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 06GA7tbM021348 for ; Thu, 16 Jul 2020 06:07:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECA9719C58; Thu, 16 Jul 2020 10:07:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64DB419C4F for ; Thu, 16 Jul 2020 10:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894319; 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=wR4fJNyoTPWS/445zcO3hhQw+s6ERewqwhXGFSeNEa8=; b=JhlLmQg6tRApxONBEw4VT18GhiG+qBnYvYMXGJd0Hp+YjeG5Ep/qv1LU/bP0ToAcJTOYdc qlOjQwuD8ZP9kcl+LY6CQT0AuF2lZvciBE9IuirNjrT1UgfDs5QsJks8ulFG4mqiS/lDN2 i+nYFdAEj017+CGnpT4c1IANWtOOOj8= X-MC-Unique: PPzHM-jPO6KVf1tFnpKcFA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 349/351] meson: adjust our documentation to mention meson instead of autoconf Date: Thu, 16 Jul 2020 11:59:45 +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.14 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 --- CONTRIBUTING.rst | 9 ++++---- docs/advanced-tests.rst | 14 ++++++------ docs/best-practices.rst | 2 +- docs/committer-guidelines.rst | 6 +++--- docs/compiling.html.in | 40 ++++++++++++++++------------------- docs/hacking.rst | 4 ++-- docs/strategy.html.in | 27 ++++++----------------- docs/windows.html.in | 18 +++++++--------- 8 files changed, 50 insertions(+), 70 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 972b1898736..bda5cae6270 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -12,13 +12,12 @@ your git clone run: =20 :: =20 - $ mkdir build && cd build - $ ../autogen.sh - $ make + $ meson build + $ ninja -C build =20 You'll find the freshly-built document in ``docs/contribute.html``. =20 -If ``configure`` fails because of missing dependencies, you can set +If ``meson setup`` fails because of missing dependencies, you can set up your system by calling =20 :: @@ -39,7 +38,7 @@ to run =20 :: =20 - $ sudo dnf install gcc make libtool autoconf automake rpm-build + $ sudo dnf install gcc make ninja-build rpm-build =20 You might still be missing some dependencies if your distribution is shipping an old libvirt version, but that will get you much closer to diff --git a/docs/advanced-tests.rst b/docs/advanced-tests.rst index d2d29d976d9..c8c02eabe06 100644 --- a/docs/advanced-tests.rst +++ b/docs/advanced-tests.rst @@ -6,8 +6,8 @@ The basic requirement before submitting changes to libvirt = is that =20 :: =20 - $ make check - $ make syntax-check + $ ninja test + $ ninja syntax-check =20 succeed after each commit. =20 @@ -17,7 +17,7 @@ by running =20 :: =20 - $ make -C tests valgrind + $ meson test --setup valgrind =20 `Valgrind `__ is a test that checks for memory management issues, such as leaks or use of uninitialized @@ -27,13 +27,13 @@ Some tests are skipped by default in a development envi= ronment, based on the time they take in comparison to the likelihood that those tests will turn up problems during incremental builds. These tests default to being run when building from a -tarball or with the configure option --enable-expensive-tests; +tarball or with the configure option -Dexpensive_tests=3Denabled; you can also force a one-time toggle of these tests by setting VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in: =20 :: =20 - $ make check VIR_TEST_EXPENSIVE=3D1 + $ VIR_TEST_EXPENSIVE=3D1 ninja test =20 If you encounter any failing tests, the VIR_TEST_DEBUG environment variable may provide extra information to debug the @@ -42,8 +42,8 @@ amounts of information: =20 :: =20 - $ VIR_TEST_DEBUG=3D1 make check (or) - $ VIR_TEST_DEBUG=3D2 make check + $ VIR_TEST_DEBUG=3D1 ninja test (or) + $ VIR_TEST_DEBUG=3D2 ninja test =20 When debugging failures during development, it is possible to focus in on just the failing subtests by using VIR_TEST_RANGE. diff --git a/docs/best-practices.rst b/docs/best-practices.rst index 4a28b03b652..b2572c81100 100644 --- a/docs/best-practices.rst +++ b/docs/best-practices.rst @@ -26,7 +26,7 @@ with minimal back-and-forth. and an explanation of how the sequence of patches fits together. Moreover, please keep in mind that it's required to be able to compile cleanly (**including** - ``make check`` and ``make syntax-check``) after each + ``ninja test`` and ``ninja syntax-check``) after each patch. A feature does not have to work until the end of a series, but intermediate patches must compile and not cause test-suite failures (this is to preserve the usefulness of diff --git a/docs/committer-guidelines.rst b/docs/committer-guidelines.rst index 3be08e6fed3..1f879ddf934 100644 --- a/docs/committer-guidelines.rst +++ b/docs/committer-guidelines.rst @@ -12,7 +12,7 @@ objection on the list it should be good to go. If the pat= ch touches a part of the code where you're not the main maintainer, or where you do not have a very clear idea of how things work, it's better to wait for a more authoritative feedback though. -Before committing, please also rebuild locally, run 'make check +Before committing, please also rebuild locally, run 'ninja test syntax-check', and make sure you don't raise errors. =20 An exception to 'review and approval on the list first' is fixing @@ -21,10 +21,10 @@ failures to build: - if a recently committed patch breaks compilation on a platform or for a given driver, then it's fine to commit a minimal fix directly without getting the review feedback first -- if make check or make syntax-check breaks, if there is an +- if ninja test or ninja syntax-check breaks, if there is an obvious fix, it's fine to commit immediately. The patch should still be sent to the list (or tell what the fix was if - trivial), and 'make check syntax-check' should pass too, before + trivial), and 'ninja test syntax-check' should pass too, before committing anything - fixes for documentation and code comments can be managed in the same way, but still make sure they get reviewed if non-trivial. diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 0e12a9218e3..2a65fa7b8b0 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -9,28 +9,26 @@

Compiling a release tarball

=20

- libvirt uses the standard configure/make/install steps and mandates + libvirt uses the standard setup/build/install steps and mandates that the build directory is different that the source directory:

=20 
 $ xz -c libvirt-x.x.x.tar.xz | tar xvf -
 $ cd libvirt-x.x.x
-$ mkdir build && cd build
-$ ../configure
+$ meson build =20

- The configure script can be given options to change its defau= lt + The meson script can be given options to change its default behaviour.

=20

- To get the complete list of the options it can take, pass it the - --help option like this: + To get the complete list of the options run the following command:

=20 
-$ ../configure --help
+$ meson configure =20

When you have determined which options you want to use (if any), @@ -38,7 +36,7 @@ $ ../configure --help

=20

- Note the use of sudo with the make install command + Note the use of sudo with the ninja install command below. Using sudo is only required when installing to a location yo= ur user does not have write access to. Installing to a system location is a good example of this. @@ -46,14 +44,14 @@ $ ../configure --help =20

If you are installing to a location that your user does have = write - access to, then you can instead run the make install command + access to, then you can instead run the ninja install command without putting sudo before it.

=20 
-$ ../configure [possible options]
-$ make
-$ sudo make install
+$ meson build [possible options] +$ ninja -C build +$ sudo ninja -C build install =20

At this point you may have to run ldconfig or a similar utili= ty @@ -63,12 +61,10 @@ $ sudo make install

Building from a GIT checkout

=20

- The libvirt build process uses GNU autotools, so after obtaining a - checkout it is necessary to generate the configure script and Makefi= le.in - templates using the autogen.sh command. By default when - the configure script is run from within a GIT checkout,= it + The libvirt build process uses Meson build system. By default when + the meson is run from within a GIT checkout, it will turn on -Werror for builds. This can be disabled with - --disable-werror, but this is not recommended. + --werror=3Dfalse, but this is not recommended.

=20

To build & install libvirt to your home @@ -76,9 +72,9 @@ $ sudo make install

=20 
-$ ./autogen.sh --prefix=3D$HOME/usr
-$ make
-$ sudo make install
+$ meson build --prefix=3D$HOME/usr +$ ninja -C build +$ ninja -C build install =20

Be aware though, that binaries built with a custom prefix will not @@ -88,8 +84,8 @@ $ sudo make install

=20 
-$ ./autogen.sh --system
-$ make
+$ meson build -Dsystem=3Dtrue
+$ ninja -C build
=20

diff --git a/docs/hacking.rst b/docs/hacking.rst index ccc94010b3a..4a9a1e19565 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -30,8 +30,8 @@ changes. That is: =20 :: =20 - $ make check - $ make syntax-check + $ ninja test + $ ninja syntax-check =20 These tests help making sure that your changes don't introduce regressions in libvirt, as well as validating that any new code diff --git a/docs/strategy.html.in b/docs/strategy.html.in index 42c285d9f6a..0d845d006af 100644 --- a/docs/strategy.html.in +++ b/docs/strategy.html.in @@ -22,13 +22,12 @@ in the C language.

Python
Various supporting build/test scripts are written in Python, with - compatibility for Python 2 and 3.
+ compatibility for Python 3.
Perl
Various supporting build/test scripts are written in Perl. It is also used for many syntax-check inline rules
Shell
-
configure, generated by autoconf, is a shell script. - Shell is also used for some simple build/test scripts. At runtime +
Shell is used for some simple build/test scripts. At runtime libvirt avoids shell except when using SSH tunnels to a remote host
XSLT
@@ -38,14 +37,10 @@
HTML
The website documentation is all written in plain HTML. Some HTML is also auto-generated for API documentation
-
M4
-
The autoconf configure script uses a large number of - M4 macros to generate its content
+
Meson
+
The core build system uses the new Meson build system
make
-
The core build system uses the traditional GNU make recipes
-
automake
-
The make recipes use automake's language extensions which are - then turned into regular make rules
+
The syntax-check uses make recipes
awk/sed
A number of the syntax-check inline rules involve use of awk/sed scripts
@@ -58,8 +53,8 @@ The wide range of languages used present a knowledge burden for developers involved in libvirt, especially when there are multiple languages all used in the same problem spaces. This is most notable - in the build system which uses a combination of shell, M4, make, - automake, awk, sed, Perl and Python, with debugging requiring + in the build system which uses a combination of Meson, shell, awk, + sed, Perl and Python, with debugging requiring understanding of the interactions between many languages. The popularity of Perl has declined, while Python has become more popular. This directly influences the amount and quality of @@ -119,14 +114,6 @@ code.

=20 -

- The Meson build system is written in Python 3. This directly informs= the - choice of Python 3 as the language for all supporting build scripts, - re-inforcing the other benefits of Python over Perl, Shell, M4, - automake, etc. There is no intention to support Python 2 given Meson= 's - requirement for Python 3. -

-

Using the RST format for documentation allows for the use of XSLT to= be eliminated from the build process. RST and the Sphinx toolkit are wi= dely diff --git a/docs/windows.html.in b/docs/windows.html.in index a0ff525e1ad..13dab1f6a40 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -180,16 +180,14 @@

=20 
-mkdir build && cd build
-../configure \
-  --without-sasl \
-  --without-polkit \
-  --without-python \
-  --without-libxl \
-  --without-qemu \
-  --without-lxc \
-  --without-openvz \
-  --without-libvirtd
+meson build \
+  -Dsasl=3Ddisabled \
+  -Dpolkit=3Ddisabled \
+  -Ddriver_libxl=3Ddisabled \
+  -Ddriver_qemu=3Ddisabled \
+  -Ddriver_lxc=3Ddisabled \
+  -Ddriver_openvz=3Ddisabled \
+  -Ddriver_libvirtd=3Ddisabled
=20 --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594894309; cv=none; d=zohomail.com; s=zohoarc; b=Xpu/2jcRoGYnTiYRRqas213/f0kV2Ar5oYWQf7456U+t1wpeiqR5lutWtT+Z9g+NFJMFln8sEEUPzfIPfMfXbUXauFR+5lsM9bwwtu2HC2blOJk4U7k03mwJgkYU2H7vxJTZPd/TdX5HtudlBvS6Qp8wQgUc09+uKOyLRa3uSQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894309; 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=9FvjD316QkwdhT1asDI1BfRl5SJv7jY5tz0kxWjVnKw=; b=BCnZ6W19I1TNerL7CpUuAMmKdzTm4yQkZGA3Ntr/gxCQlFm4mD1p+cGv+0cf4JwM6AhlUckfJ1NQqG4ZnhVQU4DgGQA6xKIMMQr8PQBnW/VnXpYVgURGcp5OuQO7ejZQeWpebBj6HwWDufUU/zhDcUXq7XEOZB3EiMnncFpWGu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 159489430963816.768439041511897; Thu, 16 Jul 2020 03:11:49 -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-46-0EYEhsmLPTmQJtd5haqjGw-1; Thu, 16 Jul 2020 06:11:45 -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 8DFEC80BCBE; Thu, 16 Jul 2020 10:11:39 +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 6F6A17B423; Thu, 16 Jul 2020 10:11:39 +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 3EABC730E3; Thu, 16 Jul 2020 10:11:39 +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 06GA7uek021359 for ; Thu, 16 Jul 2020 06:07:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id D695919C58; Thu, 16 Jul 2020 10:07:56 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EE1419C4F for ; Thu, 16 Jul 2020 10:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894308; 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=9FvjD316QkwdhT1asDI1BfRl5SJv7jY5tz0kxWjVnKw=; b=O7vzXSvY5hbII9bSPtIlr/26mjAPsDwlUwr3oECTlfJ3NJhPApPFWCDAR+r6aUyvc3574T tnhjt2hn3Q457vPSdSQsYim8SNGvXjJ7xf5WbGXc015+GKAsdEaOUKJcyVrAgftmSvcjzQ HNbxolCOcQ/DMHyqVx3inFEE+l7PO98= X-MC-Unique: 0EYEhsmLPTmQJtd5haqjGw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 350/351] meson: update .gitlab-ci.yml file Date: Thu, 16 Jul 2020 11:59:46 +0200 Message-Id: <1b36b8aff8e7cea42acb5177e4b7a21436a1ba38.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.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 --- .gitlab-ci.yml | 57 ++++++++++--------- ci/aarch64-linux-gnu.meson | 11 ++++ ci/arm-linux-gnueabi.meson | 11 ++++ ci/arm-linux-gnueabihf.meson | 11 ++++ ci/cirrus/build.yml | 10 ++-- ci/cirrus/libvirt-freebsd-12.vars | 4 +- ci/cirrus/libvirt-macos-1015.vars | 4 +- ci/containers/libvirt-centos-7.Dockerfile | 2 +- ci/containers/libvirt-centos-8.Dockerfile | 4 +- .../libvirt-centos-stream.Dockerfile | 4 +- ...libvirt-debian-10-cross-aarch64.Dockerfile | 5 +- .../libvirt-debian-10-cross-armv6l.Dockerfile | 6 +- .../libvirt-debian-10-cross-armv7l.Dockerfile | 6 +- .../libvirt-debian-10-cross-i686.Dockerfile | 5 +- .../libvirt-debian-10-cross-mips.Dockerfile | 5 +- ...ibvirt-debian-10-cross-mips64el.Dockerfile | 5 +- .../libvirt-debian-10-cross-mipsel.Dockerfile | 5 +- ...libvirt-debian-10-cross-ppc64le.Dockerfile | 5 +- .../libvirt-debian-10-cross-s390x.Dockerfile | 5 +- ci/containers/libvirt-debian-10.Dockerfile | 4 +- ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 5 +- ...libvirt-debian-sid-cross-armv6l.Dockerfile | 6 +- ...libvirt-debian-sid-cross-armv7l.Dockerfile | 6 +- .../libvirt-debian-sid-cross-i686.Dockerfile | 5 +- ...bvirt-debian-sid-cross-mips64el.Dockerfile | 5 +- ...libvirt-debian-sid-cross-mipsel.Dockerfile | 6 +- ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 5 +- .../libvirt-debian-sid-cross-s390x.Dockerfile | 5 +- ci/containers/libvirt-debian-sid.Dockerfile | 4 +- ci/containers/libvirt-fedora-31.Dockerfile | 4 +- ci/containers/libvirt-fedora-32.Dockerfile | 4 +- ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 4 +- ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 4 +- .../libvirt-fedora-rawhide.Dockerfile | 4 +- ci/containers/libvirt-opensuse-151.Dockerfile | 2 +- ci/containers/libvirt-ubuntu-1804.Dockerfile | 2 +- ci/containers/libvirt-ubuntu-2004.Dockerfile | 4 +- ci/i686-linux-gnu.meson | 11 ++++ ci/mips-linux-gnu.meson | 11 ++++ ci/mips64el-linux-gnuabi64.meson | 11 ++++ ci/mipsel-linux-gnu.meson | 11 ++++ ci/powerpc64le-linux-gnu.meson | 11 ++++ ci/s390x-linux-gnu.meson | 11 ++++ 43 files changed, 246 insertions(+), 64 deletions(-) create mode 100644 ci/aarch64-linux-gnu.meson create mode 100644 ci/arm-linux-gnueabi.meson create mode 100644 ci/arm-linux-gnueabihf.meson create mode 100644 ci/i686-linux-gnu.meson create mode 100644 ci/mips-linux-gnu.meson create mode 100644 ci/mips64el-linux-gnuabi64.meson create mode 100644 ci/mipsel-linux-gnu.meson create mode 100644 ci/powerpc64le-linux-gnu.meson create mode 100644 ci/s390x-linux-gnu.meson diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c997dc6df25..c789f1f4fea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,6 @@ stages: - builds =20 .script_variables: &script_variables | - export MAKEFLAGS=3D"-j$(getconf _NPROCESSORS_ONLN)" export CCACHE_BASEDIR=3D"$(pwd)" export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" export CCACHE_MAXSIZE=3D"500M" @@ -50,10 +49,25 @@ stages: before_script: - *script_variables script: - - mkdir build - - cd build - - ../autogen.sh || (cat config.log && exit 1) - - $MAKE distcheck + - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) + - ninja -C build dist + +# Default native build job only for CentOS 7 that is always run +# meson dist fails on CentOS 7 because of old git that fails to clone +# from shallow git repository which is done when running meson dist +.native_build_centos_7_job_template: &native_build_centos_7_job_definition + stage: builds + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest + cache: + paths: + - ccache/ + key: "$CI_JOB_NAME" + before_script: + - *script_variables + script: + - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) + - ninja -C build + - ninja -C build test =20 # Jobs that we delegate to Cirrus CI because they require an operating # system other than Linux. These jobs will only run if the required @@ -84,6 +98,8 @@ stages: -e "s|[@]PKGS@|$PKGS|g" -e "s|[@]MAKE@|$MAKE|g" -e "s|[@]PYTHON@|$PYTHON|g" + -e "s|[@]PIP@|$PIP|g" + -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml - cirrus-run ci/cirrus/$NAME.yml @@ -102,10 +118,8 @@ stages: before_script: - *script_variables script: - - mkdir build - - cd build - - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) - - $MAKE + - meson build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.= txt && exit 1) + - ninja -C build =20 =20 # Native container build jobs @@ -277,7 +291,7 @@ x64-debian-sid: NAME: debian-sid =20 x64-centos-7: - <<: *native_build_job_definition + <<: *native_build_centos_7_job_definition variables: NAME: centos-7 =20 @@ -420,12 +434,8 @@ website: before_script: - *script_variables script: - - mkdir build - - cd build - - ../autogen.sh --prefix=3D$(pwd)/../vroot || (cat config.log && exit = 1) - - $MAKE -C docs - - $MAKE -C docs install - - cd .. + - meson build --prefix=3D$(pwd)/vroot || (cat build/meson-logs/meson-l= og.txt && exit 1) + - ninja -C build install-web - mv vroot/share/doc/libvirt/html/ website artifacts: expose_as: 'Website' @@ -442,10 +452,8 @@ codestyle: before_script: - *script_variables script: - - mkdir build - - cd build - - ../autogen.sh || (cat config.log && exit 1) - - $MAKE syntax-check + - meson build || (cat build/meson-logs/meson-log.txt && exit 1) + - ninja -C build syntax-check =20 =20 # This artifact published by this job is downloaded to push to Weblate @@ -459,12 +467,9 @@ potfile: before_script: - *script_variables script: - - mkdir build - - cd build - - ../autogen.sh || (cat config.log && exit 1) - - $MAKE -C src generated-sources - - $MAKE -C po libvirt.pot - - cd .. + - meson build || (cat build/meson-logs/meson-log.txt && exit 1) + - ninja -C build libvirt-pot-dep + - ninja -C build libvirt-pot - cp po/libvirt.pot libvirt.pot artifacts: expose_as: 'Potfile' diff --git a/ci/aarch64-linux-gnu.meson b/ci/aarch64-linux-gnu.meson new file mode 100644 index 00000000000..1da8d6025c0 --- /dev/null +++ b/ci/aarch64-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/aarch64-linux-gnu-gcc' +ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar' +strip =3D '/usr/bin/aarch64-linux-gnu-strip' +pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'aarch64' +cpu =3D 'aarch64' +endian =3D 'little' diff --git a/ci/arm-linux-gnueabi.meson b/ci/arm-linux-gnueabi.meson new file mode 100644 index 00000000000..9e5e06b84dc --- /dev/null +++ b/ci/arm-linux-gnueabi.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/arm-linux-gnueabi-gcc' +ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar' +strip =3D '/usr/bin/arm-linux-gnueabi-strip' +pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'arm' +cpu =3D 'arm' +endian =3D 'little' diff --git a/ci/arm-linux-gnueabihf.meson b/ci/arm-linux-gnueabihf.meson new file mode 100644 index 00000000000..c761707d495 --- /dev/null +++ b/ci/arm-linux-gnueabihf.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/arm-linux-gnueabihf-gcc' +ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar' +strip =3D '/usr/bin/arm-linux-gnueabihf-strip' +pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'arm' +cpu =3D 'armhf' +endian =3D 'little' diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 49e90b6d67b..aff461ccbc1 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -13,14 +13,12 @@ env: build_task: install_script: - @INSTALL_COMMAND@ @PKGS@ + - @PIP@ install @PYPI_PKGS@ clone_script: - git clone --depth 1000 "$CI_REPOSITORY_URL" . - git fetch origin "$CI_COMMIT_REF_NAME" - git reset --hard "$CI_COMMIT_SHA" build_script: - - mkdir build - - cd build - - ../autogen.sh --prefix=3D$(pwd)/install-root - - $MAKE -j3 - - $MAKE -j3 install - - $MAKE -j3 dist + - meson build --prefix=3D$(pwd)/install-root + - ninja -C build + - ninja -C build install diff --git a/ci/cirrus/libvirt-freebsd-12.vars b/ci/cirrus/libvirt-freebsd-= 12.vars index c7d4fbab0ff..7c29c6f8993 100644 --- a/ci/cirrus/libvirt-freebsd-12.vars +++ b/ci/cirrus/libvirt-freebsd-12.vars @@ -4,4 +4,6 @@ CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PKGS=3D'augeas autoconf automake avahi bash bash-completion ca_root_nss cc= ache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb get= text gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh li= bssh2 libtool libxml2 libxslt lsof meson ncurses ninja p5-App-cpanminus pat= ch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools = py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl' +PIP=3D'/usr/local/bin/pip-3.7' +PKGS=3D'augeas autoconf automake avahi bash bash-completion ca_root_nss cc= ache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb get= text gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh li= bssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch per= l5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-w= heel python3 qemu-utils radvd readline screen sudo vim yajl' +PYPI_PKGS=3D'meson=3D=3D0.54.0' diff --git a/ci/cirrus/libvirt-macos-1015.vars b/ci/cirrus/libvirt-macos-10= 15.vars index a14c41a277b..7704d747dfc 100644 --- a/ci/cirrus/libvirt-macos-1015.vars +++ b/ci/cirrus/libvirt-macos-1015.vars @@ -4,4 +4,6 @@ CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PKGS=3D'augeas autoconf automake bash bash-completion ccache cpanminus cpp= i curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libi= scsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make meson ncurses= ninja perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yaj= l' +PIP=3D'/usr/local/bin/pip3' +PKGS=3D'augeas autoconf automake bash bash-completion ccache cpanminus cpp= i curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libi= scsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make ncurses ninja= perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl' +PYPI_PKGS=3D'meson=3D=3D0.54.0' diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libv= irt-centos-7.Dockerfile index 08d93866443..a1879e08ece 100644 --- a/ci/containers/libvirt-centos-7.Dockerfile +++ b/ci/containers/libvirt-centos-7.Dockerfile @@ -128,7 +128,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.49.0 + meson=3D=3D0.54.0 =20 ENV LANG "en_US.UTF-8" =20 diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libv= irt-centos-8.Dockerfile index 2ac825fc807..fc66c4e4ea7 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -59,7 +59,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ lsof \ lvm2 \ make \ - meson \ ncurses-devel \ net-tools \ netcf-devel \ @@ -102,6 +101,9 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers= /libvirt-centos-stream.Dockerfile index e0025e2acb2..2fac2683b27 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -60,7 +60,6 @@ RUN dnf install -y centos-release-stream && \ lsof \ lvm2 \ make \ - meson \ ncurses-devel \ net-tools \ netcf-devel \ @@ -103,6 +102,9 @@ RUN dnf install -y centos-release-stream && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/= containers/libvirt-debian-10-cross-aarch64.Dockerfile index 2d49f5e6e77..ed8a813b32b 100644 --- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -113,6 +112,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -123,3 +125,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "aarch64-linux-gnu" ENV CONFIGURE_OPTS "--host=3Daarch64-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/aarch64-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-armv6l.Dockerfile index f9d6ee4c9f4..2c7eddf90fc 100644 --- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -93,6 +92,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libncurses-dev:armel \ libnl-3-dev:armel \ libnl-route-3-dev:armel \ + libnuma-dev:armel \ libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ @@ -111,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -121,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "arm-linux-gnueabi" ENV CONFIGURE_OPTS "--host=3Darm-linux-gnueabi" +ENV MESON_OPTS "--cross-file=3Dci/arm-linux-gnueabi.meson" diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-armv7l.Dockerfile index f26e0595352..80907b10805 100644 --- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -93,6 +92,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libncurses-dev:armhf \ libnl-3-dev:armhf \ libnl-route-3-dev:armhf \ + libnuma-dev:armhf \ libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ @@ -112,6 +112,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +125,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "arm-linux-gnueabihf" ENV CONFIGURE_OPTS "--host=3Darm-linux-gnueabihf" +ENV MESON_OPTS "--cross-file=3Dci/arm-linux-gnueabihf.meson" diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/con= tainers/libvirt-debian-10-cross-i686.Dockerfile index eaca5ee20b3..fc27ab47c63 100644 --- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "i686-linux-gnu" ENV CONFIGURE_OPTS "--host=3Di686-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/i686-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/con= tainers/libvirt-debian-10-cross-mips.Dockerfile index 7909471dccf..96a99b356fe 100644 --- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "mips-linux-gnu" ENV CONFIGURE_OPTS "--host=3Dmips-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/mips-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci= /containers/libvirt-debian-10-cross-mips64el.Dockerfile index 0e8bb6f4fb6..d70577678f9 100644 --- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "mips64el-linux-gnuabi64" ENV CONFIGURE_OPTS "--host=3Dmips64el-linux-gnuabi64" +ENV MESON_OPTS "--cross-file=3Dci/mips64el-linux-gnuabi64.meson" diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-mipsel.Dockerfile index 9faf47dff10..08553d9cdf2 100644 --- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "mipsel-linux-gnu" ENV CONFIGURE_OPTS "--host=3Dmipsel-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/mipsel-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/= containers/libvirt-debian-10-cross-ppc64le.Dockerfile index 68a438485d8..276a357a5a4 100644 --- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "powerpc64le-linux-gnu" ENV CONFIGURE_OPTS "--host=3Dpowerpc64le-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/powerpc64le-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/co= ntainers/libvirt-debian-10-cross-s390x.Dockerfile index 473ad32435b..2da2bb0125f 100644 --- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "s390x-linux-gnu" ENV CONFIGURE_OPTS "--host=3Ds390x-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/s390x-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/lib= virt-debian-10.Dockerfile index e1c97f2bf0f..a3fd428757d 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -69,7 +69,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -106,6 +105,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci= /containers/libvirt-debian-sid-cross-aarch64.Dockerfile index 9aedc673305..d227d933c76 100644 --- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -113,6 +112,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -123,3 +125,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "aarch64-linux-gnu" ENV CONFIGURE_OPTS "--host=3Daarch64-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/aarch64-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-armv6l.Dockerfile index 3f5ccba66a6..5b93c8353df 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -93,6 +92,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libncurses-dev:armel \ libnl-3-dev:armel \ libnl-route-3-dev:armel \ + libnuma-dev:armel \ libparted-dev:armel \ libpcap0.8-dev:armel \ libpciaccess-dev:armel \ @@ -111,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -121,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "arm-linux-gnueabi" ENV CONFIGURE_OPTS "--host=3Darm-linux-gnueabi" +ENV MESON_OPTS "--cross-file=3Dci/arm-linux-gnueabi.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-armv7l.Dockerfile index f67f13cf85b..76027933fcd 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -93,6 +92,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libncurses-dev:armhf \ libnl-3-dev:armhf \ libnl-route-3-dev:armhf \ + libnuma-dev:armhf \ libparted-dev:armhf \ libpcap0.8-dev:armhf \ libpciaccess-dev:armhf \ @@ -112,6 +112,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +125,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "arm-linux-gnueabihf" ENV CONFIGURE_OPTS "--host=3Darm-linux-gnueabihf" +ENV MESON_OPTS "--cross-file=3Dci/arm-linux-gnueabihf.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/co= ntainers/libvirt-debian-sid-cross-i686.Dockerfile index 0ed089f9ab2..19f0e787066 100644 --- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "i686-linux-gnu" ENV CONFIGURE_OPTS "--host=3Di686-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/i686-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/c= i/containers/libvirt-debian-sid-cross-mips64el.Dockerfile index cdafb2aef81..07307e083ae 100644 --- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "mips64el-linux-gnuabi64" ENV CONFIGURE_OPTS "--host=3Dmips64el-linux-gnuabi64" +ENV MESON_OPTS "--cross-file=3Dci/mips64el-linux-gnuabi64.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-mipsel.Dockerfile index 532b70be3bf..98b1dff49aa 100644 --- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -97,6 +96,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libparted-dev:mipsel \ libpcap0.8-dev:mipsel \ libpciaccess-dev:mipsel \ + librbd-dev:mipsel \ libreadline-dev:mipsel \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ @@ -111,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -121,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "mipsel-linux-gnu" ENV CONFIGURE_OPTS "--host=3Dmipsel-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/mipsel-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci= /containers/libvirt-debian-sid-cross-ppc64le.Dockerfile index 8bc32873bc6..00271ac1a7b 100644 --- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "powerpc64le-linux-gnu" ENV CONFIGURE_OPTS "--host=3Dpowerpc64le-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/powerpc64le-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/c= ontainers/libvirt-debian-sid-cross-s390x.Dockerfile index 6a98b30326b..60d1ddd35ea 100644 --- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -112,6 +111,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get autoremove -y && \ apt-get autoclean -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" @@ -122,3 +124,4 @@ ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" =20 ENV ABI "s390x-linux-gnu" ENV CONFIGURE_OPTS "--host=3Ds390x-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dci/s390x-linux-gnu.meson" diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/li= bvirt-debian-sid.Dockerfile index b8ec601ef12..80c828e9c05 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -69,7 +69,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -106,6 +105,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/lib= virt-fedora-31.Dockerfile index 7b492d30c05..972ea16c5d9 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-31.Dockerfile @@ -57,7 +57,6 @@ RUN dnf update -y && \ lsof \ lvm2 \ make \ - meson \ ncurses-devel \ net-tools \ netcf-devel \ @@ -103,6 +102,9 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/lib= virt-fedora-32.Dockerfile index f208f82a2ae..a2099683110 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -57,7 +57,6 @@ RUN dnf update -y && \ lsof \ lvm2 \ make \ - meson \ ncurses-devel \ net-tools \ netcf-devel \ @@ -103,6 +102,9 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile = b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile index c1cce71e5f2..290d1de2d4a 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile @@ -31,7 +31,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-utils \ ninja-build \ @@ -81,6 +80,9 @@ RUN dnf install -y \ mingw32-readline && \ dnf clean all -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile = b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile index 8c1829be131..77a136a5ed2 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile @@ -31,7 +31,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-utils \ ninja-build \ @@ -81,6 +80,9 @@ RUN dnf install -y \ mingw64-readline && \ dnf clean all -y =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/container= s/libvirt-fedora-rawhide.Dockerfile index 8e092744f6e..a8509c9ca83 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -58,7 +58,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ lsof \ lvm2 \ make \ - meson \ ncurses-devel \ net-tools \ netcf-devel \ @@ -104,6 +103,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/= libvirt-opensuse-151.Dockerfile index 2ba408efb74..0cc5df2a1bb 100644 --- a/ci/containers/libvirt-opensuse-151.Dockerfile +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -100,7 +100,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.49.0 + meson=3D=3D0.54.0 =20 ENV LANG "en_US.UTF-8" =20 diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/l= ibvirt-ubuntu-1804.Dockerfile index 96751307704..5cb4384aed3 100644 --- a/ci/containers/libvirt-ubuntu-1804.Dockerfile +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -108,7 +108,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 RUN pip3 install \ - meson=3D=3D0.49.0 + meson=3D=3D0.54.0 =20 ENV LANG "en_US.UTF-8" =20 diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/l= ibvirt-ubuntu-2004.Dockerfile index 2457e7a8dba..ae0b048c47a 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ lsof \ lvm2 \ make \ - meson \ net-tools \ nfs-common \ ninja-build \ @@ -107,6 +106,9 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 +RUN pip3 install \ + meson=3D=3D0.54.0 + ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/i686-linux-gnu.meson b/ci/i686-linux-gnu.meson new file mode 100644 index 00000000000..638113e1d21 --- /dev/null +++ b/ci/i686-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/i686-linux-gnu-gcc' +ar =3D '/usr/bin/i686-linux-gnu-gcc-ar' +strip =3D '/usr/bin/i686-linux-gnu-strip' +pkgconfig =3D '/usr/bin/i686-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'x86' +cpu =3D 'i686' +endian =3D 'little' diff --git a/ci/mips-linux-gnu.meson b/ci/mips-linux-gnu.meson new file mode 100644 index 00000000000..2c4c21c1e02 --- /dev/null +++ b/ci/mips-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/mips-linux-gnu-gcc' +ar =3D '/usr/bin/mips-linux-gnu-gcc-ar' +strip =3D '/usr/bin/mips-linux-gnu-strip' +pkgconfig =3D '/usr/bin/mips-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'mips' +cpu =3D 'mips' +endian =3D 'little' diff --git a/ci/mips64el-linux-gnuabi64.meson b/ci/mips64el-linux-gnuabi64.= meson new file mode 100644 index 00000000000..459c8154d7b --- /dev/null +++ b/ci/mips64el-linux-gnuabi64.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc' +ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar' +strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip' +pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'mips64' +cpu =3D 'mips64el' +endian =3D 'little' diff --git a/ci/mipsel-linux-gnu.meson b/ci/mipsel-linux-gnu.meson new file mode 100644 index 00000000000..308bda511ee --- /dev/null +++ b/ci/mipsel-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/mipsel-linux-gnu-gcc' +ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar' +strip =3D '/usr/bin/mipsel-linux-gnu-strip' +pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'mips' +cpu =3D 'mipsel' +endian =3D 'little' diff --git a/ci/powerpc64le-linux-gnu.meson b/ci/powerpc64le-linux-gnu.meson new file mode 100644 index 00000000000..9a151e2c12f --- /dev/null +++ b/ci/powerpc64le-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/powerpc64le-linux-gnu-gcc' +ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar' +strip =3D '/usr/bin/powerpc64le-linux-gnu-strip' +pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 'ppc64' +cpu =3D 'powerpc64le' +endian =3D 'little' diff --git a/ci/s390x-linux-gnu.meson b/ci/s390x-linux-gnu.meson new file mode 100644 index 00000000000..28a292c7203 --- /dev/null +++ b/ci/s390x-linux-gnu.meson @@ -0,0 +1,11 @@ +[binaries] +c =3D '/usr/bin/s390x-linux-gnu-gcc' +ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar' +strip =3D '/usr/bin/s390x-linux-gnu-strip' +pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config' + +[host_machine] +system =3D 'linux' +cpu_family =3D 's390x' +cpu =3D 's390x' +endian =3D 'little' --=20 2.26.2 From nobody Thu May 2 00:12:15 2024 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=1594894573; cv=none; d=zohomail.com; s=zohoarc; b=VLDEfVYKRYa0TxncPwIMlR1ycLwHqgKWuAUwjV7FcgK2l2qXZmyzZ7zQEskKZpxA7ibl+8UjKjgWrxowp/IAk/7wadAfRoRcWqA4XNUR7LCxjJv4UKnvDqTZLxMN1spm48ABkx/7c4W2P/TK1uUHdCL4aIrdkeU1W/T35CgXI6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894573; 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=s2yHJ9RwoyA01cLrGRe5z4abU88bfYilbQLa3+cOaWU=; b=BMt0AtA6LrWnIBnyeNVoFVi9dssxClkZdJfVb/3PsDlTz0q75Q3eEzOnMyUrzRcOeMpHrkq+IIhcU3GlTL/liwSSdgMnajK1iwJ1KPuMEqVcZGC27wnJpQ8rnnzymjY0yAkDIuu1oImZPR2WO2jk2QnJGaocKoNsNrNnoHl9nrg= 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 1594894573736900.5127737965199; Thu, 16 Jul 2020 03:16:13 -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-365-L2YqN4zvMP2bVdJYQPQ-eA-1; Thu, 16 Jul 2020 06:15:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B772B800E23; Thu, 16 Jul 2020 10:15:09 +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 959C46FED1; Thu, 16 Jul 2020 10:15:09 +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 5D4E5181A6A7; Thu, 16 Jul 2020 10:15:09 +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 06GA7v9C021370 for ; Thu, 16 Jul 2020 06:07:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id C4B5A19C4F; Thu, 16 Jul 2020 10:07:57 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E66C2E02C for ; Thu, 16 Jul 2020 10:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894572; 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=s2yHJ9RwoyA01cLrGRe5z4abU88bfYilbQLa3+cOaWU=; b=FFrt1/+8uc8hBXiusQaIffI5pv80h20mb2BUpTDa6dJkqSJSe32mSIBtjrLD5Pa5ZzQYjN h3c+OI/FbFHaJdiVJoutMKZD/O4TIJV0taPsofPYTzC+l9LsIy2lhW/3ienhoFLL3PmA5e 5A8rA1LZ8cIb4i9Hoanib7Qwe2ejFpc= X-MC-Unique: L2YqN4zvMP2bVdJYQPQ-eA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 351/351] meson: .gitlab-ci.yml: switch armv7l build to Debian 10 Date: Thu, 16 Jul 2020 11:59:47 +0200 Message-Id: <0a2a046c40dd803abdb375578d4af7e6d79b033b.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.11 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" On Debian Sid there are broken headers for cross compilation. There is no header unconditionally included by . With autotools the build works correctly because the header detection tries to compile simple code that includes the header but with Meson the detection works differently. We check which is present so it should be safe to include it. We could workaround it in libvirt by checking for presence of as well but I don't believe that's a correct approach. IMHO it should be fixed in Debian. Signed-off-by: Pavel Hrdina --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c789f1f4fea..04b664bc7fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -364,6 +364,12 @@ armv6l-debian-10: NAME: debian-10 CROSS: armv6l =20 +armv7l-debian-10: + <<: *cross_build_job_definition + variables: + NAME: debian-10 + CROSS: armv7l + mips64el-debian-10: <<: *cross_build_job_definition variables: @@ -394,12 +400,6 @@ s390x-debian-sid: NAME: debian-sid CROSS: s390x =20 -armv7l-debian-sid: - <<: *cross_build_job_definition - variables: - NAME: debian-sid - CROSS: armv7l - i686-debian-sid: <<: *cross_build_job_definition variables: --=20 2.26.2