External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: src: generate openrc init files

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-07-28 12:11:31 +02:00
parent dd4f2c73ad
commit 25ab77a197
30 changed files with 118 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Makefile.am
View File

@ -35,17 +35,8 @@ tapset_DATA =
endif WITH_DTRACE_PROBES
RPC_PROBE_FILES =
LOGROTATE_FILES_IN =
OPENRC_INIT_FILES =
OPENRC_INIT_FILES_IN =
OPENRC_CONF_FILES =
SYSCONF_FILES =
COMMON_UNIT_VARS = \
-e 's|[@]runstatedir[@]|$(runstatedir)|g' \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
$(NULL)
include security/Makefile.inc.am
include access/Makefile.inc.am
include logging/Makefile.inc.am
@ -231,25 +222,6 @@ uninstall-sysconfig:
done
rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
OPENRC_CONF_DIR = $(sysconfdir)/conf.d
install-openrc-conf:
$(MKDIR_P) $(DESTDIR)$(OPENRC_CONF_DIR)
for f in $(OPENRC_CONF_FILES:%.confd=%) ; \
do \
tgt=`basename $$f`; \
$(INSTALL_DATA) $(srcdir)/$$f.confd \
$(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \
done
uninstall-openrc-conf:
for f in $(OPENRC_CONF_FILES:%.confd=%) ; \
do \
tgt=`basename $$f`; \
rm -f $(DESTDIR)$(OPENRC_CONF_DIR)/$$tgt; \
done
rmdir $(DESTDIR)$(OPENRC_CONF_DIR) || :
LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
BUILT_SOURCES += $(LOGROTATE_FILES)
@ -279,40 +251,6 @@ UNINSTALL_LOCAL += uninstall-logrotate
endif WITH_LIBVIRTD
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_OPENRC
OPENRC_INIT_DIR = $(sysconfdir)/init.d
BUILT_SOURCES += $(OPENRC_INIT_FILES)
install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf
$(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR)
for f in $(OPENRC_INIT_FILES:%.init=%) ; \
do \
tgt=`basename $$f`; \
$(INSTALL_SCRIPT) $$f.init \
$(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \
done
uninstall-openrc: uninstall-openrc-conf
for f in $(OPENRC_INIT_FILES:%.init=%) ; \
do \
tgt=`basename $$f`; \
rm -f $(DESTDIR)$(OPENRC_INIT_DIR)/$$tgt ; \
done
rmdir $(DESTDIR)$(OPENRC_INIT_DIR) || :
INSTALL_DATA_LOCAL += install-openrc
UNINSTALL_LOCAL += uninstall-openrc
endif LIBVIRT_INIT_SCRIPT_OPENRC
endif WITH_LIBVIRTD
generated-sources: $(BUILT_SOURCES)
install-data-local: $(INSTALL_DATA_LOCAL) \
$(INSTALL_DATA_DIRS:%=install-data-%)
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"

10
src/interface/Makefile.inc.am
View File

@ -8,14 +8,4 @@ if WITH_INTERFACE
SYSCONF_FILES += interface/virtinterfaced.sysconf
OPENRC_INIT_FILES += \
virtinterfaced.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
interface/virtinterfaced.init.in \
$(NULL)
virtinterfaced.init: interface/virtinterfaced.init.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_INTERFACE

5
src/interface/meson.build
View File

@ -47,4 +47,9 @@ if conf.has('WITH_INTERFACE')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtinterfaced',
'in_file': files('virtinterfaced.init.in')
}
endif

10
src/libxl/Makefile.inc.am
View File

@ -7,16 +7,6 @@ if WITH_LIBXL
SYSCONF_FILES += libxl/virtxend.sysconf
OPENRC_INIT_FILES += \
virtxend.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
libxl/virtxend.init.in \
$(NULL)
virtxend.init: libxl/virtxend.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
INSTALL_DATA_DIRS += libxl
install-data-libxl:

5
src/libxl/meson.build
View File

@ -66,4 +66,9 @@ if conf.has('WITH_LIBXL')
'deps': 'ConditionPathExists=/proc/xen/capabilities',
'conflicts': true,
}
openrc_init_files += {
'name': 'virtxend',
'in_file': files('virtxend.init.in'),
}
endif

11
src/locking/Makefile.inc.am
View File

@ -3,13 +3,6 @@
RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
SYSCONF_FILES += locking/virtlockd.sysconf
OPENRC_INIT_FILES += \
virtlockd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
locking/virtlockd.init.in \
$(NULL)
INSTALL_DATA_DIRS += locking
install-data-locking:
@ -33,7 +26,3 @@ endif WITH_LIBVIRTD
install-data-locking \
uninstall-data-locking \
$(NULL)
virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@

5
src/locking/meson.build
View File

