2:56 a.m.
Wen Congyang (3):
build: generate files when building without libvirtd
build: probes.d and libvirtd.stp should be part of tarball
test: all test_scripts should be part of tarball when building
without libvirtd
daemon/Makefile.am | 110 ++++++++++++++++++++++++++--------------------------
tests/Makefile.am | 18 ++++++++
2 files changed, 73 insertions(+), 55 deletions(-)
3:02 a.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
...
make[1]: Entering directory `/home/wency/source/libvirt-nodaemon/daemon'
make[1]: *** No rule to make target `remote_dispatch_prototypes.h', needed by
`distdir'. Stop.
make[1]: Leaving directory `/home/wency/source/libvirt-nodaemon/daemon'
make: *** [distdir] Error 1
---
daemon/Makefile.am | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 2095c1c..338663f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -53,6 +53,59 @@ EXTRA_DIST = \
BUILT_SOURCES =
+REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
+QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
+
+$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
+ $(QEMU_PROTOCOL) > $@
+
if WITH_LIBVIRTD
man8_MANS = libvirtd.8
@@ -210,59 +263,6 @@ endif
remote.c: $(DAEMON_GENERATED)
remote.h: $(DAEMON_GENERATED)
-REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
-QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
-
-$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
- $(QEMU_PROTOCOL) > $@
-
LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
libvirtd.uml.logrotate libvirtd.logrotate
--
1.7.1
4:36 a.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
...
make[1]: Entering directory `/home/wency/source/libvirt-nodaemon/daemon'
make[1]: *** No rule to make target `remote_dispatch_prototypes.h', needed by
`distdir'. Stop.
make[1]: Leaving directory `/home/wency/source/libvirt-nodaemon/daemon'
make: *** [distdir] Error 1
---
daemon/Makefile.am | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 2095c1c..338663f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -53,6 +53,59 @@ EXTRA_DIST = \
BUILT_SOURCES =
+REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
+QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
+
+$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
+ $(REMOTE_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
+ $(REMOTE_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
+ $(QEMU_PROTOCOL) > $@
+
+$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
+ $(QEMU_PROTOCOL)
+ $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
+ $(QEMU_PROTOCOL) > $@
+
if WITH_LIBVIRTD
man8_MANS = libvirtd.8
@@ -210,59 +263,6 @@ endif
remote.c: $(DAEMON_GENERATED)
remote.h: $(DAEMON_GENERATED)
-REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
-QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
-
-$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
- $(REMOTE_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
- $(REMOTE_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
- $(QEMU_PROTOCOL) > $@
-
-$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
- $(QEMU_PROTOCOL)
- $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
- $(QEMU_PROTOCOL) > $@
-
LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
libvirtd.uml.logrotate libvirtd.logrotate
ACK
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
7:11 a.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
On 05/13/2011 03:36 AM, Daniel P. Berrange wrote:
On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
> Steps to reproduce this problem:
> 1. # ./autogen.sh --without-libvirtd
> 2. # make dist
> ...
> make[1]: Entering directory `/home/wency/source/libvirt-nodaemon/daemon'
> make[1]: *** No rule to make target `remote_dispatch_prototypes.h', needed by
`distdir'. Stop.
> make[1]: Leaving directory `/home/wency/source/libvirt-nodaemon/daemon'
> make: *** [distdir] Error 1
ACK
This duplicates my patch:
https://www.redhat.com/archives/libvir-list/2011-May/msg00676.html
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
12:27 a.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
At 2011-5-13 20:11, Eric Blake write:
On 05/13/2011 03:36 AM, Daniel P. Berrange wrote:
> On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
>> Steps to reproduce this problem:
>> 1. # ./autogen.sh --without-libvirtd
>> 2. # make dist
>> ...
>> make[1]: Entering directory `/home/wency/source/libvirt-nodaemon/daemon'
>> make[1]: *** No rule to make target `remote_dispatch_prototypes.h',
needed by `distdir'. Stop.
>> make[1]: Leaving directory `/home/wency/source/libvirt-nodaemon/daemon'
>> make: *** [distdir] Error 1
>
> ACK
This duplicates my patch:
https://www.redhat.com/archives/libvir-list/2011-May/msg00676.html
No, it does not duplicate this patch.
You maybe give a wrong link?
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
8:43 a.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
On 05/13/2011 11:27 PM, Wen Congyang wrote:
At 2011-5-13 20:11, Eric Blake write:
> On 05/13/2011 03:36 AM, Daniel P. Berrange wrote:
>> On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
>>> Steps to reproduce this problem:
>>> 1. # ./autogen.sh --without-libvirtd
>>> 2. # make dist
>>> ...
>>> make[1]: Entering directory
>>> `/home/wency/source/libvirt-nodaemon/daemon'
>>> make[1]: *** No rule to make target
>>> `remote_dispatch_prototypes.h', needed by `distdir'. Stop.
>>> make[1]: Leaving directory
>>> `/home/wency/source/libvirt-nodaemon/daemon'
>>> make: *** [distdir] Error 1
>>
>> ACK
>
> This duplicates my patch:
>
> https://www.redhat.com/archives/libvir-list/2011-May/msg00676.html
No, it does not duplicate this patch.
You maybe give a wrong link?
Looks like I might have done so. I guess I was thinking of:
https://www.redhat.com/archives/libvir-list/2011-May/msg00696.html
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
9:11 p.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
At 05/14/2011 09:43 PM, Eric Blake Write:
On 05/13/2011 11:27 PM, Wen Congyang wrote:
> At 2011-5-13 20:11, Eric Blake write:
>> On 05/13/2011 03:36 AM, Daniel P. Berrange wrote:
>>> On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
>>>> Steps to reproduce this problem:
>>>> 1. # ./autogen.sh --without-libvirtd
>>>> 2. # make dist
>>>> ...
>>>> make[1]: Entering directory
>>>> `/home/wency/source/libvirt-nodaemon/daemon'
>>>> make[1]: *** No rule to make target
>>>> `remote_dispatch_prototypes.h', needed by `distdir'. Stop.
>>>> make[1]: Leaving directory
>>>> `/home/wency/source/libvirt-nodaemon/daemon'
>>>> make: *** [distdir] Error 1
>>>
>>> ACK
>>
>> This duplicates my patch:
>>
>> https://www.redhat.com/archives/libvir-list/2011-May/msg00676.html
>
> No, it does not duplicate this patch.
>
> You maybe give a wrong link?
Looks like I might have done so. I guess I was thinking of:
https://www.redhat.com/archives/libvir-list/2011-May/msg00696.html
Your patch and my patch do not fix the same problem. I apply your patch and
still can reproduce this problem.
Your patch fix the problem about './configure --without-remote', and my patch
fix the problem about './configure --without-libvirtd'.
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
8:38 p.m.
New subject: [libvirt] [PATCH 1/3] build: generate files when building without libvirtd
At 2011-5-13 17:36, Daniel P. Berrange write:
On Fri, May 13, 2011 at 04:02:13PM +0800, Wen Congyang wrote:
> Steps to reproduce this problem:
> 1. # ./autogen.sh --without-libvirtd
> 2. # make dist
> ...
> make[1]: Entering directory `/home/wency/source/libvirt-nodaemon/daemon'
> make[1]: *** No rule to make target `remote_dispatch_prototypes.h', needed by
`distdir'. Stop.
> make[1]: Leaving directory `/home/wency/source/libvirt-nodaemon/daemon'
> make: *** [distdir] Error 1
>
> ---
> daemon/Makefile.am | 106 ++++++++++++++++++++++++++--------------------------
> 1 files changed, 53 insertions(+), 53 deletions(-)
>
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index 2095c1c..338663f 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -53,6 +53,59 @@ EXTRA_DIST = \
>
> BUILT_SOURCES =
>
> +REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
> +QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
> +
> +$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
> + $(REMOTE_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
> + $(REMOTE_PROTOCOL)> $@
> +
> +$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
> + $(REMOTE_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
> + $(REMOTE_PROTOCOL)> $@
> +
> +$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
> + $(REMOTE_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
> + $(REMOTE_PROTOCOL)> $@
> +
> +$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
> + $(REMOTE_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
> + $(REMOTE_PROTOCOL)> $@
> +
> +$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
> + $(REMOTE_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
> + $(REMOTE_PROTOCOL)> $@
> +
> +$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
> + $(QEMU_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
> + $(QEMU_PROTOCOL)> $@
> +
> +$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
> + $(QEMU_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
> + $(QEMU_PROTOCOL)> $@
> +
> +$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
> + $(QEMU_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
> + $(QEMU_PROTOCOL)> $@
> +
> +$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
> + $(QEMU_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
> + $(QEMU_PROTOCOL)> $@
> +
> +$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
> + $(QEMU_PROTOCOL)
> + $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
> + $(QEMU_PROTOCOL)> $@
> +
> if WITH_LIBVIRTD
>
> man8_MANS = libvirtd.8
> @@ -210,59 +263,6 @@ endif
> remote.c: $(DAEMON_GENERATED)
> remote.h: $(DAEMON_GENERATED)
>
> -REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
> -QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
> -
> -$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
> - $(REMOTE_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
> - $(REMOTE_PROTOCOL)> $@
> -
> -$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
> - $(REMOTE_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
> - $(REMOTE_PROTOCOL)> $@
> -
> -$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
> - $(REMOTE_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
> - $(REMOTE_PROTOCOL)> $@
> -
> -$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
> - $(REMOTE_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
> - $(REMOTE_PROTOCOL)> $@
> -
> -$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
> - $(REMOTE_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
> - $(REMOTE_PROTOCOL)> $@
> -
> -$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
> - $(QEMU_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
> - $(QEMU_PROTOCOL)> $@
> -
> -$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
> - $(QEMU_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
> - $(QEMU_PROTOCOL)> $@
> -
> -$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
> - $(QEMU_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
> - $(QEMU_PROTOCOL)> $@
> -
> -$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
> - $(QEMU_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
> - $(QEMU_PROTOCOL)> $@
> -
> -$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
> - $(QEMU_PROTOCOL)
> - $(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
> - $(QEMU_PROTOCOL)> $@
> -
> LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
> libvirtd.uml.logrotate libvirtd.logrotate
ACK
This patch does not duplicate Eric's patch.
So I pushed it.
Daniel
3:02 a.m.
New subject: [libvirt] [PATCH 2/3] build: probes.d and libvirtd.stp should be part of tarball
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
...
make[2]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
make[2]: *** No rule to make target `probes.d', needed by `probes.h'. Stop.
make[2]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1'
make: *** [all] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.WkAD7a (%build)
---
daemon/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 338663f..92d154f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -218,8 +218,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
libvirtd_LDADD += $(AVAHI_LIBS)
endif
-EXTRA_DIST += probes.d libvirtd.stp
-
if WITH_DTRACE
libvirtd_LDADD += probes.o
nodist_libvirtd_SOURCES = probes.h
@@ -349,6 +347,8 @@ uninstall-local:: uninstall-data-sasl
endif # WITH_LIBVIRTD
# This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
+EXTRA_DIST += probes.d libvirtd.stp
+
POD2MAN = pod2man -c "Virtualization Support" \
-r "$(PACKAGE)-$(VERSION)" -s 8
--
1.7.1
4:36 a.m.
New subject: [libvirt] [PATCH 2/3] build: probes.d and libvirtd.stp should be part of tarball
On Fri, May 13, 2011 at 04:02:50PM +0800, Wen Congyang wrote:
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
...
make[2]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
make[2]: *** No rule to make target `probes.d', needed by `probes.h'. Stop.
make[2]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1'
make: *** [all] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.WkAD7a (%build)
---
daemon/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 338663f..92d154f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -218,8 +218,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
libvirtd_LDADD += $(AVAHI_LIBS)
endif
-EXTRA_DIST += probes.d libvirtd.stp
-
if WITH_DTRACE
libvirtd_LDADD += probes.o
nodist_libvirtd_SOURCES = probes.h
@@ -349,6 +347,8 @@ uninstall-local:: uninstall-data-sasl
endif # WITH_LIBVIRTD
# This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
+EXTRA_DIST += probes.d libvirtd.stp
+
POD2MAN = pod2man -c "Virtualization Support" \
-r "$(PACKAGE)-$(VERSION)" -s 8
ACK
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
12:47 a.m.
New subject: [libvirt] [PATCH 2/3] build: probes.d and libvirtd.stp should be part of tarball
At 2011-5-13 17:36, Daniel P. Berrange write:
On Fri, May 13, 2011 at 04:02:50PM +0800, Wen Congyang wrote:
> Steps to reproduce this problem:
> 1. # ./autogen.sh --without-libvirtd
> 2. # make dist
> 3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
> ...
> make[2]: Entering directory
`/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
> make[2]: *** No rule to make target `probes.d', needed by `probes.h'.
Stop.
> make[2]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1'
> make: *** [all] Error 2
> error: Bad exit status from /var/tmp/rpm-tmp.WkAD7a (%build)
>
> ---
> daemon/Makefile.am | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index 338663f..92d154f 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -218,8 +218,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
> libvirtd_LDADD += $(AVAHI_LIBS)
> endif
>
> -EXTRA_DIST += probes.d libvirtd.stp
> -
> if WITH_DTRACE
> libvirtd_LDADD += probes.o
> nodist_libvirtd_SOURCES = probes.h
> @@ -349,6 +347,8 @@ uninstall-local:: uninstall-data-sasl
> endif # WITH_LIBVIRTD
>
> # This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
> +EXTRA_DIST += probes.d libvirtd.stp
> +
> POD2MAN = pod2man -c "Virtualization Support" \
> -r "$(PACKAGE)-$(VERSION)" -s 8
ACK
Thanks, pushed.
Daniel
3:03 a.m.
New subject: [libvirt] [PATCH 3/3] test: all test_scripts should be part of tarball when building without libvirtd
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
...
make check-TESTS
make[1]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
make[1]: *** No rule to make target `test_conf.sh', needed by `check-TESTS'.
Stop.
make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
make: *** [check-am] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.7Rb9PV (%check)
---
tests/Makefile.am | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe191fd..bc171d2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -144,6 +144,24 @@ test_scripts += \
virsh-optparse \
virsh-schedinfo \
virsh-synopsis
+else
+EXTRA_DIST += \
+ test_conf.sh \
+ cpuset \
+ daemon-conf \
+ define-dev-segfault \
+ int-overflow \
+ libvirtd-fail \
+ libvirtd-pool \
+ read-bufsiz \
+ read-non-seekable \
+ start \
+ undefine \
+ vcpupin \
+ virsh-all \
+ virsh-optparse \
+ virsh-schedinfo \
+ virsh-synopsis
endif
if WITH_SECDRIVER_APPARMOR
--
1.7.1
4:37 a.m.
New subject: [libvirt] [PATCH 3/3] test: all test_scripts should be part of tarball when building without libvirtd
On Fri, May 13, 2011 at 04:03:20PM +0800, Wen Congyang wrote:
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
...
make check-TESTS
make[1]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
make[1]: *** No rule to make target `test_conf.sh', needed by `check-TESTS'.
Stop.
make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
make: *** [check-am] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.7Rb9PV (%check)
---
tests/Makefile.am | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe191fd..bc171d2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -144,6 +144,24 @@ test_scripts += \
virsh-optparse \
virsh-schedinfo \
virsh-synopsis
+else
+EXTRA_DIST += \
+ test_conf.sh \
+ cpuset \
+ daemon-conf \
+ define-dev-segfault \
+ int-overflow \
+ libvirtd-fail \
+ libvirtd-pool \
+ read-bufsiz \
+ read-non-seekable \
+ start \
+ undefine \
+ vcpupin \
+ virsh-all \
+ virsh-optparse \
+ virsh-schedinfo \
+ virsh-synopsis
endif
ACK
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
12:47 a.m.
New subject: [libvirt] [PATCH 3/3] test: all test_scripts should be part of tarball when building without libvirtd
At 2011-5-13 17:37, Daniel P. Berrange write:
On Fri, May 13, 2011 at 04:03:20PM +0800, Wen Congyang wrote:
> Steps to reproduce this problem:
> 1. # ./autogen.sh --without-libvirtd
> 2. # make dist
> 3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
> ...
> make check-TESTS
> make[1]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
> make[1]: *** No rule to make target `test_conf.sh', needed by
`check-TESTS'. Stop.
> make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/tests'
> make: *** [check-am] Error 2
> error: Bad exit status from /var/tmp/rpm-tmp.7Rb9PV (%check)
>
> ---
> tests/Makefile.am | 18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index fe191fd..bc171d2 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -144,6 +144,24 @@ test_scripts += \
> virsh-optparse \
> virsh-schedinfo \
> virsh-synopsis
> +else
> +EXTRA_DIST += \
> + test_conf.sh \
> + cpuset \
> + daemon-conf \
> + define-dev-segfault \
> + int-overflow \
> + libvirtd-fail \
> + libvirtd-pool \
> + read-bufsiz \
> + read-non-seekable \
> + start \
> + undefine \
> + vcpupin \
> + virsh-all \
> + virsh-optparse \
> + virsh-schedinfo \
> + virsh-synopsis
> endif
ACK
Thanks, pushed.
Daniel
4934
days inactive
4943
days old
13 comments
4 participants
participants (4)
-
Daniel P. Berrange -
Eric Blake -
Wen Congyang -
Wen Congyang