External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: src/network: install firewalld zone file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-06-25 17:30:21 +02:00
parent c957791859
commit 7f1e2fa7a6
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@ -23,7 +23,6 @@
BUILT_SOURCES =
DRIVER_SOURCE_FILES =
STATEFUL_DRIVER_SOURCE_FILES =
INSTALL_DATA_DIRS =
INSTALL_DATA_LOCAL =
UNINSTALL_LOCAL =
SYM_FILES =
@ -201,8 +200,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemtap.py
endif WITH_DTRACE_PROBES
install-data-local: $(INSTALL_DATA_LOCAL) \
$(INSTALL_DATA_DIRS:%=install-data-%)
install-data-local: $(INSTALL_DATA_LOCAL)
uninstall-local: $(UNINSTALL_LOCAL) \
$(INSTALL_DATA_DIRS:%=uninstall-data-%)
uninstall-local: $(UNINSTALL_LOCAL)

22
src/network/Makefile.inc.am
View File

@ -3,25 +3,3 @@
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
if WITH_NETWORK
INSTALL_DATA_DIRS += network
install-data-network:
if WITH_FIREWALLD_ZONE
$(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
$(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
$(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
endif WITH_FIREWALLD_ZONE
uninstall-data-network:
if WITH_FIREWALLD_ZONE
rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
endif WITH_FIREWALLD_ZONE
endif WITH_NETWORK
.PHONY: \
install-data-network \
uninstall-data-network \
$(NULL)

8
src/network/meson.build
View File

@ -114,4 +114,12 @@ if conf.has('WITH_NETWORK')
confdir / 'qemu' / 'networks' / 'autostart',
'../default.xml', 'default.xml',
)
if conf.has('WITH_FIREWALLD_ZONE')
install_data(
'libvirt.zone',
install_dir: prefix / 'lib' / 'firewalld' / 'zones',
rename: [ 'libvirt.xml' ],
)
endif
endif