4:59 a.m.
make rpm finally succeeds with these two patches.
Jiri Denemark (2):
build: Install both qemu-lockd.conf and qemu-sanlock.conf
spec: Include lockd files in libvirt-daemon package
libvirt.spec.in | 4 ++++
src/Makefile.am | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
--
1.8.0.2
4:59 a.m.
New subject: [libvirt] [PATCH 1/2] build: Install both qemu-lockd.conf and qemu-sanlock.conf
With sanlock enabled, only one of those files was installed.
---
src/Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 33b4ab0..ef09e6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ BUILT_SOURCES =
CLEANFILES =
DISTCLEANFILES =
MAINTAINERCLEANFILES =
+nodist_conf_DATA =
THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
@@ -1583,7 +1584,7 @@ if WITH_DTRACE_PROBES
lockd_la_LIBADD += libvirt_probes.lo
endif
if WITH_QEMU
-nodist_conf_DATA = locking/qemu-lockd.conf
+nodist_conf_DATA += locking/qemu-lockd.conf
BUILT_SOURCES += locking/qemu-lockd.conf
DISTCLEANFILES += locking/qemu-lockd.conf
endif
@@ -1734,7 +1735,7 @@ locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
cp $< $@
if WITH_QEMU
-nodist_conf_DATA = locking/qemu-sanlock.conf
+nodist_conf_DATA += locking/qemu-sanlock.conf
BUILT_SOURCES += locking/qemu-sanlock.conf
DISTCLEANFILES += locking/qemu-sanlock.conf
endif
--
1.8.0.2
4:59 a.m.
New subject: [libvirt] [PATCH 2/2] spec: Include lockd files in libvirt-daemon package
---
libvirt.spec.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index b5cd32f..7457a48 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1692,6 +1692,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
%if %{with_qemu}
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
+%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
%endif
%if %{with_lxc}
@@ -1744,6 +1745,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%if %{with_libvirtd}
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
+%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
%endif
%if %{with_qemu}
@@ -1758,6 +1760,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
%{_datadir}/augeas/lenses/libvirtd.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/libvirt_lockd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
%if %{with_polkit}
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
--
1.8.0.2
5:14 a.m.
On Fri, Dec 14, 2012 at 11:59:22 +0100, Jiri Denemark wrote:
make rpm finally succeeds with these two patches.
Jiri Denemark (2):
build: Install both qemu-lockd.conf and qemu-sanlock.conf
spec: Include lockd files in libvirt-daemon package
libvirt.spec.in | 4 ++++
src/Makefile.am | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
Pushed.
Jirka
4364
days inactive
4364
days old
5 comments
2 participants
participants (2)
-
Jiri Denemark -
Peter Krempa