External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: src: generate libvirt daemon conf and augeas 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 11:54:39 +02:00
parent 3225a20bb7
commit 5740e1789e
27 changed files with 58 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -21,7 +21,6 @@
# that actually use them.
BUILT_SOURCES =
nodist_conf_DATA =
DRIVER_SOURCE_FILES =
STATEFUL_DRIVER_SOURCE_FILES =
INSTALL_DATA_DIRS =
@ -31,7 +30,6 @@ SYM_FILES =
USED_SYM_FILES =
augeas_DATA =
augeastest_DATA =
conf_DATA =
if WITH_DTRACE_PROBES
tapset_DATA =
endif WITH_DTRACE_PROBES
@ -198,9 +196,6 @@ check-augeas: $(augeas_DATA) $(augeastest_DATA)
fi
.PHONY: check-augeas
AUG_GENTEST_SCRIPT = $(top_srcdir)/scripts/augeas-gentest.py
AUG_GENTEST = $(RUNUTF8) $(PYTHON) $(AUG_GENTEST_SCRIPT)
if WITH_DTRACE_PROBES
BUILT_SOURCES += libvirt_functions.stp

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

@ -2,33 +2,3 @@
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
if WITH_BHYVE
nodist_conf_DATA += bhyve/virtbhyved.conf
augeas_DATA += bhyve/virtbhyved.aug
augeastest_DATA += bhyve/test_virtbhyved.aug
bhyve/virtbhyved.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
$< > $@
bhyve/virtbhyved.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
$< > $@
bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
bhyve/virtbhyved.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
> $@ || rm -f $@
endif WITH_BHYVE

4
src/bhyve/meson.build
View File

@ -51,4 +51,8 @@ if conf.has('WITH_BHYVE')
'aug': files('test_libvirtd_bhyve.aug.in'),
'conf': files('bhyve.conf'),
}
virt_daemon_confs += {
'name': 'virtbhyved',
}
endif

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

@ -6,10 +6,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_INTERFACE
nodist_conf_DATA += interface/virtinterfaced.conf
augeas_DATA += interface/virtinterfaced.aug
augeastest_DATA += interface/test_virtinterfaced.aug
SYSCONF_FILES += interface/virtinterfaced.sysconf
SYSTEMD_UNIT_FILES += \
@ -48,27 +44,4 @@ virtinterface%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
interface/virtinterfaced.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
$< > $@
interface/virtinterfaced.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
$< > $@
interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \
interface/virtinterfaced.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
> $@ || rm -f $@
endif WITH_INTERFACE

4
src/interface/meson.build
View File

@ -34,4 +34,8 @@ if conf.has('WITH_INTERFACE')
'-DMODULE_NAME="interface"',
],
}
virt_daemon_confs += {
'name': 'virtinterfaced',
}
endif

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

@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
if WITH_LIBXL
nodist_conf_DATA += libxl/virtxend.conf
augeas_DATA += libxl/virtxend.aug
augeastest_DATA += libxl/test_virtxend.aug
SYSCONF_FILES += libxl/virtxend.sysconf
SYSTEMD_UNIT_FILES += \
@ -48,29 +44,6 @@ virtxend.service: libxl/virtxend.service.in $(top_builddir)/config.status
virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@
libxl/virtxend.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtxend/' \
$< > $@
libxl/virtxend.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtxend/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
$< > $@
libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
libxl/virtxend.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtxend/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
> $@ || rm -f $@
INSTALL_DATA_DIRS += libxl
install-data-libxl:

4
src/libxl/meson.build
View File

@ -52,4 +52,8 @@ if conf.has('WITH_LIBXL')
'aug': files('test_libvirtd_libxl.aug.in'),
'conf': files('libxl.conf'),
}
virt_daemon_confs += {
'name': 'virtxend',
}
endif

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

@ -11,10 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_LXC
nodist_conf_DATA += lxc/virtlxcd.conf
augeas_DATA += lxc/virtlxcd.aug
augeastest_DATA += lxc/test_virtlxcd.aug
SYSCONF_FILES += lxc/virtlxcd.sysconf
SYSTEMD_UNIT_FILES += \
@ -50,29 +46,6 @@ virtlxcd.service: lxc/virtlxcd.service.in $(top_builddir)/config.status
virtlxc%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@
lxc/virtlxcd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
$< > $@
lxc/virtlxcd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
$< > $@
lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \
lxc/virtlxcd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
> $@ || rm -f $@
if WITH_DTRACE_PROBES
RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
endif

4
src/lxc/meson.build
View File

@ -136,4 +136,8 @@ if conf.has('WITH_LXC')
'aug': files('test_libvirtd_lxc.aug.in'),
'conf': files('lxc.conf'),
}
virt_daemon_confs += {
'name': 'virtlxcd',
}
endif

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

