From 2ba64a44fb00b79b1b9e8e897db7dbd0fbe1df31 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 23 Jun 2020 13:51:26 +0200 Subject: [PATCH] meson: src/nwfilter: install nwfilter XML files Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 4df4756adf..4d34d7f3ad 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 5e0ded5be0..2459e29485 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -64,4 +64,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 0000000000..95af75bb15 --- /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')