@ -144,6 +144,11 @@ if conf.has('WITH_LIBVIRTD')
'socket_admin_in': files('virtlockd-admin.socket.in'),
}
openrc_init_files += {
'name': 'virtlockd',
'in_file': files('virtlockd.init.in'),
}
if conf.has('WITH_SANLOCK')
virt_helpers += {
'name': 'libvirt_sanlock_helper',

10
src/logging/Makefile.inc.am
View File

@ -1,13 +1,3 @@
# vim: filetype=automake
SYSCONF_FILES += logging/virtlogd.sysconf
OPENRC_INIT_FILES += \
virtlogd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
logging/virtlogd.init.in \
$(NULL)
virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@

5
src/logging/meson.build
View File

@ -88,6 +88,11 @@ if conf.has('WITH_LIBVIRTD')
'socket_in': files('virtlogd.socket.in'),
'socket_admin_in': files('virtlogd-admin.socket.in'),
}
openrc_init_files += {
'name': 'virtlogd',
'in_file': files('virtlogd.init.in'),
}
endif
log_inc_dir = include_directories('.')

10
src/lxc/Makefile.inc.am
View File

@ -13,16 +13,6 @@ if WITH_LXC
SYSCONF_FILES += lxc/virtlxcd.sysconf
OPENRC_INIT_FILES += \
virtlxcd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
lxc/virtlxcd.init.in \
$(NULL)
virtlxcd.init: lxc/virtlxcd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
if WITH_DTRACE_PROBES
RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
endif

5
src/lxc/meson.build
View File

@ -149,4 +149,9 @@ if conf.has('WITH_LXC')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtlxcd',
'in_file': files('virtlxcd.init.in'),
}
endif

41
src/meson.build
View File

@ -199,6 +199,12 @@ guest_unit_files = []
# * conflicts - if the service conflicts with libvirtd (optional, true)
virt_daemon_units = []
# openrc_init_files
# generate libvirt daemon openrc init files
# * name - daemon name (required)
# * in_file - source init file (required)
openrc_init_files = []
# list subdirectories
@ -744,4 +750,39 @@ if conf.has('WITH_LIBVIRTD')
endforeach
endforeach
endif
# Generate openrc init files
if init_script == 'openrc'
foreach init : openrc_init_files
init_conf = configuration_data()
init_conf.set('sbindir', sbindir)
init_conf.set('runstatedir', runstatedir)
if conf.has('WITH_FIREWALLD')
need_firewalld = 'need firewalld'
else
need_firewalld = ''
endif
init_conf.set('NEED_FIREWALLD', need_firewalld)
init_file = configure_file(
input: init['in_file'],
output: '@0@.init'.format(init['name']),
configuration: init_conf,
)
install_data(
init_file,
install_dir: sysconfdir / 'init.d',
rename: [ init['name'] ],
)
if init.has_key('confd')
install_data(
init['confd'],
install_dir: sysconfdir / 'conf.d',
rename: [ init['name'] ],
)
endif
endforeach
endif
endif

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

@ -7,16 +7,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_NETWORK
SYSCONF_FILES += network/virtnetworkd.sysconf
OPENRC_INIT_FILES += \
virtnetworkd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
network/virtnetworkd.init.in \
$(NULL)
virtnetworkd.init: network/virtnetworkd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
INSTALL_DATA_DIRS += network
UUID=$(shell uuidgen 2>/dev/null)

5
src/network/meson.build
View File

@ -66,4 +66,9 @@ if conf.has('WITH_NETWORK')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtnetworkd',
'in_file': files('virtnetworkd.init.in'),
}
endif

11
src/node_device/Makefile.inc.am
View File

@ -13,15 +13,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_NODE_DEVICES
SYSCONF_FILES += node_device/virtnodedevd.sysconf
OPENRC_INIT_FILES += \
virtnodedevd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
node_device/virtnodedevd.init.in \
$(NULL)
virtnodedevd.init: node_device/virtnodedevd.init.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_NODE_DEVICES

5
src/node_device/meson.build
View File

@ -59,4 +59,9 @@ if conf.has('WITH_NODE_DEVICES')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtnodedevd',
'in_file': files('virtnodedevd.init.in'),
}
endif

10
src/nwfilter/Makefile.inc.am
View File

@ -13,14 +13,4 @@ nwfilterxml_DATA = $(NWFILTER_XML_FILES)
SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
OPENRC_INIT_FILES += \
virtnwfilterd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
nwfilter/virtnwfilterd.init.in \
$(NULL)
virtnwfilterd.init: nwfilter/virtnwfilterd.init.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_NWFILTER

5
src/nwfilter/meson.build
View File

@ -54,4 +54,9 @@ if conf.has('WITH_NWFILTER')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtnwfilterd',
'in_file': files('virtnwfilterd.init.in'),
}
endif

10
src/qemu/Makefile.inc.am
View File

