[libvirt] [PATCH 0/3] Fix yet again some Admin API bugs
Pushed under trivial and build-breaker rules. The 'make rpm' is broken. There is still one issue I'm chasing down. Running 'distcheck' shows some errors. Michal Privoznik (3): daemon: Distribute admin_server.h tests: Follow virnetserver to virnetdaemon transition libvirt.spec: Don't expect virt-admin in libvirt-admin yet daemon/Makefile.am | 2 +- libvirt.spec.in | 2 -- tests/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) -- 2.3.6
The Admin API consists of a few files on daemon side. Notably daemon/admin_server.{ch}. While they are both on the repo, only the .c file is mentioned in Makefile. Therefore, .h is not distributed and 'make rpm' fails. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- daemon/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index bb08d9f..b9c089d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -128,7 +128,7 @@ libvirtd_conf_la_LIBADD = $(LIBXML_LIBS) noinst_LTLIBRARIES += libvirtd_admin.la libvirtd_admin_la_SOURCES = \ - admin_server.c \ + admin_server.c admin_server.h \ ../src/admin/admin_protocol.c libvirtd_admin_la_CFLAGS = \ -- 2.3.6
In a4746114582 the virnetserver test was renamed to virnetdaemon. Moreover, as the test relies on some data stored under virnetserverdata/ the folder was renamed too. But this was not reflected in the Makefile. Therefore when building outside of the repository, the data folder was not distributed and test failed. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index cefe8b3..a1cca5c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,8 +137,8 @@ EXTRA_DIST = \ virsh-uriprecedence \ vircgroupdata \ virfiledata \ + virnetdaemondata \ virnetdevtestdata \ - virnetserverdata \ virpcitestdata \ virscsidata \ virusbtestdata \ -- 2.3.6
While Martin introduced the binary (and its manpage) in commit 4e7ccf87133 it was pushed by mistake. Therefore it was reverted in 220393bfb043. The problem is, the original commit was not quite right as the binary was added into the spec file in a different commit: 55e0c840af. So as long as the binary does not exist, we must remove it from the spec file too. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 592e9b9..dcd174a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2221,8 +2221,6 @@ exit 0 %files admin %defattr(-, root, root) -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin %{_libdir}/libvirt-admin.so.* %files client -f %{name}.lang -- 2.3.6
participants (1)
-
Michal Privoznik