@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
if WITH_NETWORK
nodist_conf_DATA += network/virtnetworkd.conf
augeas_DATA += network/virtnetworkd.aug
augeastest_DATA += network/test_virtnetworkd.aug
SYSCONF_FILES += network/virtnetworkd.sysconf
SYSTEMD_UNIT_FILES += \
@ -46,29 +42,6 @@ virtnetwork%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
network/virtnetworkd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
$< > $@
network/virtnetworkd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
$< > $@
network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \
network/virtnetworkd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
> $@ || rm -f $@
INSTALL_DATA_DIRS += network
UUID=$(shell uuidgen 2>/dev/null)

4
src/network/meson.build
View File

@ -46,6 +46,10 @@ if conf.has('WITH_NETWORK')
],
}
virt_daemon_confs += {
'name': 'virtnetworkd',
}
virt_helpers += {
'name': 'libvirt_leaseshelper',
'sources': [

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

@ -12,10 +12,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_NODE_DEVICES
nodist_conf_DATA += node_device/virtnodedevd.conf
augeas_DATA += node_device/virtnodedevd.aug
augeastest_DATA += node_device/test_virtnodedevd.aug
SYSCONF_FILES += node_device/virtnodedevd.sysconf
SYSTEMD_UNIT_FILES += \
@ -53,28 +49,4 @@ virtnodedevd.service: node_device/virtnodedevd.service.in \
virtnodedev%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
node_device/virtnodedevd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
$< > $@
node_device/virtnodedevd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
$< > $@
node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \
node_device/virtnodedevd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
> $@ || rm -f $@
endif WITH_NODE_DEVICES

4
src/node_device/meson.build
View File

@ -46,4 +46,8 @@ if conf.has('WITH_NODE_DEVICES')
'-DMODULE_NAME="nodedev"',
],
}
virt_daemon_confs += {
'name': 'virtnodedevd',
}
endif

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

@ -11,10 +11,6 @@ if WITH_NWFILTER
nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter
nwfilterxml_DATA = $(NWFILTER_XML_FILES)
nodist_conf_DATA += nwfilter/virtnwfilterd.conf
augeas_DATA += nwfilter/virtnwfilterd.aug
augeastest_DATA += nwfilter/test_virtnwfilterd.aug
SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
SYSTEMD_UNIT_FILES += \
@ -52,28 +48,4 @@ virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \
virtnwfilter%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
$< > $@
nwfilter/virtnwfilterd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
$< > $@
nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \
nwfilter/virtnwfilterd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
> $@ || rm -f $@
endif WITH_NWFILTER

4
src/nwfilter/meson.build
View File

@ -41,4 +41,8 @@ if conf.has('WITH_NWFILTER')
'-DMODULE_NAME="nwfilter"',
],
}
virt_daemon_confs += {
'name': 'virtnwfilterd',
}
endif

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

@ -4,10 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
if WITH_QEMU
nodist_conf_DATA += qemu/virtqemud.conf
augeas_DATA += qemu/virtqemud.aug
augeastest_DATA += qemu/test_virtqemud.aug
SYSCONF_FILES += qemu/virtqemud.sysconf
SYSTEMD_UNIT_FILES += \
@ -43,29 +39,6 @@ virtqemud.service: qemu/virtqemud.service.in $(top_builddir)/config.status
virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
qemu/virtqemud.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
$< > $@
qemu/virtqemud.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
$< > $@
qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
qemu/virtqemud.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
> $@ || rm -f $@
INSTALL_DATA_DIRS += qemu
install-data-qemu:

4
src/qemu/meson.build
View File

@ -137,4 +137,8 @@ if conf.has('WITH_QEMU')
],
'install_dir': bindir,
}
virt_daemon_confs += {
'name': 'virtqemud',
}
endif

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

@ -62,39 +62,6 @@ OPENRC_CONF_FILES += \
if WITH_LIBVIRTD
augeas_DATA += \
remote/libvirtd.aug \
remote/virtproxyd.aug \
$(NULL)
augeastest_DATA += \
remote/test_libvirtd.aug \
remote/test_virtproxyd.aug \
$(NULL)
nodist_conf_DATA += \
remote/libvirtd.conf \
remote/virtproxyd.conf \
$(NULL)
remote/libvirtd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's|[@]runstatedir[@]|@runstatedir@|' \
-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
$< > $@
remote/virtproxyd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)sed \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's|[@]runstatedir[@]|@runstatedir@|' \
-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
$< > $@
INSTALL_DATA_DIRS += remote
install-data-remote:
@ -103,50 +70,6 @@ install-data-remote:
uninstall-data-remote:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
remote/libvirtd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
$< > $@
remote/virtproxyd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
$< > $@
remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
remote/libvirtd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's|[@]runstatedir[@]|@runstatedir@|' \
-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
> $@ || rm -f $@
remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \
remote/virtproxyd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/d' \
-e '/[@]END[@]/d' \
-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
-e 's|[@]runstatedir[@]|@runstatedir@|' \
-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
> $@ || rm -f $@
if WITH_SYSCTL
# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
# /usr/lib/sysctl.d/ even when libdir is /usr/lib64

