Compare commits

...
Sign in to create a new pull request.

23 commits

Author SHA1 Message Date
Jerry James
c72a1f45b7 Fix a changelog entry 2026-01-13 20:55:21 -07:00
Richard W.M. Jones
8a797311d9 OCaml 5.4.0 rebuild 2025-10-14 20:53:52 +01:00
Fedora Release Engineering
4fde25577d Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:08:59 +00:00
Jerry James
9408e4cecd Rebuild to fix OCaml dependencies
- Change http URLs to https
2025-07-12 16:37:42 -06:00
Richard W.M. Jones
a01d2f0db3 Enable ocaml-gettext again 2025-04-03 09:47:56 +01:00
Richard W.M. Jones
7f256431dc Remove unused patch lines
Fixes: commit 2db015db27
2025-02-28 11:56:26 +00:00
Richard W.M. Jones
2db015db27 New upstream version 1.1.2
Disable gettext support in Fedora Rawhide
2025-02-28 11:35:53 +00:00
Richard W.M. Jones
5c32f27eb0 Bump and rebuild for ocaml-gettext 0.5.0 2025-02-27 09:37:15 +00:00
Fedora Release Engineering
b592237ea6 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:28:10 +00:00
Jerry James
7503fd9d5d OCaml 5.3.0 rebuild for Fedora 42 2025-01-10 14:39:34 -07:00
Fedora Release Engineering
b3c021903b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:52:58 +00:00
Richard W.M. Jones
fbd272eaed OCaml 5.2.0 ppc64le fix 2024-06-19 16:57:33 +01:00
Richard W.M. Jones
7be3bf590e OCaml 5.2.0 for Fedora 41 2024-05-30 09:06:45 +01:00
Fedora Release Engineering
529d23a425 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:57:46 +00:00
Richard W.M. Jones
d69db7ac00 OCaml 5.1.1 + s390x code gen fix for Fedora 40 2023-12-18 15:34:13 +00:00
Richard W.M. Jones
b6f608c2dd OCaml 5.1.1 rebuild for Fedora 40 2023-12-12 15:11:37 +00:00
Richard W.M. Jones
3b9599d9b0 Fix build issue with libxml2 2.12.1 2023-11-27 14:23:48 +00:00
Richard W.M. Jones
4e8b6c0e45 OCaml 5.1 rebuild for Fedora 40 2023-10-05 16:34:42 +01:00
Fedora Release Engineering
b303817896 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:44:47 +00:00
Richard W.M. Jones
cc0771474e OCaml 5.0 rebuild for Fedora 39 2023-07-12 00:40:01 +01:00
Richard W.M. Jones
13160cd795 ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) 2023-07-11 11:36:26 +01:00
Jerry James
423f9604a5 OCaml 5.0.0 rebuild
Other changes:
- Add patch to fix linking on bytecode-only architectures
- Update deprecated %patchN usage
- Use %license macro
2023-07-10 22:51:05 -06:00
Richard W.M. Jones
28f5329fbb Migrated to SPDX license 2023-06-05 16:09:11 +01:00
3 changed files with 79 additions and 54 deletions

View file

@ -1,39 +0,0 @@
From 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8 Mon Sep 17 00:00:00 2001
From: Yuya Higashi <higashi.yuya@fujitsu.com>
Date: Tue, 15 Nov 2022 13:56:21 +0900
Subject: [PATCH] virt-top: fix to explicitly disconnect from libvirtd
To prevent libvirtd from printing virNetSocketReadWire I/O errors when
the virt-top command exits, explicitly disconnect from libvirtd.
Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
---
src/top.ml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/top.ml b/src/top.ml
index 75fbcb9..cbe655a 100644
--- a/src/top.ml
+++ b/src/top.ml
@@ -306,7 +306,7 @@ let get_string maxlen =
)
(* Main loop. *)
-let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
+let rec main_loop ((conn, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
as setup) =
let csv_flags = !csv_cpu, !csv_mem, !csv_block, !csv_net in
@@ -372,7 +372,8 @@ let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _,
if not !quit || !end_time <> None then
millisleep delay
)
- done
+ done;
+ C.close conn
and get_key_press setup delay =
(* Read the next key, waiting up to 'delay' milliseconds. *)
--
2.31.1