@ -6,16 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
if WITH_QEMU
SYSCONF_FILES += qemu/virtqemud.sysconf
OPENRC_INIT_FILES += \
virtqemud.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
qemu/virtqemud.init.in \
$(NULL)
virtqemud.init: qemu/virtqemud.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
INSTALL_DATA_DIRS += qemu
install-data-qemu:

5
src/qemu/meson.build
View File

@ -150,4 +150,9 @@ if conf.has('WITH_QEMU')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtqemud',
'in_file': files('virtqemud.init.in'),
}
endif

30
src/remote/Makefile.inc.am
View File

@ -12,19 +12,6 @@ SYSCONF_FILES += \
remote/virtproxyd.sysconf \
$(NULL)
OPENRC_INIT_FILES += \
libvirtd.init \
virtproxyd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
remote/libvirtd.init.in \
remote/virtproxyd.init.in \
$(NULL)
OPENRC_CONF_FILES += \
remote/libvirtd.confd \
remote/virtproxyd.confd \
$(NULL)
if WITH_LIBVIRTD
INSTALL_DATA_DIRS += remote
@ -100,20 +87,3 @@ uninstall-sasl:
INSTALL_DATA_LOCAL += install-sasl
UNINSTALL_LOCAL += uninstall-sasl
endif WITH_SASL
LIBVIRTD_INIT_VARS = \
$(COMMON_UNIT_VARS)
if WITH_FIREWALLD
LIBVIRTD_INIT_VARS += \
-e 's|[@]NEED_FIREWALLD[@]|need firewalld|g'
else ! WITH_FIREWALLD
LIBVIRTD_INIT_VARS += \
-e 's|[@]NEED_FIREWALLD[@]||g'
endif ! WITH_FIREWALLD
libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
virtproxyd.init: remote/virtproxyd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@

12
src/remote/meson.build
View File

@ -164,6 +164,12 @@ if conf.has('WITH_REMOTE')
'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
}
openrc_init_files += {
'name': 'libvirtd',
'in_file': files('libvirtd.init.in'),
'confd': files('libvirtd.confd'),
}
virt_daemons += {
'name': 'virtproxyd',
'c_args': [
@ -187,6 +193,12 @@ if conf.has('WITH_REMOTE')
'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
'deps': libvirtd_socket_conflicts,
}
openrc_init_files += {
'name': 'virtproxyd',
'in_file': files('virtproxyd.init.in'),
'confd': files('virtproxyd.confd'),
}
endif
endif

11
src/secret/Makefile.inc.am
View File

@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_SECRETS
SYSCONF_FILES += secret/virtsecretd.sysconf
OPENRC_INIT_FILES += \
virtsecretd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
secret/virtsecretd.init.in \
$(NULL)
virtsecretd.init: secret/virtsecretd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_SECRETS

5
src/secret/meson.build
View File

@ -36,4 +36,9 @@ if conf.has('WITH_SECRETS')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtsecretd',
'in_file': files('virtsecretd.init.in'),
}
endif

11
src/storage/Makefile.inc.am
View File

@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_STORAGE
SYSCONF_FILES += storage/virtstoraged.sysconf
OPENRC_INIT_FILES += \
virtstoraged.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
storage/virtstoraged.init.in \
$(NULL)
virtstoraged.init: storage/virtstoraged.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_STORAGE

5
src/storage/meson.build
View File

@ -134,6 +134,11 @@ if conf.has('WITH_STORAGE')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtstoraged',
'in_file': files('virtstoraged.init.in'),
}
endif
if conf.has('WITH_STORAGE_DISK')

11
src/vbox/Makefile.inc.am
View File

@ -7,15 +7,4 @@ DRIVER_SOURCE_FILES += \
if WITH_VBOX
SYSCONF_FILES += vbox/virtvboxd.sysconf
OPENRC_INIT_FILES += \
virtvboxd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
vbox/virtvboxd.init.in \
$(NULL)
virtvboxd.init: vbox/virtvboxd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_VBOX

5
src/vbox/meson.build
View File

@ -59,4 +59,9 @@ if conf.has('WITH_VBOX')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtvboxd',
'in_file': files('virtvboxd.init.in'),
}
endif

11
src/vz/Makefile.inc.am
View File

@ -6,15 +6,4 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
if WITH_VZ
SYSCONF_FILES += vz/virtvzd.sysconf
OPENRC_INIT_FILES += \
virtvzd.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
vz/virtvzd.init.in \
$(NULL)
virtvzd.init: vz/virtvzd.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
endif WITH_VZ

5
src/vz/meson.build
View File

@ -51,4 +51,9 @@ if conf.has('WITH_VZ')
'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
}
openrc_init_files += {
'name': 'virtvzd',
'in_file': files('virtvzd.init.in'),
}
endif