From nobody Fri Apr 19 23:01:15 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=1571922918; cv=none; d=zoho.com; s=zohoarc; b=aTGbP3PSOoJlCScFQdsTJKqQvNlajzRtILyV5zbVQXt8ptzxnMHeoCoMNKkoNp3I/Hv+OiMAc0yADoPBPCLfI54qQm1aS7Q9WXRpvQs70oQ88LRYdNq4QVQtmdeiOR4BM7d7qHgExX/hp38iksf+1JQFnDQwhlKYMtQ8gjzosmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922918; h=Content-Type:Content-Transfer-Encoding:Date:From: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=MNxGv05EXaXyIAeQOMupdFYNy68VXi3hg+iPam5x81sUyS4PPwOe+B8i40JLOwi2bzoezj4DZterGIhjbukQgzlHWJE3xX6GuyFjYNX5u7CaMqYA11ff3zlsNG4p3n8gP1W+3MPdwC3YfYzXQeFljzsxTCFkd+ZmwTbN4DyLrOA= 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 1571922917996212.89588271831963; Thu, 24 Oct 2019 06:15:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-ZLXqAWM3MTq07vm1NPxWxA-1; Thu, 24 Oct 2019 09:13:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7FF745ED; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A4105D9CA; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1BB463FB49; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5gif015840 for ; Thu, 24 Oct 2019 09:05:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4326660BF3; Thu, 24 Oct 2019 13:05:42 +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 A2C0E60BE0 for ; Thu, 24 Oct 2019 13:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922916; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=LQNQoombtbP42T4nD9VH1ZtMh6ERnkRTKOUbSfaxWMjrYawAh8/CuNKShwuTzCvNMM1E6V 0BnF7oLpnw5RaYIqRQ8qrdWs6POKhTFcoJZKijdkTTGJ123C5R+aTETiXF+c/YtvWWNnRX uUyYcuIyZbom07KmpoVZY5xqo1Uyg/U= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:19 +0200 Message-Id: <8e998d23f9e0754cefe385f403c94f357d6e5287.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.79 on 10.5.11.14 X-MC-Unique: ZLXqAWM3MTq07vm1NPxWxA-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 Fri Apr 19 23:01:15 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=1571922777; cv=none; d=zoho.com; s=zohoarc; b=ZfS5aHEXjJBmrE7Nu2jFibkHkg/tryyU6joBsh8Bpm1ZgraGeM1DZ9755SgWtvLCBkwxv/HTmXt+ykhghqGT1AtaRQAptBEuSAqS94CHDc2I6ipIYDEjY9Hh4Q4G9TdTeBeTsdd5KqUGtUsyDBQ2qWx7B7rbgPfN7Nxbq+HYugM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922777; h=Content-Type:Content-Transfer-Encoding:Date:From: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=i5nM7Thll4PhbN/dN2QxsCNrTpSOU1raDtChn91tOcR53gXI+zn7myWhFgiCQnU2+3yixb8SV6OozwFcJEB0wxZDNkN187X6wA5xaE+sAr7VSfGk/m02642spABlL76tAT2rfLSayTkqVv+cLwN2GxRybumTcyWbVylDLGIQvlc= 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 1571922777492525.4797388108011; Thu, 24 Oct 2019 06:12:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-90-wobuYUbBOxCT55MxoDLLzQ-1; Thu, 24 Oct 2019 09:12:53 -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 91515107AD37; Thu, 24 Oct 2019 13:12:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 619121001DF0; Thu, 24 Oct 2019 13:12:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 085B73FB43; Thu, 24 Oct 2019 13:12:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5hGo015855 for ; Thu, 24 Oct 2019 09:05:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 53F2360BF3; Thu, 24 Oct 2019 13:05:43 +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 B420C60BE0 for ; Thu, 24 Oct 2019 13:05:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922776; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=iifjRdkvcnwNTzDPrHqrZTaE1m/zEVhULbG0uOLfK/9Ro89o1YcejUzC6/ZzFwA+PuSXmg dyTS34EJZ53A69r24yyQKM4IPrMD1AT8Yu7SxBLRavZZtrOIWVCam6cnUP/iyz+02ICZdN LyYvrxGnAJot2qWBv2bjWq2NGl9KwP4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:20 +0200 Message-Id: <85dc3fba2fda76a6aee5f50de0e5fed31523d3f0.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.84 on 10.5.11.22 X-MC-Unique: wobuYUbBOxCT55MxoDLLzQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922844; cv=none; d=zoho.com; s=zohoarc; b=AZBMb0pfcJVDeZs3ONvfa3icPdy2dhFnWK+/0tmC3dEeHe7yujk5e/52QCeXXcfygb57pyhF4i4WrF4LyEpr1px6euuBYYnrN8V/15gpc+cNuxoHyEMNJZ/JW+Ub3Dsv4GMe5rVGPISekaYrpK+ZSE4Jo7IpNT9q47coauPD04A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922844; h=Content-Type:Content-Transfer-Encoding:Date:From: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=KBZTgtVhkMOopN6nDqzPPjSOrjhivt+8clBugtHUWYTsovDYznTdrCHUUI7tlFyZZyXFvBCzCHn7jRXQubZ0djNudZFU9I7uAmLD08+R2fqMz5IzHKycFO+S6salhHsH3+dIT5ODcvbeDlU8zWVbDpr9zGnuTaVgfRl165QOZ8c= 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 1571922844827174.31407923005395; Thu, 24 Oct 2019 06:14:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-29DMDQzcPw2BvDmuZQvrAQ-1; Thu, 24 Oct 2019 09:13:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A19D9607; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B5E560923; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D92D180BAA1; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5i3E015865 for ; Thu, 24 Oct 2019 09:05:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7F93060C57; Thu, 24 Oct 2019 13:05:44 +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 B957B60BE0 for ; Thu, 24 Oct 2019 13:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922843; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=V2RJNVKFvVOF8k9EujtQmWzIiveDbaJxX2rAi0rqTZLwL7LLa/xose89iOJuzk2ILELjoO MsspBKrTjLZO8RqiXU9x/ztUUT3e3JYgRwXruDyEklNs9MDGXe6cHHYceTS6BguT7PbQxL xKLI9oEPfABFMJ9aGtZdkJrqX6HgWpY= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:21 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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: 29DMDQzcPw2BvDmuZQvrAQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922844; cv=none; d=zoho.com; s=zohoarc; b=See3LkogZF0EdEIXNGYmyeFivmm23W/qynTlontLwk+Koh/AnkjmM8E29u17ttytnbK3NFN85N3kBCjV5ktIVmizXrZD3CgQaHa7TDK7j1+DzFopO3Scu/14gYaL5bzim+YMQMHjxF6kCQWVsUMmtex6HuW8Yi4IfQbE6cTWQaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922844; h=Content-Type:Content-Transfer-Encoding:Date:From: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=kQwAE2HmBTxu5Hxy4WUuDZIeXUffX1x+gLpigwrJKC1G0SlxSuZCYYVuaDctO/CZi20t1kLw0rYjxeRTD2RTVMiKh9Xe3hCxwCDZyFtS27p/4bpS7yE+YObU2L36H2+fiF1tB2aeBtd9J2zA+mdAbkaR/tWn1fD2MOObkmNzBSU= 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 157192284465631.42304597284499; Thu, 24 Oct 2019 06:14:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-WMowkiIQOFaZ8mIdNH9wJA-1; Thu, 24 Oct 2019 09:13:06 -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 7D5021005532; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4455B100EBDA; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DADDB3FB51; Thu, 24 Oct 2019 13:12:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5j1o015876 for ; Thu, 24 Oct 2019 09:05:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB0D560BF3; Thu, 24 Oct 2019 13:05: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 F2B4A60C57 for ; Thu, 24 Oct 2019 13:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922843; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=gXXqujmbel+X68/hm+HSbkrw0NGi1CnIJMMQ6rr1zMiJZEUoAA0g8DcLjyjgYeEzaGzJBB P4ZKux9DDrixRfd4e/xfrsHBwaT94y8OHJqhwlsUnvFjkThlwIXDyfMJaQkmZAAig4cVgH A4mUKcIz91I3DmbbYD6XH2L+ZPrC4FA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:22 +0200 Message-Id: <4a0982dc44365fa5c05c4fe34a17fc468cde3b52.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.84 on 10.5.11.22 X-MC-Unique: WMowkiIQOFaZ8mIdNH9wJA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922784; cv=none; d=zoho.com; s=zohoarc; b=fPTUYZah7linbnq116tWNl7ug9ip/QoVyC/yiO/0nJVQME05QloRtiP+YwqODBZjsQ90czXfNfrfEteS9Ls0C8Fu104Lc5j98Li4Q+PAHs05Lp42eGgW/1ioofCFxl+N6S8ncGg4nHsMwDq4grn//T2trwtiyXADnZvcHmMOhL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922784; h=Content-Type:Content-Transfer-Encoding:Date:From: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=PCVPyOWZFX5Rc5k7jKdJplsca6Cm/misZQSOrmd/gyTCEwSbcffmAKZahwAZuJKqOmOu0w6Cw/UP0ZxbYfCVYpKLIve6sPS0FUFzg6XSHTGQgLKeVsXWY/cz2kTrp5gR/1uukaUOju6Mn/ULt+U7atCPeBRMhtVb7SNEx4THf8o= 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 157192278471413.782082522337646; Thu, 24 Oct 2019 06:13:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-22-2rmvBxz6Ns2G-ls6vLdSOw-1; Thu, 24 Oct 2019 09:12:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C5771005516; Thu, 24 Oct 2019 13:12:44 +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 7FE1B60852; Thu, 24 Oct 2019 13:12: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 D017E3FB43; Thu, 24 Oct 2019 13:12:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5llF015886 for ; Thu, 24 Oct 2019 09:05:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 295E960C83; Thu, 24 Oct 2019 13:05:47 +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 6241560BE0 for ; Thu, 24 Oct 2019 13:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922783; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=ZtJ8AOjiNHKAW4IyI9d70WnCMHimKzxrRgBv6d9K05/gEP2N9rRpms/nj3C24uZo47s8AC yPFsmNQgEIVLn6Hp7c5f+K610PF/c27tfuDHTMb5EkVPLejrY0CL3DKhbbRkm1l2NSNaR4 +AbRdKtUUVr4kM+f93yBp5dGqLEetG4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:23 +0200 Message-Id: <470a9428c5c53b39e0cbe1278dbb000b436fe662.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.79 on 10.5.11.13 X-MC-Unique: 2rmvBxz6Ns2G-ls6vLdSOw-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922813; cv=none; d=zoho.com; s=zohoarc; b=nlEElSaAqQdstf0Y30xmarlj7st29zYu8BzqOpduhb82NrXF5QmziqmJLdYixv/G6+UFJVIXj3zzovnfM5JXaMeBPJSmX5TkZVwnBkgVOCelVEXGSGbbv4ueidM7FZWM9nWDmDJjjvPE2BD/fDkL5McghmbvM+5tAH2T/uinfsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922813; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hv2USXFlI8YeCfF4nPpJU+4i+ff3uJC2CWclzUSsGwc=; b=NKWMlD2uXxpPBAzefRnBk6ppiCl/gB2ZaZ4bhYYS1+yyI2q1LlHVngb5NmjJS0lOt9N/zaMIiXx7acdxIHew0hRd1wdnskJW99wjO83KeE5k/c3j5eF9fgvcKffbDG6ki27yKLF9fzcDKplwDugXd8PGPQBvq4rT4WTgyuqfQKM= 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 1571922813055761.4489628599466; Thu, 24 Oct 2019 06:13:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-QO1-HDV0N_eYFDENwnXpqw-1; Thu, 24 Oct 2019 09:12:59 -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 98114107AD39; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6981910027C5; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 30C563FB45; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5mXC015901 for ; Thu, 24 Oct 2019 09:05:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2FF3060C57; Thu, 24 Oct 2019 13:05:48 +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 9160160BE0 for ; Thu, 24 Oct 2019 13:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922811; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Hv2USXFlI8YeCfF4nPpJU+4i+ff3uJC2CWclzUSsGwc=; b=UUWpZ3Hp+N0VRlavjyuUNiJlPRTjRLH3Zz7pJPLqV/A5EFEmPwVw2X//Yz2eloMl+r8Jha XVdg2QZsC9xJCxHnbd7HrwiWS0Klwqe17/t0vXRDhmapfDaxML1CQp/SpO5DLVIjQQfJH9 wiZA3SmVWPNsUT0sDAySEmkNn6ilI4M= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:24 +0200 Message-Id: <9a81789e72893eceac71292825d2e82c11abeea0.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.84 on 10.5.11.22 X-MC-Unique: QO1-HDV0N_eYFDENwnXpqw-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 =20 Chnages in v3: - update --transdir and --srcdir options as there are used by python-zanata-client =20 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..7011890255 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 \ + --transdir $(builddir) \ + --srcdir $(srcdir) =20 pull-po: $(POTFILE) - zanata pull --create-skeletons + zanata pull \ + --project-config $(srcdir)/zanata.xml \ + --create-skeletons \ + --transdir $(builddir) \ + --srcdir $(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 Fri Apr 19 23:01:15 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=1571922850; cv=none; d=zoho.com; s=zohoarc; b=bOW9k0COmVkKgpfi4J9Gy33r8lJWD1pQAe/NcchGoK1kXVNQQXacL9enYxh+uIabMbejfqVD0QRxL6P8IjME+RbS8/FdtvCj8PfVdLJWpHhfyI6/HuS/ODxGZWl7vaXY0MfAnb/oFWc+zcieJWEp2Si4YW3qP2JJsJPn6WlcH5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922850; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=haPCiQLHcdld3xt3lBrIhHNmWnjedcQ7M7oD7WZisqI=; b=WVjpwR/iKawlxOx7yPy0gWtYZWUut+gamuyx2xyVrRh3rt2ZUBPqN3qtuOK0gtC7NnFquk3mHoyuGyJqEjS+K3klcsxOxDPYX0rZlS6bnThWxwjwmAAyQqvk2UdUdv+Z8XWQLNFLLoyGgIJ/+mIGyCHAsOD4ibpDkB0PfFNFcOo= 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 1571922850632851.7636103073343; Thu, 24 Oct 2019 06:14:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-136-_Z1dzVLiONe_buPJpbwdNw-1; Thu, 24 Oct 2019 09:13:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D359A1800E0D; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A48060628; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3FE943FB54; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5npB015907 for ; Thu, 24 Oct 2019 09:05:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id A354060C83; Thu, 24 Oct 2019 13:05: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 96B1F60BE0 for ; Thu, 24 Oct 2019 13:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922849; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=haPCiQLHcdld3xt3lBrIhHNmWnjedcQ7M7oD7WZisqI=; b=dW7qmaPah6acNw2pp02tqpJCwCXf0w4SvnGLNEM3H/V4I7OsMef28imzjKousH8g8EtGH5 3LegCi19CVKkrESVFkb4MERXTfBVZ4E4UzClM1ykig3cXgLJGA5+6OLZ6Ub/jAiUeVcgqa EqgBFHZetSE0EwAaOhopD5PJNhDhhXc= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:25 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.13 X-MC-Unique: _Z1dzVLiONe_buPJpbwdNw-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 7011890255..58f0c0f81a 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 Fri Apr 19 23:01:15 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=1571922876; cv=none; d=zoho.com; s=zohoarc; b=MaC2N8mMv7R5ywh+x+oOMpodUyUx3Z1Xw+6XA+CldLhUhI4BFaYAMFBIor95ldI4nx1wchNAZhO3oXki7V5xcdJWPcARnNZuD6pDBbNtUm0YpvrKHG8ozWi2ZgToxqxNq4UhjR8gVJI+Be1Uf/K6wkRz0UcOCAaArTDk0OPKsGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922876; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NHMClvmfLkZf0aD+8lHE8ADeE2iihShLVOrZ2xJ9VN8=; b=JYa4jVHos46R4kjWuwvKM6+cbmoyqsKOcO8fvT4jfxYh/CYBJCU0M3pEbhlYDsXXCnrWIOhZY3rX9mltcTx7rKwMn0K/zsWmlxu2gLEYv9cWKL8vwJE0in4a/BOXBK7uv1nOSF83lhzqHzFx9Gan1+bo0DTRH/nsOoqpgas5nWc= 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 15719228763615.892754519044615; Thu, 24 Oct 2019 06:14:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-xAMKo140NrCOigRnilo_rQ-1; Thu, 24 Oct 2019 09:14:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A22E75FB; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A69D10027AB; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3BAB0180BA9C; Thu, 24 Oct 2019 13:12:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5pjX015922 for ; Thu, 24 Oct 2019 09:05:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1163A60BF3; Thu, 24 Oct 2019 13:05:51 +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 3FA9B60BE0 for ; Thu, 24 Oct 2019 13:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922874; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NHMClvmfLkZf0aD+8lHE8ADeE2iihShLVOrZ2xJ9VN8=; b=PC++b2fky1bpAxiwt3dsVdNtnKzvfKSm5mN/4r65HNXIqsI1YfdGiT0CZYSFDl08D8QYBS 1LKvYgjyQ2DuCiJM7pFdDRCoWLTrXJkNtRa2fZ2Mnp1dNZGT9ub/5O8OkS/s07e3tsJBa6 wVFDFjADxjiAVRz8r4vdJYlwYLX48Gg= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:26 +0200 Message-Id: <01b0109eb73f04660d33b839473a096d7d9f7746.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 08/20] po: README.md: add a note about which Zanata client is required X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: 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: xAMKo140NrCOigRnilo_rQ-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: Daniel P. Berrang=C3=A9 --- Notes: New in v3. po/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/po/README.md b/po/README.md index 71b5793a2d..2f77c5d48c 100644 --- a/po/README.md +++ b/po/README.md @@ -4,6 +4,9 @@ Libvirt Message Translation Libvirt translatable messages are maintained using the GNU Gettext tools a= nd file formats, in combination with the Zanata web service. =20 +python-zanata-client is required in order to use make to pull/push transla= tions +from/to Zanata server. + Source repository =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 19 23:01:15 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=1571922788; cv=none; d=zoho.com; s=zohoarc; b=nlSuqErpB1xz01leqNEGTdggdwShmCBb8gp2AE+sMfbqAcHHdzm8eobvbsdZ4VCXG9yebNnTl84R7DtrQcxwPEYmSs3RoGKGJJnvbsvx1XElFBR8QOoULKlnmhCwq/iYEkqAIlLHIwIJCypTGSErRKqDWi84oNfc4YAUik2waN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922788; h=Content-Type:Content-Transfer-Encoding:Date:From: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=ivLaL1bsVbSzdc2AkeUVL9pCA44WGeXiITNlvKX8AIEc5tQTa8wiyFFesr8zIcZDQxFF5CukYdljDlNqgfiyN5e+hCHpFdARc657QkyynoyNr7vKcrohCBkEC2iIgqZs43yxvjk5Lm+FrLEYncUTYFvAi3afrqoJBp8Vc/xREkk= 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 1571922788530750.3112167143717; Thu, 24 Oct 2019 06:13:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-W10an7S9NxWwSw8aiCnj9A-1; Thu, 24 Oct 2019 09:13:03 -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 9CD99800D65; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 737C962A75; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2C862180BA9F; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5qds015932 for ; Thu, 24 Oct 2019 09:05:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 931A060BE0; Thu, 24 Oct 2019 13:05: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 6DC6460BF3 for ; Thu, 24 Oct 2019 13:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922787; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=gNbOnTE/S9dpw2WbEMI0BuMJSYBacy2rMvM6FSB7WAmI3x5siAG8HGqnWpgPKUdJDUP2T9 p4Q0qAjy/hq412JIXrEBO450vBsdQny2p6Ivr5CbwRcHYeOSM3TdMazpxTXUP2v09M6UcC IfcnvUWiiYYvpE15lPP7Ul4jqCfsiYQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.79 on 10.5.11.15 X-MC-Unique: W10an7S9NxWwSw8aiCnj9A-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922792; cv=none; d=zoho.com; s=zohoarc; b=e8IAQAhr/A2Dnwxyd4RUTGpba+A0u4YodbW+tZ4b96eM6jeN9omDLkqGFXmJXTYO6ZthyxBZQZUTtdCFERzQZKzVRyOiiKsK2S+ba+4G33gWS2FmoKMUVAjFHfMvXHOCoYZLOtM1RDA5kq4o4vXBZfLHYq3V37MXklbsHvJFHzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922792; h=Content-Type:Content-Transfer-Encoding:Date:From: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=i2KCwGytihzsCBN6WlAfu/R3X7v9HWPbIcCa4mPblV9Zj/z6pKE2qZT8U/kzQitu78iymY5pme4OGuePHJkuUj2Dqyy1qFnp3pKVremfAdk8NczKFnS2FCuDE/N6tZlVJIgKlDdXAIfjMM/SYkAArCBYR15xk6iT/336Kf+nvH4= 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 15719227926101017.551410792964; Thu, 24 Oct 2019 06:13:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-N52uXwyVNGq6JF3eozYVbA-1; Thu, 24 Oct 2019 09:13:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C37171800E0F; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85D6460167; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 366A93FB4D; Thu, 24 Oct 2019 13:12:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5r6Z015937 for ; Thu, 24 Oct 2019 09:05:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id A453A60BE0; Thu, 24 Oct 2019 13:05:53 +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 0760560C57 for ; Thu, 24 Oct 2019 13:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922791; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=bxGBXL5QJbJQQvHSPstNbRdfTWJKTTxxkY1JoFDf1y2ZnwidAboy1ULGoDTik4nbmSi/F1 +7vPhtwSEjOcgovgtgB4d5mqSzFk51fTPYlIlXP2FFrB73C849d+G9DCWYcEnLHvaEVvpv FdnjVMcAEU/VpMVsklbwyHnRMmoH9bE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:28 +0200 Message-Id: <54b06abb2213861bb2edffeb036f96337043ac6e.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.11 X-MC-Unique: N52uXwyVNGq6JF3eozYVbA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922864; cv=none; d=zoho.com; s=zohoarc; b=h5AKr6MWveP/xJ6tbPHiF5ZO37KdUcoxRiS0nwaUu3Wm8X4FkYWZxlUUQ/eUpKx1CaiEF5YRQlGuBRbyAj0docJUrnfHyTZikHVQwBRxEOhATmoFMNZY+cOKcXBd6QIfXR0h7Y508R4QTrMNCgg3aMVwMQX6IhRTsT5LhtCCSrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922864; h=Content-Type:Content-Transfer-Encoding:Date:From: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=adSJyE7Ez3RZ8Thi7cIQYbfpK3bBvyi0BqGtJgDp72EcSzma1GPw7fci7fAcLZUAJZn7bYxBlDcSTXdd4zthrS2+XFcxD6IBf+T02Z1y3x/yFhPAyDiSrYl9EoXcutlhUev9qw2NNkWy4/hfyNBE8G3Cy0kcFnjcIBTIiuRp+UU= 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 1571922864843293.8208297484955; Thu, 24 Oct 2019 06:14: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-204-QIN_dFzAPB68BlrNfdOPjQ-1; Thu, 24 Oct 2019 09:13:16 -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 C6B5C800D63; Thu, 24 Oct 2019 13:13:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FD9E60624; Thu, 24 Oct 2019 13:13:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5922F180BAA4; Thu, 24 Oct 2019 13:13:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5se6015948 for ; Thu, 24 Oct 2019 09:05:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id D1C0360BF3; Thu, 24 Oct 2019 13:05:54 +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 3DD0A60C80 for ; Thu, 24 Oct 2019 13:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922863; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=UTFC50iXdF4Al+rSwtO9FZEs/zG5BhS/9hOuUuL0L0+ClgRFz2w7vqNPv2uLHs8QRxamYE izItow02zuWMyVuI/kKlJgi0n0M4XysMZiJxhCFLk9RuH95vNk8j42DX3S1lExP/Aj9pt5 GaAHC4ff9rIjD3WHgt6y4P8rL8F4hDs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:29 +0200 Message-Id: <84aed7f99ac0fb6e5bce43849355c6aea3b15397.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.79 on 10.5.11.13 X-MC-Unique: QIN_dFzAPB68BlrNfdOPjQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922886; cv=none; d=zoho.com; s=zohoarc; b=Lzd8t9FCzMkOB1MEL8iQ+e5ReiFsH6g59YdrsqKeXWFD+d5FNs+3Qc4ImaQ6vWo2hbf/z6mYXyjyhbdyiena3z4CokqXJNK/ZoYk1pTmSoAgADR+SJ7s2KI3h0UQNGOcjyOO13e9Hm4bJuNjXkMT4UM33K0RaiSAaK6H0KGOK9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922886; h=Content-Type:Content-Transfer-Encoding:Date:From: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=erbJIfO5hJ+BohbCR6a+nez1d5qNcfLzGXU44nODjKwuM8bcGxpAGF26kWQEpvBfqUzvTYqz9MxrLvyRRh/37DU99a7/+zj83n6velKjgNxUzXneMb2rFkkru7gC+ZtuDSSZasQVk47R3eVkWwN3cVAgU5tOVIIlYe27ER1IxE8= 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 1571922886038594.5673123469383; Thu, 24 Oct 2019 06:14: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-258-1KOvep0MNsWb5t7kw3iBQg-1; Thu, 24 Oct 2019 09:13:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6259C800D67; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 327D55D9CA; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD4C63FB50; Thu, 24 Oct 2019 13:12:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5tCr015953 for ; Thu, 24 Oct 2019 09:05:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id C238260C83; Thu, 24 Oct 2019 13:05:55 +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 3789760BE0 for ; Thu, 24 Oct 2019 13:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922884; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=UBWKaahXXTB2D7VEUgYKIYECzKrV0pt4kjpm6PCFdt3IQ/YYD5Kn20hQzwfhqvFaxXMQrq CTQVBR0pD9iQgrDRro5qsBkeGJaJ38mxu4noCno3ealRCK+YN533F+CvIKeAum74+up5JG otyxlXqO3+Sk4WZuFWSKwG28mSFyxJU= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:30 +0200 Message-Id: <74506f051c68e7b3f6f42c33a83ea8bd95a86ac8.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.14 X-MC-Unique: 1KOvep0MNsWb5t7kw3iBQg-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922796; cv=none; d=zoho.com; s=zohoarc; b=Lt63LEdZKU5czlga5moAZJZ269jL48pzqPPk6nUc4mp7t7/gbi2O29vM9Wv+quR30YZzLUJRBclbpPSUm6FZeJgg6XW/JWW5afP1Rrfnw75oUPfS25moyXYGfB3arUb+wIKHedGUfPgT3bJF7uB8KBjSt3RNAw5w/Ivs4qyKBXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922796; h=Content-Type:Content-Transfer-Encoding:Date:From: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=IrC2Yie3jscvolm4tdXvBr3uln43srCshKlRNpQFGWhamSIIj7JcfVRsqdbgm3D11wQSN6PRmrCndkwKuE/Cdx/NspZtCMrJ+iuH92DMHeuO91vpkT2qApyM/ZMZ7P+o/vvtUxsSVvuW4FcXqjVGlZrrevUTiwSPKfNEpvmsc8o= 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 1571922796391909.3740386105118; Thu, 24 Oct 2019 06:13: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-334-vMIuof18PiKrVCnvQoXYdA-1; Thu, 24 Oct 2019 09:13:11 -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 C2FC3608; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EC3D60923; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3347118005A0; Thu, 24 Oct 2019 13:13:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5uLv015959 for ; Thu, 24 Oct 2019 09:05:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC48160C57; Thu, 24 Oct 2019 13:05:56 +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 2903660BE0 for ; Thu, 24 Oct 2019 13:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922795; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=aw1p28KKNsiyVoOc6Vjo4l9mNgJK0bAqFSO7bc2V+bzbnvL7B1QUmkAym0O0847mwk7MiZ JUcsuTG4v/HE+s9KcxOguPcx+GwNds6IHjTFuuRfZJhjIiEFYUT6X2iV2Mhu7M+1imBUKe m5U6g9FI1/aLm1eFovUEE//BtpT/8d8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:31 +0200 Message-Id: <350e98100f1c1ed7d7d62931be5d79e1ef67b841.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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: vMIuof18PiKrVCnvQoXYdA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922850; cv=none; d=zoho.com; s=zohoarc; b=PecHnPvdokVisl5wM5b6Bq9vWu6+c/e7SBqaKg0gpbzZfkhHDp4nQd7jpDeIjUjg+u4vdU7MK2mIi9v3ismQliP+JZ0iiwQHzR7EfQTUnv1fn5UA1So0Bijag2Ujm84vPthkPdEBsR0FKCuP3TSeCQHq4/frvGbt5KE+S8S60UM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922850; h=Content-Type:Content-Transfer-Encoding:Date:From: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=OpjHpHlLLfUeMVrx6zHfAtSqa8YxF9QQG6XvENWg1pPJNdO1MS2sQorQJ3DbYSC+KZ/vjy65N537P6c24MvXNFCSTORj9xvYop3jEX3Bk1UzG0E1v8z7U45gpXpowxQuzvoBUyti5VaDlCDLYmSRMYD2h8unNGI691Uc30vuN2U= 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 15719228505762.3384467456506854; Thu, 24 Oct 2019 06:14:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-136-aaIfkBGgNp64Uq6M4PT-PA-1; Thu, 24 Oct 2019 09:13:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD9560A; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A46B210027A9; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 404F1180BA9D; Thu, 24 Oct 2019 13:13:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5w98015969 for ; Thu, 24 Oct 2019 09:05:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 34FC460BF3; Thu, 24 Oct 2019 13:05:58 +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 2317560C57 for ; Thu, 24 Oct 2019 13:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922849; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=XbD8pMRWt+o8ct1HnfRxFO8rziqY4bnUvdpvSzg1ecXtzl5exd8TSWX8czTQKhTaMO7uy5 2CmtzaFK32oQBxqEf9EgBy2sfM9G1gbPO2XoE3LiIYRp8kTZrcyYUUt4W/wqSVQyw0epMK 3WY295VZVGbC0H+GjNQA4oMeyN/dQaI= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.84 on 10.5.11.22 X-MC-Unique: aaIfkBGgNp64Uq6M4PT-PA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922844; cv=none; d=zoho.com; s=zohoarc; b=acsprb+LEIP2fI6Ns5yv4ZwqZwzDdx+ri1qSboO898l5nse7EEEQrzPTHZx3QOvPg+GXOGtD9w73WkPacFBInVCNWb2uCDQCvIAi58KSmvksk6BjAGkD3r4YAX9MYtiKXYpWJCAVkvnBp16V2q1GKnO73Pz+L+BqawMt1d5+sLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922844; h=Content-Type:Content-Transfer-Encoding:Date:From: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=maw7/miKOAyoj11xxkKU7oUh5QHrBQQlG4hsFuqh3ayHGQ2HS3rBRrUVd6L3QxNazrGzlOqP9qSvMjzHeI7hVegX//a89pUq8mD9YFeZHs/NoJVgut31rJNDmSMkhS8/XbDOaF+uBMhco9++zfphPdvR47cNgJL/+mgjuFZ0S6g= 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 1571922844950774.04280092233; Thu, 24 Oct 2019 06:14:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-9WtPldlCM8SnXIfv4LXiPQ-1; Thu, 24 Oct 2019 09:13:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01AF7107AD37; Thu, 24 Oct 2019 13:13:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD5595DD7A; Thu, 24 Oct 2019 13:13:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8790A3FB51; Thu, 24 Oct 2019 13:13:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD5xhQ015979 for ; Thu, 24 Oct 2019 09:05:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id A23EE60C83; Thu, 24 Oct 2019 13:05:59 +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 DCFFA60BE0 for ; Thu, 24 Oct 2019 13:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922843; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=PEq+URttlaP9NsO4n4R/H4hCoazYQLtF+9kXK5VLa5ZHyDBQr1N0rSnGo7T+mpVGFDY4uY EqwXYRT/McpDMMqwRucUPB6AuEN9mFwzHIiZ7bx+JAeUQiHDBQBxavi+7qTzKu9iI+kAY8 CK07AQJ23A1OE11ly6+ad1sWTeeD/WA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:33 +0200 Message-Id: <4b96a9f85bafa3a9b8fddfaeb8570fe167896bb7.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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: 9WtPldlCM8SnXIfv4LXiPQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922883; cv=none; d=zoho.com; s=zohoarc; b=I0ZT4jeBQ1Kus12QJmBJ3eEiZcPOZ2q+q0icAJqJXuM75bBwAt56BxdLI1+oc62C3O812lJMZ/OcdW9Jg843OejJ+7CS+BRreF84eZhuKluALeGqv2kssUenhvOJwzWxzj50p7B0OoNSkG0qYbXEfKJjchUCPwh1zHRKfgqAv9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922883; h=Content-Type:Content-Transfer-Encoding:Date:From: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=J8fPFz9WVDHGHrU5FdJyi+Sb7XzAQg2kybLmlc/BsJ0GQ9sYHqqzjzke+MjZQTFbsG9rHc0C9dvn/L0GWrYsW9iyzIEvRWzgmZ7WPBc90hYnEVtSUTnP0Phwap7xCn0xRxnMv3hhD99CbaWlIRzpkBbcyOvt4um2nplgdrn6dTM= 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 1571922883628257.5219221431039; Thu, 24 Oct 2019 06:14:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-VbkP8rvPPdqfF9iBUzEoqw-1; Thu, 24 Oct 2019 09:14:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67B34800D49; Thu, 24 Oct 2019 13:14:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B7F752EE; Thu, 24 Oct 2019 13:14:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E60B93FB44; Thu, 24 Oct 2019 13:14:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD61mU015989 for ; Thu, 24 Oct 2019 09:06:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 50D1B60C80; Thu, 24 Oct 2019 13:06:01 +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 3C4B260C57 for ; Thu, 24 Oct 2019 13:06:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922882; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=jRrGbOBfkFRHWYQ+qRSMuKmN6FeNeVCusixpjmW0VNpB2TqgHS87vHbO4Ktlp9pMB62s+2 4mBEbPCOcpuMncPtzwhPnxtDhN7OAB8Z5px923X21ac5o6gG7qY9JkgfHlsv8pwjBokI2K 0ri8sChnLj+byqMOl0GdCEoU63MFnJs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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: VbkP8rvPPdqfF9iBUzEoqw-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922986; cv=none; d=zoho.com; s=zohoarc; b=YVv5H2hZlFtXpT5t7ytoIxWSMAwMrfQuk/nLSGiw7gN3Mi+OFp5fniphBXk//6wakGP/TUBi1n9SbhSCTyhNqSk1QRUWs05I3O085THpGvGJfJT1PxQTfP/dhuJ37lu9dXbeYfLHYz+eOOvdn1GFprVm1lAfT0ZYPK9u21y3Ijg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922986; h=Content-Type:Content-Transfer-Encoding:Date:From: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=SfLwS1P/ABJgQPyYtP+sZay27sDY9M1/MwSb/yOEiVxa6SwbA7QNXSGqL2A/RWFb9y2r3UWrIJlfH4FxoOhObsxjLwive8l40pZQyaSolFKdVnexK/0WzzN9+rB1lzHCakFq1DAlYg+TI7cYM2YEsQ525xuP2+iASLRVK15yz3U= 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 1571922986462132.94343726221882; Thu, 24 Oct 2019 06:16:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-nTjGkcSzOhSq3M_ctpJ9SQ-1; Thu, 24 Oct 2019 09:16:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BA08800D5A; Thu, 24 Oct 2019 13:16:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E633352E7; Thu, 24 Oct 2019 13:16:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 98B89180B76F; Thu, 24 Oct 2019 13:16:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD62eY016009 for ; Thu, 24 Oct 2019 09:06:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB02A60BE0; Thu, 24 Oct 2019 13:06:02 +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 EA49D60BF3 for ; Thu, 24 Oct 2019 13:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922985; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=X3Z2wIY7GRG6hgJ0oVDqAoNiAoP/opF9XdEwUlOEErAlkUXLx0k6UBuZE9fHVmuGK6Lc/S k9cSmorfGGI59nz/OmiBB6nx3/EpPxkkt2zirCYGZsmEoB7BhCVexCkiJSnTVMhPUhRic5 QNSo3KFTKoix7/vfv2qkYUpdIxnjL0g= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:35 +0200 Message-Id: <6a0fc2e4d75545f4a4bdd4f47f03380b572efa1f.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.84 on 10.5.11.23 X-MC-Unique: nTjGkcSzOhSq3M_ctpJ9SQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922902; cv=none; d=zoho.com; s=zohoarc; b=a1/UuVZM1EsadUV3cIk2+gytmpTlrK8msTCif7YYhrmZjyrr/QOSkNqafW+8FDGoqboQ+n+YD4cDJanW37Rx17wRqexz9X2hZ0W6AN6q6p7K9gZ6JmsM/N923dI84v59mYpwQYHDicZdyfGJLpnhLFGw6DqUOfcVHm0VpdYglMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922902; h=Content-Type:Content-Transfer-Encoding:Date:From: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=WgW7y2lPfIfy1yrfGH30y5ifLFKVcgkRzxzLXEEr7zI2bAVvDlfyJnIGh/cGbGARJXt3Jvr9FnN9IHfucit1u2OdCK7nd6Bxk22lO0hS0L+mqlypaK48i4IfbtvmTPcFBcdENUWkBlX6aT/FkKTRKClTb//JJ0cJErIGnoKP9Jo= 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 157192290259430.35315714821013; Thu, 24 Oct 2019 06:15:02 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-glM0ToZwNNSTh_aB8FoDoQ-1; Thu, 24 Oct 2019 09:14:58 -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 A9E9D47B; Thu, 24 Oct 2019 13:14:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F27160852; Thu, 24 Oct 2019 13:14:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 32FB33FB41; Thu, 24 Oct 2019 13:14:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD67LX016031 for ; Thu, 24 Oct 2019 09:06:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05D0A60BF3; Thu, 24 Oct 2019 13:06:07 +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 5EE2360BE0 for ; Thu, 24 Oct 2019 13:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=hu7ikArB/FFh05FnTtc2qdSyU3gab0iHxDb6bbzduF50YdahqlCexa87toQIDdRd5CJxDh HRzNR0uZ7xZIaBTTepCPt7YPlaJunLwd9EF0vOIoEKuhbTlIBg+b4ovowG4uZ28LnevL1o 3r2zvLoxHTQITVlPskey6dKjrlBaxWs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:36 +0200 Message-Id: <64cdbe8ebf764e2df1a1f9555fdbac3c53698e9e.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.13 X-MC-Unique: glM0ToZwNNSTh_aB8FoDoQ-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922933; cv=none; d=zoho.com; s=zohoarc; b=TqwPgi/WS1xP2kDeuUG4gle43ptzFFdifD9tdZdt7OAhPk4QMClOThps4B76lFitnui8gf2g5XUeI+vJ5dH0IJ6KaChYGk1xF+fhdO4/LAn0RrvMbUZdRxHosuhWjYh6WD2ENCKJCey4Y2CDCYI3xNd8Nz0lznSei6qy6uEKNOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922933; h=Content-Type:Content-Transfer-Encoding:Date:From: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=OqDz2xKiUlhDvfhdxwjdhyxbVrZycCH++L/odmA0pr6rBPjMiNHKHvCjFTDHQ4k/wnycdkHaHIMTTxesBRpA1b6CMM2EB+8ZEP0Ufk8kSErKJFGhj8uCNVFPaSjqteQpNuoobMUdw9g/j4CP9vlwKnR4AyPKpOWQomW+yNewTtA= 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 1571922933315391.50201843671243; Thu, 24 Oct 2019 06:15:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-lAh7t6wgPSmWfHXZpQefDA-1; Thu, 24 Oct 2019 09:15:29 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1C4347B; Thu, 24 Oct 2019 13:15:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C257D600CC; Thu, 24 Oct 2019 13:15:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 62712180B780; Thu, 24 Oct 2019 13:15:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD68CX016051 for ; Thu, 24 Oct 2019 09:06:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAE9D60BF3; Thu, 24 Oct 2019 13:06: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 77D1060BE0 for ; Thu, 24 Oct 2019 13:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=fD5nCEHiWdAhlxvTU/w+sdkkuTpm6hGOTJKrGeMZsPrLuoKX0V7V/A4E6Hyr0bH6LWOyxU IFkb9xap9tF6uaE3PA7K+nsn/ytbJHln+4Vk9FkO5DJlmWzRvV17Iql5hnB3nrWPQVzYCK /hFw22K5ivz+sBxcD69pvTYC/jBjg0g= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:37 +0200 Message-Id: <34f3376582ba6eac1f906de473f0c9d36ea9491d.1571922204.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.11 X-MC-Unique: lAh7t6wgPSmWfHXZpQefDA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 Fri Apr 19 23:01:15 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=1571922997; cv=none; d=zoho.com; s=zohoarc; b=RrxzF68fcXtMapp75FdnFwEDjFh/Dt8FZ8znuY2nnTDqfdDpA9NvndiBOZPGHw1Ffw8Ye/wH3SgbJDL+Z3S/NmrQgDCao9Ff4UDlN2qj6P5nYoj5dThUJsppXS27r1Lnonht/u2ossAjor5RSBMCFyAwkMYBwEYE/i0OKSrUPZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571922997; h=Content-Type:Content-Transfer-Encoding:Date:From: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=L28igp117/cuPsmL1SMUal+AMM5Kcdj4MjKw8X9O5OASPw0PUR1TFeSYdoYQO97MvmpjOiuVYi9x9RCBWtwxXT9c/fIkrzAqSB9RG1iE0BYhPmkkqhHXDneaIEmpUB+oSSnH6QMqZJfb02JwvVAODVOw0OVkMXdfeUu74BB9dKU= 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 1571922997333994.9892343533963; Thu, 24 Oct 2019 06:16:37 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-Xzp2jjTGNWuDMGz62DbwLA-1; Thu, 24 Oct 2019 09:16:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BABD800D5C; Thu, 24 Oct 2019 13:16:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 111E160852; Thu, 24 Oct 2019 13:16:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BECF43FB43; Thu, 24 Oct 2019 13:16:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OD69DR016056 for ; Thu, 24 Oct 2019 09:06:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF56460BF3; Thu, 24 Oct 2019 13:06: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 32F5F60BE0 for ; Thu, 24 Oct 2019 13:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571922996; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-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=ZGh0QgNRbx2PZEce90sef1OxPIylgfDqq5zXbNock4eZPFT39YC3nCYNWwJhC0f4u1C417 JWCRwYRASPvKLPvJ/3oX1q4IZvhq9TeRgp+BBNMlSE9Tilshxr1QF//HC4JC25XV2UkskO xvOXWGkWBLdlKPa/PcH+a3zHS0VN4q4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 15:05:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 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.13 X-MC-Unique: Xzp2jjTGNWuDMGz62DbwLA-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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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