10
src/remote/meson.build
View File

@ -139,6 +139,11 @@ if conf.has('WITH_REMOTE')
],
}
virt_daemon_confs += {
'name': 'libvirtd',
'with_ip': true,
}
virt_daemons += {
'name': 'virtproxyd',
'c_args': [
@ -148,6 +153,11 @@ if conf.has('WITH_REMOTE')
'-DVIRTPROXYD',
],
}
virt_daemon_confs += {
'name': 'virtproxyd',
'with_ip': true,
}
endif
endif

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

@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
if WITH_SECRETS
nodist_conf_DATA += secret/virtsecretd.conf
augeas_DATA += secret/virtsecretd.aug
augeastest_DATA += secret/test_virtsecretd.aug
SYSCONF_FILES += secret/virtsecretd.sysconf
SYSTEMD_UNIT_FILES += \
@ -46,27 +42,4 @@ virtsecret%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
secret/virtsecretd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
$< > $@
secret/virtsecretd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
$< > $@
secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \
secret/virtsecretd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
> $@ || rm -f $@
endif WITH_SECRETS

4
src/secret/meson.build
View File

@ -23,4 +23,8 @@ if conf.has('WITH_SECRETS')
'-DMODULE_NAME="secret"',
],
}
virt_daemon_confs += {
'name': 'virtsecretd',
}
endif

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

@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
if WITH_STORAGE
nodist_conf_DATA += storage/virtstoraged.conf
augeas_DATA += storage/virtstoraged.aug
augeastest_DATA += storage/test_virtstoraged.aug
SYSCONF_FILES += storage/virtstoraged.sysconf
SYSTEMD_UNIT_FILES += \
@ -46,28 +42,4 @@ virtstorage%.socket: remote/libvirt%.socket.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
storage/virtstoraged.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
$< > $@
storage/virtstoraged.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
$< > $@
storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
storage/virtstoraged.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
> $@ || rm -f $@
endif WITH_STORAGE

4
src/storage/meson.build
View File

@ -121,6 +121,10 @@ if conf.has('WITH_STORAGE')
'-DMODULE_NAME="storage"',
],
}
virt_daemon_confs += {
'name': 'virtstoraged',
}
endif
if conf.has('WITH_STORAGE_DISK')

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

@ -6,10 +6,6 @@ DRIVER_SOURCE_FILES += \
$(NULL)
if WITH_VBOX
nodist_conf_DATA += vbox/virtvboxd.conf
augeas_DATA += vbox/virtvboxd.aug
augeastest_DATA += vbox/test_virtvboxd.aug
SYSCONF_FILES += vbox/virtvboxd.sysconf
SYSTEMD_UNIT_FILES += \
@ -45,27 +41,4 @@ virtvboxd.service: vbox/virtvboxd.service.in $(top_builddir)/config.status
virtvbox%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@
vbox/virtvboxd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
$< > $@
vbox/virtvboxd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
$< > $@
vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \
vbox/virtvboxd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
> $@ || rm -f $@
endif WITH_VBOX

4
src/vbox/meson.build
View File

@ -46,4 +46,8 @@ if conf.has('WITH_VBOX')
'-DMODULE_NAME="vbox"',
],
}
virt_daemon_confs += {
'name': 'virtvboxd',
}
endif

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

@ -5,10 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
if WITH_VZ
nodist_conf_DATA += vz/virtvzd.conf
augeas_DATA += vz/virtvzd.aug
augeastest_DATA += vz/test_virtvzd.aug
SYSCONF_FILES += vz/virtvzd.sysconf
SYSTEMD_UNIT_FILES += \
@ -44,27 +40,4 @@ virtvzd.service: vz/virtvzd.service.in $(top_builddir)/config.status
virtvz%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@
vz/virtvzd.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
$< > $@
vz/virtvzd.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
$< > $@
vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \
vz/virtvzd.conf $(AUG_GENTEST_SCRIPT)
$(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
> $@ || rm -f $@
endif WITH_VZ

4
src/vz/meson.build
View File

@ -38,4 +38,8 @@ if conf.has('WITH_VZ')
'-DMODULE_NAME="vz"',
],
}
virt_daemon_confs += {
'name': 'virtvzd',
}
endif