On Wed, 2016-10-26 at 08:46 +0200, Boris Fiuczynski wrote:
> > if WITH_WIRESHARK_DISSECTOR
> >
> > -ws_plugindir = $(plugindir)
> > +ws_plugindir = $(prefix)$(plugindir)
> > ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
> > wireshark_src_libvirt_la_CPPFLAGS = \
> > -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS)
>
> It looks like this patch has broken the RPM build
>
>
https://ci.centos.org/view/libvirt-project/job/libvirt-master-rpm/82/syst...
>
> Notice at the make install phase:
>
> /usr/bin/mkdir -p
'/home/jenkins/rpmbuild/BUILDROOT/libvirt-2.4.0-1.fc23.x86_64/usr/usr/lib64/wireshark/plugins/1.12.12'
> /bin/sh ../libtool --mode=install /usr/bin/install -c wireshark/src/libvirt.la
'/home/jenkins/rpmbuild/BUILDROOT/libvirt-2.4.0-
1.fc23.x86_64/usr/usr/lib64/wireshark/plugins/1.12.12'
> libtool: install: /usr/bin/install -c
wireshark/src/.libs/libvirt.so /home/jenkins/rpmbuild/BUILDROOT/libvirt-2.4.0-
1.fc23.x86_64/usr/usr/lib64/wireshark/plugins/1.12.12/libvirt.so
> libtool: install: /usr/bin/install -c
wireshark/src/.libs/libvirt.lai /home/jenkins/rpmbuild/BUILDROOT/libvirt-2.4.0-
1.fc23.x86_64/usr/usr/lib64/wireshark/plugins/1.12.12/libvirt.la
> libtool: warning: remember to run 'libtool --finish
/usr/usr/lib64/wireshark/plugins/1.12.12'
>
>
> It is getting "/usr/usr" in the path which is very wrong.
I can confirm that the rpm build is broken with wireshark versions < 2.
The package config of these versions do not provide plugindir and the
code change in this patch is only working correctly when it is provided
and otherwise ends up with the scenario Daniel outlined above.
I think that line
http://libvirt.org/git/?p=libvirt.git;a=blob;f=m4/virt-wireshark.m4;h=e1e...
needs fixing but I have no good idea how to make the adjustment
compatible with the changes in the else branch.
I have a partial fix for this
https://www.redhat.com/archives/libvir-list/2016-October/msg01169.html
Doesn't handle all cases yet but should be good enough to
make the CI job green again. Feel free to give it a go :)
--
Andrea Bolognani / Red Hat / Virtualization