3:57 a.m.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tools/wireshark/Makefile.am | 1 +
tools/wireshark/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/wireshark/Makefile.am b/tools/wireshark/Makefile.am
index b6fa57c..28e6ed8 100644
--- a/tools/wireshark/Makefile.am
+++ b/tools/wireshark/Makefile.am
@@ -20,3 +20,4 @@
if WITH_WIRESHARK_DISSECTOR
SUBDIRS = src
endif WITH_WIRESHARK_DISSECTOR
+EXTRA_DIST = util/genxdrstub.pl util/make-dissector-reg
diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am
index afe9975..44f22be 100644
--- a/tools/wireshark/src/Makefile.am
+++ b/tools/wireshark/src/Makefile.am
@@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir)
ws_plugin_LTLIBRARIES = libvirt.la
-libvirt_la_SOURCES = packet-libvirt.c plugin.c
+libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c
libvirt_la_CPPFLAGS = $(WS_DISSECTOR_CPPFLAGS)
libvirt_la_LDFLAGS = -avoid-version -module
--
1.8.5.3
4:14 a.m.
On Tue, Feb 04, 2014 at 10:57:45AM +0100, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tools/wireshark/Makefile.am | 1 +
tools/wireshark/src/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/wireshark/Makefile.am b/tools/wireshark/Makefile.am
index b6fa57c..28e6ed8 100644
--- a/tools/wireshark/Makefile.am
+++ b/tools/wireshark/Makefile.am
@@ -20,3 +20,4 @@
if WITH_WIRESHARK_DISSECTOR
SUBDIRS = src
endif WITH_WIRESHARK_DISSECTOR
+EXTRA_DIST = util/genxdrstub.pl util/make-dissector-reg
I'd add samples/libvirt-sample.pdml as well even though it's just a sample file
and
not required for building.
ACK with/without this change.
Christophe
diff --git a/tools/wireshark/src/Makefile.am
b/tools/wireshark/src/Makefile.am
index afe9975..44f22be 100644
--- a/tools/wireshark/src/Makefile.am
+++ b/tools/wireshark/src/Makefile.am
@@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir)
ws_plugin_LTLIBRARIES = libvirt.la
-libvirt_la_SOURCES = packet-libvirt.c plugin.c
+libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c
libvirt_la_CPPFLAGS = $(WS_DISSECTOR_CPPFLAGS)
libvirt_la_LDFLAGS = -avoid-version -module
--
1.8.5.3
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
4:32 a.m.
On Tue, Feb 04, 2014 at 11:14:34AM +0100, Christophe Fergeau wrote:
On Tue, Feb 04, 2014 at 10:57:45AM +0100, Martin Kletzander wrote:
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> tools/wireshark/Makefile.am | 1 +
> tools/wireshark/src/Makefile.am | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/wireshark/Makefile.am b/tools/wireshark/Makefile.am
> index b6fa57c..28e6ed8 100644
> --- a/tools/wireshark/Makefile.am
> +++ b/tools/wireshark/Makefile.am
> @@ -20,3 +20,4 @@
> if WITH_WIRESHARK_DISSECTOR
> SUBDIRS = src
> endif WITH_WIRESHARK_DISSECTOR
> +EXTRA_DIST = util/genxdrstub.pl util/make-dissector-reg
I'd add samples/libvirt-sample.pdml as well even though it's just a sample file
and
not required for building.
ACK with/without this change.
Oh no, I always forget that my git send-email is not set up the same
way as format-patch is; that is formatting notes into commit messages.
Thus this mail misses the "Pushed as a build-breaker" note :(
So this is already pushed, but feel free to add the sample as well, at
least it will be part of the tar.gz. I don't know where to put it in
the specfile, though.
Martin
Christophe
> diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am
> index afe9975..44f22be 100644
> --- a/tools/wireshark/src/Makefile.am
> +++ b/tools/wireshark/src/Makefile.am
> @@ -21,7 +21,7 @@
> INCLUDES = -I$(top_srcdir)
>
> ws_plugin_LTLIBRARIES = libvirt.la
> -libvirt_la_SOURCES = packet-libvirt.c plugin.c
> +libvirt_la_SOURCES = packet-libvirt.h packet-libvirt.c plugin.c
> libvirt_la_CPPFLAGS = $(WS_DISSECTOR_CPPFLAGS)
> libvirt_la_LDFLAGS = -avoid-version -module
>
> --
> 1.8.5.3
>
> --
> libvir-list mailing list
> libvir-list(a)redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
9:29 a.m.
On 02/04/2014 03:32 AM, Martin Kletzander wrote:
On Tue, Feb 04, 2014 at 11:14:34AM +0100, Christophe Fergeau wrote:
> On Tue, Feb 04, 2014 at 10:57:45AM +0100, Martin Kletzander wrote:
>> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
>> ---
>> tools/wireshark/Makefile.am | 1 +
>> tools/wireshark/src/Makefile.am | 2 +-
>> 2 files changed, 2 insertions(+), 1 deletion(-)
So this is already pushed, but feel free to add the sample as well, at
least it will be part of the tar.gz. I don't know where to put it in
the specfile, though.
I'm now seeing this failure:
Checking for unpackaged file(s): /usr/lib/rpm/check-files
/home/eblake/rpmbuild/BUILDROOT/libvirt-1.2.2-1.fc20.x86_64
error: Installed (but unpackaged) file(s) found:
/usr/lib64/wireshark/plugins/1.10.5/libvirt.la
/usr/lib64/wireshark/plugins/1.10.5/libvirt.so
Do we need to create a new subpackage for libvirt-wireshark, where we
stick both the .so and the examples?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
9:39 a.m.
On Tue, Feb 04, 2014 at 08:29:53AM -0700, Eric Blake wrote:
On 02/04/2014 03:32 AM, Martin Kletzander wrote:
> On Tue, Feb 04, 2014 at 11:14:34AM +0100, Christophe Fergeau wrote:
>> On Tue, Feb 04, 2014 at 10:57:45AM +0100, Martin Kletzander wrote:
>>> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
>>> ---
>>> tools/wireshark/Makefile.am | 1 +
>>> tools/wireshark/src/Makefile.am | 2 +-
>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> So this is already pushed, but feel free to add the sample as well, at
> least it will be part of the tar.gz. I don't know where to put it in
> the specfile, though.
I'm now seeing this failure:
Checking for unpackaged file(s): /usr/lib/rpm/check-files
/home/eblake/rpmbuild/BUILDROOT/libvirt-1.2.2-1.fc20.x86_64
error: Installed (but unpackaged) file(s) found:
/usr/lib64/wireshark/plugins/1.10.5/libvirt.la
/usr/lib64/wireshark/plugins/1.10.5/libvirt.so
Do we need to create a new subpackage for libvirt-wireshark, where we
stick both the .so and the examples?
Yes, indeed. It seems this part got missed
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 :|
3947
days inactive
3947
days old
4 comments
4 participants
participants (4)
-
Christophe Fergeau -
Daniel P. Berrange -
Eric Blake -
Martin Kletzander