[libvirt PATCH 235/351] meson: src/nwfilter: install nwfilter XML files

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:51 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/nwfilter/Makefile.inc.am |  9 ---------
 src/nwfilter/meson.build     |  2 ++
 src/nwfilter/xml/meson.build | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/nwfilter/xml/meson.build

diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 4df4756adf7..4d34d7f3ad1 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -1,14 +1,5 @@
 # vim: filetype=automake
 
-NWFILTER_XML_FILES = $(wildcard $(srcdir)/nwfilter/xml/*.xml)
-
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES))
-
-if WITH_NWFILTER
-
-nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter
-nwfilterxml_DATA = $(NWFILTER_XML_FILES)
-
-endif WITH_NWFILTER
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index a832c2ddaeb..a05f0ce8fcf 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -65,4 +65,6 @@ if conf.has('WITH_NWFILTER')
     'name': 'virtnwfilterd',
     'file': files('virtnwfilterd.sysconf'),
   }
+
+  subdir('xml')
 endif
diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build
new file mode 100644
index 00000000000..95af75bb15e
--- /dev/null
+++ b/src/nwfilter/xml/meson.build
@@ -0,0 +1,22 @@
+nwfilter_xml_files = [
+  'allow-arp.xml',
+  'allow-dhcp-server.xml',
+  'allow-dhcp.xml',
+  'allow-incoming-ipv4.xml',
+  'allow-ipv4.xml',
+  'clean-traffic-gateway.xml',
+  'clean-traffic.xml',
+  'no-arp-ip-spoofing.xml',
+  'no-arp-mac-spoofing.xml',
+  'no-arp-spoofing.xml',
+  'no-ip-multicast.xml',
+  'no-ip-spoofing.xml',
+  'no-mac-broadcast.xml',
+  'no-mac-spoofing.xml',
+  'no-other-l2-traffic.xml',
+  'no-other-rarp-traffic.xml',
+  'qemu-announce-self-rarp.xml',
+  'qemu-announce-self.xml',
+]
+
+install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
-- 
2.26.2




More information about the libvir-list mailing list