View file

@ -1,2 +1,2 @@
SHA512 (virt-top-1.1.1.tar.gz) = 4f4c7338f1ce1f82b1a9287c256da4b60d7b2e5163ea4b19eb0257c104303dcecf28177f8034e34d255fec462adc19ab61e6a4b9db857da02f2cdf2b1c818093
SHA512 (virt-top-1.1.1.tar.gz.sig) = 6236b7a68492663d743f1ee2e50ea91adafab97654c333d2b92f66a0c7a9cd5d6748fe2467f29db80c65428d804624a42d64f3ee7d0d09f612e95effec0e395e
SHA512 (virt-top-1.1.2.tar.gz) = 1dd495daf106601236680b6d028262a217b8b93edb51c3f6c148fef7b452d8d188f1df18d500338377d9becff2174a6e33ccda4eaa913e7a159820d7bfca3a3c
SHA512 (virt-top-1.1.2.tar.gz.sig) = db754791923aa30838b5f33bd6a523fda4a34068e9b20cdedc09e56a72de7e894f156e70106c5274f9e8121dde25cfc594e9fcb932dca08af15fe67e0c27990a

View file

@ -1,18 +1,20 @@
%undefine _package_note_flags
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
Name: virt-top
Version: 1.1.1
Release: 9%{?dist}
Version: 1.1.2
Release: 5%{?dist}
Summary: Utility like top(1) for displaying virtualization stats
License: GPLv2+
License: GPL-2.0-or-later
%if 0%{?rhel}
# No qemu-kvm on POWER (RHBZ#1946532).
ExcludeArch: %{power64}
%endif
URL: http://people.redhat.com/~rjones/virt-top/
Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
Source1: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz.sig
URL: https://people.redhat.com/~rjones/virt-top/
Source0: https://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
Source1: https://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz.sig
# Post-process output of CSV file (RHBZ#665817, RHBZ#912020).
Source2: processcsv.py
@ -25,9 +27,6 @@ Source4: libguestfs.keyring
# included in RHEL builds.
Patch1: virt-top-1.0.9-processcsv-documentation.patch
# Fix "Input/output error" in journal (RHBZ#2148798)
Patch2: 0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: ocaml >= 3.10.2
@ -65,9 +64,11 @@ different virtualization systems.
%setup -q
%if 0%{?rhel} >= 6
%patch1 -p1
%patch -P1 -p1
%endif
%patch2 -p1
# "ocamlfind byte" has been removed as an alias
sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
%build
@ -106,7 +107,8 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%files -f %{name}.lang
%doc COPYING README TODO
%doc README TODO
%license COPYING
%{_bindir}/virt-top
%{_mandir}/man1/virt-top.1*
%if 0%{?rhel} >= 6
@ -116,6 +118,68 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%changelog
* Tue Oct 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-5
- OCaml 5.4.0 rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jul 07 2025 Jerry James <loganjerry@gmail.com> - 1.1.2-3
- Rebuild to fix OCaml dependencies
- Change http URLs to https
* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-2
- Enable ocaml-gettext again
* Fri Feb 28 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-1
- New upstream version 1.1.2
- Disable gettext support in Fedora Rawhide
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 1.1.1-22
- OCaml 5.3.0 rebuild for Fedora 42
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-20
- OCaml 5.2.0 ppc64le fix
* Thu May 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-19
- OCaml 5.2.0 for Fedora 41
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-17
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-16
- OCaml 5.1.1 rebuild for Fedora 40
* Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-15
- Fix build issue with libxml2 2.12.1
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-14
- OCaml 5.1 rebuild for Fedora 40
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-12
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.1.1-11
- OCaml 5.0.0 rebuild
- Add patch to fix linking on bytecode-only architectures
- Update deprecated %%patchN usage
- Use %%license macro
* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-10
- Migrated to SPDX license
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-9
- Rebuild OCaml packages for F38