[libvirt PATCH 0/3] mingw: Misc cleanups
Andrea Bolognani (3): mingw: Don't ship virt-admin mings: Don't ship virt-(xml|pki)-validate mingw: Don't ship virkey* manual pages mingw-libvirt.spec.in | 14 -------------- 1 file changed, 14 deletions(-) -- 2.34.1
virt-admin can only be used to configure the local daemon, and we don't build the daemon for Windows. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- mingw-libvirt.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dbcb6d4b8f..01beb6ff18 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -200,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe -%{mingw32_bindir}/virt-admin.exe %{mingw32_bindir}/virt-xml-validate %{mingw32_bindir}/virt-pki-validate %{mingw32_bindir}/libvirt-lxc-0.dll @@ -253,7 +252,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_includedir}/libvirt/libvirt-admin.h %{mingw32_mandir}/man1/virsh.1* -%{mingw32_mandir}/man1/virt-admin.1* %{mingw32_mandir}/man1/virt-xml-validate.1* %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* @@ -266,7 +264,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe -%{mingw64_bindir}/virt-admin.exe %{mingw64_bindir}/virt-xml-validate %{mingw64_bindir}/virt-pki-validate %{mingw64_bindir}/libvirt-lxc-0.dll @@ -319,7 +316,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_includedir}/libvirt/libvirt-admin.h %{mingw64_mandir}/man1/virsh.1* -%{mingw64_mandir}/man1/virt-admin.1* %{mingw64_mandir}/man1/virt-xml-validate.1* %{mingw64_mandir}/man1/virt-pki-validate.1* %{mingw64_mandir}/man7/virkey*.7* -- 2.34.1
On Tue, Jan 25, 2022 at 07:03:37PM +0100, Andrea Bolognani wrote:
virt-admin can only be used to configure the local daemon, and we don't build the daemon for Windows.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- mingw-libvirt.spec.in | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dbcb6d4b8f..01beb6ff18 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -200,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
%{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe -%{mingw32_bindir}/virt-admin.exe %{mingw32_bindir}/virt-xml-validate %{mingw32_bindir}/virt-pki-validate %{mingw32_bindir}/libvirt-lxc-0.dll @@ -253,7 +252,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_includedir}/libvirt/libvirt-admin.h
%{mingw32_mandir}/man1/virsh.1* -%{mingw32_mandir}/man1/virt-admin.1* %{mingw32_mandir}/man1/virt-xml-validate.1* %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* @@ -266,7 +264,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
%{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe -%{mingw64_bindir}/virt-admin.exe %{mingw64_bindir}/virt-xml-validate %{mingw64_bindir}/virt-pki-validate %{mingw64_bindir}/libvirt-lxc-0.dll @@ -319,7 +316,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_includedir}/libvirt/libvirt-admin.h
%{mingw64_mandir}/man1/virsh.1* -%{mingw64_mandir}/man1/virt-admin.1* %{mingw64_mandir}/man1/virt-xml-validate.1* %{mingw64_mandir}/man1/virt-pki-validate.1* %{mingw64_mandir}/man7/virkey*.7*
Simply removing entries from %files will result in RPM exiting with an error message that files were installed in the virtual root but not included in %files. 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 :|
These are shell scripts which are not useful in the context of cross-compilation, so it doesn't make sense to include them. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- mingw-libvirt.spec.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 01beb6ff18..95039e1419 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -200,8 +200,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_bindir}/libvirt-0.dll %{mingw32_bindir}/virsh.exe -%{mingw32_bindir}/virt-xml-validate -%{mingw32_bindir}/virt-pki-validate %{mingw32_bindir}/libvirt-lxc-0.dll %{mingw32_bindir}/libvirt-qemu-0.dll %{mingw32_bindir}/libvirt-admin-0.dll @@ -252,8 +250,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_includedir}/libvirt/libvirt-admin.h %{mingw32_mandir}/man1/virsh.1* -%{mingw32_mandir}/man1/virt-xml-validate.1* -%{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* # Mingw64 @@ -264,8 +260,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_bindir}/libvirt-0.dll %{mingw64_bindir}/virsh.exe -%{mingw64_bindir}/virt-xml-validate -%{mingw64_bindir}/virt-pki-validate %{mingw64_bindir}/libvirt-lxc-0.dll %{mingw64_bindir}/libvirt-qemu-0.dll %{mingw64_bindir}/libvirt-admin-0.dll @@ -316,8 +310,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_includedir}/libvirt/libvirt-admin.h %{mingw64_mandir}/man1/virsh.1* -%{mingw64_mandir}/man1/virt-xml-validate.1* -%{mingw64_mandir}/man1/virt-pki-validate.1* %{mingw64_mandir}/man7/virkey*.7* %changelog -- 2.34.1
They're part of the -daemon package on Linux. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- This patch is sort of an RFC actually, because maybe even on Linux it would make more sense for these to be included in the -client package instead? Their usefulness in the mingw package still seems questionable. mingw-libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 95039e1419..39f8cc0cf3 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -250,7 +250,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_includedir}/libvirt/libvirt-admin.h %{mingw32_mandir}/man1/virsh.1* -%{mingw32_mandir}/man7/virkey*.7* # Mingw64 %files -n mingw64-libvirt @@ -310,6 +309,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_includedir}/libvirt/libvirt-admin.h %{mingw64_mandir}/man1/virsh.1* -%{mingw64_mandir}/man7/virkey*.7* %changelog -- 2.34.1
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé