From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917884; cv=none; d=zoho.com; s=zohoarc; b=DwKkZaDGerZO5mhx9Le4Gjt10cPfX2CNsql7I3HKI4jUCyOvbhQE22BOAt19bwpSXAhXreZioWLUOrMlFPWDSbnMamRv4F6XjLe0cC225HnU64JSYJtmWgGnJnti/7bNCupbt39LLpJNH5v+FkOrxWfSPUPg62yWjj5eqXq5LEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917884; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WZZu2ktAoUOjNSO1bwx6N/7UBc/uWBaugYjE7PvdLHU=; b=UWH3JmS1UdccvbYKigyOp2BQ4kTYQPc9mG5+eZyoRTzJVfQKkNUcYl2AViqQxgJRrzdJ54+xkfHMkwCZeIvfxt2ogm+ktfn+Aq6vFPa6dqNjvhBY1RhNggmzExd6JrLIScuiKqMyZl8IyrK5XABrjvDwbMwlw6ZecmrLugwBY3U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917884544197.6890155797155; Thu, 24 Oct 2019 04:51: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-60-VQ9q7kq9O66NE3Dg1sGTNw-1; Thu, 24 Oct 2019 07:51: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 C540C107AD33; Thu, 24 Oct 2019 11:51: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 607031001DE4; Thu, 24 Oct 2019 11:51: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 C4C5F1803B4B; Thu, 24 Oct 2019 11:51:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBp8sr032342 for ; Thu, 24 Oct 2019 07:51:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04D8360126; Thu, 24 Oct 2019 11:51:08 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65E81600CC for ; Thu, 24 Oct 2019 11:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917883; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WZZu2ktAoUOjNSO1bwx6N/7UBc/uWBaugYjE7PvdLHU=; b=I1nGLPvhYW99FoB3th4p6Xu/2/yOSPKM0lJnieQx/JmIQQy6jB7RuqxbZ8ASAeT4FFqbxT atc6etu7nX+4pcIvv+V452NcDTWVUoxJAEI4vH72dRlDQy9L4zlu0P+OeVpIRVEWIEsMcU I3G+b1rCSl3aWKNow40HWzQXynFIqn0= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:43 +0200 Message-Id: <8e998d23f9e0754cefe385f403c94f357d6e5287.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 01/20] build: mandate use of a build dir != src dir X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: VQ9q7kq9O66NE3Dg1sGTNw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Daniel P. Berrang=C3=A9 Historically we've allowed builds in the main src dir, but meson does not support this. Explicitly force separate build dir in autotools to align with meson. We must re-enable dependency tracking which the RPM %configure macro turns off. Without this, the build dir doesn't get the source directory tree mirrored. Signed-off-by: Daniel P. Berrang=C3=A9 --- Notes: New in v2. configure.ac | 6 ++++++ libvirt.spec.in | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8b53b6ada9..476bba2800 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,12 @@ dnl License along with this library. If not, see dnl . =20 AC_INIT([libvirt], [5.9.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]) diff --git a/libvirt.spec.in b/libvirt.spec.in index dcad08cb5f..723ced3535 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1163,7 +1163,13 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{= _specdir}/%{name}.spec) %endif =20 rm -f po/stamp-po -%configure --with-runstatedir=3D%{_rundir} \ + +%define _configure ../configure +mkdir %{_vpath_builddir} +cd %{_vpath_builddir} + +%configure --enable-dependency-tracking \ + --with-runstatedir=3D%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ @@ -1232,6 +1238,7 @@ 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 =20 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -1313,6 +1320,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvir= t_qemu_probes.stp \ %endif =20 %check +cd %{_vpath_builddir} if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=3D1 then cat test-suite.log || true --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917882; cv=none; d=zoho.com; s=zohoarc; b=Mpgd7FF7DJjeSekoRT3nxcyo5wm455V6b/H+459WG3X/abXFXlK6KcHM3wTQAxhX7PCped/CUHJFx5rHFnl3+fl/+c8+Wa2XVuAqKHUhRLHSJln3pm5YqL97wXnvk6+6i5Kp9LAJYjbx+xZGnGDeJZocx/Z8K/RVkH9Sjn6QPAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917882; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NabIFq6mKfeWqf4lA9q371/I6kiiYipvNHtBWBmz6DU=; b=PDuprGr+MCTnqSxJK7X+7fOyDX9nTIJAhVei9PDt4Cm7f57pw/eF2pAbZLM9jzhKeNzbMhiJnz1QlsDrcXdzVvo/IfyBG6LxOodTWCLQ2nakTktL7h+j0yh9QlPCIlqxnZpsPkdR0fuZyHnI36BGDPyisNgAFeLgWQMZpAh6XXc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917882281698.6140432947495; Thu, 24 Oct 2019 04:51: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-146-t7_jPHIfNvu222jCrEcyhw-1; Thu, 24 Oct 2019 07:51:18 -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 B78985E9; Thu, 24 Oct 2019 11:51: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 75A0562A66; Thu, 24 Oct 2019 11:51: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 A9E4C1803B4D; Thu, 24 Oct 2019 11:51:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBp9Kd032349 for ; Thu, 24 Oct 2019 07:51:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D04260126; Thu, 24 Oct 2019 11:51:09 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C774600CC for ; Thu, 24 Oct 2019 11:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917880; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NabIFq6mKfeWqf4lA9q371/I6kiiYipvNHtBWBmz6DU=; b=i8C0I9k9DqTp4iuiHxfADaa6HoQNrNzkRNAOwFgLtsWF/bPvp9V3E64Veld8PhtegeFzkM +qq98zp2UrjncfXUUwEG9fK8CYWSKmiKnm7K7m+pNOXWgdy4zOwUq8SUN7RmVfaUxxOVCl o1ZIfm9VZ2v0zZE8Xs5AJuwhjR2o6Cc= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:44 +0200 Message-Id: <85dc3fba2fda76a6aee5f50de0e5fed31523d3f0.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 02/20] .gitignore: cleanup old and obsolete ignores X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: t7_jPHIfNvu222jCrEcyhw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that we forbid builds in source directory we can remove a lot of ignores that are created during build time. To make the cleanup easier in the future create a sections in our .gitignore file. Signed-off-by: Pavel Hrdina --- Notes: New in v2. .gitignore | 249 ++++++----------------------------------------------- 1 file changed, 26 insertions(+), 223 deletions(-) diff --git a/.gitignore b/.gitignore index c45b8bd098..bd64eb5b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,17 @@ +# vim related ignores +*.swp +.lvimrc + +# emacs related ignores *#*# *.#*# -*.[187] -*.[187].in -*.a -*.cov -*.exe -*.exe.manifest -*.gcda -*.gcno -*.gcov -*.html -*.i -*.la -*.lo -*.loT -*.o -*.orig -*.pem -*.pyc -*.rej -*.s -*.service -*.socket -*.swp -*~ .#* -.color_coded -.deps -.dirstamp -.gdb_history -.git -.git-module-status -.libs -.lvimrc -.memdump -.sc-start-sc_* -.ycm_extra_conf.py + +# autotools related ignores +!/m4/virt-*.m4 +*.cov /AUTHORS /INSTALL -/NEWS /aclocal.m4 /autom4te.cache /build-aux/.gitignore @@ -46,70 +19,32 @@ /build-aux/depcomp /build-aux/missing /build-aux/test-driver -/build/ -/ci/scratch/ -/confdefs.h -/config.cache -/config.guess -/config.h /config.h.in /config.log -/config.rpath -/config.status -/config.sub /configure -/configure.lineno -/conftest.* -/docs/aclperms.htmlinc -/docs/apibuild.py.stamp -/docs/devhelp/libvirt.devhelp -/docs/hvsupport.html.in -/docs/libvirt-admin-*.xml -/docs/libvirt-api.xml -/docs/libvirt-lxc-*.xml -/docs/libvirt-qemu-*.xml -/docs/libvirt-refs.xml -/docs/news.html.in -/docs/todo.html.in -/examples/c/admin/client_close -/examples/c/admin/client_info -/examples/c/admin/client_limits -/examples/c/admin/list_clients -/examples/c/admin/list_servers -/examples/c/admin/logging -/examples/c/admin/threadpool_params -/examples/c/domain/dommigrate -/examples/c/domain/domtop -/examples/c/domain/info1 -/examples/c/domain/rename -/examples/c/domain/suspend -/examples/c/misc/event-test -/examples/c/misc/hellolibvirt -/examples/c/misc/openauth +/m4/* +Makefile.in + +# gnulib related ignores +!/gnulib/lib/Makefile.am +!/gnulib/tests/Makefile.am +*.rej +*~ /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* -/include/libvirt/libvirt-common.h -/libtool -/libvirt-*.tar.xz -/libvirt-[0-9]* -/libvirt*.pc -/libvirt.spec -/ltconfig -/ltmain.sh -/m4/* -/mingw-libvirt.spec -/mkinstalldirs + +# git related ignores +*.orig +.git-module-status + +# libvirt related ignores +!/po/*.mini.po +/build/ +/ci/scratch/ /po/*gmo /po/*po -!/po/*.mini.po /po/*pot -/proxy/ -/python/ -/run -/sc_* -/src/.*.stamp -/src/*.pc /src/access/org.libvirt.api.policy /src/access/viraccessapicheck.c /src/access/viraccessapicheck.h @@ -120,151 +55,19 @@ /src/admin/admin_client.h /src/admin/admin_protocol.[ch] /src/admin/admin_server_dispatch_stubs.h -/src/admin/libvirt_admin.def -/src/admin/libvirt_admin.syms -/src/bhyve/test_libvirtd_bhyve.aug -/src/bhyve/test_virtbhyved.aug -/src/bhyve/virtbhyved.aug -/src/bhyve/virtbhyved.conf /src/esx/*.generated.* /src/hyperv/*.generated.* -/src/interface/test_virtinterfaced.aug -/src/interface/virtinterfaced.aug -/src/interface/virtinterfaced.conf -/src/libvirt*.def -/src/libvirt.syms -/src/libvirt_access.syms -/src/libvirt_access.xml -/src/libvirt_access_lxc.syms -/src/libvirt_access_lxc.xml -/src/libvirt_access_qemu.syms -/src/libvirt_access_qemu.xml -/src/libvirt_*.stp -/src/libvirt_*helper -/src/libvirt_*probes.h -/src/libvirt_lxc -/src/libvirtd -/src/libvirtd*.logrotate -/src/libxl/test_libvirtd_libxl.aug -/src/libxl/test_virtxend.aug -/src/libxl/virtxend.aug -/src/libxl/virtxend.conf -/src/locking/libxl-lockd.conf -/src/locking/libxl-sanlock.conf /src/locking/lock_daemon_dispatch_stubs.h /src/locking/lock_protocol.[ch] -/src/locking/qemu-lockd.conf -/src/locking/qemu-sanlock.conf -/src/locking/test_libvirt_sanlock.aug -/src/locking/test_libvirt_lockd.aug -/src/locking/test_virtlockd.aug /src/logging/log_daemon_dispatch_stubs.h /src/logging/log_protocol.[ch] -/src/logging/test_virtlogd.aug /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h /src/lxc/lxc_monitor_protocol.c /src/lxc/lxc_monitor_protocol.h -/src/lxc/lxc_protocol.[ch] -/src/lxc/test_libvirtd_lxc.aug -/src/lxc/test_virtlxcd.aug -/src/lxc/virtlxcd.aug -/src/lxc/virtlxcd.conf -/src/network/test_virtnetworkd.aug -/src/network/virtnetworkd.aug -/src/network/virtnetworkd.conf -/src/node_device/test_virtnodedevd.aug -/src/node_device/virtnodedevd.aug -/src/node_device/virtnodedevd.conf -/src/nwfilter/test_virtnwfilterd.aug -/src/nwfilter/virtnwfilterd.aug -/src/nwfilter/virtnwfilterd.conf -/src/qemu/test_libvirtd_qemu.aug -/src/qemu/test_virtqemud.aug -/src/qemu/virtqemud.aug -/src/qemu/virtqemud.conf /src/remote/*_client_bodies.h /src/remote/*_protocol.[ch] /src/remote/*_stubs.h -/src/remote/libvirtd.aug -/src/remote/libvirtd.conf -/src/remote/test_libvirtd.aug -/src/remote/test_virtproxyd.aug -/src/remote/virtproxyd.aug -/src/remote/virtproxyd.conf /src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virnetprotocol.[ch] -/src/secret/test_virtsecretd.aug -/src/secret/virtsecretd.aug -/src/secret/virtsecretd.conf -/src/storage/test_virtstoraged.aug -/src/storage/virtstoraged.aug -/src/storage/virtstoraged.conf -/src/test*.aug -/src/util/virkeycodetable*.h -/src/util/virkeynametable*.h -/src/vbox/test_virtvboxd.aug -/src/vbox/virtvboxd.aug -/src/vbox/virtvboxd.conf -/src/virt-aa-helper -/src/virtbhyved -/src/virtinterfaced -/src/virtxend -/src/virtlockd -/src/virtlogd -/src/virtlxcd -/src/virtnetworkd -/src/virtnodedevd -/src/virtnwfilterd -/src/virtproxyd -/src/virtqemud -/src/virtsecretd -/src/virtstoraged -/src/virtvboxd -/src/virtvzd -/src/virt-guest-shutdown.target -/src/vz/test_virtvzd.aug -/src/vz/virtvzd.aug -/src/vz/virtvzd.conf -/tests/*.log -/tests/*.pid -/tests/*.trs -/tests/*test -/tests/commandhelper -/tests/qemucapsprobe -!/tests/virsh-self-test -!/tests/virt-aa-helper-test -!/tests/virt-admin-self-test -/tests/reconnect -/tests/ssh -/tests/test_file_access.txt -/tests/test_conf -/tools/libvirt-guests.sh -/tools/virt-login-shell -/tools/virt-login-shell-helper -/tools/virsh -/tools/virsh-*-edit.c -/tools/virt-admin -/tools/virt-*-validate -/tools/virt-sanlock-cleanup -/tools/wireshark/src/libvirt -/update.log -GPATH -GRTAGS -GTAGS -Makefile -Makefile.in -TAGS -coverage -cscope.files -cscope.in.out -cscope.out -cscope.po.out -results.log -stamp-h -stamp-h.in -stamp-h1 tags -!/gnulib/lib/Makefile.am -!/gnulib/tests/Makefile.am -!/m4/virt-*.m4 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917989; cv=none; d=zoho.com; s=zohoarc; b=MxmI1Py8LjZ+o+MQSvV7sGzKtNLGM3HYX5UKgGeqaPTv+QKUX8hDQPSGWMkVJE1T3lhOzk9Ayr/mJFlc0aJnV6FwnY2d3H9/+FL2hL2keYIVNsJnOdbV5oGMMtixuc6M4c+pD34aAmSpVdBxncm75wvatCOr1Dyu9Qfoh8ZEJOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917989; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uI3vMXM7Rq7I9jWOsiJzDE0yvpISz70mSx+5+H0sMEE=; b=mgglkoHHYUGNEr9CDgOClhp0ztt8IhFmO7WU08hWGw2t4KiXhEz8ZBXlH7pvW1thUFek4Swk4u6tvEWs5gCdtnaQwljmrYncgZkjmTVMh/B5l8hkxOV2/xu/HTGO3uR10Ih3YIPwxMe2K/v3owMUfKgEsd8H6ZdKBxPBA9Ru02I= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 157191798982752.677958658970965; Thu, 24 Oct 2019 04:53: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-38-ZIXALt_PMcuVoqju5tmTAg-1; Thu, 24 Oct 2019 07:51: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 536CC5E4; Thu, 24 Oct 2019 11:51: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 2B0016061E; Thu, 24 Oct 2019 11:51: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 CD9A84EE69; Thu, 24 Oct 2019 11:51:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpBh5032362 for ; Thu, 24 Oct 2019 07:51:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A784860126; Thu, 24 Oct 2019 11:51:11 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14EF4600CC for ; Thu, 24 Oct 2019 11:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917988; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uI3vMXM7Rq7I9jWOsiJzDE0yvpISz70mSx+5+H0sMEE=; b=i0j2gzf+Y1jNf06XaCIfFvLI+3UsplMf7R8rNQbxHa7x5SCurtlQPkXPIYZAF0Y50+2xD+ W7peOV7ioE+JG9avnRV5HQbNGqsjErHkVXswfn0jzHjC38SjAQEJjOSu/XINgB8vUWyn2K Bw6820sh+ls7JhjG2/l7/l+Vm+vCo3U= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:45 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 03/20] syntax-check.mk: fix sc_po_check rule X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: ZIXALt_PMcuVoqju5tmTAg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit <22d8e27ccd5faf48ee2bf288a1b9059aa7ffd28b> introduced our syntax-check.mk file based on gnulib rules. However, the rule was completely ignored as we don't have POTFILES.in file. Signed-off-by: Pavel Hrdina --- Notes: New in v2. build-aux/syntax-check.mk | 2 +- po/POTFILES | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..5890f4737f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1974,7 +1974,7 @@ 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 $(srcdir)/po/POTFILES generated_files ?=3D $(srcdir)/lib/*.[ch] _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) sc_po_check: diff --git a/po/POTFILES b/po/POTFILES index 04eba73725..51317d38b0 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -29,6 +29,7 @@ src/conf/netdev_vport_profile_conf.c src/conf/network_conf.c src/conf/networkcommon_conf.c src/conf/node_device_conf.c +src/conf/node_device_util.c src/conf/numa_conf.c src/conf/nwfilter_conf.c src/conf/nwfilter_params.c @@ -38,9 +39,14 @@ src/conf/snapshot_conf.c src/conf/storage_adapter_conf.c src/conf/storage_conf.c src/conf/virchrdev.c +src/conf/virdomainmomentobjlist.c src/conf/virdomainobjlist.c src/conf/virnetworkobj.c +src/conf/virnetworkportdef.c src/conf/virnodedeviceobj.c +src/conf/virnwfilterbindingdef.c +src/conf/virnwfilterbindingobj.c +src/conf/virnwfilterbindingobjlist.c src/conf/virnwfilterobj.c src/conf/virsavecookie.c src/conf/virsecretobj.c @@ -60,6 +66,7 @@ src/esx/esx_storage_backend_vmfs.c src/esx/esx_storage_driver.c src/esx/esx_stream.c src/esx/esx_util.c +src/esx/esx_util.h src/esx/esx_vi.c src/esx/esx_vi_methods.c src/esx/esx_vi_types.c @@ -128,16 +135,22 @@ src/phyp/phyp_driver.c src/qemu/qemu_agent.c src/qemu/qemu_alias.c src/qemu/qemu_block.c +src/qemu/qemu_blockjob.c src/qemu/qemu_capabilities.c src/qemu/qemu_cgroup.c +src/qemu/qemu_checkpoint.c src/qemu/qemu_command.c src/qemu/qemu_conf.c +src/qemu/qemu_dbus.c src/qemu/qemu_domain.c src/qemu/qemu_domain_address.c src/qemu/qemu_driver.c +src/qemu/qemu_extdevice.c +src/qemu/qemu_firmware.c src/qemu/qemu_hostdev.c src/qemu/qemu_hotplug.c src/qemu/qemu_interface.c +src/qemu/qemu_interop_config.c src/qemu/qemu_migration.c src/qemu/qemu_migration_cookie.c src/qemu/qemu_migration_params.c @@ -146,12 +159,15 @@ src/qemu/qemu_monitor_json.c src/qemu/qemu_monitor_text.c src/qemu/qemu_process.c src/qemu/qemu_qapi.c +src/qemu/qemu_slirp.c +src/qemu/qemu_tpm.c +src/qemu/qemu_vhost_user.c +src/qemu/qemu_vhost_user_gpu.c src/remote/remote_client_bodies.h src/remote/remote_daemon.c src/remote/remote_daemon_config.c src/remote/remote_daemon_dispatch.c src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_dispatch_qemu_stubs.h src/remote/remote_daemon_stream.c src/remote/remote_driver.c src/rpc/virkeepalive.c @@ -170,11 +186,13 @@ src/rpc/virnetsocket.c src/rpc/virnetsshsession.c src/rpc/virnettlscontext.c src/secret/secret_driver.c +src/secret/secret_util.c src/security/security_apparmor.c src/security/security_dac.c src/security/security_driver.c src/security/security_manager.c src/security/security_selinux.c +src/security/security_util.c src/security/virt-aa-helper.c src/storage/parthelper.c src/storage/storage_backend.c @@ -182,6 +200,7 @@ src/storage/storage_backend_disk.c src/storage/storage_backend_fs.c src/storage/storage_backend_gluster.c src/storage/storage_backend_iscsi.c +src/storage/storage_backend_iscsi_direct.c src/storage/storage_backend_logical.c src/storage/storage_backend_mpath.c src/storage/storage_backend_rbd.c @@ -190,6 +209,8 @@ src/storage/storage_backend_sheepdog.c src/storage/storage_backend_vstorage.c src/storage/storage_backend_zfs.c src/storage/storage_driver.c +src/storage/storage_file_fs.c +src/storage/storage_file_gluster.c src/storage/storage_util.c src/test/test_driver.c src/util/iohelper.c @@ -201,6 +222,10 @@ src/util/virauthconfig.c src/util/virbitmap.c src/util/virbuffer.c src/util/vircgroup.c +src/util/vircgroupbackend.c +src/util/vircgroupbackend.h +src/util/vircgroupv1.c +src/util/vircgroupv2.c src/util/virclosecallbacks.c src/util/vircommand.c src/util/virconf.c @@ -215,6 +240,7 @@ src/util/virfdstream.c src/util/virfile.c src/util/virfilecache.c src/util/virfirewall.c +src/util/virfirewalld.c src/util/virfirmware.c src/util/virhash.c src/util/virhook.c @@ -232,6 +258,7 @@ src/util/virlockspace.c src/util/virlog.c src/util/virmacmap.c src/util/virmdev.c +src/util/virmodule.c src/util/virnetdev.c src/util/virnetdevbandwidth.c src/util/virnetdevbridge.c @@ -266,15 +293,18 @@ src/util/virstoragefile.c src/util/virstoragefilebackend.c src/util/virstring.c src/util/virsysinfo.c +src/util/virsystemd.c src/util/virthreadjob.c src/util/virthreadpool.c src/util/virtime.c src/util/virtpm.c +src/util/virtypedparam-public.c src/util/virtypedparam.c src/util/viruri.c src/util/virusb.c src/util/virutil.c src/util/virvhba.c +src/util/virvsock.c src/util/virxml.c src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_XPCOMCGlue.c @@ -294,6 +324,7 @@ src/vz/vz_utils.h tests/virpolkittest.c tools/libvirt-guests.sh.in tools/virsh-checkpoint.c +tools/virsh-completer-host.c tools/virsh-console.c tools/virsh-domain-monitor.c tools/virsh-domain.c @@ -309,12 +340,14 @@ tools/virsh-snapshot.c tools/virsh-util.c tools/virsh-volume.c tools/virsh.c +tools/virsh.h tools/virt-admin.c tools/virt-host-validate-bhyve.c tools/virt-host-validate-common.c tools/virt-host-validate-lxc.c tools/virt-host-validate-qemu.c tools/virt-host-validate.c -tools/virt-login-shell.c +tools/virt-login-shell-helper.c +tools/vsh-table.c tools/vsh.c tools/vsh.h --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917899; cv=none; d=zoho.com; s=zohoarc; b=S8KkUYoXweyy8+LVg2bchBcstIT7BXgfMshTmy3uo1JO4xEMSuuS9hR7B111Rkp6o8JPCJojSb38wBt4zOIBZiUvuKlR+FNdG1djYaU+hfpL6Wb0HZjpFH/nm+8MBUXCvHzrAey1Se4SlCXB63rmhtq9qifzk9sjq/r7ZPkB7mI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917899; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w44qSW0UnYH1X45xDpiepexPtOIkJwZmhxKDHWIC+pQ=; b=F5U08o0Oh2otavr0y4OsBmFeXx5jEjvzuMfS4jw0VYrUaIiTz1TKVhuVmZ+6oP4rxVuzWB9ZejQ8iobJHYQw/0+OhLt2I23qqIew+HXmhgNh+pO+k1xLLupRGXBggEg7kkagGZrxm0v2TRXP5K+u65uiddLLT7waWdt3De7Xbjs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917899196845.491052986504; Thu, 24 Oct 2019 04:51: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-82-XyR9GnA8PPiKYtWSiywHJw-1; Thu, 24 Oct 2019 07:51:35 -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 E621B800D5B; Thu, 24 Oct 2019 11:51: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 B9BA361F21; Thu, 24 Oct 2019 11:51: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 76F20180BA9C; Thu, 24 Oct 2019 11:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpCHa032369 for ; Thu, 24 Oct 2019 07:51:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id A493A60161; Thu, 24 Oct 2019 11:51:12 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A7B0600CC for ; Thu, 24 Oct 2019 11:51:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917898; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w44qSW0UnYH1X45xDpiepexPtOIkJwZmhxKDHWIC+pQ=; b=KJbPwsy5nPhnXg1ajMyFRizsKmLfbJ3sJYasdrW2R2HPcKUk6KsrOnuWICffwGYAyQtWJM ALtsBztYb2qGMZohfH7StUNlU4IAcVpF5ZymQ8GvsT/76tuVVUiKPUAMlS0UCNUuKv8f+K HM41YR2yW48aB54CJd9adV9egpQ3CBE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:46 +0200 Message-Id: <4a0982dc44365fa5c05c4fe34a17fc468cde3b52.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 04/20] syntax-check.mk: cleanup sc_po_check dependencies X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: XyR9GnA8PPiKYtWSiywHJw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Introduce new rule 'generated-sources' as a helper for PO files check to make sure that all generated files are prepared and to not duplicate the list on different places. This will be used as a dependency for sc_po_check rule instead of duplicated list of generated files. Signed-off-by: Pavel Hrdina --- Notes: New in v2. build-aux/syntax-check.mk | 25 ++++++------------------- src/Makefile.am | 3 +++ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 5890f4737f..6acda4eea3 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1953,6 +1953,9 @@ sc_m4_quote_check: halt=3D'quote the first arg to AC_DEF*' \ $(_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' @@ -1977,7 +1980,9 @@ perl_translatable_files_list_ =3D \ po_file ?=3D $(srcdir)/po/POTFILES generated_files ?=3D $(srcdir)/lib/*.[ch] _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) -sc_po_check: + +# sc_po_check can fail if generated files are not built first +sc_po_check: gen_source_files @if test -f $(po_file); then \ $(GREP) -E -v '^(#|$$)' $(po_file) \ | $(GREP) -v '^src/false\.c$$' | sort > $@-1; \ @@ -2160,24 +2165,6 @@ test-wrap-argv: group-qemu-caps: $(AM_V_GEN)$(PERL) $(top_srcdir)/tests/group-qemu-caps.pl --check $(top_s= rcdir)/ =20 -# sc_po_check can fail if generated files are not built first -sc_po_check: \ - $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \ - $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \ - $(srcdir)/src/remote/remote_client_bodies.h \ - $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ - $(srcdir)/src/admin/admin_client.h -$(srcdir)/src/remote/remote_daemon_dispatch_stubs.h: $(srcdir)/src/remote/= remote_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_stubs.h -$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/src/re= mote/qemu_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h -$(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_p= rotocol.x - $(MAKE) -C src remote/remote_client_bodies.h -$(srcdir)/src/admin/admin_server_dispatch_stubs.h: $(srcdir)/src/admin/adm= in_protocol.x - $(MAKE) -C src admin/admin_server_dispatch_stubs.h -$(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x - $(MAKE) -C src admin/admin_client.h - # List all syntax-check exemptions: exclude_file_name_regexp--sc_avoid_strcase =3D ^tools/vsh\.h$$ =20 diff --git a/src/Makefile.am b/src/Makefile.am index ebc24610e2..e0b917fcdd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -717,6 +717,9 @@ 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" --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917991; cv=none; d=zoho.com; s=zohoarc; b=bbkitc9ZcNx4sJr789gQz5UhhDyPmY1mLUjP9Cj/8LCdPv2be5tnY57T7xXgjtwQI0ixnNtoT0ML9DTiHEOEsrMizTBaxiVjKgqJ7oF9x28++VFwEvZLs8CoFda/kHDXWqhiXkBfOW3h1/dGxUlGLrW+TKMB3NY9DYYfq8hf+SA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917991; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BWCVd50vihdH53Tl2xnqe+5CnvAE+ihFaTttaTy9VOg=; b=A+mXn2nIljWfvmmy83knBCPkOddi4oaPWU4GCbbaDXwBJ+XTNrSwDZWDsk+vgVvfMQR7ScajmYNhBU/fO4K+De562xuJeio0xjVdzqmTIVll1agg9fjjbBs47g6SEtB7wEh5Ev8uAPE4OK3h0C/jE5PI22aLwkkYIjumyWYUbOM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917991430386.0626792677024; Thu, 24 Oct 2019 04:53: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-192-zxhICQq6MHizFg3cazS-AA-1; Thu, 24 Oct 2019 07:51:38 -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 8A9A1800D5F; Thu, 24 Oct 2019 11:51: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 648361001B39; Thu, 24 Oct 2019 11:51: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 2114B4EE70; Thu, 24 Oct 2019 11:51:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpEUC032385 for ; Thu, 24 Oct 2019 07:51:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15E25600CC; Thu, 24 Oct 2019 11:51:14 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C51F60126 for ; Thu, 24 Oct 2019 11:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BWCVd50vihdH53Tl2xnqe+5CnvAE+ihFaTttaTy9VOg=; b=Ku8ra0DuHpIFWDWqaeRF3IY/p5N+zq2yzdfAs0XFLyKu3olYn2Quh3mVj14USReDOJYIZ8 ZRb6BJWWwqiMeSdyG0LK1EQCFq3aTO7XvLTD/CRUhcpvyeYIi/cHmqkt0upSDmeFYx/mjh osfi7+b9o6r2gVr9sucBKn5xaFa3vxU= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:47 +0200 Message-Id: <470a9428c5c53b39e0cbe1278dbb000b436fe662.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 05/20] syntax-check.mk: cleanup generated_files list for sc_po_check X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: zxhICQq6MHizFg3cazS-AA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move generated_files variable closer to the sc_po_check rule and remove non-existent gnulib internal path. Signed-off-by: Pavel Hrdina --- Notes: New in v2. build-aux/syntax-check.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 6acda4eea3..985739b373 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -134,15 +134,6 @@ syntax-check: $(local-check) # We use .gnulib, not gnulib. gnulib_dir =3D $(srcdir)/.gnulib =20 -# List of additional files that we want to pick up in our POTFILES.in -# This is all gnulib files, as well as generated files for RPC code. -generated_files =3D \ - $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_disp= atch_*stubs.h \ - $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ - $(srcdir)/src/remote/*_client_bodies.h \ - $(srcdir)/src/*/*_protocol.[ch] \ - $(srcdir)/gnulib/lib/*.[ch] - # We haven't converted all scripts to using gnulib's init.sh yet. _test_script_regex =3D \<\(init\|test-lib\)\.sh\> =20 @@ -1978,7 +1969,16 @@ perl_translatable_files_list_ =3D \ # 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 -generated_files ?=3D $(srcdir)/lib/*.[ch] + +# List of additional files that we want to pick up in our POTFILES.in +# This is all gnulib files, as well as generated files for RPC code. +generated_files =3D \ + $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_disp= atch_*stubs.h \ + $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ + $(srcdir)/src/remote/*_client_bodies.h \ + $(srcdir)/src/*/*_protocol.[ch] \ + $(srcdir)/gnulib/lib/*.[ch] + _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) =20 # sc_po_check can fail if generated files are not built first --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917910; cv=none; d=zoho.com; s=zohoarc; b=SrILkLuquLecd9Olc7imhVf+hy+O+B6B6t51QTEoGekGcEDLi+UAGJ3m/xbBq83/WpZ3R+H8tR2nCDW/spVnQoH7pNDlZw1QzdiE/7xprPpGvdtplBb0v4u3vgJrhl4rSqomzEnzwEHzqfqu4c8gzx6zNj0lOI2jSS+bIc3b0ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917910; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+JbMzeDJ8p9mZpb7N58ibPKKDEWRrvuQ1ZS7dYDMe0U=; b=PUYML5LdoAWonWAy7ZNyK5vjNN6ByydZtf0Z3Z8tIlhRtEdx/83wY1UodNtAv/BoiOTaJavl8vJdX7fv7cWSAHGIkV6BnyTPDJgA3PXxmsZsGGQFjyfAj5pIisuwnBKHPTpDY+Ud9wgiVgVdSigFZM/i3vi0/BsVxiTufSdly7g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 157191791090170.72930644092276; Thu, 24 Oct 2019 04:51: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-66-q7l5dgzZMpuIWEdd1FupCw-1; Thu, 24 Oct 2019 07:51:43 -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 11A5C801E70; Thu, 24 Oct 2019 11:51: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 E21F75C240; Thu, 24 Oct 2019 11:51: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 8CD3F4EE73; Thu, 24 Oct 2019 11:51:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpFca032393 for ; Thu, 24 Oct 2019 07:51:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3276160126; Thu, 24 Oct 2019 11:51:15 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B230600CC for ; Thu, 24 Oct 2019 11:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917909; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+JbMzeDJ8p9mZpb7N58ibPKKDEWRrvuQ1ZS7dYDMe0U=; b=OtIIdoY1M44H+Rb/hRfQFAI32GRkc3GHMoOBoUB4vIkN4YBVwQD40UBR2J3YooUY4RNTwe xtnG8YVibNLRIfzgin7MopRjTPXEHwNEFvIMJAlhKNkpSUPHZ8GIsdV2V20u5r930phRoW acz5xMJ01+DqOfdAfeRF0tUtuIjilmA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:48 +0200 Message-Id: <7ae766e2701d0afb320093522b54d917af3febcb.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 06/20] po: generate files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: q7l5dgzZMpuIWEdd1FupCw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Historically we did not support VPATH builds and everything was generated into source directory. The introduction of VPATH builds did not changed the way how our translation files are handled. This patch changes the rules to generate everything into build directory and stops distributing generated files in order to have properly separated VPATH builds. Signed-off-by: Pavel Hrdina --- Notes: Changes in v2: - keep the zanata binary name, this will be fixed by separate patch .gitignore | 4 ---- po/Makefile.am | 35 +++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index bd64eb5b1a..4c4807019c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,12 +39,8 @@ Makefile.in .git-module-status =20 # libvirt related ignores -!/po/*.mini.po /build/ /ci/scratch/ -/po/*gmo -/po/*po -/po/*pot /src/access/org.libvirt.api.policy /src/access/viraccessapicheck.c /src/access/viraccessapicheck.h diff --git a/po/Makefile.am b/po/Makefile.am index b0e2c15d44..f3510e6d59 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -16,17 +16,16 @@ LANGS :=3D \ =20 =20 POTFILE_DEPS :=3D $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) -POTFILE :=3D $(srcdir)/$(DOMAIN).pot -POFILES :=3D $(LANGS:%=3D$(srcdir)/%.po) -GMOFILES :=3D $(LANGS:%=3D$(srcdir)/%.gmo) +POTFILE :=3D $(DOMAIN).pot +POMINIFILES :=3D $(LANGS:%=3D%.mini.po) +POFILES :=3D $(LANGS:%=3D%.po) +GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -MAINTAINERCLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) =20 EXTRA_DIST =3D \ POTFILES \ - $(POTFILE) \ - $(POFILES) \ - $(GMOFILES) + $(POMINIFILES) =20 if HAVE_GNU_GETTEXT_TOOLS =20 @@ -63,10 +62,18 @@ update-mini-po: $(POTFILE) done =20 push-pot: $(POTFILE) - zanata push --push-type=3Dsource + zanata push \ + --project-config $(srcdir)/zanata.xml \ + --push-type=3Dsource \ + --trans-dir $(builddir) \ + --src-dir $(srcdir) =20 pull-po: $(POTFILE) - zanata pull --create-skeletons + zanata pull \ + --project-config $(srcdir)/zanata.xml \ + --create-skeletons \ + --trans-dir $(builddir) \ + --src-dir $(srcdir) $(MAKE) update-mini-po $(MAKE) update-gmo =20 @@ -76,19 +83,17 @@ $(POTFILE): POTFILES $(POTFILE_DEPS) $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 -$(srcdir)/%.po: $(srcdir)/%.mini.po $(POTFILE) +%.po: %.mini.po $(POTFILE) $(MSGMERGE) --no-fuzzy-matching $< $(POTFILE) | \ $(SED) $(SED_PO_FIXUP_ARGS) > $@ =20 -$(srcdir)/%.gmo: $(srcdir)/%.po +%.gmo: %.po rm -f $@ $@-t $(MSGFMT) -c -o $@-t $< mv $@-t $@ =20 .PRECIOUS: $(POTFILE) $(POFILES) =20 -endif HAVE_GNU_GETTEXT_TOOLS - if ENABLE_NLS =20 # Cannot use 'localedir' since this conflicts with autoconf. @@ -99,7 +104,7 @@ install-data-hook: $(GMOFILES) for lang in $(LANGS); do \ d=3D$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \ mkdir -p $$d; \ - install -m 0644 $(srcdir)/$$lang.gmo $$d/$(DOMAIN).mo; \ + install -m 0644 $$lang.gmo $$d/$(DOMAIN).mo; \ done =20 uninstall-hook: @@ -109,3 +114,5 @@ uninstall-hook: done =20 endif ENABLE_NLS + +endif HAVE_GNU_GETTEXT_TOOLS --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917895; cv=none; d=zoho.com; s=zohoarc; b=OfT0KTXKG63Kke+43ox29qTJuqzCbOA3v/fSt6NgOhe5MmDdfy/alh7yRUeTje/KxXP46FkxukJnHKuK/Q+kfjhue7rhipVDhXS1//pSE+hy6Umx8SMSrF2LSzVB3loT6V9rBKPwfodNWx74CfaBynV9b8o8d9FSmsDhi0Ch41s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917895; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qsE1tQLbJGa20xVz3karBYzYn0HQoF3dMz8Mw0PTnus=; b=IViD5gdvXyzT9yIuuWzNPlnowEe7mBA5JdRGS0bc9JmXXWRXTuwNqrQBMtNnHxaRRod0jTjJ7zDk9g1kPEPAzv1p33Kd3ATY6AserpUXC3/GI8+kaWEA5BwQkHrCFOGUGxFCfuchdlZ2TmlKkRaTU2oV323F29ovsIHnfhmhrGQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917895667251.95401120381325; Thu, 24 Oct 2019 04:51: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-38-ivsmOxsZP9GCgZGLb7EvJw-1; Thu, 24 Oct 2019 07:51:32 -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 5B1AB1005516; Thu, 24 Oct 2019 11:51: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 31C7067600; Thu, 24 Oct 2019 11:51: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 D12CB180B536; Thu, 24 Oct 2019 11:51:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpGck032401 for ; Thu, 24 Oct 2019 07:51:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1C7E60126; Thu, 24 Oct 2019 11:51:16 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE39F600CC for ; Thu, 24 Oct 2019 11:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917894; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qsE1tQLbJGa20xVz3karBYzYn0HQoF3dMz8Mw0PTnus=; b=Am0s5daidAXxOMh52e74J8V4134Fwi+QdJqymHqLDbr3CRsqifkH9yyAJaws82V4EFh5BK qB4L+t9ceM2gP5GvYD73H1+y5rCDNMiadpxZ6xZnwi/tlAKvteM/zBb9Ycx13vJkzGDwyJ jsdlQylb4fbr2LgEChIXt7MKHprYAVk= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:49 +0200 Message-Id: <91088d50fd6e81bc7f3c402391b21544934c2517.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 07/20] po: rewrite the way how we generate files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: ivsmOxsZP9GCgZGLb7EvJw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There was no need to handle files for translation from build directory but that will change with following patches where we will stop generating source files into source directory. In order to have them included for translation we have to prefix each file with SRCDIR or BUILDDIR. Signed-off-by: Pavel Hrdina --- Notes: Changes in v2: - add builddir paths for sc_po_check to detect generated source files and generate correct diff if the check fails build-aux/syntax-check.mk | 8 +- po/Makefile.am | 14 +- po/POTFILES | 353 -------------------------------------- po/POTFILES.in | 353 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 368 insertions(+), 360 deletions(-) delete mode 100644 po/POTFILES create mode 100644 po/POTFILES.in diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 985739b373..75993ee284 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -56,6 +56,7 @@ VC_LIST_ALWAYS_EXCLUDE_REGEX ?=3D ^$$ # when $(srcdir) is a pathological name like "....", the leading sed comma= nd # removes only the intended prefix. _dot_escaped_srcdir =3D $(subst .,\.,$(srcdir)) +_dot_escaped_builddir =3D $(subst .,\.,$(builddir)) =20 # Post-process $(VC_LIST) output, prepending $(srcdir)/, but only # when $(srcdir) is not ".". @@ -1968,11 +1969,13 @@ 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 +po_file ?=3D $(srcdir)/po/POTFILES.in =20 # List of additional files that we want to pick up in our POTFILES.in # This is all gnulib files, as well as generated files for RPC code. generated_files =3D \ + $(builddir)/src/*.[ch] \ + $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_disp= atch_*stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ @@ -1989,7 +1992,8 @@ sc_po_check: gen_source_files { $(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)/||' \ + | $(SED) 's|^$(_dot_escaped_srcdir)|@SRCDIR@|' \ + | $(SED) 's|^$(_dot_escaped_builddir)|@BUILDDIR@|' \ | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \ diff --git a/po/Makefile.am b/po/Makefile.am index f3510e6d59..01f27a6e23 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -15,16 +15,21 @@ LANGS :=3D \ uk ur vi wba yo zh_CN zh_HK zh_TW zu =20 =20 -POTFILE_DEPS :=3D $(shell $(SED) 's,^,$(top_srcdir)/,' $(srcdir)/POTFILES) +POTFILES_IN =3D $(srcdir)/POTFILES.in +POTFILES: $(POTFILES_IN) + $(AM_V_GEN) cat $(POTFILES_IN) | \ + $(SED) 's|[@]SRCDIR[@]|$(top_srcdir)|' | \ + $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@ +POTFILE_DEPS =3D $(shell cat POTFILES) POTFILE :=3D $(DOMAIN).pot POMINIFILES :=3D $(LANGS:%=3D%.mini.po) POFILES :=3D $(LANGS:%=3D%.po) GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) +CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) POTFILES =20 EXTRA_DIST =3D \ - POTFILES \ + $(POTFILES_IN) \ $(POMINIFILES) =20 if HAVE_GNU_GETTEXT_TOOLS @@ -38,7 +43,6 @@ XGETTEXT_ARGS =3D \ --package-name=3D"$(PACKAGE_NAME)" \ --package-version=3D"$(PACKAGE_VERSION)" \ --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ - --directory=3D$(top_srcdir) \ $(NULL) =20 SED_PO_FIXUP_ARGS =3D \ @@ -79,7 +83,7 @@ pull-po: $(POTFILE) =20 $(POTFILE): POTFILES $(POTFILE_DEPS) $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ - --files-from=3D$(abs_srcdir)/POTFILES + --files-from=3D$(abs_builddir)/POTFILES $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 diff --git a/po/POTFILES b/po/POTFILES deleted file mode 100644 index 51317d38b0..0000000000 --- a/po/POTFILES +++ /dev/null @@ -1,353 +0,0 @@ -gnulib/lib/gai_strerror.c -gnulib/lib/regcomp.c -src/access/viraccessdriverpolkit.c -src/access/viraccessmanager.c -src/admin/admin_server.c -src/admin/admin_server_dispatch.c -src/admin/admin_server_dispatch_stubs.h -src/admin/libvirt-admin.c -src/bhyve/bhyve_capabilities.c -src/bhyve/bhyve_command.c -src/bhyve/bhyve_device.c -src/bhyve/bhyve_domain.c -src/bhyve/bhyve_driver.c -src/bhyve/bhyve_monitor.c -src/bhyve/bhyve_parse_command.c -src/bhyve/bhyve_process.c -src/conf/capabilities.c -src/conf/checkpoint_conf.c -src/conf/cpu_conf.c -src/conf/device_conf.c -src/conf/domain_addr.c -src/conf/domain_capabilities.c -src/conf/domain_conf.c -src/conf/domain_event.c -src/conf/interface_conf.c -src/conf/netdev_bandwidth_conf.c -src/conf/netdev_vlan_conf.c -src/conf/netdev_vport_profile_conf.c -src/conf/network_conf.c -src/conf/networkcommon_conf.c -src/conf/node_device_conf.c -src/conf/node_device_util.c -src/conf/numa_conf.c -src/conf/nwfilter_conf.c -src/conf/nwfilter_params.c -src/conf/object_event.c -src/conf/secret_conf.c -src/conf/snapshot_conf.c -src/conf/storage_adapter_conf.c -src/conf/storage_conf.c -src/conf/virchrdev.c -src/conf/virdomainmomentobjlist.c -src/conf/virdomainobjlist.c -src/conf/virnetworkobj.c -src/conf/virnetworkportdef.c -src/conf/virnodedeviceobj.c -src/conf/virnwfilterbindingdef.c -src/conf/virnwfilterbindingobj.c -src/conf/virnwfilterbindingobjlist.c -src/conf/virnwfilterobj.c -src/conf/virsavecookie.c -src/conf/virsecretobj.c -src/conf/virstorageobj.c -src/cpu/cpu.c -src/cpu/cpu_arm.c -src/cpu/cpu_map.c -src/cpu/cpu_ppc64.c -src/cpu/cpu_s390.c -src/cpu/cpu_x86.c -src/datatypes.c -src/driver.c -src/esx/esx_driver.c -src/esx/esx_network_driver.c -src/esx/esx_storage_backend_iscsi.c -src/esx/esx_storage_backend_vmfs.c -src/esx/esx_storage_driver.c -src/esx/esx_stream.c -src/esx/esx_util.c -src/esx/esx_util.h -src/esx/esx_vi.c -src/esx/esx_vi_methods.c -src/esx/esx_vi_types.c -src/hyperv/hyperv_driver.c -src/hyperv/hyperv_util.c -src/hyperv/hyperv_wmi.c -src/interface/interface_backend_netcf.c -src/interface/interface_backend_udev.c -src/internal.h -src/libvirt-domain-checkpoint.c -src/libvirt-domain-snapshot.c -src/libvirt-domain.c -src/libvirt-host.c -src/libvirt-lxc.c -src/libvirt-network.c -src/libvirt-nodedev.c -src/libvirt-nwfilter.c -src/libvirt-qemu.c -src/libvirt-secret.c -src/libvirt-storage.c -src/libvirt-stream.c -src/libvirt.c -src/libxl/libxl_capabilities.c -src/libxl/libxl_conf.c -src/libxl/libxl_domain.c -src/libxl/libxl_driver.c -src/libxl/libxl_migration.c -src/libxl/xen_common.c -src/libxl/xen_xl.c -src/libxl/xen_xm.c -src/locking/lock_daemon.c -src/locking/lock_daemon_dispatch.c -src/locking/lock_driver_lockd.c -src/locking/lock_driver_sanlock.c -src/locking/lock_manager.c -src/locking/sanlock_helper.c -src/logging/log_daemon.c -src/logging/log_daemon_dispatch.c -src/logging/log_handler.c -src/logging/log_manager.c -src/lxc/lxc_cgroup.c -src/lxc/lxc_conf.c -src/lxc/lxc_container.c -src/lxc/lxc_controller.c -src/lxc/lxc_domain.c -src/lxc/lxc_driver.c -src/lxc/lxc_fuse.c -src/lxc/lxc_hostdev.c -src/lxc/lxc_native.c -src/lxc/lxc_process.c -src/network/bridge_driver.c -src/network/bridge_driver_linux.c -src/network/leaseshelper.c -src/node_device/node_device_driver.c -src/node_device/node_device_hal.c -src/node_device/node_device_udev.c -src/nwfilter/nwfilter_dhcpsnoop.c -src/nwfilter/nwfilter_driver.c -src/nwfilter/nwfilter_ebiptables_driver.c -src/nwfilter/nwfilter_gentech_driver.c -src/nwfilter/nwfilter_learnipaddr.c -src/openvz/openvz_conf.c -src/openvz/openvz_driver.c -src/openvz/openvz_util.c -src/phyp/phyp_driver.c -src/qemu/qemu_agent.c -src/qemu/qemu_alias.c -src/qemu/qemu_block.c -src/qemu/qemu_blockjob.c -src/qemu/qemu_capabilities.c -src/qemu/qemu_cgroup.c -src/qemu/qemu_checkpoint.c -src/qemu/qemu_command.c -src/qemu/qemu_conf.c -src/qemu/qemu_dbus.c -src/qemu/qemu_domain.c -src/qemu/qemu_domain_address.c -src/qemu/qemu_driver.c -src/qemu/qemu_extdevice.c -src/qemu/qemu_firmware.c -src/qemu/qemu_hostdev.c -src/qemu/qemu_hotplug.c -src/qemu/qemu_interface.c -src/qemu/qemu_interop_config.c -src/qemu/qemu_migration.c -src/qemu/qemu_migration_cookie.c -src/qemu/qemu_migration_params.c -src/qemu/qemu_monitor.c -src/qemu/qemu_monitor_json.c -src/qemu/qemu_monitor_text.c -src/qemu/qemu_process.c -src/qemu/qemu_qapi.c -src/qemu/qemu_slirp.c -src/qemu/qemu_tpm.c -src/qemu/qemu_vhost_user.c -src/qemu/qemu_vhost_user_gpu.c -src/remote/remote_client_bodies.h -src/remote/remote_daemon.c -src/remote/remote_daemon_config.c -src/remote/remote_daemon_dispatch.c -src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_stream.c -src/remote/remote_driver.c -src/rpc/virkeepalive.c -src/rpc/virnetclient.c -src/rpc/virnetclientprogram.c -src/rpc/virnetclientstream.c -src/rpc/virnetdaemon.c -src/rpc/virnetlibsshsession.c -src/rpc/virnetmessage.c -src/rpc/virnetsaslcontext.c -src/rpc/virnetserver.c -src/rpc/virnetserverclient.c -src/rpc/virnetserverprogram.c -src/rpc/virnetserverservice.c -src/rpc/virnetsocket.c -src/rpc/virnetsshsession.c -src/rpc/virnettlscontext.c -src/secret/secret_driver.c -src/secret/secret_util.c -src/security/security_apparmor.c -src/security/security_dac.c -src/security/security_driver.c -src/security/security_manager.c -src/security/security_selinux.c -src/security/security_util.c -src/security/virt-aa-helper.c -src/storage/parthelper.c -src/storage/storage_backend.c -src/storage/storage_backend_disk.c -src/storage/storage_backend_fs.c -src/storage/storage_backend_gluster.c -src/storage/storage_backend_iscsi.c -src/storage/storage_backend_iscsi_direct.c -src/storage/storage_backend_logical.c -src/storage/storage_backend_mpath.c -src/storage/storage_backend_rbd.c -src/storage/storage_backend_scsi.c -src/storage/storage_backend_sheepdog.c -src/storage/storage_backend_vstorage.c -src/storage/storage_backend_zfs.c -src/storage/storage_driver.c -src/storage/storage_file_fs.c -src/storage/storage_file_gluster.c -src/storage/storage_util.c -src/test/test_driver.c -src/util/iohelper.c -src/util/viralloc.c -src/util/virarptable.c -src/util/viraudit.c -src/util/virauth.c -src/util/virauthconfig.c -src/util/virbitmap.c -src/util/virbuffer.c -src/util/vircgroup.c -src/util/vircgroupbackend.c -src/util/vircgroupbackend.h -src/util/vircgroupv1.c -src/util/vircgroupv2.c -src/util/virclosecallbacks.c -src/util/vircommand.c -src/util/virconf.c -src/util/vircrypto.c -src/util/virdbus.c -src/util/virdnsmasq.c -src/util/virerror.c -src/util/virerror.h -src/util/vireventpoll.c -src/util/virfcp.c -src/util/virfdstream.c -src/util/virfile.c -src/util/virfilecache.c -src/util/virfirewall.c -src/util/virfirewalld.c -src/util/virfirmware.c -src/util/virhash.c -src/util/virhook.c -src/util/virhostcpu.c -src/util/virhostdev.c -src/util/virhostmem.c -src/util/viridentity.c -src/util/virinitctl.c -src/util/viriptables.c -src/util/viriscsi.c -src/util/virjson.c -src/util/virkeyfile.c -src/util/virlease.c -src/util/virlockspace.c -src/util/virlog.c -src/util/virmacmap.c -src/util/virmdev.c -src/util/virmodule.c -src/util/virnetdev.c -src/util/virnetdevbandwidth.c -src/util/virnetdevbridge.c -src/util/virnetdevip.c -src/util/virnetdevmacvlan.c -src/util/virnetdevmidonet.c -src/util/virnetdevopenvswitch.c -src/util/virnetdevtap.c -src/util/virnetdevveth.c -src/util/virnetdevvportprofile.c -src/util/virnetlink.c -src/util/virnodesuspend.c -src/util/virnuma.c -src/util/virobject.c -src/util/virpci.c -src/util/virperf.c -src/util/virpidfile.c -src/util/virpolkit.c -src/util/virportallocator.c -src/util/virprocess.c -src/util/virqemu.c -src/util/virrandom.c -src/util/virresctrl.c -src/util/virrotatingfile.c -src/util/virscsi.c -src/util/virscsihost.c -src/util/virscsivhost.c -src/util/virsecret.c -src/util/virsocketaddr.c -src/util/virstorageencryption.c -src/util/virstoragefile.c -src/util/virstoragefilebackend.c -src/util/virstring.c -src/util/virsysinfo.c -src/util/virsystemd.c -src/util/virthreadjob.c -src/util/virthreadpool.c -src/util/virtime.c -src/util/virtpm.c -src/util/virtypedparam-public.c -src/util/virtypedparam.c -src/util/viruri.c -src/util/virusb.c -src/util/virutil.c -src/util/virvhba.c -src/util/virvsock.c -src/util/virxml.c -src/vbox/vbox_MSCOMGlue.c -src/vbox/vbox_XPCOMCGlue.c -src/vbox/vbox_common.c -src/vbox/vbox_driver.c -src/vbox/vbox_network.c -src/vbox/vbox_snapshot_conf.c -src/vbox/vbox_storage.c -src/vbox/vbox_tmpl.c -src/vmware/vmware_conf.c -src/vmware/vmware_driver.c -src/vmx/vmx.c -src/vz/vz_driver.c -src/vz/vz_sdk.c -src/vz/vz_utils.c -src/vz/vz_utils.h -tests/virpolkittest.c -tools/libvirt-guests.sh.in -tools/virsh-checkpoint.c -tools/virsh-completer-host.c -tools/virsh-console.c -tools/virsh-domain-monitor.c -tools/virsh-domain.c -tools/virsh-edit.c -tools/virsh-host.c -tools/virsh-interface.c -tools/virsh-network.c -tools/virsh-nodedev.c -tools/virsh-nwfilter.c -tools/virsh-pool.c -tools/virsh-secret.c -tools/virsh-snapshot.c -tools/virsh-util.c -tools/virsh-volume.c -tools/virsh.c -tools/virsh.h -tools/virt-admin.c -tools/virt-host-validate-bhyve.c -tools/virt-host-validate-common.c -tools/virt-host-validate-lxc.c -tools/virt-host-validate-qemu.c -tools/virt-host-validate.c -tools/virt-login-shell-helper.c -tools/vsh-table.c -tools/vsh.c -tools/vsh.h diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000000..f11d483290 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,353 @@ +@SRCDIR@/gnulib/lib/gai_strerror.c +@SRCDIR@/gnulib/lib/regcomp.c +@SRCDIR@/src/access/viraccessdriverpolkit.c +@SRCDIR@/src/access/viraccessmanager.c +@SRCDIR@/src/admin/admin_server.c +@SRCDIR@/src/admin/admin_server_dispatch.c +@SRCDIR@/src/admin/admin_server_dispatch_stubs.h +@SRCDIR@/src/admin/libvirt-admin.c +@SRCDIR@/src/bhyve/bhyve_capabilities.c +@SRCDIR@/src/bhyve/bhyve_command.c +@SRCDIR@/src/bhyve/bhyve_device.c +@SRCDIR@/src/bhyve/bhyve_domain.c +@SRCDIR@/src/bhyve/bhyve_driver.c +@SRCDIR@/src/bhyve/bhyve_monitor.c +@SRCDIR@/src/bhyve/bhyve_parse_command.c +@SRCDIR@/src/bhyve/bhyve_process.c +@SRCDIR@/src/conf/capabilities.c +@SRCDIR@/src/conf/checkpoint_conf.c +@SRCDIR@/src/conf/cpu_conf.c +@SRCDIR@/src/conf/device_conf.c +@SRCDIR@/src/conf/domain_addr.c +@SRCDIR@/src/conf/domain_capabilities.c +@SRCDIR@/src/conf/domain_conf.c +@SRCDIR@/src/conf/domain_event.c +@SRCDIR@/src/conf/interface_conf.c +@SRCDIR@/src/conf/netdev_bandwidth_conf.c +@SRCDIR@/src/conf/netdev_vlan_conf.c +@SRCDIR@/src/conf/netdev_vport_profile_conf.c +@SRCDIR@/src/conf/network_conf.c +@SRCDIR@/src/conf/networkcommon_conf.c +@SRCDIR@/src/conf/node_device_conf.c +@SRCDIR@/src/conf/node_device_util.c +@SRCDIR@/src/conf/numa_conf.c +@SRCDIR@/src/conf/nwfilter_conf.c +@SRCDIR@/src/conf/nwfilter_params.c +@SRCDIR@/src/conf/object_event.c +@SRCDIR@/src/conf/secret_conf.c +@SRCDIR@/src/conf/snapshot_conf.c +@SRCDIR@/src/conf/storage_adapter_conf.c +@SRCDIR@/src/conf/storage_conf.c +@SRCDIR@/src/conf/virchrdev.c +@SRCDIR@/src/conf/virdomainmomentobjlist.c +@SRCDIR@/src/conf/virdomainobjlist.c +@SRCDIR@/src/conf/virnetworkobj.c +@SRCDIR@/src/conf/virnetworkportdef.c +@SRCDIR@/src/conf/virnodedeviceobj.c +@SRCDIR@/src/conf/virnwfilterbindingdef.c +@SRCDIR@/src/conf/virnwfilterbindingobj.c +@SRCDIR@/src/conf/virnwfilterbindingobjlist.c +@SRCDIR@/src/conf/virnwfilterobj.c +@SRCDIR@/src/conf/virsavecookie.c +@SRCDIR@/src/conf/virsecretobj.c +@SRCDIR@/src/conf/virstorageobj.c +@SRCDIR@/src/cpu/cpu.c +@SRCDIR@/src/cpu/cpu_arm.c +@SRCDIR@/src/cpu/cpu_map.c +@SRCDIR@/src/cpu/cpu_ppc64.c +@SRCDIR@/src/cpu/cpu_s390.c +@SRCDIR@/src/cpu/cpu_x86.c +@SRCDIR@/src/datatypes.c +@SRCDIR@/src/driver.c +@SRCDIR@/src/esx/esx_driver.c +@SRCDIR@/src/esx/esx_network_driver.c +@SRCDIR@/src/esx/esx_storage_backend_iscsi.c +@SRCDIR@/src/esx/esx_storage_backend_vmfs.c +@SRCDIR@/src/esx/esx_storage_driver.c +@SRCDIR@/src/esx/esx_stream.c +@SRCDIR@/src/esx/esx_util.c +@SRCDIR@/src/esx/esx_util.h +@SRCDIR@/src/esx/esx_vi.c +@SRCDIR@/src/esx/esx_vi_methods.c +@SRCDIR@/src/esx/esx_vi_types.c +@SRCDIR@/src/hyperv/hyperv_driver.c +@SRCDIR@/src/hyperv/hyperv_util.c +@SRCDIR@/src/hyperv/hyperv_wmi.c +@SRCDIR@/src/interface/interface_backend_netcf.c +@SRCDIR@/src/interface/interface_backend_udev.c +@SRCDIR@/src/internal.h +@SRCDIR@/src/libvirt-domain-checkpoint.c +@SRCDIR@/src/libvirt-domain-snapshot.c +@SRCDIR@/src/libvirt-domain.c +@SRCDIR@/src/libvirt-host.c +@SRCDIR@/src/libvirt-lxc.c +@SRCDIR@/src/libvirt-network.c +@SRCDIR@/src/libvirt-nodedev.c +@SRCDIR@/src/libvirt-nwfilter.c +@SRCDIR@/src/libvirt-qemu.c +@SRCDIR@/src/libvirt-secret.c +@SRCDIR@/src/libvirt-storage.c +@SRCDIR@/src/libvirt-stream.c +@SRCDIR@/src/libvirt.c +@SRCDIR@/src/libxl/libxl_capabilities.c +@SRCDIR@/src/libxl/libxl_conf.c +@SRCDIR@/src/libxl/libxl_domain.c +@SRCDIR@/src/libxl/libxl_driver.c +@SRCDIR@/src/libxl/libxl_migration.c +@SRCDIR@/src/libxl/xen_common.c +@SRCDIR@/src/libxl/xen_xl.c +@SRCDIR@/src/libxl/xen_xm.c +@SRCDIR@/src/locking/lock_daemon.c +@SRCDIR@/src/locking/lock_daemon_dispatch.c +@SRCDIR@/src/locking/lock_driver_lockd.c +@SRCDIR@/src/locking/lock_driver_sanlock.c +@SRCDIR@/src/locking/lock_manager.c +@SRCDIR@/src/locking/sanlock_helper.c +@SRCDIR@/src/logging/log_daemon.c +@SRCDIR@/src/logging/log_daemon_dispatch.c +@SRCDIR@/src/logging/log_handler.c +@SRCDIR@/src/logging/log_manager.c +@SRCDIR@/src/lxc/lxc_cgroup.c +@SRCDIR@/src/lxc/lxc_conf.c +@SRCDIR@/src/lxc/lxc_container.c +@SRCDIR@/src/lxc/lxc_controller.c +@SRCDIR@/src/lxc/lxc_domain.c +@SRCDIR@/src/lxc/lxc_driver.c +@SRCDIR@/src/lxc/lxc_fuse.c +@SRCDIR@/src/lxc/lxc_hostdev.c +@SRCDIR@/src/lxc/lxc_native.c +@SRCDIR@/src/lxc/lxc_process.c +@SRCDIR@/src/network/bridge_driver.c +@SRCDIR@/src/network/bridge_driver_linux.c +@SRCDIR@/src/network/leaseshelper.c +@SRCDIR@/src/node_device/node_device_driver.c +@SRCDIR@/src/node_device/node_device_hal.c +@SRCDIR@/src/node_device/node_device_udev.c +@SRCDIR@/src/nwfilter/nwfilter_dhcpsnoop.c +@SRCDIR@/src/nwfilter/nwfilter_driver.c +@SRCDIR@/src/nwfilter/nwfilter_ebiptables_driver.c +@SRCDIR@/src/nwfilter/nwfilter_gentech_driver.c +@SRCDIR@/src/nwfilter/nwfilter_learnipaddr.c +@SRCDIR@/src/openvz/openvz_conf.c +@SRCDIR@/src/openvz/openvz_driver.c +@SRCDIR@/src/openvz/openvz_util.c +@SRCDIR@/src/phyp/phyp_driver.c +@SRCDIR@/src/qemu/qemu_agent.c +@SRCDIR@/src/qemu/qemu_alias.c +@SRCDIR@/src/qemu/qemu_block.c +@SRCDIR@/src/qemu/qemu_blockjob.c +@SRCDIR@/src/qemu/qemu_capabilities.c +@SRCDIR@/src/qemu/qemu_cgroup.c +@SRCDIR@/src/qemu/qemu_checkpoint.c +@SRCDIR@/src/qemu/qemu_command.c +@SRCDIR@/src/qemu/qemu_conf.c +@SRCDIR@/src/qemu/qemu_dbus.c +@SRCDIR@/src/qemu/qemu_domain.c +@SRCDIR@/src/qemu/qemu_domain_address.c +@SRCDIR@/src/qemu/qemu_driver.c +@SRCDIR@/src/qemu/qemu_extdevice.c +@SRCDIR@/src/qemu/qemu_firmware.c +@SRCDIR@/src/qemu/qemu_hostdev.c +@SRCDIR@/src/qemu/qemu_hotplug.c +@SRCDIR@/src/qemu/qemu_interface.c +@SRCDIR@/src/qemu/qemu_interop_config.c +@SRCDIR@/src/qemu/qemu_migration.c +@SRCDIR@/src/qemu/qemu_migration_cookie.c +@SRCDIR@/src/qemu/qemu_migration_params.c +@SRCDIR@/src/qemu/qemu_monitor.c +@SRCDIR@/src/qemu/qemu_monitor_json.c +@SRCDIR@/src/qemu/qemu_monitor_text.c +@SRCDIR@/src/qemu/qemu_process.c +@SRCDIR@/src/qemu/qemu_qapi.c +@SRCDIR@/src/qemu/qemu_slirp.c +@SRCDIR@/src/qemu/qemu_tpm.c +@SRCDIR@/src/qemu/qemu_vhost_user.c +@SRCDIR@/src/qemu/qemu_vhost_user_gpu.c +@SRCDIR@/src/remote/remote_client_bodies.h +@SRCDIR@/src/remote/remote_daemon.c +@SRCDIR@/src/remote/remote_daemon_config.c +@SRCDIR@/src/remote/remote_daemon_dispatch.c +@SRCDIR@/src/remote/remote_daemon_dispatch_stubs.h +@SRCDIR@/src/remote/remote_daemon_stream.c +@SRCDIR@/src/remote/remote_driver.c +@SRCDIR@/src/rpc/virkeepalive.c +@SRCDIR@/src/rpc/virnetclient.c +@SRCDIR@/src/rpc/virnetclientprogram.c +@SRCDIR@/src/rpc/virnetclientstream.c +@SRCDIR@/src/rpc/virnetdaemon.c +@SRCDIR@/src/rpc/virnetlibsshsession.c +@SRCDIR@/src/rpc/virnetmessage.c +@SRCDIR@/src/rpc/virnetsaslcontext.c +@SRCDIR@/src/rpc/virnetserver.c +@SRCDIR@/src/rpc/virnetserverclient.c +@SRCDIR@/src/rpc/virnetserverprogram.c +@SRCDIR@/src/rpc/virnetserverservice.c +@SRCDIR@/src/rpc/virnetsocket.c +@SRCDIR@/src/rpc/virnetsshsession.c +@SRCDIR@/src/rpc/virnettlscontext.c +@SRCDIR@/src/secret/secret_driver.c +@SRCDIR@/src/secret/secret_util.c +@SRCDIR@/src/security/security_apparmor.c +@SRCDIR@/src/security/security_dac.c +@SRCDIR@/src/security/security_driver.c +@SRCDIR@/src/security/security_manager.c +@SRCDIR@/src/security/security_selinux.c +@SRCDIR@/src/security/security_util.c +@SRCDIR@/src/security/virt-aa-helper.c +@SRCDIR@/src/storage/parthelper.c +@SRCDIR@/src/storage/storage_backend.c +@SRCDIR@/src/storage/storage_backend_disk.c +@SRCDIR@/src/storage/storage_backend_fs.c +@SRCDIR@/src/storage/storage_backend_gluster.c +@SRCDIR@/src/storage/storage_backend_iscsi.c +@SRCDIR@/src/storage/storage_backend_iscsi_direct.c +@SRCDIR@/src/storage/storage_backend_logical.c +@SRCDIR@/src/storage/storage_backend_mpath.c +@SRCDIR@/src/storage/storage_backend_rbd.c +@SRCDIR@/src/storage/storage_backend_scsi.c +@SRCDIR@/src/storage/storage_backend_sheepdog.c +@SRCDIR@/src/storage/storage_backend_vstorage.c +@SRCDIR@/src/storage/storage_backend_zfs.c +@SRCDIR@/src/storage/storage_driver.c +@SRCDIR@/src/storage/storage_file_fs.c +@SRCDIR@/src/storage/storage_file_gluster.c +@SRCDIR@/src/storage/storage_util.c +@SRCDIR@/src/test/test_driver.c +@SRCDIR@/src/util/iohelper.c +@SRCDIR@/src/util/viralloc.c +@SRCDIR@/src/util/virarptable.c +@SRCDIR@/src/util/viraudit.c +@SRCDIR@/src/util/virauth.c +@SRCDIR@/src/util/virauthconfig.c +@SRCDIR@/src/util/virbitmap.c +@SRCDIR@/src/util/virbuffer.c +@SRCDIR@/src/util/vircgroup.c +@SRCDIR@/src/util/vircgroupbackend.c +@SRCDIR@/src/util/vircgroupbackend.h +@SRCDIR@/src/util/vircgroupv1.c +@SRCDIR@/src/util/vircgroupv2.c +@SRCDIR@/src/util/virclosecallbacks.c +@SRCDIR@/src/util/vircommand.c +@SRCDIR@/src/util/virconf.c +@SRCDIR@/src/util/vircrypto.c +@SRCDIR@/src/util/virdbus.c +@SRCDIR@/src/util/virdnsmasq.c +@SRCDIR@/src/util/virerror.c +@SRCDIR@/src/util/virerror.h +@SRCDIR@/src/util/vireventpoll.c +@SRCDIR@/src/util/virfcp.c +@SRCDIR@/src/util/virfdstream.c +@SRCDIR@/src/util/virfile.c +@SRCDIR@/src/util/virfilecache.c +@SRCDIR@/src/util/virfirewall.c +@SRCDIR@/src/util/virfirewalld.c +@SRCDIR@/src/util/virfirmware.c +@SRCDIR@/src/util/virhash.c +@SRCDIR@/src/util/virhook.c +@SRCDIR@/src/util/virhostcpu.c +@SRCDIR@/src/util/virhostdev.c +@SRCDIR@/src/util/virhostmem.c +@SRCDIR@/src/util/viridentity.c +@SRCDIR@/src/util/virinitctl.c +@SRCDIR@/src/util/viriptables.c +@SRCDIR@/src/util/viriscsi.c +@SRCDIR@/src/util/virjson.c +@SRCDIR@/src/util/virkeyfile.c +@SRCDIR@/src/util/virlease.c +@SRCDIR@/src/util/virlockspace.c +@SRCDIR@/src/util/virlog.c +@SRCDIR@/src/util/virmacmap.c +@SRCDIR@/src/util/virmdev.c +@SRCDIR@/src/util/virmodule.c +@SRCDIR@/src/util/virnetdev.c +@SRCDIR@/src/util/virnetdevbandwidth.c +@SRCDIR@/src/util/virnetdevbridge.c +@SRCDIR@/src/util/virnetdevip.c +@SRCDIR@/src/util/virnetdevmacvlan.c +@SRCDIR@/src/util/virnetdevmidonet.c +@SRCDIR@/src/util/virnetdevopenvswitch.c +@SRCDIR@/src/util/virnetdevtap.c +@SRCDIR@/src/util/virnetdevveth.c +@SRCDIR@/src/util/virnetdevvportprofile.c +@SRCDIR@/src/util/virnetlink.c +@SRCDIR@/src/util/virnodesuspend.c +@SRCDIR@/src/util/virnuma.c +@SRCDIR@/src/util/virobject.c +@SRCDIR@/src/util/virpci.c +@SRCDIR@/src/util/virperf.c +@SRCDIR@/src/util/virpidfile.c +@SRCDIR@/src/util/virpolkit.c +@SRCDIR@/src/util/virportallocator.c +@SRCDIR@/src/util/virprocess.c +@SRCDIR@/src/util/virqemu.c +@SRCDIR@/src/util/virrandom.c +@SRCDIR@/src/util/virresctrl.c +@SRCDIR@/src/util/virrotatingfile.c +@SRCDIR@/src/util/virscsi.c +@SRCDIR@/src/util/virscsihost.c +@SRCDIR@/src/util/virscsivhost.c +@SRCDIR@/src/util/virsecret.c +@SRCDIR@/src/util/virsocketaddr.c +@SRCDIR@/src/util/virstorageencryption.c +@SRCDIR@/src/util/virstoragefile.c +@SRCDIR@/src/util/virstoragefilebackend.c +@SRCDIR@/src/util/virstring.c +@SRCDIR@/src/util/virsysinfo.c +@SRCDIR@/src/util/virsystemd.c +@SRCDIR@/src/util/virthreadjob.c +@SRCDIR@/src/util/virthreadpool.c +@SRCDIR@/src/util/virtime.c +@SRCDIR@/src/util/virtpm.c +@SRCDIR@/src/util/virtypedparam-public.c +@SRCDIR@/src/util/virtypedparam.c +@SRCDIR@/src/util/viruri.c +@SRCDIR@/src/util/virusb.c +@SRCDIR@/src/util/virutil.c +@SRCDIR@/src/util/virvhba.c +@SRCDIR@/src/util/virvsock.c +@SRCDIR@/src/util/virxml.c +@SRCDIR@/src/vbox/vbox_MSCOMGlue.c +@SRCDIR@/src/vbox/vbox_XPCOMCGlue.c +@SRCDIR@/src/vbox/vbox_common.c +@SRCDIR@/src/vbox/vbox_driver.c +@SRCDIR@/src/vbox/vbox_network.c +@SRCDIR@/src/vbox/vbox_snapshot_conf.c +@SRCDIR@/src/vbox/vbox_storage.c +@SRCDIR@/src/vbox/vbox_tmpl.c +@SRCDIR@/src/vmware/vmware_conf.c +@SRCDIR@/src/vmware/vmware_driver.c +@SRCDIR@/src/vmx/vmx.c +@SRCDIR@/src/vz/vz_driver.c +@SRCDIR@/src/vz/vz_sdk.c +@SRCDIR@/src/vz/vz_utils.c +@SRCDIR@/src/vz/vz_utils.h +@SRCDIR@/tests/virpolkittest.c +@SRCDIR@/tools/libvirt-guests.sh.in +@SRCDIR@/tools/virsh-checkpoint.c +@SRCDIR@/tools/virsh-completer-host.c +@SRCDIR@/tools/virsh-console.c +@SRCDIR@/tools/virsh-domain-monitor.c +@SRCDIR@/tools/virsh-domain.c +@SRCDIR@/tools/virsh-edit.c +@SRCDIR@/tools/virsh-host.c +@SRCDIR@/tools/virsh-interface.c +@SRCDIR@/tools/virsh-network.c +@SRCDIR@/tools/virsh-nodedev.c +@SRCDIR@/tools/virsh-nwfilter.c +@SRCDIR@/tools/virsh-pool.c +@SRCDIR@/tools/virsh-secret.c +@SRCDIR@/tools/virsh-snapshot.c +@SRCDIR@/tools/virsh-util.c +@SRCDIR@/tools/virsh-volume.c +@SRCDIR@/tools/virsh.c +@SRCDIR@/tools/virsh.h +@SRCDIR@/tools/virt-admin.c +@SRCDIR@/tools/virt-host-validate-bhyve.c +@SRCDIR@/tools/virt-host-validate-common.c +@SRCDIR@/tools/virt-host-validate-lxc.c +@SRCDIR@/tools/virt-host-validate-qemu.c +@SRCDIR@/tools/virt-host-validate.c +@SRCDIR@/tools/virt-login-shell-helper.c +@SRCDIR@/tools/vsh-table.c +@SRCDIR@/tools/vsh.c +@SRCDIR@/tools/vsh.h --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917909; cv=none; d=zoho.com; s=zohoarc; b=E9f8DvXLz66Gdm2O28qZeleXyPihIpkzvZnmQcYOWwcKEjQG8SqlBC+ySJ5+uHs6wSQpXIi+w8Cfwb1m8/D0eQuCl0ITTm7Hf44HZFe4wsdathGOc+IdP4Cymuh2iJzvWxYqo4s5fZ/mVNR9v66NQlFLWvcD6LEPcFTULXGlSHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917909; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XzURCjWW5Nj58nkmyoLSoDqs/3eArjYx+EiMYssZRTM=; b=T3KCjGn6dZv63nj0DYI7udIB2GAhoZKFoouGmUXgmdH2uB+fvbE/CixD3le2xfViIGVqsual2aqN7S/Bk3zh+YedfjdNFoiX9Vk8WXxvG7gnz8IuhyzcFRbkaYwKWIJFktDXB6EemcLcRhH2fB9w3lDhPQL7OvejeNytpOLEqv0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 157191790926728.88916183344452; Thu, 24 Oct 2019 04:51: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-156-dvkrRMbDNxWRMoAwjxYsHg-1; Thu, 24 Oct 2019 07:51: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 7B830602; Thu, 24 Oct 2019 11:51: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 5205C52D1; Thu, 24 Oct 2019 11:51: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 08F9F180BAA1; Thu, 24 Oct 2019 11:51:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpInS032416 for ; Thu, 24 Oct 2019 07:51:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3257B60126; Thu, 24 Oct 2019 11:51:18 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64BC5600CC for ; Thu, 24 Oct 2019 11:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917908; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XzURCjWW5Nj58nkmyoLSoDqs/3eArjYx+EiMYssZRTM=; b=JMyI31Ry96Sroann3zJ6uIj2uD/djutmz82LCBA5umGNVCD8Cg8bhqEReDEz5hit7OZDfK WP6qXka9W7jBKltebVDltK6SPe9vVkm9Nqx+4BTUoE+6oLhUo3zzg5REtjQZEA77LW/7P+ mQvdjWcq0642xFlMqZBDPcHNN+B/dqg= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:50 +0200 Message-Id: <23788d9f36139fd3246693abe2c3d6590c5f1cec.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 08/20] po: detect zanata binary during configure time X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: dvkrRMbDNxWRMoAwjxYsHg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Currently we had hard-coded `zanata` as a name of the binary, but it can also be `zanata-cli`. Signed-off-by: Pavel Hrdina --- Notes: New in v2. m4/virt-external-programs.m4 | 2 ++ po/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index 0f995998c3..0fc6716529 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -87,4 +87,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ =20 AC_PATH_PROG([EBTABLES_PATH], [ebtables], [/sbin/ebtables], [$LIBVIRT_SB= IN_PATH]) AC_DEFINE_UNQUOTED([EBTABLES_PATH], ["$EBTABLES_PATH"], [path to ebtable= s binary]) + + AC_PATH_PROGS([ZANATA], [zanata zanata-cli], [zanata]) ]) diff --git a/po/Makefile.am b/po/Makefile.am index 01f27a6e23..63c2f1483a 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -66,14 +66,14 @@ update-mini-po: $(POTFILE) done =20 push-pot: $(POTFILE) - zanata push \ + $(ZANATA) push \ --project-config $(srcdir)/zanata.xml \ --push-type=3Dsource \ --trans-dir $(builddir) \ --src-dir $(srcdir) =20 pull-po: $(POTFILE) - zanata pull \ + $(ZANATA) pull \ --project-config $(srcdir)/zanata.xml \ --create-skeletons \ --trans-dir $(builddir) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917996; cv=none; d=zoho.com; s=zohoarc; b=bcH2XlVCIe3x/WtXGVZve4oYthw9PYs/J5Nvdj0jhsR7zSdZh4ko8KWiw+KhXsr/M/iRtuy7L2L0Hzs8MQYll98HJtm2ncxUeqGV+fAwL7B6l5F0yDTdYebZRWazdK9hbq3unQXXN4fY9z0KZA7/pmyB+840/ZNjFHNilufNdRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917996; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZDv6kJXz1Xom+jjJVTIk6hNOTuWIb9tNQysJBJq/Fsc=; b=JD/BlAI1DZv9iaVe+0jzKwKGgs+CSIXdUD9oadjp1fiRxKeFy8ucV7UrPunclwAeYGBQTgV8/woYNfT4oTXCHQ9+uA8nFmpy8ye9FYfmLf9TIJvLaEt40rbHSuOwRjNbbEOhCX62MMguBBY5uskHUI4LIw107O/Ia+fAsfFccCU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917996049692.2927427221881; Thu, 24 Oct 2019 04:53: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-310-kF2c5maNN7Gk-iHO1C2pIA-1; Thu, 24 Oct 2019 07:51:49 -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 D88AF100551A; Thu, 24 Oct 2019 11:51: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 B524810027C0; Thu, 24 Oct 2019 11:51: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 73AC9180BA9A; Thu, 24 Oct 2019 11:51:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpJ1g032426 for ; Thu, 24 Oct 2019 07:51:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id CA25360126; Thu, 24 Oct 2019 11:51:19 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16031600CC for ; Thu, 24 Oct 2019 11:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZDv6kJXz1Xom+jjJVTIk6hNOTuWIb9tNQysJBJq/Fsc=; b=Bdk9n9oWgeqpwCpTic0u5qhvQQmal59frlKAu9pOtDDtFhm3L3bDP43aLrbE91Z54SbmAC bBdkeXpwb1GzK4310g28Ts97DCMJcHj7ag/nIwzHKu3tM+nMqCF6/64e72ryxmAu5dSM2I 4I8bZCJzEVLxxBmlMgmTMSLhCPvnSeg= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:51 +0200 Message-Id: <1c039d72e8cbd9c94d9634f25d914a55d24db6ac.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 09/20] remote: unify rpc server dispatch generated files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: kF2c5maNN7Gk-iHO1C2pIA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Our naming was not consistent. Use the protocol name as prefix for all generated files. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- Notes: Changes in v2: - modify generated_files in for sc_po_check as well build-aux/syntax-check.mk | 3 ++- src/remote/Makefile.inc.am | 12 ++++++------ src/remote/remote_daemon_dispatch.c | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 75993ee284..156c72d452 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,7 +1976,8 @@ po_file ?=3D $(srcdir)/po/POTFILES.in generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_disp= atch_*stubs.h \ + $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ + $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/src/*/*_protocol.[ch] \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 00f2212909..5c5f5f4d2c 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -20,8 +20,8 @@ REMOTE_DRIVER_SOURCES =3D \ =20 REMOTE_DAEMON_GENERATED =3D \ remote/remote_daemon_dispatch_stubs.h \ - remote/remote_daemon_dispatch_lxc_stubs.h \ - remote/remote_daemon_dispatch_qemu_stubs.h \ + remote/lxc_daemon_dispatch_stubs.h \ + remote/qemu_daemon_dispatch_stubs.h \ $(NULL) =20 REMOTE_DAEMON_SOURCES =3D \ @@ -442,17 +442,17 @@ remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/= gendispatch.pl \ --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ > $(srcdir)/remote/remote_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_lxc_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +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) \ - > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h + > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +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) \ - > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h + > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h =20 libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 40d97e944a..694bfe534c 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -131,8 +131,8 @@ remoteGetStorageConn(virNetServerClientPtr client); =20 =20 #include "remote_daemon_dispatch_stubs.h" -#include "remote_daemon_dispatch_qemu_stubs.h" -#include "remote_daemon_dispatch_lxc_stubs.h" +#include "qemu_daemon_dispatch_stubs.h" +#include "lxc_daemon_dispatch_stubs.h" =20 =20 /* Prototypes */ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917898; cv=none; d=zoho.com; s=zohoarc; b=UHCcc8KgovN2l1q0eNOdvqXx7+BJZiaCRFsdTtcEBFOxf1wwWjlA+xHPFW62DcadrZqnt/li7f3MPvUI4y5peZpXYLJSBMyBQgQNnu4IDORCZRWdeShAAPWlju0QSxqXy8iJkV3YSim7EQ5p2NJXaEFQSWamVjfFAIafaF9XcS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917898; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c+OVYZ48oUgW/NUd+YIxT7wpMe9FCuz9wGyWO5ZquiU=; b=JQF/MVg5aePdpHj6F2khkDu7LdNJJEgxpZFvRDtWMmhPdwBhhavLvDlZkUwkG1sHtXz5agLNfRQWvW8m6MIyWw4ElY5hr6ywN2X+GkQpotYIbAwqwEU7l3u1FXqwFljxZCdbZF1zb0DuYmuGxJCeG56i37vLSsCwOHh1/5MoHGk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917898102800.6637248348655; Thu, 24 Oct 2019 04:51: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-102-qD98kZJ7OXGnV7C2BY1riA-1; Thu, 24 Oct 2019 07:51:35 -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 99664107AD37; Thu, 24 Oct 2019 11:51: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 6BFEE61F24; Thu, 24 Oct 2019 11:51: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 1B87F180BA9E; Thu, 24 Oct 2019 11:51:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpKeQ032437 for ; Thu, 24 Oct 2019 07:51:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id D2C5160126; Thu, 24 Oct 2019 11:51:20 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CB43600CC for ; Thu, 24 Oct 2019 11:51:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917897; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=c+OVYZ48oUgW/NUd+YIxT7wpMe9FCuz9wGyWO5ZquiU=; b=MJePNjojYhFzEBE1nVCK50mVLy/VG1n+QiE20x0/79uz21tfG1AoHoQ41a3XG9jDzG58i6 zixrbWdXuh2GQV9a53EFmI4/zDkFqedoYqUhm9H6V88oMV9oe/QEHukfcgGx9dX4OD/E1A B3ZhLkarbcQ/JnTnEguy9S5UA8VYqVc= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:52 +0200 Message-Id: <98a00278a2f0a207c55e2a44f64e8f5604a99b2f.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 10/20] src: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: qD98kZJ7OXGnV7C2BY1riA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This affects more than src/Makefile.am as the rule to generate source files for protocols is generic for all sub-directories. Affected files are: src/admin/admin_protocol.{h,c} src/locking/lock_protocol.{h,c} src/logging/log_protocol.{h,c} src/lxc/lxc_monitor_protocol.{h,c} src/remote/{lxc,qemu,remote}_protocol.{h,c} src/rpc/{virkeepalive,virnet}protocol.{h,c} Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 8 -------- build-aux/syntax-check.mk | 1 - src/Makefile.am | 4 ++-- src/admin/Makefile.inc.am | 3 +++ src/locking/Makefile.inc.am | 6 ++++++ src/logging/Makefile.inc.am | 4 ++++ src/lxc/Makefile.inc.am | 4 ++++ src/remote/Makefile.inc.am | 4 ++++ src/rpc/Makefile.inc.am | 3 +++ tests/Makefile.am | 1 + 10 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4c4807019c..6f8d59987e 100644 --- a/.gitignore +++ b/.gitignore @@ -49,21 +49,13 @@ Makefile.in /src/access/viraccessapicheckqemu.c /src/access/viraccessapicheckqemu.h /src/admin/admin_client.h -/src/admin/admin_protocol.[ch] /src/admin/admin_server_dispatch_stubs.h /src/esx/*.generated.* /src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h -/src/locking/lock_protocol.[ch] /src/logging/log_daemon_dispatch_stubs.h -/src/logging/log_protocol.[ch] /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h -/src/lxc/lxc_monitor_protocol.c -/src/lxc/lxc_monitor_protocol.h /src/remote/*_client_bodies.h -/src/remote/*_protocol.[ch] /src/remote/*_stubs.h -/src/rpc/virkeepaliveprotocol.[ch] -/src/rpc/virnetprotocol.[ch] tags diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 156c72d452..b83e98860d 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1980,7 +1980,6 @@ generated_files =3D \ $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ - $(srcdir)/src/*/*_protocol.[ch] \ $(srcdir)/gnulib/lib/*.[ch] =20 _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) diff --git a/src/Makefile.am b/src/Makefile.am index e0b917fcdd..da7e2e6c80 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -394,11 +394,11 @@ GENERATED_SYM_FILES +=3D \ =20 %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $(srcdir)/$(subst $(srcdir)/,,$@) + $< $(subst $(srcdir)/,,$@) =20 %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $(srcdir)/$(subst $(srcdir)/,,$@) + $< $(subst $(srcdir)/,,$@) =20 check-local: check-augeas =20 diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 4fd7878e5c..bea0967aaf 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -30,6 +30,7 @@ libvirt_driver_admin_la_CFLAGS =3D \ $(XDR_CFLAGS) \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/admin \ + -I$(top_builddir)/src/rpc \ $(NULL) libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) @@ -87,8 +88,10 @@ endif WITH_DTRACE_PROBES =20 libvirt_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ + -I$(builddir)/admin \ -I$(srcdir)/remote \ -I$(srcdir)/rpc \ + -I$(builddir)/rpc \ $(XDR_CFLAGS) \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2b1c030041..ba7a9ea2ea 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -109,6 +109,9 @@ lockd_la_SOURCES =3D \ $(NULL) lockd_la_CFLAGS =3D \ -I$(srcdir)/conf \ + -I$(srcdir)/locking \ + -I$(builddir)/locking \ + -I$(builddir)/rpc \ $(XDR_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) @@ -146,6 +149,9 @@ virtlockd_SOURCES =3D \ $(LOCK_DAEMON_GENERATED) \ $(NULL) virtlockd_CFLAGS =3D \ + -I$(srcdir)/locking \ + -I$(builddir)/locking \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 7d10b646ea..bb7ea7338d 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -67,6 +67,8 @@ libvirt_driver_log_la_SOURCES =3D \ $(LOG_DRIVER_SOURCES) \ $(NULL) libvirt_driver_log_la_CFLAGS =3D \ + -I$(builddir)/logging \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) @@ -82,6 +84,8 @@ virtlogd_SOURCES =3D \ $(LOG_DAEMON_GENERATED) \ $(NULL) virtlogd_CFLAGS =3D \ + -I$(builddir)/logging \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(XDR_CFLAGS) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index b6db70af7d..78f14bf37a 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -95,6 +95,8 @@ libvirt_driver_lxc_impl_la_CFLAGS =3D \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ + -I$(builddir)/lxc \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_lxc_impl_la_LIBADD =3D \ @@ -199,6 +201,8 @@ endif WITH_DTRACE_PROBES libvirt_lxc_LDADD +=3D $(SECDRIVER_LIBS) libvirt_lxc_CFLAGS =3D \ -I$(srcdir)/conf \ + -I$(builddir)/lxc \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(CAPNG_CFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 5c5f5f4d2c..6b0ae586d1 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -50,6 +50,8 @@ REMOTE_DAEMON_CFLAGS =3D \ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ + -I$(builddir)/rpc \ + -I$(builddir)/remote \ $(NULL) =20 REMOTE_DAEMON_LD_FLAGS =3D \ @@ -174,6 +176,8 @@ 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) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index b8ca53c69a..4aa38db1ab 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -79,6 +79,7 @@ EXTRA_DIST +=3D \ endif ! WITH_LIBSSH =20 libvirt_net_rpc_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ $(SSH2_CFLAGS) \ @@ -109,6 +110,7 @@ libvirt_net_rpc_server_la_SOURCES =3D \ rpc/virnetserver.c \ $(NULL) libvirt_net_rpc_server_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(DBUS_CFLAGS) \ $(XDR_CFLAGS) \ $(SASL_CFLAGS) \ @@ -129,6 +131,7 @@ libvirt_net_rpc_client_la_SOURCES =3D \ rpc/virnetclient.c \ $(NULL) libvirt_net_rpc_client_la_CFLAGS =3D \ + -I$(builddir)/rpc \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index a9acd88670..9ae456c268 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,6 +25,7 @@ AM_CPPFLAGS =3D \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/conf \ + -I$(top_builddir)/src/rpc \ $(NULL) =20 WARN_CFLAGS +=3D $(RELAXED_FRAME_LIMIT_CFLAGS) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917902; cv=none; d=zoho.com; s=zohoarc; b=KG/NvPdToi7rgEKhYgqMwpu7eMw7PcMnMeRTD0zFt4Lv9Q0VOWEii3p6JpIdupJxwb8VxG3bj1MSy34aDNmGN6wT/nZpuAcO6cexbCdqwuCN8/SH8ktmTdrNisSqoR2XOnHyIlrQaWLm4yHz9zd14uAbmoSEcBivWWiOYRoYoPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917902; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bz8GxukqaVclxqn8HzqDEnaCfLxbcyE5fGPng/lUuEo=; b=WTp2wYU+j43XuhiT6ZvM1GLodUrGZ1OhpEUNRzDoANd44ixNSlH+v+DGoovXsP2YS3psvvsXYIlyRQokhs6Sx7htioWHDEVfWDS5RwBfa51AD0RxOma7bjxeHrtEv2J+Xqi13kgE3P17lzGITVem05CLpGealwPz23MGFc971pE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917902958163.0835672526996; Thu, 24 Oct 2019 04:51: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-218-j8_90knnM-2iUcyfoxSjow-1; Thu, 24 Oct 2019 07:51:38 -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 076EC1800E0E; Thu, 24 Oct 2019 11:51: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 D45DF52E8; Thu, 24 Oct 2019 11:51: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 9937B180BA99; Thu, 24 Oct 2019 11:51:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpMBC032444 for ; Thu, 24 Oct 2019 07:51:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 32F2060126; Thu, 24 Oct 2019 11:51:22 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F3DB600CC for ; Thu, 24 Oct 2019 11:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Bz8GxukqaVclxqn8HzqDEnaCfLxbcyE5fGPng/lUuEo=; b=Pr5BwpL1YV0FmyHKveBeZUxAC8LLbEJ3WFanhiivTwb6CnO033mLBB8ux0/+/BSX1vD17w NdBKsJj3KIVOu8B9IgwL8tVsSaacfhVAVxAnubmb7OSlPk/ArbQfgcXhaA9Kg5cT5CBpMm yDspntEstXPDVTsy0zv4hgmz9kNS6CI= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:53 +0200 Message-Id: <87a5ddf38131179f842bced84f9de6bdd21b0c8b.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 11/20] src: access: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: j8_90knnM-2iUcyfoxSjow-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore .gitignore | 7 ------- po/POTFILES.in | 3 +++ src/access/Makefile.inc.am | 14 +++++++------- src/admin/Makefile.inc.am | 1 + src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/lxc/Makefile.inc.am | 1 + src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 1 + src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + 14 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6f8d59987e..8c1078c56c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,13 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/access/org.libvirt.api.policy -/src/access/viraccessapicheck.c -/src/access/viraccessapicheck.h -/src/access/viraccessapichecklxc.c -/src/access/viraccessapichecklxc.h -/src/access/viraccessapicheckqemu.c -/src/access/viraccessapicheckqemu.h /src/admin/admin_client.h /src/admin/admin_server_dispatch_stubs.h /src/esx/*.generated.* diff --git a/po/POTFILES.in b/po/POTFILES.in index f11d483290..b975139933 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,6 @@ +@BUILDDIR@/src/access/viraccessapicheck.c +@BUILDDIR@/src/access/viraccessapichecklxc.c +@BUILDDIR@/src/access/viraccessapicheckqemu.c @SRCDIR@/gnulib/lib/gai_strerror.c @SRCDIR@/gnulib/lib/regcomp.c @SRCDIR@/src/access/viraccessdriverpolkit.c diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index ea27adbe0b..2d871ec8aa 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -38,7 +38,7 @@ ACCESS_DRIVER_POLKIT_SOURCES =3D \ access/viraccessdriverpolkit.c \ $(NULL) =20 -ACCESS_DRIVER_POLKIT_POLICY =3D $(srcdir)/access/org.libvirt.api.policy +ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.policy =20 GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 @@ -122,31 +122,31 @@ 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) \ - > $(srcdir)/access/viraccessapicheck.h + > 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 \ - > $(srcdir)/access/viraccessapicheck.c + > access/viraccessapicheck.c =20 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) \ - > $(srcdir)/access/viraccessapicheckqemu.h + > 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 \ - > $(srcdir)/access/viraccessapicheckqemu.c + > access/viraccessapicheckqemu.c =20 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) \ - > $(srcdir)/access/viraccessapichecklxc.h + > 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 \ - > $(srcdir)/access/viraccessapichecklxc.c + > access/viraccessapichecklxc.c diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index bea0967aaf..94cbed9972 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -89,6 +89,7 @@ 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 \ diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 780b2277ba..30ea98ad15 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -21,6 +21,7 @@ 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) \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index ef8e9613f5..5d9cf14f7f 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_libxl_impl_la_CFLAGS =3D \ $(LIBXL_CFLAGS) \ $(LIBXML_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 78f14bf37a..f22a53e58d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -94,6 +94,7 @@ libvirt_driver_lxc_impl_la_CFLAGS =3D \ $(FUSE_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(builddir)/lxc \ -I$(builddir)/rpc \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index b58b5ea645..2f7932ae60 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -44,6 +44,7 @@ libvirt_driver_network_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 9b58636a0c..1dfa0a5274 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -39,6 +39,7 @@ libvirt_driver_nodedev_la_SOURCES =3D $(NODE_DEVICE_DRIVE= R_SOURCES) =20 libvirt_driver_nodedev_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index e24e8aa2a0..ca05cba934 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -37,6 +37,7 @@ libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ $(DBUS_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 2074a5f54f..69e290c428 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -95,6 +95,7 @@ libvirt_driver_qemu_impl_la_CFLAGS =3D \ $(SELINUX_CFLAGS) \ $(XDR_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 6b0ae586d1..7361d02cf4 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -48,6 +48,7 @@ REMOTE_DAEMON_CFLAGS =3D \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ -I$(builddir)/rpc \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index fd7c90a137..94f293d418 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -28,6 +28,7 @@ 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) diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 08a9f4e86c..ec35ab7665 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -119,6 +119,7 @@ storagefile_LTLIBRARIES =3D libvirt_driver_storage_impl_la_SOURCES =3D libvirt_driver_storage_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ $(AM_CFLAGS) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917906; cv=none; d=zoho.com; s=zohoarc; b=L7IqeRNjYFpPlFW61uMHLtS+DLkWmQHOdU0piZc3yz25YWyw0pP8Br3fNieyKBJlUlN+Xclngk5Zs68ipkdOKlDhQv0uHdfcnEHwGZQAWythNBO4+UWcqpipRR0c4V4BT8Hr0MtpNDtvsdSnLTLneXRF1hmJrAJ+k8IkkPcTfXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917906; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ux3qyatiuRivSJkhKMU1u8ZWHJLGSV0BayXfPCnCCPw=; b=RoHQcC1Cf5Yqowtcr6nE11tb7CRqhGsWeYsnNJbOFMSKPEo3tfUSnD9NpWC5R90ISHWEMr8ySCyfKi96rNT+A/5rj+FCm+iC9/UNPtiWKdjf1BMhA0PSW/65VBhjJ61KJNROWvSgebY60nHUOYYOvyGMS2mwI9Pl6jgtGHpIuqg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917906409809.2812228572425; Thu, 24 Oct 2019 04:51: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-352-Z34haR1wPxyAn1huvU-HYQ-1; Thu, 24 Oct 2019 07:51: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 892D81800E07; Thu, 24 Oct 2019 11:51: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 634D85D70E; Thu, 24 Oct 2019 11:51: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 25D0D4EE75; Thu, 24 Oct 2019 11:51:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpQdv032465 for ; Thu, 24 Oct 2019 07:51:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C14560126; Thu, 24 Oct 2019 11:51:26 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65BB2600CC for ; Thu, 24 Oct 2019 11:51:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917905; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ux3qyatiuRivSJkhKMU1u8ZWHJLGSV0BayXfPCnCCPw=; b=fzFHtpJR3he/Rag2XzTGF55A7Pb9yylOUIpTT0vZeHrkM/TmDKpukcMmKUg04KW9QtxzLc DW7GOqYp9AGYDnfPO0Fdss2o6rggKh4UGjBCu399kNlzxSIuYWX8MZ54yPvBZSKCgojWhj qGstqAgwr2UzqC5+HqVIJxk3n4niJaI= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:54 +0200 Message-Id: <7126d68d7c22be84b17f12e135a8fc92f9a1f290.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 12/20] src: admin: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: Z34haR1wPxyAn1huvU-HYQ-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 2 -- build-aux/syntax-check.mk | 1 - po/POTFILES.in | 3 ++- src/admin/Makefile.inc.am | 7 ++++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8c1078c56c..8989b3e3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,8 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/admin/admin_client.h -/src/admin/admin_server_dispatch_stubs.h /src/esx/*.generated.* /src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index b83e98860d..cf60e890d2 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1977,7 +1977,6 @@ generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ - $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] diff --git a/po/POTFILES.in b/po/POTFILES.in index b975139933..e15192ebea 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,13 +1,14 @@ @BUILDDIR@/src/access/viraccessapicheck.c @BUILDDIR@/src/access/viraccessapichecklxc.c @BUILDDIR@/src/access/viraccessapicheckqemu.c +@BUILDDIR@/src/admin/admin_client.h +@BUILDDIR@/src/admin/admin_server_dispatch_stubs.h @SRCDIR@/gnulib/lib/gai_strerror.c @SRCDIR@/gnulib/lib/regcomp.c @SRCDIR@/src/access/viraccessdriverpolkit.c @SRCDIR@/src/access/viraccessmanager.c @SRCDIR@/src/admin/admin_server.c @SRCDIR@/src/admin/admin_server_dispatch.c -@SRCDIR@/src/admin/admin_server_dispatch_stubs.h @SRCDIR@/src/admin/libvirt-admin.c @SRCDIR@/src/bhyve/bhyve_capabilities.c @SRCDIR@/src/bhyve/bhyve_command.c diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 94cbed9972..448f7e1203 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -28,8 +28,9 @@ libvirt_driver_admin_la_SOURCES =3D \ libvirt_driver_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/util \ -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_LIBADD =3D ../gnulib/lib/libgnu.la @@ -123,13 +124,13 @@ 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) \ - > $(srcdir)/admin/admin_client.h + > 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) \ - > $(srcdir)/admin/admin_server_dispatch_stubs.h + > admin/admin_server_dispatch_stubs.h =20 admin/libvirt_admin.syms: admin/libvirt_admin_public.syms $(ADMIN_SYM_FILE= S) \ $(top_builddir)/config.status --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917898; cv=none; d=zoho.com; s=zohoarc; b=TxpLEQUjLf89pLir4UtwWe/o/PCqyaDglF1/pep5JRu8nD3umoA/ZMo4MgJUymq8B17yk65dROaHMJ8THziUXsZ8MIgPMQMKPLw94/u2JlHI4uXYctLQL2A/UYFyL7PUd49MUvpB06fez1QKT4JNpP2YzZCKOcqUyykJpt0z0TU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917898; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lO0Onwx93YfzJA+S4II/eraNqqoh747pr0RW3Gfc+/g=; b=nMXAKV6zNzeZjlKDzFt1tsGSMCYDTsV59pEGbqBxGqzu55RFlGV72lHn502Ix7JxGISUWfFScGy5iT+Y2Mufq3aQ+Zt7rK+LtofMBi3uP44WtakCOj60vb3qV6IX2ttSUo7QGLQgSQ3H7zvxLpHeFD3FvJEw9xDwDIPWZuWWAQw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917898035769.1955222684697; Thu, 24 Oct 2019 04:51: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-106-OrFzhg7jNO61p6xLmyff5w-1; Thu, 24 Oct 2019 07:51: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 06BCE1005529; Thu, 24 Oct 2019 11:51: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 D048B6062D; Thu, 24 Oct 2019 11:51: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 8A3A24EE68; Thu, 24 Oct 2019 11:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpR1g032478 for ; Thu, 24 Oct 2019 07:51:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB5846012D; Thu, 24 Oct 2019 11:51:27 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id D690160126 for ; Thu, 24 Oct 2019 11:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917896; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lO0Onwx93YfzJA+S4II/eraNqqoh747pr0RW3Gfc+/g=; b=OXYp+1eWbBOwvQ68baTRt2gu5xsf0HPbHxSjq0PraZtGA9cX6MOwLZSTUDIxd/K2D4WBzX HjSD/9ezsvZ+9lLsh79SH7Zbco+E9KM7bEjdOsDF70AQkLO9OlMfHJLFdg0wwB9Hr5Uj2P FnCUYITwPnmfUmf/TKq1pKn94u9bkfY= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:55 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 13/20] src: esx: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: OrFzhg7jNO61p6xLmyff5w-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore .gitignore | 1 - src/esx/Makefile.inc.am | 5 +++-- src/esx/esx_vi_generator.py | 11 ++++------- tests/Makefile.am | 3 +++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8989b3e3e3..46f6f98045 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/esx/*.generated.* /src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 3dab05d71c..7ba9fd1758 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -63,8 +63,8 @@ $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) =20 $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(RUNUTF8) $(PYTHON) \ - $(srcdir)/esx/esx_vi_generator.py && touch $@ + $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ + $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ =20 MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) =20 @@ -81,6 +81,7 @@ 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) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 28d440a6df..c77de6e60c 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1379,14 +1379,11 @@ additional_object_features =3D { =20 removed_object_features =3D {} =20 +if len(sys.argv) !=3D 3: + report_error("usage: %s srcdir builddir" % sys.argv[0]) =20 - -if "srcdir" in os.environ: - input_filename =3D os.path.join(os.environ["srcdir"], "esx/esx_vi_gene= rator.input") - output_dirname =3D os.path.join(os.environ["srcdir"], "esx") -else: - input_filename =3D os.path.join(os.getcwd(), "esx_vi_generator.input") - output_dirname =3D os.getcwd() +input_filename =3D os.path.join(sys.argv[1], "esx/esx_vi_generator.input") +output_dirname =3D os.path.join(sys.argv[2], "esx") =20 =20 =20 diff --git a/tests/Makefile.am b/tests/Makefile.am index 9ae456c268..d549e38e18 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -756,6 +756,9 @@ esxutilstest_SOURCES =3D \ esxutilstest.c \ testutils.c testutils.h 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 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917901; cv=none; d=zoho.com; s=zohoarc; b=FCxExtwRag39pi0aEPNQ3v7KugecC3RaV+S88wQH8MCvt55B6RmIavobVqXAIkQ9XIdPZg2AFqpqoon8L/IEGodph4H+aEXUakfpl5eTv1FNwi8DXMd+CNUQ/hePdmbHq028E+8e1+AcsLSO1dNh8c04qjipFDuu1cbqK6qbwfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917901; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ga3aoG0+pW4w9/ZcjgwSQ5AoYBo+dTKgJDycZEKTNLM=; b=P+BDT43x96eXZnX20iKH8OFVg+DTWmlw+BcKINhXURqcqVvayXjxLCtJU5ayX+l0GRTRMWihl9fiLJAGmmknj1qdwe/b86q1JL307Q3ptcFC3XeDOEridchUhYiXn+bPlkad+xQoZ5WptUwviy7FD4At4ul3UIh6JeJTNMrB2xQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917901921443.36341072592325; Thu, 24 Oct 2019 04:51: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-342-09qwXX9WObyrAC3i4Nh2Gw-1; Thu, 24 Oct 2019 07:51: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 9DBD7600; Thu, 24 Oct 2019 11:51: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 79D816062E; Thu, 24 Oct 2019 11:51: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 2E4ED180B536; Thu, 24 Oct 2019 11:51:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpS3c032484 for ; Thu, 24 Oct 2019 07:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id C88C96012D; Thu, 24 Oct 2019 11:51:28 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3513960126 for ; Thu, 24 Oct 2019 11:51:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917900; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ga3aoG0+pW4w9/ZcjgwSQ5AoYBo+dTKgJDycZEKTNLM=; b=gerQun+o/nyLa9tFK/8tao1REvKi5sXg4aA5NzpK1OqMnJwLsRXIje3jgpRqOKBw/XeGlS PBxG2/BN/WkZJ1ipUaRb1leWGY9P/TKAL3YmI8/hgO2CPXayXagttng36EhAghN7YGVA0V EOojWa9mAMaJm6uR0D4Q20sn8rryYa0= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:56 +0200 Message-Id: <7683db17d1e6a46ad183e88bf58f9ecef3c8b917.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 14/20] src: hyperv: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: 09qwXX9WObyrAC3i4Nh2Gw-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore .gitignore | 1 - src/hyperv/Makefile.inc.am | 5 +++-- src/hyperv/hyperv_wmi_generator.py | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 46f6f98045..85a417112d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/hyperv/*.generated.* /src/locking/lock_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h /src/lxc/lxc_controller_dispatch.h diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 6728b39c90..79e94d09bb 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -41,8 +41,8 @@ $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) =20 $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(RUNUTF8) $(PYTHON) \ - $(srcdir)/hyperv/hyperv_wmi_generator.py \ + $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ + $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) @@ -53,6 +53,7 @@ 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) diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_gen= erator.py index a9ece0ff00..c3cd39cc76 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -454,12 +454,11 @@ def parse_class(block): =20 =20 def main(): - if "srcdir" in os.environ: - input_filename =3D os.path.join(os.environ["srcdir"], "hyperv/hype= rv_wmi_generator.input") - output_dirname =3D os.path.join(os.environ["srcdir"], "hyperv") - else: - input_filename =3D os.path.join(os.getcwd(), "hyperv_wmi_generator= .input") - output_dirname =3D os.getcwd() + if len(sys.argv) !=3D 3: + report_error("usage: %s srcdir builddir" % sys.argv[0]) + + input_filename =3D os.path.join(sys.argv[1], "hyperv", "hyperv_wmi_gen= erator.input") + output_dirname =3D os.path.join(sys.argv[2], "hyperv") =20 classes_typedef =3D open_and_print(os.path.join(output_dirname, "hyper= v_wmi_classes.generated.typedef")) classes_header =3D open_and_print(os.path.join(output_dirname, "hyperv= _wmi_classes.generated.h")) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917914; cv=none; d=zoho.com; s=zohoarc; b=bZq17YOwBxKkoCINrRu3qof8JGGXs9Qma6H5CcAzSKMo8FXbLKuQQLNvxyo0JfsPeuGZ9oTW67xAbX/FBhgd46Nw3x3LYMsTDKy52e7l3ZZYKIwty735UEVzexLWKIA4A4iAKXM9r7iSRZ8qz5mFd9z8UDKlyP4WvUa9JXMmOoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917914; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=swWu1ker73qSj01Lf9b+yKSCNyxkXTN3oYiOLcRZ6r0=; b=VRMCGIrB8/PEXCWDM14a2B8fFWStkwnIbD8OYNnW66vnZP3Hfa23dLjR5Sivd+IanqenNcCnxIlEnla+aTXg9yD+eHcPs+n5EQi5yzeoaDwMHCj5akCG6tr+JlkshsOZsaoPc5JrLm2KRM7Ez8s6TWDv3L/OX6IPyxN3V+mIIlo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917914716762.117450415976; Thu, 24 Oct 2019 04:51: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-338-eO6tVXJaNZqDMlZdnxKsKw-1; Thu, 24 Oct 2019 07:51:52 -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 84D0A800D5B; Thu, 24 Oct 2019 11:51: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 5B170612AB; Thu, 24 Oct 2019 11:51: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 0EBBB4EEB7; Thu, 24 Oct 2019 11:51:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpXDd032510 for ; Thu, 24 Oct 2019 07:51:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 336906031D; Thu, 24 Oct 2019 11:51:33 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E1836012D for ; Thu, 24 Oct 2019 11:51:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917913; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=swWu1ker73qSj01Lf9b+yKSCNyxkXTN3oYiOLcRZ6r0=; b=XX/2dOTxlO0eu0jj3UVinfUYALemG9JWBieM49+SQA6SNGzc+XpY3XMyUxU/9NMcXJmN0T qGP89xA04v2xloiYN3lhMvyz6iH0xUnAfuftCnzjctZisAHlH2HKZp4t23Id7m64Lj5UXe 4gDq45G4UfikY1DinB0KFEsuOfmpuoY= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:57 +0200 Message-Id: <13493b1b9bb92781e5b30480563bddd68553c36d.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 15/20] src: locking: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: eO6tVXJaNZqDMlZdnxKsKw-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 1 - build-aux/syntax-check.mk | 2 +- src/locking/Makefile.inc.am | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85a417112d..ed11b77921 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/locking/lock_daemon_dispatch_stubs.h /src/logging/log_daemon_dispatch_stubs.h /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index cf60e890d2..62fe528c75 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,7 +1976,7 @@ po_file ?=3D $(srcdir)/po/POTFILES.in generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \ + $(srcdir)/src/*/{remote,qemu,lxc,log}_daemon_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ba7a9ea2ea..2bfb662016 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -280,7 +280,7 @@ 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) > $(srcdir)/locking/lock_daemon_dispatch_stubs.h + $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h =20 =20 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917918; cv=none; d=zoho.com; s=zohoarc; b=KeKP3Je0JZbYohFOwn83ekCRLIFPoo0rwWjhV5wGrRQE3jxtdVSZpwHQsr9eEXlcHcVbbOtKBGOESBGrM32yYkdhSN2A2vRjnjAc3WTJ3BBiw4HsoghjFCEKTuT6wIsbsPqsDPmEOyRTQ521EE6NUGMZCEOfLvKzB/XcCnzzRE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917918; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/FlwR/FvoZHp+wHjlADgoJzT/h0JAptMau2SaVy0xCM=; b=D9jOoTzhRPj0WRbKTAGI+4LQadV94Ce+rXOVsGzU7ITobfCWkA5IzZZEVWcPb4o5WaVd8r274YdRJL1VIIrX6pCywTqtirwujO4sdnTgJwZEHPhpF6J71MiaZgSCLScobAeHswhCz1jLjunzIWrO3W6qc3EMBN4QQ3JPvHuUowY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917918787169.33366966594565; Thu, 24 Oct 2019 04:51: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-270-I9QIg8vPPMu9ICsq_zB8Cw-1; Thu, 24 Oct 2019 07:51:55 -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 DEF9D800D49; Thu, 24 Oct 2019 11:51: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 B565252E8; Thu, 24 Oct 2019 11:51: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 6F926180BA9B; Thu, 24 Oct 2019 11:51:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpae1032524 for ; Thu, 24 Oct 2019 07:51:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CF696012D; Thu, 24 Oct 2019 11:51:36 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E4BB601B7 for ; Thu, 24 Oct 2019 11:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917917; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/FlwR/FvoZHp+wHjlADgoJzT/h0JAptMau2SaVy0xCM=; b=iN7T6W2BdmNhfDvEuzwC+27WsPGWMeuC7r3gHVTDpJSGnnngMwFgkb3zPTFdcyR51ky3z5 Ra9N9jnJ6uJxfLbckG63QAYprGAtuZxRDL16FrYxEYfflOmd1oe0/VSc4TYXAfBRccENBN KoV3/JrU4G5EhUpxNZG+wxDaydIIcjI= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:58 +0200 Message-Id: <578b617ca1b8210ab33d9431ecd64dcc9ec9d218.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 16/20] src: logging: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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-MC-Unique: I9QIg8vPPMu9ICsq_zB8Cw-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 1 - build-aux/syntax-check.mk | 2 +- src/logging/Makefile.inc.am | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ed11b77921..eaad5a1883 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/logging/log_daemon_dispatch_stubs.h /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h /src/remote/*_client_bodies.h diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 62fe528c75..a7e87e7a81 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,7 +1976,7 @@ po_file ?=3D $(srcdir)/po/POTFILES.in generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote,qemu,lxc,log}_daemon_dispatch_stubs.h \ + $(srcdir)/src/*/{remote,qemu,lxc}_daemon_dispatch_stubs.h \ $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index bb7ea7338d..dbaac2bb0d 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -127,7 +127,7 @@ 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) > $(srcdir)/logging/log_daemon_dispatch_stubs.h + $(LOG_PROTOCOL) > logging/log_daemon_dispatch_stubs.h =20 virtlogd.8.in: logging/virtlogd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571918004; cv=none; d=zoho.com; s=zohoarc; b=huRFjrHVt4w5SyWMeLgazMuF1I/Q1oe8jufbjJCnICf/WtdVwt2a4I+KrOYvO9xfL3vEM7jB321aWHnZ+7YOygWnKXmSCbIiWxuYizUNjGZoVETFGrm6j0luvDasGuQM2Wqqfb1+xn4Wz6wt+uC+PY4rqHJ0cHYdPZ1ZKjhi+Qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571918004; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h4RC0cEexNs54O0NIluGcrz4PUfYNho2eC2IYLdDF4g=; b=e7UKSN62WYmu36cYmMjxcfJZ6Mig9ZVe4f/WDn5mShFaH2+zPnJcs/2Pv8+r9P3fTlqp6Idgyw9RwLJv/42EPSy8SDnply/Z3cNhVjhEbWv0nWwt6nVvnLrOL606rTpA1DZl7uowDGaZf19kwwKyeff5pda+CHIkelMiUVPus+0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571918004536537.8260539139335; Thu, 24 Oct 2019 04:53: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-8-u9WMBVz6OiO89bFM2VonEw-1; Thu, 24 Oct 2019 07:51:59 -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 4F0F4801E66; Thu, 24 Oct 2019 11:51: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 2693060F8C; Thu, 24 Oct 2019 11:51: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 D94724EEFA; Thu, 24 Oct 2019 11:51:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpdNO032535 for ; Thu, 24 Oct 2019 07:51:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8384B601B7; Thu, 24 Oct 2019 11:51:39 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB9D76012D for ; Thu, 24 Oct 2019 11:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571918003; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=h4RC0cEexNs54O0NIluGcrz4PUfYNho2eC2IYLdDF4g=; b=AaJ23U9/prlHLdCXmUn1ws2Jk8A8WcdL8ibfLiDhq4L3G263pbE+Iv3f+dMbzsxbOtXJOs QY1Ed3mR+A2sAhzR05svFyrk5XklQqk+p4RwlS87irnOjQOZrcV4PXnbZywI1MGm5O/a+F c0wMmW6kjfhOMiWeCd4MpNCWPU/pu24= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:59 +0200 Message-Id: <1fbb16c30b2e1844c5eacf04b124778fd34a1eb1.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 17/20] src: lxc: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: u9WMBVz6OiO89bFM2VonEw-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 2 -- build-aux/syntax-check.mk | 1 - src/lxc/Makefile.inc.am | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eaad5a1883..38d6637c1c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,8 +41,6 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/lxc/lxc_controller_dispatch.h -/src/lxc/lxc_monitor_dispatch.h /src/remote/*_client_bodies.h /src/remote/*_stubs.h tags diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index a7e87e7a81..392fc34320 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1977,7 +1977,6 @@ generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ $(srcdir)/src/*/{remote,qemu,lxc}_daemon_dispatch_stubs.h \ - $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \ $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] =20 diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index f22a53e58d..cb55dfd1c6 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -252,13 +252,13 @@ 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) > \ - $(srcdir)/lxc/lxc_monitor_dispatch.h + lxc/lxc_monitor_dispatch.h =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) > \ - $(srcdir)/lxc/lxc_controller_dispatch.h + lxc/lxc_controller_dispatch.h =20 .PHONY: \ install-data-lxc \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571917925; cv=none; d=zoho.com; s=zohoarc; b=bQxAK24Q7nKHp5EB2BbWFFGw/Uk7kU4pbU9CsAqZng8mb8gEdNu9JQpQiUROcATqTkBQEE/9cE0jQk7WION6QCmd4vL28ghUk+eVR378ZvVUbO+ZXylQzoKOUDuDHfmwXC0xx6sQt1huGDpH8sJDdgFxyk7cZre3lKXsSnVsRPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917925; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JFA5Fun/pZxAERJQSYbW1x764+gJEYwpVOyE4LXQ+3E=; b=gTBO71JFYx0Acpd4H1P6VBpi2+hTTCW8uYXeK9AG0o6gvfC6tFGrQ0g8EiD7GVq6KZW3cOMjuxFRpZ3u2fnc3uFY84hgjm2IC/Jr2kvso39Gol5KYLt4o3PVbffV/dj934KWAml9W2wQX1Lq7aeAgeabOK05cWBhJDfPgl7MSnA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571917925549663.7861918303311; Thu, 24 Oct 2019 04:52: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-12-Vj4aBWbiP4OITBV5RoxT1w-1; Thu, 24 Oct 2019 07:52: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 E05951800E06; Thu, 24 Oct 2019 11:51: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 B984E60F8C; Thu, 24 Oct 2019 11:51: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 75B35180BAAB; Thu, 24 Oct 2019 11:51:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpjhk032554 for ; Thu, 24 Oct 2019 07:51:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44AF2601B7; Thu, 24 Oct 2019 11:51:45 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id A70CC6012D for ; Thu, 24 Oct 2019 11:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917924; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JFA5Fun/pZxAERJQSYbW1x764+gJEYwpVOyE4LXQ+3E=; b=M9NHB9zs4Cx3z1y4Gtgky/PPhwuw+Lpqp0++f/ROYFNGPja8lfasdgqD5I0p1aCHog0F81 eOgQoH11yYz3zqKU6/a26W8vewbmrq5nIZ+k164GR7KEDWB2Cx7hbWZ6WKXqMDunmfhDDv EfGCFFs49mvZxJ7w2lHLPDAEJJBSMyk= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:51:00 +0200 Message-Id: <0be2ae7638b4ad895078fd726f1a3ec881dc28f9.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 18/20] src: remote: generate source files into build directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: Vj4aBWbiP4OITBV5RoxT1w-1 X-Mimecast-Spam-Score: 0 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 --- Notes: Changes in v2: - remove entries from .gitignore - modify generated_files for sc_po_check as well .gitignore | 2 -- build-aux/syntax-check.mk | 2 -- po/POTFILES.in | 4 ++-- src/remote/Makefile.inc.am | 12 ++++++------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 38d6637c1c..2d6e3e3194 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,4 @@ Makefile.in # libvirt related ignores /build/ /ci/scratch/ -/src/remote/*_client_bodies.h -/src/remote/*_stubs.h tags diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 392fc34320..ab9ba33c9c 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1976,8 +1976,6 @@ po_file ?=3D $(srcdir)/po/POTFILES.in generated_files =3D \ $(builddir)/src/*.[ch] \ $(builddir)/src/*/*.[ch] \ - $(srcdir)/src/*/{remote,qemu,lxc}_daemon_dispatch_stubs.h \ - $(srcdir)/src/remote/*_client_bodies.h \ $(srcdir)/gnulib/lib/*.[ch] =20 _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) diff --git a/po/POTFILES.in b/po/POTFILES.in index e15192ebea..fc280cc62e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,8 @@ @BUILDDIR@/src/access/viraccessapicheckqemu.c @BUILDDIR@/src/admin/admin_client.h @BUILDDIR@/src/admin/admin_server_dispatch_stubs.h +@BUILDDIR@/src/remote/remote_client_bodies.h +@BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h @SRCDIR@/gnulib/lib/gai_strerror.c @SRCDIR@/gnulib/lib/regcomp.c @SRCDIR@/src/access/viraccessdriverpolkit.c @@ -167,11 +169,9 @@ @SRCDIR@/src/qemu/qemu_tpm.c @SRCDIR@/src/qemu/qemu_vhost_user.c @SRCDIR@/src/qemu/qemu_vhost_user_gpu.c -@SRCDIR@/src/remote/remote_client_bodies.h @SRCDIR@/src/remote/remote_daemon.c @SRCDIR@/src/remote/remote_daemon_config.c @SRCDIR@/src/remote/remote_daemon_dispatch.c -@SRCDIR@/src/remote/remote_daemon_dispatch_stubs.h @SRCDIR@/src/remote/remote_daemon_stream.c @SRCDIR@/src/remote/remote_driver.c @SRCDIR@/src/rpc/virkeepalive.c diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 7361d02cf4..242eb3ed2d 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -427,37 +427,37 @@ remote/remote_client_bodies.h: $(srcdir)/rpc/gendispa= tch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ remote REMOTE $(REMOTE_PROTOCOL) \ - > $(srcdir)/remote/remote_client_bodies.h + > remote/remote_client_bodies.h =20 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) \ - > $(srcdir)/remote/lxc_client_bodies.h + > remote/lxc_client_bodies.h =20 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) \ - > $(srcdir)/remote/qemu_client_bodies.h + > remote/qemu_client_bodies.h =20 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) \ - > $(srcdir)/remote/remote_daemon_dispatch_stubs.h + > remote/remote_daemon_dispatch_stubs.h =20 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) \ - > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h + > remote/lxc_daemon_dispatch_stubs.h =20 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) \ - > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h + > remote/qemu_daemon_dispatch_stubs.h =20 libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571918008; cv=none; d=zoho.com; s=zohoarc; b=I9TOxiUl+kMcmTQzfG4bslRhLxFMxXderzNe39uYO53gSrlq1bj9qBb0hq5xhvqOPr1HvtTSk3DSZI78GjeLx3O1r0hwslgIedsbNHH0qtZM72abxL0DdiMdMgN+4WEoHOgGK08RZrh/9n6WJQP26k1cJdOkfvFlNnQLSasIocE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571918008; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ybgu8yp5Sydi5tmI4uRE6nB2tNmmjVSVZP5Wb1jHjiU=; b=j0HCQYtbCWEUDGRMipb51tRvDPbvIpbXAu76r/blFo1hzEQqgE4D5j1U08ARYS1qvJxM22Yi/CQeKYjv+3uiLIC3PTFfs3tRjT2vzmrEntTrtR+32EgaGAK+/neIpNHrODnD5vGePBFFFKp7IlXFspaEoZLRt9Tq01tRttdPYKU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571918008409145.73446040868623; Thu, 24 Oct 2019 04:53: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-60-7tY8Ja9uNJCy9DU-eO-UmA-1; Thu, 24 Oct 2019 07:51: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 41F87800D5A; Thu, 24 Oct 2019 11:51:51 +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 1F21862A75; Thu, 24 Oct 2019 11:51: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 D09764EEBD; Thu, 24 Oct 2019 11:51:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpnoW032603 for ; Thu, 24 Oct 2019 07:51:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE300601B7; Thu, 24 Oct 2019 11:51:49 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id C25206012D for ; Thu, 24 Oct 2019 11:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571918007; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ybgu8yp5Sydi5tmI4uRE6nB2tNmmjVSVZP5Wb1jHjiU=; b=auEOSMfvFY5JxqTNdySwz6GDHBGBLy6GxgQKasQ2SpyKzHR8T34cexbeMiG/dqI4va+b1Y MVKCdLfb+pceCrYT62ujJOc+9QKWl9zK1AkzEJ99Ck22yFMSDAlq8M8xCx92YKwJYVid85 4PKG7i9iz5d5OrBLgi/dD3WF8npT4c4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:51:01 +0200 Message-Id: <066eebd04fe546f5bdfc76c29a5512dc5a9f5a27.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 19/20] src: stop distributing generated source files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: 7tY8Ja9uNJCy9DU-eO-UmA-1 X-Mimecast-Spam-Score: 0 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 --- src/Makefile.am | 6 +++--- src/access/Makefile.inc.am | 3 ++- src/admin/Makefile.inc.am | 13 +++++++------ src/bhyve/Makefile.inc.am | 1 + src/esx/Makefile.inc.am | 4 +--- src/hyperv/Makefile.inc.am | 4 +--- src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 8 +++++--- src/logging/Makefile.inc.am | 12 +++++++----- src/lxc/Makefile.inc.am | 27 ++++++++++++++++++--------- src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 20 ++++++++++++-------- src/rpc/Makefile.inc.am | 5 ++++- src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 6 ++++-- src/vbox/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 22 files changed, 75 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index da7e2e6c80..4a0c121a7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -655,13 +655,13 @@ endif WITH_LIBVIRTD < $< > $@-t && \ mv $@-t $@ =20 -CLEANFILES +=3D $(man8_MANS) -MAINTAINERCLEANFILES +=3D $(MANINFILES) +CLEANFILES +=3D \ + $(man8_MANS) \ + $(MANINFILES) =20 EXTRA_DIST +=3D \ $(SYSTEMD_UNIT_FILES_IN) \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 =20 diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 2d871ec8aa..fd0a5d8098 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -43,13 +43,14 @@ ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.= policy GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 EXTRA_DIST +=3D \ - $(ACCESS_DRIVER_POLKIT_POLICY) \ access/genpolkit.pl \ $(NULL) =20 =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 diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 448f7e1203..3feb23aa20 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,22 +9,21 @@ ADMIN_PROTOCOL_GENERATED =3D \ admin/admin_server_dispatch_stubs.h \ $(NULL) =20 -EXTRA_DIST +=3D $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +EXTRA_DIST +=3D $(ADMIN_PROTOCOL) BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) +CLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) =20 admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h =20 noinst_LTLIBRARIES +=3D libvirt_driver_admin.la libvirt_driver_admin_la_SOURCES =3D \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ admin/admin_server.c \ admin/admin_server.h \ admin/admin_server_dispatch.c \ admin/admin_server_dispatch.h \ - admin/admin_server_dispatch_stubs.h \ $(NULL) +nodist_libvirt_driver_admin_la_SOURCES =3D \ + $(ADMIN_PROTOCOL_GENERATED) libvirt_driver_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ @@ -60,9 +59,11 @@ lib_LTLIBRARIES +=3D libvirt-admin.la =20 libvirt_admin_la_SOURCES =3D \ admin/libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ $(DATATYPES_SOURCES) =20 +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) \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 96ae2f5044..de9fbe9239 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -56,6 +56,7 @@ 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) virtbhyved_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtbhyved\"" \ diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 7ba9fd1758..6b10755b7e 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -44,7 +44,6 @@ ESX_DRIVER_EXTRA_DIST =3D \ esx/README \ esx/esx_vi_generator.input \ esx/esx_vi_generator.py \ - $(ESX_DRIVER_GENERATED) \ $(NULL) =20 ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp @@ -54,7 +53,6 @@ DRIVER_SOURCE_FILES +=3D $(ESX_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(ESX_DRIVER_SOURCES) \ $(ESX_DRIVER_EXTRA_DIST) \ - $(ESX_GENERATED_STAMP) \ $(NULL) =20 BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) @@ -66,7 +64,7 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.in= put \ $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) +CLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) =20 if WITH_ESX USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 79e94d09bb..b71602c971 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -24,8 +24,6 @@ HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp HYPERV_DRIVER_EXTRA_DIST =3D \ hyperv/hyperv_wmi_generator.input \ hyperv/hyperv_wmi_generator.py \ - $(HYPERV_DRIVER_GENERATED) \ - $(HYPERV_GENERATED_STAMP) \ $(NULL) =20 DRIVER_SOURCE_FILES +=3D $(HYPERV_DRIVER_SOURCES) @@ -45,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_ge= nerator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) +CLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) =20 if WITH_HYPERV noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 30ea98ad15..5f22b90cb4 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -52,6 +52,7 @@ 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) virtinterfaced_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtinterfaced\"" \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5d9cf14f7f..8686e78a5d 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -64,6 +64,7 @@ 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) virtxend_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtxend\"" \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2bfb662016..5c2361a581 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -43,8 +43,6 @@ LOCK_DAEMON_SOURCES =3D \ =20 EXTRA_DIST +=3D \ $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_DRIVER_SOURCES) \ @@ -64,7 +62,7 @@ BUILT_SOURCES +=3D \ $(LOCK_DAEMON_GENERATED) \ $(NULL) =20 -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) @@ -105,6 +103,8 @@ 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 \ @@ -145,6 +145,8 @@ sbin_PROGRAMS +=3D virtlockd =20 virtlockd_SOURCES =3D \ $(LOCK_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlockd_SOURCES =3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dbaac2bb0d..fba54239d5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -10,7 +10,6 @@ LOG_DAEMON_GENERATED =3D \ $(NULL) =20 LOG_DRIVER_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ logging/log_manager.c \ logging/log_manager.h \ $(NULL) @@ -30,10 +29,8 @@ LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x =20 EXTRA_DIST +=3D \ $(LOG_PROTOCOL) \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER_SOURCES) \ + $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -42,7 +39,7 @@ BUILT_SOURCES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) @@ -66,6 +63,9 @@ 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 \ @@ -80,6 +80,8 @@ man8_MANS +=3D virtlogd.8 =20 virtlogd_SOURCES =3D \ $(LOG_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlogd_SOURCES =3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index cb55dfd1c6..d3a7cbf93b 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -22,8 +22,6 @@ LXC_GENERATED =3D \ LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x =20 LXC_DRIVER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -47,8 +45,6 @@ LXC_DRIVER_SOURCES =3D \ $(NULL) =20 LXC_CONTROLLER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -62,13 +58,17 @@ LXC_CONTROLLER_SOURCES =3D \ lxc/lxc_controller.c \ $(NULL) =20 - -DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ - $(LXC_GENERATED) \ $(LXC_CONTROLLER_SOURCES) \ $(NULL) =20 @@ -112,7 +112,11 @@ 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) +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 =20 sbin_PROGRAMS +=3D virtlxcd @@ -123,6 +127,7 @@ augeastest_DATA +=3D lxc/test_virtlxcd.aug CLEANFILES +=3D lxc/virtlxcd.aug =20 virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodst_virtlxcd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtlxcd\"" \ @@ -183,6 +188,10 @@ 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) \ $(PIE_LDFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 2f7932ae60..58dd90c23b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -59,6 +59,7 @@ 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) virtnetworkd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnetworkd\"" \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 1dfa0a5274..2a8c437e7b 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -77,6 +77,7 @@ 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) virtnodedevd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnodedevd\"" \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index ca05cba934..c320b75f78 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -60,6 +60,7 @@ 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) virtnwfilterd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnwfilterd\"" \ diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 69e290c428..3f3476b2b4 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -134,6 +134,7 @@ 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) virtqemud_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtqemud\"" \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 242eb3ed2d..f5de92be23 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -15,7 +15,6 @@ REMOTE_DRIVER_GENERATED =3D \ REMOTE_DRIVER_SOURCES =3D \ remote/remote_driver.c \ remote/remote_driver.h \ - $(REMOTE_DRIVER_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_GENERATED =3D \ @@ -33,7 +32,6 @@ REMOTE_DAEMON_SOURCES =3D \ remote/remote_daemon_dispatch.h \ remote/remote_daemon_stream.c \ remote/remote_daemon_stream.h \ - $(REMOTE_DAEMON_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_CFLAGS =3D \ @@ -140,7 +138,9 @@ REMOTE_DRIVER_PROTOCOL =3D \ $(LXC_PROTOCOL) \ $(NULL) =20 -DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(REMOTE_DRIVER_GENERATED) \ + $(REMOTE_DRIVER_SOURCES) =20 EXTRA_DIST +=3D \ $(REMOTE_DRIVER_PROTOCOL) \ @@ -161,11 +161,9 @@ BUILT_SOURCES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES +=3D \ remote/libvirtd.conf \ remote/virtproxyd.conf \ $(NULL) @@ -182,10 +180,13 @@ libvirt_driver_remote_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) +libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_SOURCES) +nodist_libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_GENERATED) =20 if WITH_DTRACE_PROBES -nodist_libvirt_driver_remote_la_SOURCES =3D libvirt_probes.h +nodist_libvirt_driver_remote_la_SOURCES +=3D libvirt_probes.h endif WITH_DTRACE_PROBES =20 if WITH_SASL @@ -230,6 +231,8 @@ man8_MANS +=3D libvirtd.8 =20 libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) =20 +nodist_libvirtd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) + libvirtd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ @@ -243,6 +246,7 @@ libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtproxyd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtproxyd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 4aa38db1ab..a5bde92c9f 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -16,7 +16,7 @@ VIR_NET_RPC_GENERATED =3D \ $(NULL) =20 BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) -MAINTAINERCLEANFILES +=3D $(VIR_NET_RPC_GENERATED) +CLEANFILES +=3D $(VIR_NET_RPC_GENERATED) =20 noinst_LTLIBRARIES +=3D \ libvirt-net-rpc.la \ @@ -39,6 +39,9 @@ libvirt_net_rpc_la_SOURCES =3D \ rpc/virnetsocket.c \ rpc/virkeepalive.h \ rpc/virkeepalive.c \ + $(NULL) + +nodist_libvirt_net_rpc_la_SOURCES =3D \ $(VIR_NET_RPC_GENERATED) \ $(NULL) =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 94f293d418..3d77366d3c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -48,6 +48,7 @@ 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) virtsecretd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtsecretd\"" \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ec35ab7665..1dfe48668f 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -152,6 +152,7 @@ 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) virtstoraged_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtstoraged\"" \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index d8c8e61c4b..0eadef71ca 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -253,9 +253,8 @@ KEYMANS =3D $(KEYPODS:%.pod=3D%.7) =20 man7_MANS +=3D $(KEYMANS) =20 -UTIL_SOURCES +=3D $(KEYTABLES) BUILT_SOURCES +=3D $(KEYTABLES) -MAINTAINERCLEANFILES +=3D $(KEYTABLES) +CLEANFILES +=3D $(KEYTABLES) CLEANFILES +=3D $(KEYMANS) $(KEYPODS) =20 UTIL_IO_HELPER_SOURCES =3D util/iohelper.c @@ -266,6 +265,9 @@ 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) \ diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 346a84429b..551189c0f5 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -73,6 +73,7 @@ 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) virtvboxd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvboxd\"" \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index c5bef04088..1757c8ba10 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -47,6 +47,7 @@ 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) virtvzd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvzd\"" \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 05:38:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571918055; cv=none; d=zoho.com; s=zohoarc; b=lduJyNqUd3X2DCxiEL5rFBLjsCcT/lkLLGCLflWUz2kTcchi9GqysrloQwW7p5sSrHqmf47Ei0XeRPXTZSpEvQMkxXpGPVuUC1oQ93y7vLpog4UMYUScPFfymiOSbH5P2YGvaJhSNo//kBJsO+vhy1sAiJD8oRQCiwO8urZh7TI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571918055; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c9roS7MW1SQrUjgSkEqu74gRel/cNladKu9HiS1uSNE=; b=a0Mio7S/drqeZOVK3OMR9nVBFqg9e3DexqbtcrqtHHGVzNC/IICD+Oa/hMnI960IyQ4l1st6JLpRs/Urf68jRoQm2qob+eC2eABoK/8n9cj2arAVG03SrahgdMLcNDyHYM0eDP/55yxjxwpkVVhuMT10Tld44gMb9G+JCi3VC0s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571918055048622.0802525279873; Thu, 24 Oct 2019 04:54: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-376-ieCDPFH7ONqdqLqnGs13eg-1; Thu, 24 Oct 2019 07:51: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 8B1C91005529; Thu, 24 Oct 2019 11:51: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 672F45C231; Thu, 24 Oct 2019 11:51: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 28E15180BAA7; Thu, 24 Oct 2019 11:51:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpqEr032625 for ; Thu, 24 Oct 2019 07:51:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA7DE6012D; Thu, 24 Oct 2019 11:51:52 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BEC601B7 for ; Thu, 24 Oct 2019 11:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571918053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=c9roS7MW1SQrUjgSkEqu74gRel/cNladKu9HiS1uSNE=; b=hexKIUjpzCPWzU8qxU4l7HltN9+9yykxj+1O4kdez4zDZuG+j3z6410M//9AjPaxx7TCtd nQQDBLqrV9KknhqVVMDtZicsL/ajYReBeEFuZoQLBjh51ZDXoJnNeXT5NirYBXpoDM5+Ut FBiBbiJF5iSyuCyu+xovRZB0cGKmeB0= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:51:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 20/20] tools: stop distributing generated source files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-MC-Unique: ieCDPFH7ONqdqLqnGs13eg-1 X-Mimecast-Spam-Score: 0 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 --- tools/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 68320c7246..1a541a3984 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -84,7 +84,6 @@ EXTRA_DIST =3D \ bash-completion/vsh \ libvirt_recover_xattrs.sh \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list