12:56 p.m.
Hopefully I covered what's necessary... Essentially a bunch of
copying of existing examples...
I haven't been able to actually build an RPM locally for a long
time, but this does work with make install at least (or at least
it worked in the environment I tried it on).
John Ferlan (2):
logd: Install the admin sockets
lockd: Install the admin sockets
libvirt.spec.in | 20 ++++++++++++++++----
src/Makefile.am | 39 +++++++++++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 12 deletions(-)
--
2.13.6
12:56 p.m.
New subject: [libvirt] [PATCH 1/2] logd: Install the admin sockets
Commit id '85d45ff0' added support for the logd admin socket, but
forgot to add the socket to the make and spec files for installation
purposes.
NB: Includes breaking up the long %systemd_ lists across multiple lines
for ease of reading
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
libvirt.spec.in | 16 ++++++++++++----
src/Makefile.am | 20 ++++++++++++++++----
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1879e1f8b..d94031067 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1520,13 +1520,16 @@ exit 0
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_post virtlockd.socket virtlogd.socket libvirtd.service
+ %systemd_post virtlockd.socket \
+ virtlogd.socket virtlogd-admin.socket \
+ libvirtd.service
%else
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable \
virtlockd.socket \
virtlogd.socket \
+ virtlogd-admin.socket \
libvirtd.service >/dev/null 2>&1 || :
fi
%endif
@@ -1553,19 +1556,23 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%preun daemon
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_preun libvirtd.service virtlogd.socket virtlogd.service virtlockd.socket
virtlockd.service
+ %systemd_preun libvirtd.service \
+ virtlogd.socket virtlogd-admin.socket virtlogd.service \
+ virtlockd.socket virtlockd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable \
libvirtd.service \
virtlogd.socket \
+ virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
virtlockd.service > /dev/null 2>&1 || :
/bin/systemctl stop \
libvirtd.service \
virtlogd.socket \
+ virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
virtlockd.service > /dev/null 2>&1 || :
@@ -1613,9 +1620,9 @@ fi
if [ $1 -ge 1 ] ; then
%if %{with_systemd}
/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
- /bin/systemctl enable virtlogd.socket || :
+ /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
- /bin/systemctl start virtlogd.socket || :
+ /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
%else
/sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
/sbin/chkconfig virtlogd on || :
@@ -1820,6 +1827,7 @@ exit 0
%{_unitdir}/virt-guest-shutdown.target
%{_unitdir}/virtlogd.service
%{_unitdir}/virtlogd.socket
+%{_unitdir}/virtlogd-admin.socket
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
%else
diff --git a/src/Makefile.am b/src/Makefile.am
index 79adc9ba5..3d7b8f7c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2810,6 +2810,7 @@ EXTRA_DIST += \
locking/test_virtlockd.aug.in \
logging/virtlogd.service.in \
logging/virtlogd.socket.in \
+ logging/virtlogd-admin.socket.in \
logging/virtlogd.aug \
logging/virtlogd.conf \
logging/test_virtlogd.aug.in \
@@ -2824,12 +2825,13 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
BUILT_SOURCES += virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket
+ virtlogd.service virtlogd.socket virtlogd-admin.socket
DISTCLEANFILES += virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket
+ virtlogd.service virtlogd.socket virtlogd-admin.socket
install-systemd: virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket install-sysconfig
+ virtlogd.service virtlogd.socket virtlogd-admin.socket \
+ install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
@@ -2839,12 +2841,15 @@ install-systemd: virtlockd.service virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
+ $(INSTALL_DATA) virtlogd-admin.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
install-systemd:
@@ -2879,6 +2884,13 @@ virtlogd.socket: logging/virtlogd.socket.in
$(top_builddir)/config.status
< $< > $@-t && \
mv $@-t $@
+virtlogd-admin.socket: logging/virtlogd-admin.socket.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)sed \
+ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+ < $< > $@-t && \
+ mv $@-t $@
+
if WITH_SANLOCK
lockdriver_LTLIBRARIES += sanlock.la
--
2.13.6
4:18 a.m.
New subject: [libvirt] [PATCH 1/2] logd: Install the admin sockets
On Tue, Feb 06, 2018 at 01:56:25PM -0500, John Ferlan wrote:
Commit id '85d45ff0' added support for the logd admin socket,
but
forgot to add the socket to the make and spec files for installation
purposes.
Sigh, I messed up well there.
NB: Includes breaking up the long %systemd_ lists across multiple lines
for ease of reading
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
libvirt.spec.in | 16 ++++++++++++----
src/Makefile.am | 20 ++++++++++++++++----
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1879e1f8b..d94031067 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1520,13 +1520,16 @@ exit 0
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_post virtlockd.socket virtlogd.socket libvirtd.service
+ %systemd_post virtlockd.socket \
+ virtlogd.socket virtlogd-admin.socket \
+ libvirtd.service
%else
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable \
virtlockd.socket \
virtlogd.socket \
+ virtlogd-admin.socket \
libvirtd.service >/dev/null 2>&1 || :
fi
%endif
@@ -1553,19 +1556,23 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%preun daemon
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_preun libvirtd.service virtlogd.socket virtlogd.service
virtlockd.socket virtlockd.service
+ %systemd_preun libvirtd.service \
+ virtlogd.socket virtlogd-admin.socket virtlogd.service \
+ virtlockd.socket virtlockd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable \
libvirtd.service \
virtlogd.socket \
+ virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
virtlockd.service > /dev/null 2>&1 || :
/bin/systemctl stop \
libvirtd.service \
virtlogd.socket \
+ virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
virtlockd.service > /dev/null 2>&1 || :
@@ -1613,9 +1620,9 @@ fi
if [ $1 -ge 1 ] ; then
%if %{with_systemd}
/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1
&&
- /bin/systemctl enable virtlogd.socket || :
+ /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
- /bin/systemctl start virtlogd.socket || :
+ /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
%else
/sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
/sbin/chkconfig virtlogd on || :
@@ -1820,6 +1827,7 @@ exit 0
%{_unitdir}/virt-guest-shutdown.target
%{_unitdir}/virtlogd.service
%{_unitdir}/virtlogd.socket
+%{_unitdir}/virtlogd-admin.socket
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
%else
diff --git a/src/Makefile.am b/src/Makefile.am
index 79adc9ba5..3d7b8f7c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2810,6 +2810,7 @@ EXTRA_DIST += \
locking/test_virtlockd.aug.in \
logging/virtlogd.service.in \
logging/virtlogd.socket.in \
+ logging/virtlogd-admin.socket.in \
logging/virtlogd.aug \
logging/virtlogd.conf \
logging/test_virtlogd.aug.in \
@@ -2824,12 +2825,13 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
BUILT_SOURCES += virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket
+ virtlogd.service virtlogd.socket virtlogd-admin.socket
DISTCLEANFILES += virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket
+ virtlogd.service virtlogd.socket virtlogd-admin.socket
install-systemd: virtlockd.service virtlockd.socket \
- virtlogd.service virtlogd.socket install-sysconfig
+ virtlogd.service virtlogd.socket virtlogd-admin.socket \
+ install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
@@ -2839,12 +2841,15 @@ install-systemd: virtlockd.service virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
+ $(INSTALL_DATA) virtlogd-admin.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
uninstall-systemd: uninstall-sysconfig
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
install-systemd:
@@ -2879,6 +2884,13 @@ virtlogd.socket: logging/virtlogd.socket.in
$(top_builddir)/config.status
< $< > $@-t && \
mv $@-t $@
+virtlogd-admin.socket: logging/virtlogd-admin.socket.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)sed \
+ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+ < $< > $@-t && \
+ mv $@-t $@
+
if WITH_SANLOCK
lockdriver_LTLIBRARIES += sanlock.la
Reviewed-by: Daniel P. Berrange <berrange(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
12:56 p.m.
New subject: [libvirt] [PATCH 2/2] lockd: Install the admin sockets
Commit id 'ce7ae55e' added support for the lockd admin socket, but
forgot to add the socket to the make and spec files for installation
purposes.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
libvirt.spec.in | 8 ++++++--
src/Makefile.am | 19 +++++++++++++++----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index d94031067..44f846a16 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1520,7 +1520,7 @@ exit 0
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_post virtlockd.socket \
+ %systemd_post virtlockd.socket virtlockd-admin.socket \
virtlogd.socket virtlogd-admin.socket \
libvirtd.service
%else
@@ -1528,6 +1528,7 @@ if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlogd.socket \
virtlogd-admin.socket \
libvirtd.service >/dev/null 2>&1 || :
@@ -1558,7 +1559,7 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%if %{with_systemd_macros}
%systemd_preun libvirtd.service \
virtlogd.socket virtlogd-admin.socket virtlogd.service \
- virtlockd.socket virtlockd.service
+ virtlockd.socket virtlockd-admin.socket virtlockd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
@@ -1568,6 +1569,7 @@ if [ $1 -eq 0 ] ; then
virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlockd.service > /dev/null 2>&1 || :
/bin/systemctl stop \
libvirtd.service \
@@ -1575,6 +1577,7 @@ if [ $1 -eq 0 ] ; then
virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlockd.service > /dev/null 2>&1 || :
fi
%endif
@@ -1830,6 +1833,7 @@ exit 0
%{_unitdir}/virtlogd-admin.socket
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
+%{_unitdir}/virtlockd-admin.socket
%else
%{_sysconfdir}/rc.d/init.d/libvirtd
%{_sysconfdir}/rc.d/init.d/virtlogd
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d7b8f7c3..64ffcd98d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2805,6 +2805,7 @@ MAINTAINERCLEANFILES += $(MANINFILES)
EXTRA_DIST += \
locking/virtlockd.service.in \
locking/virtlockd.socket.in \
+ locking/virtlockd-admin.socket.in \
locking/virtlockd.aug \
locking/virtlockd.conf \
locking/test_virtlockd.aug.in \
@@ -2824,12 +2825,12 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
-BUILT_SOURCES += virtlockd.service virtlockd.socket \
+BUILT_SOURCES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket
-DISTCLEANFILES += virtlockd.service virtlockd.socket \
+DISTCLEANFILES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket
-install-systemd: virtlockd.service virtlockd.socket \
+install-systemd: virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket \
install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
@@ -2837,6 +2838,8 @@ install-systemd: virtlockd.service virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
+ $(INSTALL_DATA) virtlockd-admin.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.socket \
@@ -2846,7 +2849,8 @@ install-systemd: virtlockd.service virtlockd.socket \
uninstall-systemd: uninstall-sysconfig
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd-admin.socket
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket
@@ -2872,6 +2876,13 @@ virtlockd.socket: locking/virtlockd.socket.in
$(top_builddir)/config.status
< $< > $@-t && \
mv $@-t $@
+virtlockd-admin.socket: locking/virtlockd-admin.socket.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)sed \
+ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+ < $< > $@-t && \
+ mv $@-t $@
+
virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
--
2.13.6
4:19 a.m.
New subject: [libvirt] [PATCH 2/2] lockd: Install the admin sockets
On Tue, Feb 06, 2018 at 01:56:26PM -0500, John Ferlan wrote:
Commit id 'ce7ae55e' added support for the lockd admin
socket, but
forgot to add the socket to the make and spec files for installation
purposes.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
libvirt.spec.in | 8 ++++++--
src/Makefile.am | 19 +++++++++++++++----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index d94031067..44f846a16 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1520,7 +1520,7 @@ exit 0
%if %{with_systemd}
%if %{with_systemd_macros}
- %systemd_post virtlockd.socket \
+ %systemd_post virtlockd.socket virtlockd-admin.socket \
virtlogd.socket virtlogd-admin.socket \
libvirtd.service
%else
@@ -1528,6 +1528,7 @@ if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlogd.socket \
virtlogd-admin.socket \
libvirtd.service >/dev/null 2>&1 || :
@@ -1558,7 +1559,7 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
%if %{with_systemd_macros}
%systemd_preun libvirtd.service \
virtlogd.socket virtlogd-admin.socket virtlogd.service \
- virtlockd.socket virtlockd.service
+ virtlockd.socket virtlockd-admin.socket virtlockd.service
%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
@@ -1568,6 +1569,7 @@ if [ $1 -eq 0 ] ; then
virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlockd.service > /dev/null 2>&1 || :
/bin/systemctl stop \
libvirtd.service \
@@ -1575,6 +1577,7 @@ if [ $1 -eq 0 ] ; then
virtlogd-admin.socket \
virtlogd.service \
virtlockd.socket \
+ virtlockd-admin.socket \
virtlockd.service > /dev/null 2>&1 || :
fi
%endif
@@ -1830,6 +1833,7 @@ exit 0
%{_unitdir}/virtlogd-admin.socket
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
+%{_unitdir}/virtlockd-admin.socket
%else
%{_sysconfdir}/rc.d/init.d/libvirtd
%{_sysconfdir}/rc.d/init.d/virtlogd
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d7b8f7c3..64ffcd98d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2805,6 +2805,7 @@ MAINTAINERCLEANFILES += $(MANINFILES)
EXTRA_DIST += \
locking/virtlockd.service.in \
locking/virtlockd.socket.in \
+ locking/virtlockd-admin.socket.in \
locking/virtlockd.aug \
locking/virtlockd.conf \
locking/test_virtlockd.aug.in \
@@ -2824,12 +2825,12 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
-BUILT_SOURCES += virtlockd.service virtlockd.socket \
+BUILT_SOURCES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket
-DISTCLEANFILES += virtlockd.service virtlockd.socket \
+DISTCLEANFILES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket
-install-systemd: virtlockd.service virtlockd.socket \
+install-systemd: virtlockd.service virtlockd.socket virtlockd-admin.socket \
virtlogd.service virtlogd.socket virtlogd-admin.socket \
install-sysconfig
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
@@ -2837,6 +2838,8 @@ install-systemd: virtlockd.service virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlockd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
+ $(INSTALL_DATA) virtlockd-admin.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/
$(INSTALL_DATA) virtlogd.socket \
@@ -2846,7 +2849,8 @@ install-systemd: virtlockd.service virtlockd.socket \
uninstall-systemd: uninstall-sysconfig
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket \
+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd-admin.socket
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket
@@ -2872,6 +2876,13 @@ virtlockd.socket: locking/virtlockd.socket.in
$(top_builddir)/config.status
< $< > $@-t && \
mv $@-t $@
+virtlockd-admin.socket: locking/virtlockd-admin.socket.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)sed \
+ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+ < $< > $@-t && \
+ mv $@-t $@
+
virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
$(AM_V_GEN)sed \
-e 's|[@]sbindir[@]|$(sbindir)|g' \
Reviewed-by: Daniel P. Berrange <berrange(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:16 a.m.
On Tue, Feb 06, 2018 at 01:56:24PM -0500, John Ferlan wrote:
Hopefully I covered what's necessary... Essentially a bunch of
copying of existing examples...
I haven't been able to actually build an RPM locally for a long
time, but this does work with make install at least (or at least
it worked in the environment I tried it on).
What sort of problem are you having ? The CI system is testing our
RPM builds on Fedora so should work.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
7:18 a.m.
On 02/08/2018 05:16 AM, Daniel P. Berrangé wrote:
On Tue, Feb 06, 2018 at 01:56:24PM -0500, John Ferlan wrote:
> Hopefully I covered what's necessary... Essentially a bunch of
> copying of existing examples...
>
> I haven't been able to actually build an RPM locally for a long
> time, but this does work with make install at least (or at least
> it worked in the environment I tried it on).
What sort of problem are you having ? The CI system is testing our
RPM builds on Fedora so should work.
Mostly bad and/or lazy (and/or annoyed) user on keyboard... Never quite
seem to get the "correct packages" installed. Sometimes I get a list of
packages I'm missing from the make rpm command, while other times it's
just a failure and I'm left guessing and debugging. After a while I just
give up hoping that the CI system will do its thing...
Still for these -admin sockets, I see the CI env is happy. I don't
believe a running environment would be as happy as I found with the
-admin socket missing there were errors in virtlogd (at least) restart
or in the first connection from a new libvirtd to virtlogd (I've
forgotten the details already as they've been nwfiltered out ;-)).
Anyway, as for make rpm on one system I had problems w/ "uniconvertor":
/usr/bin/mv: cannot stat '/tmp/magick-14461O4gf8V6BuvWf.svg': No such
file or directory
convert: delegate failed `'uniconvertor' '%i' '%o.svg';
/usr/bin/mv
'%o.svg' '%o'' @ error/delegate.c/InvokeDelegate/1919.
So /me thinks - let's remove it... That didn't work because "convert"
and "ImageMagick" are there... So remove that and get:
convert -rotate 90 libvirt-daemon-arch.fig libvirt-daemon-arch.png
make[3]: convert: Command not found
<sigh>... Even re-running autogen.sh didn't help. Perhaps there's some
package that I do have that caused autogen.sh to set something that
causes something else to believe I have the right bits.
FWIW: On another system I don't have ImageMagick or uniconvertor and
that actually builds the rpm after installing a few things along the
way. So WTF knows - it's all black magic and hokum to me.
John
7:26 a.m.
On Thu, Feb 08, 2018 at 08:18:57AM -0500, John Ferlan wrote:
On 02/08/2018 05:16 AM, Daniel P. Berrangé wrote:
> On Tue, Feb 06, 2018 at 01:56:24PM -0500, John Ferlan wrote:
>> Hopefully I covered what's necessary... Essentially a bunch of
>> copying of existing examples...
>>
>> I haven't been able to actually build an RPM locally for a long
>> time, but this does work with make install at least (or at least
>> it worked in the environment I tried it on).
>
> What sort of problem are you having ? The CI system is testing our
> RPM builds on Fedora so should work.
>
Mostly bad and/or lazy (and/or annoyed) user on keyboard... Never quite
seem to get the "correct packages" installed. Sometimes I get a list of
packages I'm missing from the make rpm command, while other times it's
just a failure and I'm left guessing and debugging. After a while I just
give up hoping that the CI system will do its thing...
You shouldn't have todo anything more then "dnf builddep libvirt" to
get all the RPM pre-requisites installed. Now technically this will
give you build deps suitable for the version of libvirt that's in
Fedora, rather than git master, but we don't add new build-deps often
enough for that to be a problem.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
7:41 a.m.
On 02/08/2018 08:26 AM, Daniel P. Berrangé wrote:
On Thu, Feb 08, 2018 at 08:18:57AM -0500, John Ferlan wrote:
>
>
> On 02/08/2018 05:16 AM, Daniel P. Berrangé wrote:
>> On Tue, Feb 06, 2018 at 01:56:24PM -0500, John Ferlan wrote:
>>> Hopefully I covered what's necessary... Essentially a bunch of
>>> copying of existing examples...
>>>
>>> I haven't been able to actually build an RPM locally for a long
>>> time, but this does work with make install at least (or at least
>>> it worked in the environment I tried it on).
>>
>> What sort of problem are you having ? The CI system is testing our
>> RPM builds on Fedora so should work.
>>
>
> Mostly bad and/or lazy (and/or annoyed) user on keyboard... Never quite
> seem to get the "correct packages" installed. Sometimes I get a list of
> packages I'm missing from the make rpm command, while other times it's
> just a failure and I'm left guessing and debugging. After a while I just
> give up hoping that the CI system will do its thing...
You shouldn't have todo anything more then "dnf builddep libvirt" to
get all the RPM pre-requisites installed. Now technically this will
give you build deps suitable for the version of libvirt that's in
Fedora, rather than git master, but we don't add new build-deps often
enough for that to be a problem.
dnf builddep didn't find anything on one system, but still fails the
make rpm with the same uniconvertor issue. Since it works elsewhere (CI
and my other host), I'm not going to jump into the rabbit hole.
John
2478
days inactive
2480
days old
8 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
John Ferlan