Here is a couple of patches related to make dist, then build from
resulting tarball and rpm building.
The first one adds a few missing header files in the associated file
variables, it's needed otherwise the missing headers would break
compilation from a distribution tarball
The second one handles the xml filter files, first they need to be
added to EXTRA_DIST from their Makefile.am otherwise they are missing
from the tarball, and second that set of file in /etc/ need to be
listed in the rpm spec file, associated with the main libvirt rpm
(i.e. where the daemon resides as it's useless with just the client).
I think those are fairly uncontroversial and are needed to not
break the distribution, but I will probably commit those tomorrow,
in case someone points out something stupid :-)
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
diff --git a/src/Makefile.am b/src/Makefile.am
index 74ee6c7..c661a5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,7 +103,8 @@ NETWORK_CONF_SOURCES = \
# Network filter driver generic impl APIs
NWFILTER_PARAM_CONF_SOURCES = \
- conf/nwfilter_params.c conf/nwfilter_conf.h
+ conf/nwfilter_params.c conf/nwfilter_params.h \
+ conf/nwfilter_conf.h
NWFILTER_CONF_SOURCES = \
$(NWFILTER_PARAM_CONF_SOURCES) \
@@ -288,8 +289,11 @@ STORAGE_HELPER_DISK_SOURCES = \
# Network filters
NWFILTER_DRIVER_SOURCES = \
nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \
- nwfilter/nwfilter_gentech_driver.c \
- nwfilter/nwfilter_ebiptables_driver.c
+ nwfilter/nwfilter_gentech_driver.c \
+ nwfilter/nwfilter_gentech_driver.h \
+ nwfilter/nwfilter_ebiptables_driver.c \
+ nwfilter/nwfilter_ebiptables_driver.h
+
# Security framework and drivers for various models
SECURITY_DRIVER_SOURCES = \
diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am
index dcf6ce4..dcc5be0 100644
--- a/examples/xml/nwfilter/Makefile.am
+++ b/examples/xml/nwfilter/Makefile.am
@@ -13,6 +13,8 @@ FILTERS = \
no-mac-spoofing.xml \
no-other-l2-traffic.xml
+EXTRA_DIST=$(FILTERS)
+
confdir = $(sysconfdir)/libvirt
NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter"
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 397fc43..6cadf84 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -670,6 +670,9 @@ fi
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%endif
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
+%{_sysconfdir}/libvirt/nwfilter/*.xml
+
%{_sysconfdir}/rc.d/init.d/libvirtd
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list