[libvirt] [PATCH] build: include augeas-gentest.pl and libvirt_qemu_probes.h into dist file
We generate *.aug from *.aug.in by augeas-gentest.pl, so this script should be included in dist file. We split QEMU dtrace probes into separate file, but we forget include libvirt_qemu_probes.h into dist file. --- src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c8efa5b..c418897 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1120,6 +1120,7 @@ check-local: check-augeas check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock AUG_GENTEST = $(top_srcdir)/build-aux/augeas-gentest.pl +EXTRA_DIST += $(AUG_GENTEST) if WITH_QEMU qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in qemu/qemu.conf $(AUG_GENTEST) @@ -1289,7 +1290,8 @@ if WITH_REMOTE $(REMOTE_DRIVER_GENERATED): libvirt_probes.h endif WITH_REMOTE -BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp +BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp \ + libvirt_qemu_probes.h if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo -- 1.7.1
On 05/29/2012 08:15 PM, Wen Congyang wrote:
We generate *.aug from *.aug.in by augeas-gentest.pl, so this script should be included in dist file.
We split QEMU dtrace probes into separate file, but we forget include libvirt_qemu_probes.h into dist file.
--- src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am index c8efa5b..c418897 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1120,6 +1120,7 @@ check-local: check-augeas check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock
AUG_GENTEST = $(top_srcdir)/build-aux/augeas-gentest.pl +EXTRA_DIST += $(AUG_GENTEST)
NAK to this hunk as it conflicts with my patch to consistently invoke the script with $(PERL): https://www.redhat.com/archives/libvir-list/2012-May/msg01301.html But ACK to the idea; I would be okay with either: EXTRA_DIST += ../build-aux/augeas-gentest.pl EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl as we do need to ship the tools to regenerate things.
if WITH_QEMU qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in qemu/qemu.conf $(AUG_GENTEST) @@ -1289,7 +1290,8 @@ if WITH_REMOTE $(REMOTE_DRIVER_GENERATED): libvirt_probes.h endif WITH_REMOTE
-BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp +BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp \ + libvirt_qemu_probes.h
BUILT_SOURCES are generally _not_ supposed to be part of the dist file. That is, *probes.h files are not needed as part of the tarball - either you don't have dtrace and don't need the file, or you have dtrace and can regenerate the file yourself. Also, why would we list libvirt_qemu_probes.h but not libvirt_qemu_probes.stp? I'm not sure this hunk is necessary or right, or if we even have latent bugs that we need to clean up with what is already present. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 05/29/2012 08:32 PM, Eric Blake wrote:
On 05/29/2012 08:15 PM, Wen Congyang wrote:
We generate *.aug from *.aug.in by augeas-gentest.pl, so this script should be included in dist file.
This part still needs fixing,
We split QEMU dtrace probes into separate file, but we forget include libvirt_qemu_probes.h into dist file.
But this part should now be obsolete, thanks to Martin's patch: https://www.redhat.com/archives/libvir-list/2012-May/msg01314.html -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 05/30/2012 07:03 AM, Eric Blake wrote:
On 05/29/2012 08:32 PM, Eric Blake wrote:
On 05/29/2012 08:15 PM, Wen Congyang wrote:
We generate *.aug from *.aug.in by augeas-gentest.pl, so this script should be included in dist file.
This part still needs fixing,
In fact, I've now pushed the fix, so that I could test 'make distcheck' and 'make rpm'. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Wen Congyang