From d99c2b9523d8fa1b2cbbcb2529ab7df28e20e629 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 16:38:48 -0600 Subject: [PATCH 01/25] Rebuild to fix OCaml dependencies --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index b2742dc..b314f17 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Sat Jul 12 2025 Jerry James - 1:2.8.1-2 +- Rebuild to fix OCaml dependencies + * Thu Jun 26 2025 Richard W.M. Jones - 1:2.8.1-1 - New upstream stable version 2.8.1 From 5b7f91c42fa4271cf98577b8ea7724e96c489048 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 13 Jul 2025 13:03:31 +0100 Subject: [PATCH 02/25] New upstream development version 2.9.1 --- sources | 4 ++-- virt-v2v.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 55ec579..9c7b034 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.8.1.tar.gz) = 70da68563e870955ca013e6d55be8f56ad65dde6f84909f06fae7ab928227a566e8949bb90e839fffce2ad4ebc604b2cfa1c5547394c8d1bd092bb95f9e6435c -SHA512 (virt-v2v-2.8.1.tar.gz.sig) = 1236dd21272c53dbafb4cd0ac4177bcf73600ff52ea8949b878793eafb1829a67880043c6e03c2d82c691d986ea8a7daa60508f4ae22345c961a939b3b6a43b0 +SHA512 (virt-v2v-2.9.1.tar.gz) = af44995b7bfbfd58263773600f3dcdf1ab4c221fd5a2a3137a63e12f33e8a9d017f6c11e623c8b1e268a23475222b764121fc9cb546639a508a7304305f40ea0 +SHA512 (virt-v2v-2.9.1.tar.gz.sig) = 587d6ae2933a634ee105ff50e2dbcb65105e0e417e57a1a5bae99b55380cff5ff99854eec161bcf7f2b9557529de43b83dab0cf78c57dc6a61a485c9fd23c475 diff --git a/virt-v2v.spec b/virt-v2v.spec index b314f17..52dbe65 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,12 +2,12 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.8-stable +%global source_directory 2.9-development Name: virt-v2v Epoch: 1 -Version: 2.8.1 -Release: 2%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Sun Jul 13 2025 Richard W.M. Jones - 1:2.9.1-1 +- New upstream development version 2.9.1 + * Sat Jul 12 2025 Jerry James - 1:2.8.1-2 - Rebuild to fix OCaml dependencies From 69d7d754bc64df2a3c6127d754620c18db284678 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 13 Jul 2025 13:00:12 -0600 Subject: [PATCH 03/25] Rebuild to fix OCaml dependencies again --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 52dbe65..02ce801 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Sun Jul 13 2025 Jerry James - 1:2.9.1-2 +- Rebuild to fix OCaml dependencies again + * Sun Jul 13 2025 Richard W.M. Jones - 1:2.9.1-1 - New upstream development version 2.9.1 From 10c9afdfa8009357ed1944271184773df489e7d8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 16 Jul 2025 13:37:40 +0100 Subject: [PATCH 04/25] New upstream development version 2.9.2 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 9c7b034..0286d0c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.1.tar.gz) = af44995b7bfbfd58263773600f3dcdf1ab4c221fd5a2a3137a63e12f33e8a9d017f6c11e623c8b1e268a23475222b764121fc9cb546639a508a7304305f40ea0 -SHA512 (virt-v2v-2.9.1.tar.gz.sig) = 587d6ae2933a634ee105ff50e2dbcb65105e0e417e57a1a5bae99b55380cff5ff99854eec161bcf7f2b9557529de43b83dab0cf78c57dc6a61a485c9fd23c475 +SHA512 (virt-v2v-2.9.2.tar.gz) = 62e635322322ffefe17639c3eff036a96c2ba2eb7df2276b0d902138070b6b459bc71d757f4c1b2aa71869c8620bc67cb4094db6d7341c4202c24c83c3ae7b1a +SHA512 (virt-v2v-2.9.2.tar.gz.sig) = d122260fd4cf17efe08396c52e211480b34f5117e14a291673c8d4669122e4e524becd5e12afb66b8c7903a8e531f58d38ea93fa42e03a7fcf47407acab9c2fb diff --git a/virt-v2v.spec b/virt-v2v.spec index 02ce801..e3c34cf 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.1 -Release: 2%{?dist} +Version: 2.9.2 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -315,6 +315,9 @@ done %changelog +* Wed Jul 16 2025 Richard W.M. Jones - 1:2.9.2-1 +- New upstream development version 2.9.2 + * Sun Jul 13 2025 Jerry James - 1:2.9.1-2 - Rebuild to fix OCaml dependencies again From 25e2eae876a4e86c84e74c064ecced2fdc985e0c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 19 Jul 2025 17:01:43 +0100 Subject: [PATCH 05/25] Bump minimum version of nbdkit to 1.45.1, matching current Rawhide Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 Bump minimum version of libguestfs to 1.56 Bump minimum version of guestfs-tools to 1.54 Also: - Remove nbdkit-noextents-filter, option removed from virt-v2v 2.9.1 - Add nbdkit-count-filter, added in nbdkit 1.45 - Drop BR nbdkit-python-plugin, as it is not needed by our test --- virt-v2v.spec | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index e3c34cf..2ac4bd1 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -46,13 +46,13 @@ BuildRequires: /usr/bin/pod2man BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.56.0-1 +BuildRequires: libguestfs-devel >= 1:1.56 BuildRequires: augeas-devel BuildRequires: bash-completion, bash-completion-devel BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel -BuildRequires: libnbd-devel >= 1.14 +BuildRequires: libnbd-devel >= 1.22 BuildRequires: libosinfo-devel BuildRequires: libvirt-daemon-kvm BuildRequires: libvirt-devel @@ -76,12 +76,10 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo +BuildRequires: nbdkit-server >= 1.45.1 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin -%if !0%{?rhel} -BuildRequires: nbdkit-python-plugin -%endif -BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9 +BuildRequires: nbdkit-cow-filter BuildRequires: mingw-srvany-redistributable >= 1.1-6 %ifarch x86_64 BuildRequires: glibc-static @@ -91,8 +89,8 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.55.12-1 -Requires: guestfs-tools >= 1.49.7-1 +Requires: libguestfs%{?_isa} >= 1:1.56 +Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. Requires: libguestfs-xfs @@ -126,11 +124,11 @@ Requires: platform-python # Python is not needed by RHEL 10. %endif %endif -Requires: libnbd >= 1.10 +Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.28.3-1.el9 +Requires: nbdkit-server >= 1.45.1 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin @@ -143,9 +141,9 @@ Requires: nbdkit-ssh-plugin Requires: nbdkit-vddk-plugin %endif Requires: nbdkit-blocksize-filter -Requires: nbdkit-cow-filter >= 1.28.3-1.el9 +Requires: nbdkit-count-filter +Requires: nbdkit-cow-filter Requires: nbdkit-multi-conn-filter -Requires: nbdkit-noextents-filter Requires: nbdkit-rate-filter Requires: nbdkit-retry-filter @@ -315,6 +313,15 @@ done %changelog +* Sat Jul 19 2025 Richard W.M. Jones - 1:2.9.2-2 +- Bump minimum version of nbdkit to 1.45.1, matching current Rawhide +- Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 +- Bump minimum version of libguestfs to 1.56 +- Bump minimum version of guestfs-tools to 1.54 +- Remove nbdkit-noextents-filter, option removed from virt-v2v 2.9.1 +- Add nbdkit-count-filter, added in nbdkit 1.45 +- Drop BR nbdkit-python-plugin, as it is not needed by our test + * Wed Jul 16 2025 Richard W.M. Jones - 1:2.9.2-1 - New upstream development version 2.9.2 From 71d5e395b29695ce42e3532016d2e03d6b1e15ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:09:05 +0000 Subject: [PATCH 06/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2ac4bd1..63e6fff 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -313,6 +313,9 @@ done %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 19 2025 Richard W.M. Jones - 1:2.9.2-2 - Bump minimum version of nbdkit to 1.45.1, matching current Rawhide - Bump minimum version of nbdcopy to 1.22, matching current Fedora 42 From 3a85108e5c431bfd7ce9ad2cb044e14d0ab1a892 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 15 Aug 2025 11:00:49 +0100 Subject: [PATCH 07/25] New upstream development version 2.9.3 Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) --- sources | 4 ++-- virt-v2v.spec | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 0286d0c..e4b0acb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.2.tar.gz) = 62e635322322ffefe17639c3eff036a96c2ba2eb7df2276b0d902138070b6b459bc71d757f4c1b2aa71869c8620bc67cb4094db6d7341c4202c24c83c3ae7b1a -SHA512 (virt-v2v-2.9.2.tar.gz.sig) = d122260fd4cf17efe08396c52e211480b34f5117e14a291673c8d4669122e4e524becd5e12afb66b8c7903a8e531f58d38ea93fa42e03a7fcf47407acab9c2fb +SHA512 (virt-v2v-2.9.3.tar.gz) = 9565f850e8e88fc6248bcdd0aba6e9fa098023abe343b7dea2f1564bd2ecf2912ce7afa1faf6f2c68021617304432b1cb60ab9b6e522e4b1ae47c79abc3264f6 +SHA512 (virt-v2v-2.9.3.tar.gz.sig) = 8f2b1d65c9cace756596357e9e16560bfa6ae1de0dcdb4a5353bf964831f9dcd25c512be94fa49e4ba81ea889169f77dc63415bfe3f6925ac37067b69e628cb1 diff --git a/virt-v2v.spec b/virt-v2v.spec index 63e6fff..345a670 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,8 +6,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.2 -Release: 3%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -46,7 +46,7 @@ BuildRequires: /usr/bin/pod2man BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.56 +BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel BuildRequires: bash-completion, bash-completion-devel BuildRequires: file @@ -89,7 +89,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.56 +Requires: libguestfs%{?_isa} >= 1:1.57.1-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -313,6 +313,10 @@ done %changelog +* Fri Aug 15 2025 Richard W.M. Jones - 1:2.9.3-1 +- New upstream development version 2.9.3 +- Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) + * Fri Jul 25 2025 Fedora Release Engineering - 1:2.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 72edbc55f8e493a089bfd5e79bdafee2480fdb9b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Aug 2025 10:03:26 +0100 Subject: [PATCH 08/25] New upstream development version 2.9.4 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e4b0acb..e4dbf84 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.3.tar.gz) = 9565f850e8e88fc6248bcdd0aba6e9fa098023abe343b7dea2f1564bd2ecf2912ce7afa1faf6f2c68021617304432b1cb60ab9b6e522e4b1ae47c79abc3264f6 -SHA512 (virt-v2v-2.9.3.tar.gz.sig) = 8f2b1d65c9cace756596357e9e16560bfa6ae1de0dcdb4a5353bf964831f9dcd25c512be94fa49e4ba81ea889169f77dc63415bfe3f6925ac37067b69e628cb1 +SHA512 (virt-v2v-2.9.4.tar.gz) = eb25a103c4f4af72bb6be6cb32e9014997532b53ca3a5319abdbfa5d8187d32cd7caae3a812b5f066ddc348303a2957a926524b016e66100d6ca785dcd1d02a2 +SHA512 (virt-v2v-2.9.4.tar.gz.sig) = ed927b57b78469781275849843c1ca6d557791d83362a7f02db47eba13d2ea0345f7959e918fd8d83d4c69459312a077fcf202c6dba2f35ae4408634fee1285a diff --git a/virt-v2v.spec b/virt-v2v.spec index 345a670..dbc2260 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ Name: virt-v2v Epoch: 1 -Version: 2.9.3 +Version: 2.9.4 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -313,6 +313,9 @@ done %changelog +* Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 +- New upstream development version 2.9.4 + * Fri Aug 15 2025 Richard W.M. Jones - 1:2.9.3-1 - New upstream development version 2.9.3 - Ensure minimum libguestfs is 1.57.1 (for guestfs_setfiles) From 26965f881b5c76fc2f77c7e255d3c9579279f58d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 10:34:15 +0100 Subject: [PATCH 09/25] New upstream development version 2.9.4 Use new ./configure --disable/--enable flags for excluding RHEL features --- sources | 4 +- virt-v2v.spec | 106 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 85 insertions(+), 25 deletions(-) diff --git a/sources b/sources index e4dbf84..a005b1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.4.tar.gz) = eb25a103c4f4af72bb6be6cb32e9014997532b53ca3a5319abdbfa5d8187d32cd7caae3a812b5f066ddc348303a2957a926524b016e66100d6ca785dcd1d02a2 -SHA512 (virt-v2v-2.9.4.tar.gz.sig) = ed927b57b78469781275849843c1ca6d557791d83362a7f02db47eba13d2ea0345f7959e918fd8d83d4c69459312a077fcf202c6dba2f35ae4408634fee1285a +SHA512 (virt-v2v-2.9.5.tar.gz) = 035a9bcbae6143364bd5b0c5236520a89e1d2543e46c4fdfaba1fe0f71db09af8899e75f67669f77318340dce54bcdc4810462e97c2913ef2663f9bc0264398d +SHA512 (virt-v2v-2.9.5.tar.gz.sig) = bc7963e14432b945b688d3efc88d8df13a7a3960c949add5a4de6c128a5db9b2f769333b12e9a255e96663a932d1789de8a1253d6934610d81f376205941b3a5 diff --git a/virt-v2v.spec b/virt-v2v.spec index dbc2260..cd09cf2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -4,9 +4,47 @@ # The source directory. %global source_directory 2.9-development +%if !0%{?rhel} +# Optional features enabled in this build for Fedora. +%global with_block_driver 1 +%global with_glance 1 +%global with_ovirt 1 +%global with_xen 1 + +# libguestfs hasn't been built on i686 for a while since there is no +# kernel built for this architecture any longer and libguestfs rather +# fundamentally depends on the kernel. Therefore we must exclude this +# arch. Note there is no bug filed for this because we do not ever +# expect that libguestfs or virt-v2v will be available on i686 so +# there is nothing that needs fixing. +ExcludeArch: %{ix86} + +# Version extra string for Fedora. +%global version_extra fedora=%{fedora},release=%{release} + +%else + +# Optional features enabled in this build for RHEL. +%global with_block_driver 0 +%global with_glance 0 +%global with_ovirt 0 +%global with_xen 0 + +# Architectures where virt-v2v is shipped on RHEL: +# +# not on aarch64 because it is not useful there +# not on %%{power64} because of RHBZ#1287826 +# not on s390x because it is not useful there +ExclusiveArch: x86_64 + +# Version extra string for RHEL. +%global version_extra rhel=%{rhel},release=%{release} + +%endif + Name: virt-v2v Epoch: 1 -Version: 2.9.4 +Version: 2.9.5 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -23,23 +61,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -%if !0%{?rhel} -# libguestfs hasn't been built on i686 for a while since there is no -# kernel built for this architecture any longer and libguestfs rather -# fundamentally depends on the kernel. Therefore we must exclude this -# arch. Note there is no bug filed for this because we do not ever -# expect that libguestfs or virt-v2v will be available on i686 so -# there is nothing that needs fixing. -ExcludeArch: %{ix86} -%else -# Architectures where virt-v2v is shipped on RHEL: -# -# not on aarch64 because it is not useful there -# not on %%{power64} because of RHBZ#1287826 -# not on s390x because it is not useful there -ExclusiveArch: x86_64 -%endif - BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -212,11 +233,27 @@ autoreconf -fiv %build %configure \ -%if !0%{?rhel} - --with-extra="fedora=%{fedora},release=%{release}" \ +%if %{with_block_driver} + --enable-block-driver \ %else - --with-extra="rhel=%{rhel},release=%{release}" \ + --disable-block-driver \ %endif +%if %{with_glance} + --enable-glance \ +%else + --disable-glance \ +%endif +%if %{with_ovirt} + --enable-ovirt \ +%else + --disable-ovirt \ +%endif +%if %{with_xen} + --enable-xen \ +%else + --disable-xen \ +%endif + --with-extra="%{version_extra}" make V=1 %{?_smp_mflags} @@ -243,6 +280,23 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-output-ovirt.1* %check +# Check that the binary runs and the features match those configured. +./run virt-v2v --version +./run virt-v2v --machine-readable | tee machine-readable.out +grep "virt-v2v-2.0" machine-readable.out +grep "input:disk" machine-readable.out +%if %{with_block_driver} +grep "block-driver-option" machine-readable.out +%endif +%if %{with_glance} +grep "output:glance" machine-readable.out +%endif +%if %{with_ovirt} +grep "output:ovirt$" machine-readable.out +grep "output:ovirt-upload" machine-readable.out +grep "output:vdsm" machine-readable.out +%endif + %ifarch x86_64 # Only run the tests with non-debug (ie. non-Rawhide) kernels. # XXX This tests for any debug kernel installed. @@ -281,15 +335,17 @@ done %{_mandir}/man1/virt-v2v.1* %{_mandir}/man1/virt-v2v-hacking.1* %{_mandir}/man1/virt-v2v-input-vmware.1* -%if !0%{?rhel} +%if %{with_xen} %{_mandir}/man1/virt-v2v-input-xen.1* +%endif +%if !0%{?rhel} %{_mandir}/man1/virt-v2v-in-place.1* %endif %{_mandir}/man1/virt-v2v-inspector.1* %{_mandir}/man1/virt-v2v-open.1* %{_mandir}/man1/virt-v2v-output-local.1* %{_mandir}/man1/virt-v2v-output-openstack.1* -%if !0%{?rhel} +%if %{with_ovirt} %{_mandir}/man1/virt-v2v-output-ovirt.1* %endif %{_mandir}/man1/virt-v2v-release-notes-1.42.1* @@ -313,6 +369,10 @@ done %changelog +* Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 +- New upstream development version 2.9.4 +- Use new ./configure --disable/--enable flags for excluding RHEL features + * Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 - New upstream development version 2.9.4 From 66650d837a4229eaec71ef73631d3a3b7d5b4fdd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 10:55:37 +0100 Subject: [PATCH 10/25] Fix version number in changelog --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index cd09cf2..f06e022 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -370,7 +370,7 @@ done %changelog * Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 -- New upstream development version 2.9.4 +- New upstream development version 2.9.5 - Use new ./configure --disable/--enable flags for excluding RHEL features * Wed Aug 27 2025 Richard W.M. Jones - 1:2.9.4-1 From 520c690092220eb65c15ecbb9ebc132458b63208 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 11:07:23 +0100 Subject: [PATCH 11/25] Add missing perl dependencies Previously some of these were pulled in implicitly. However IPC::Run3 is a new dependency of podwrapper and we need to be explicit about that one. --- virt-v2v.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index f06e022..c937dac 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -64,6 +64,9 @@ Source3: copy-patches.sh BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man +BuildRequires: perl(Pod::Usage) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 From 1fa63ef939c375b0d8d5b72fc2a6570d7f1a8c32 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 13:09:22 +0100 Subject: [PATCH 12/25] Require nbdkit-python-plugin only if we built oVirt support --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index c937dac..4481f45 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -140,7 +140,7 @@ Requires: edk2-ovmf Requires: edk2-aarch64 %endif -%if !0%{?rhel} +%if !%{with_ovirt} Requires: /usr/bin/python3 %else %if 0%{?rhel} == 9 @@ -157,7 +157,7 @@ Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin Requires: nbdkit-null-plugin -%if !0%{?rhel} +%if !%{with_ovirt} Requires: nbdkit-python-plugin %endif Requires: nbdkit-ssh-plugin From 4a4aa3a93881e4d716231fa016fc4f893bde8ee1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 13:05:42 +0100 Subject: [PATCH 13/25] Unify Fedora and RHEL 10.2 spec files --- virt-v2v.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 4481f45..2a9018e 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -72,7 +72,10 @@ BuildRequires: ocaml >= 4.08 BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel -BuildRequires: bash-completion, bash-completion-devel +BuildRequires: bash-completion +%if !0%{?rhel} +BuildRequires: bash-completion-devel +%endif BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel @@ -142,11 +145,6 @@ Requires: edk2-aarch64 %if !%{with_ovirt} Requires: /usr/bin/python3 -%else -%if 0%{?rhel} == 9 -Requires: platform-python -# Python is not needed by RHEL 10. -%endif %endif Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd From 030036337929546c950207af6775c960eb660c91 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Sep 2025 09:39:16 +0100 Subject: [PATCH 14/25] RHEL: Unnecessary to delete input-xen and output-ovirt man pages Since RHEL is compiled with_xen == 0 && with_ovirt == 0, the project should not generate these files, so deleting them should not be necessary. --- virt-v2v.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2a9018e..6063de4 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -271,9 +271,6 @@ find $RPM_BUILD_ROOT -name '*.la' -delete mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mv $RPM_BUILD_ROOT%{_bindir}/virt-v2v-in-place $RPM_BUILD_ROOT%{_libexecdir}/ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1* -# these are also not supported on RHEL -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-input-xen.1* -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-output-ovirt.1* %endif # Find locale files. From 4a7db747882488105c4bde7aae87206091671b1e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Sep 2025 21:34:06 +0100 Subject: [PATCH 15/25] New upstream development version 2.9.6 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a005b1c..f972117 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.5.tar.gz) = 035a9bcbae6143364bd5b0c5236520a89e1d2543e46c4fdfaba1fe0f71db09af8899e75f67669f77318340dce54bcdc4810462e97c2913ef2663f9bc0264398d -SHA512 (virt-v2v-2.9.5.tar.gz.sig) = bc7963e14432b945b688d3efc88d8df13a7a3960c949add5a4de6c128a5db9b2f769333b12e9a255e96663a932d1789de8a1253d6934610d81f376205941b3a5 +SHA512 (virt-v2v-2.9.6.tar.gz) = 983c784d5190c0590f83357dea1ccb2c1f9a528a26f39122b24ef35dd0209151e89acb749f11cb0d7201d33ada31330f858becc049d11790229cadcaa306bcc4 +SHA512 (virt-v2v-2.9.6.tar.gz.sig) = 28199a3d7d38148b16033831c5b26f3e5013d47d769dbd7e5571deb64e4bf094e31c8df62f5c55a0bae621b19a5011b209917d671e7c34531e6b95d304d88aaf diff --git a/virt-v2v.spec b/virt-v2v.spec index 6063de4..83d26a8 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.5 +Version: 2.9.6 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -367,6 +367,9 @@ done %changelog +* Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 +- New upstream development version 2.9.6 + * Fri Aug 29 2025 Richard W.M. Jones - 1:2.9.5-1 - New upstream development version 2.9.5 - Use new ./configure --disable/--enable flags for excluding RHEL features From 792368a646919e24c8adb0e1a24e804dd6214371 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 20 Sep 2025 17:25:20 +0100 Subject: [PATCH 16/25] New upstream development version 2.9.7 Ignore non-upstream patch to improve Windows conversions --- 0001-Update-common-submodule.patch | 48 ++++++++++++++++++++++++++++++ sources | 4 +-- virt-v2v.spec | 10 ++++++- 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 0001-Update-common-submodule.patch diff --git a/0001-Update-common-submodule.patch b/0001-Update-common-submodule.patch new file mode 100644 index 0000000..a9cbd58 --- /dev/null +++ b/0001-Update-common-submodule.patch @@ -0,0 +1,48 @@ +From 6e15298cb5e7438ecda8fd5c08f2a5ec868e97a7 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 20 Sep 2025 17:20:25 +0100 +Subject: [PATCH] Update common submodule + + Richard W.M. Jones (2): + daemon, generator: Use power of 2 for initial size of Hashtbl.create + mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 5be8d55214..ebcd4d5ecc: +diff --git a/common/mlcustomize/customize_run.ml b/common/mlcustomize/customize_run.ml +index ff719f4..64afd3a 100644 +--- a/common/mlcustomize/customize_run.ml ++++ b/common/mlcustomize/customize_run.ml +@@ -97,7 +97,7 @@ let run (g : G.guestfs) root (ops : ops) = + ) in + + (* Store the passwords and set them all at the end. *) +- let passwords = Hashtbl.create 13 in ++ let passwords = Hashtbl.create 16 in + let set_password user pw = + if Hashtbl.mem passwords user then + error (f_"multiple --root-password/--password options set the \ +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index b26b14d..114df06 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -310,8 +310,13 @@ and ddb_regedits inspect drv_name drv_pciid = + * one must add keys into the DriverDatabase. + *) + ++ let winarch = ++ match inspect.i_arch with ++ | "i386" -> "x86" | "x86_64" -> "amd64" ++ | _ -> assert false in ++ + let drv_inf = "guestor.inf" in +- let drv_inf_label = drv_inf ^ "_tmp" in ++ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in + let drv_config = "guestor_conf" in + + [ +-- +2.50.1 + diff --git a/sources b/sources index f972117..d9ef2db 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.6.tar.gz) = 983c784d5190c0590f83357dea1ccb2c1f9a528a26f39122b24ef35dd0209151e89acb749f11cb0d7201d33ada31330f858becc049d11790229cadcaa306bcc4 -SHA512 (virt-v2v-2.9.6.tar.gz.sig) = 28199a3d7d38148b16033831c5b26f3e5013d47d769dbd7e5571deb64e4bf094e31c8df62f5c55a0bae621b19a5011b209917d671e7c34531e6b95d304d88aaf +SHA512 (virt-v2v-2.9.7.tar.gz) = 55e517ec9b5a5850b1bf5f4ac14df307e1ffa0fb8b3f836c05964a091a204de7f9931ca7572618ba6e9f5902c7e4f524de76c3e4c725a302d0007d2fb4a26326 +SHA512 (virt-v2v-2.9.7.tar.gz.sig) = 0a7b49b809a6c08c7722d4d1029aecf6cf170b8bdf5e8e4bef37c401fa0212d2770760cfc4c77169d34d6f473a9f367eeedb9406005c7e0bf9d77c5034c8477b diff --git a/virt-v2v.spec b/virt-v2v.spec index 83d26a8..3eaebc5 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.6 +Version: 2.9.7 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -61,6 +61,10 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Improve Windows conversions. Not upstream yet. +# https://github.com/libguestfs/libguestfs-common/pull/17 +Patch: 0001-Update-common-submodule.patch + BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -367,6 +371,10 @@ done %changelog +* Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 +- New upstream development version 2.9.7 +- Ignore non-upstream patch to improve Windows conversions + * Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 - New upstream development version 2.9.6 From 9ba178aca41062fe1e9f0e85775399723cefb6f4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 20 Sep 2025 18:07:17 +0100 Subject: [PATCH 17/25] Fix changelog of previous commit --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 3eaebc5..fb693b7 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -373,7 +373,7 @@ done %changelog * Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 - New upstream development version 2.9.7 -- Ignore non-upstream patch to improve Windows conversions +- Backport non-upstream patch to improve Windows conversions * Tue Sep 9 2025 Richard W.M. Jones - 1:2.9.6-1 - New upstream development version 2.9.6 From f5b4a662695021d26418b3bb26aaff2850f699e9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Sep 2025 15:47:18 +0100 Subject: [PATCH 18/25] New upstream development version 2.9.8 Remove Windows conversion patch which is now upstream. --- 0001-Update-common-submodule.patch | 48 ------------------------------ sources | 4 +-- virt-v2v.spec | 10 +++---- 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 0001-Update-common-submodule.patch diff --git a/0001-Update-common-submodule.patch b/0001-Update-common-submodule.patch deleted file mode 100644 index a9cbd58..0000000 --- a/0001-Update-common-submodule.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6e15298cb5e7438ecda8fd5c08f2a5ec868e97a7 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 20 Sep 2025 17:20:25 +0100 -Subject: [PATCH] Update common submodule - - Richard W.M. Jones (2): - daemon, generator: Use power of 2 for initial size of Hashtbl.create - mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common 5be8d55214..ebcd4d5ecc: -diff --git a/common/mlcustomize/customize_run.ml b/common/mlcustomize/customize_run.ml -index ff719f4..64afd3a 100644 ---- a/common/mlcustomize/customize_run.ml -+++ b/common/mlcustomize/customize_run.ml -@@ -97,7 +97,7 @@ let run (g : G.guestfs) root (ops : ops) = - ) in - - (* Store the passwords and set them all at the end. *) -- let passwords = Hashtbl.create 13 in -+ let passwords = Hashtbl.create 16 in - let set_password user pw = - if Hashtbl.mem passwords user then - error (f_"multiple --root-password/--password options set the \ -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index b26b14d..114df06 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -310,8 +310,13 @@ and ddb_regedits inspect drv_name drv_pciid = - * one must add keys into the DriverDatabase. - *) - -+ let winarch = -+ match inspect.i_arch with -+ | "i386" -> "x86" | "x86_64" -> "amd64" -+ | _ -> assert false in -+ - let drv_inf = "guestor.inf" in -- let drv_inf_label = drv_inf ^ "_tmp" in -+ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in - let drv_config = "guestor_conf" in - - [ --- -2.50.1 - diff --git a/sources b/sources index d9ef2db..5a8739c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.7.tar.gz) = 55e517ec9b5a5850b1bf5f4ac14df307e1ffa0fb8b3f836c05964a091a204de7f9931ca7572618ba6e9f5902c7e4f524de76c3e4c725a302d0007d2fb4a26326 -SHA512 (virt-v2v-2.9.7.tar.gz.sig) = 0a7b49b809a6c08c7722d4d1029aecf6cf170b8bdf5e8e4bef37c401fa0212d2770760cfc4c77169d34d6f473a9f367eeedb9406005c7e0bf9d77c5034c8477b +SHA512 (virt-v2v-2.9.8.tar.gz) = b8f07f8fe451375aa6500861566c6d80dbcc38226ce8319444838087c433759274577303355b9445bfc09e9dcd51b809c599232f0f7ddb49fb33fbf8210f1031 +SHA512 (virt-v2v-2.9.8.tar.gz.sig) = 974568808749d78ad9120f262722feffec1aabec7817473fc63565750dfdf9d9eda96ef3cc6ab8de2f1490fba7a2e296b0e6ef908abff0384df24ec4f4bada15 diff --git a/virt-v2v.spec b/virt-v2v.spec index fb693b7..68416e2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.7 +Version: 2.9.8 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -61,10 +61,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Improve Windows conversions. Not upstream yet. -# https://github.com/libguestfs/libguestfs-common/pull/17 -Patch: 0001-Update-common-submodule.patch - BuildRequires: autoconf, automake, libtool BuildRequires: make BuildRequires: /usr/bin/pod2man @@ -371,6 +367,10 @@ done %changelog +* Mon Sep 22 2025 Richard W.M. Jones - 1:2.9.8-1 +- New upstream development version 2.9.8 +- Remove Windows conversion patch which is now upstream. + * Sat Sep 20 2025 Richard W.M. Jones - 1:2.9.7-1 - New upstream development version 2.9.7 - Backport non-upstream patch to improve Windows conversions From 790400f357e36761367678decd53f01be94d1479 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 25 Sep 2025 10:54:37 -0400 Subject: [PATCH 19/25] Fix bash-completion conditional ELN (the future RHEL 11) tracks rawhide and therefore also has bash-completion-devel and the %bash_completions_dir macro. --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 68416e2..060016d 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -73,7 +73,7 @@ BuildRequires: ocaml >= 4.08 BuildRequires: libguestfs-devel >= 1:1.57.1-1 BuildRequires: augeas-devel BuildRequires: bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 BuildRequires: bash-completion-devel %endif BuildRequires: file From a0f001aa68f950fd6596934dbc01970c0505962e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 14 Oct 2025 09:21:09 +0100 Subject: [PATCH 20/25] OCaml 5.4.0 rebuild --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 060016d..3c0f719 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -45,7 +45,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 Version: 2.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -367,6 +367,9 @@ done %changelog +* Tue Oct 14 2025 Richard W.M. Jones - 1:2.9.8-2 +- OCaml 5.4.0 rebuild + * Mon Sep 22 2025 Richard W.M. Jones - 1:2.9.8-1 - New upstream development version 2.9.8 - Remove Windows conversion patch which is now upstream. From 5af6be536a9658b15273f62c033f93b0f0bbb62c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 16 Oct 2025 17:50:24 +0100 Subject: [PATCH 21/25] New upstream development version 2.9.9 --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5a8739c..19e488a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.8.tar.gz) = b8f07f8fe451375aa6500861566c6d80dbcc38226ce8319444838087c433759274577303355b9445bfc09e9dcd51b809c599232f0f7ddb49fb33fbf8210f1031 -SHA512 (virt-v2v-2.9.8.tar.gz.sig) = 974568808749d78ad9120f262722feffec1aabec7817473fc63565750dfdf9d9eda96ef3cc6ab8de2f1490fba7a2e296b0e6ef908abff0384df24ec4f4bada15 +SHA512 (virt-v2v-2.9.9.tar.gz) = 82a73de492bc3565ad09cd9981d63459482872b4d3ebf376a15d8681698ae4caeb181ca4a84e0cd68b852b886346009f5350a268761f7ca7db9ac589af92938c +SHA512 (virt-v2v-2.9.9.tar.gz.sig) = dbd8b9702baa1b69f69c3aff52d95e6c2a0a1ef8f066248f3e33990ffefe429409b80001041389692dd24faf8628557d79173cc098e3fce1c5890feb27229bc5 diff --git a/virt-v2v.spec b/virt-v2v.spec index 3c0f719..165bd9c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,8 +44,8 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.8 -Release: 2%{?dist} +Version: 2.9.9 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -367,6 +367,9 @@ done %changelog +* Thu Oct 16 2025 Richard W.M. Jones - 1:2.9.9-1 +- New upstream development version 2.9.9 + * Tue Oct 14 2025 Richard W.M. Jones - 1:2.9.8-2 - OCaml 5.4.0 rebuild From 7ba7c6543851970522074c426acaa5324dd1332d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 20 Oct 2025 15:06:42 +0100 Subject: [PATCH 22/25] Bump minimum nbdkit version to 1.45.11 This will be the new minimum in the next development version of virt-v2v. --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 165bd9c..388d5f9 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -103,7 +103,7 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo -BuildRequires: nbdkit-server >= 1.45.1 +BuildRequires: nbdkit-server >= 1.45.11 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-cow-filter @@ -150,7 +150,7 @@ Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.45.1 +Requires: nbdkit-server >= 1.45.11 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin From b07fed3631cf8afde580707c80034f1ca20dc8e1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Nov 2025 16:37:14 +0000 Subject: [PATCH 23/25] New upstream development version 2.9.10 Requires libguestfs 1.57.6 for new inspection APIs. --- sources | 4 ++-- virt-v2v.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 19e488a..b452ce6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.9.tar.gz) = 82a73de492bc3565ad09cd9981d63459482872b4d3ebf376a15d8681698ae4caeb181ca4a84e0cd68b852b886346009f5350a268761f7ca7db9ac589af92938c -SHA512 (virt-v2v-2.9.9.tar.gz.sig) = dbd8b9702baa1b69f69c3aff52d95e6c2a0a1ef8f066248f3e33990ffefe429409b80001041389692dd24faf8628557d79173cc098e3fce1c5890feb27229bc5 +SHA512 (virt-v2v-2.9.10.tar.gz) = 950b5320413de5b398785ce98645833a770acd68ad289c86a6ea2dbe019a40c4642063cba0f6d4e7988d4521b045feb83dd7551f0ebfdba6d964757473cafcb3 +SHA512 (virt-v2v-2.9.10.tar.gz.sig) = 467a105c9469ca67c3254155682a87021610a057bc8124e1644d522bf540a944234a7118751a4f1c1308ec5bbd91904445a0223443607426f7decae2dd40c65f diff --git a/virt-v2v.spec b/virt-v2v.spec index 388d5f9..6d17d45 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.9 +Version: 2.9.10 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -70,7 +70,7 @@ BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.57.1-1 +BuildRequires: libguestfs-devel >= 1:1.57.6-1 BuildRequires: augeas-devel BuildRequires: bash-completion %if 0%{?fedora} || 0%{?rhel} >= 11 @@ -116,7 +116,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.57.1-1 +Requires: libguestfs%{?_isa} >= 1:1.57.6-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -367,6 +367,10 @@ done %changelog +* Tue Nov 4 2025 Richard W.M. Jones - 1:2.9.10-1 +- New upstream development version 2.9.10 +- Requires libguestfs 1.57.6 for new inspection APIs. + * Thu Oct 16 2025 Richard W.M. Jones - 1:2.9.9-1 - New upstream development version 2.9.9 From 1a5178ef0ccbf93ca30775013885db83f8e47c63 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Jan 2026 11:01:45 +0000 Subject: [PATCH 24/25] New upstream stable branch version 2.10.0 Requires libguestfs >= 1.58.0 and nbdkit >= 1.46. --- sources | 4 ++-- virt-v2v.spec | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sources b/sources index b452ce6..8fc8fc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.9.10.tar.gz) = 950b5320413de5b398785ce98645833a770acd68ad289c86a6ea2dbe019a40c4642063cba0f6d4e7988d4521b045feb83dd7551f0ebfdba6d964757473cafcb3 -SHA512 (virt-v2v-2.9.10.tar.gz.sig) = 467a105c9469ca67c3254155682a87021610a057bc8124e1644d522bf540a944234a7118751a4f1c1308ec5bbd91904445a0223443607426f7decae2dd40c65f +SHA512 (virt-v2v-2.10.0.tar.gz) = 035f2181c1cc5f482e96d3e21b513b95939ca224d71ac6ad938842d5af5d60ef07db1600d2ccb609dc2042b1c74088f6f39ffbe595cb51e80278ecb50c314515 +SHA512 (virt-v2v-2.10.0.tar.gz.sig) = cb6301224ef00577a9cd0fc8fa504e583eb447341bd3849e6854f2d78ae72ca39bca68b70f30efd3d1d64480acf161c5e4bc9ba943595ef4dd2a654c3268aa66 diff --git a/virt-v2v.spec b/virt-v2v.spec index 6d17d45..7557908 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,7 +2,7 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 2.9-development +%global source_directory 2.10-stable %if !0%{?rhel} # Optional features enabled in this build for Fedora. @@ -44,7 +44,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.10 +Version: 2.10.0 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -70,7 +70,7 @@ BuildRequires: perl(IPC::Run3) BuildRequires: gcc BuildRequires: ocaml >= 4.08 -BuildRequires: libguestfs-devel >= 1:1.57.6-1 +BuildRequires: libguestfs-devel >= 1:1.58.0-1 BuildRequires: augeas-devel BuildRequires: bash-completion %if 0%{?fedora} || 0%{?rhel} >= 11 @@ -103,7 +103,7 @@ BuildRequires: glibc-utils BuildRequires: %{_bindir}/qemu-nbd BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo -BuildRequires: nbdkit-server >= 1.45.11 +BuildRequires: nbdkit-server >= 1.46.1 BuildRequires: nbdkit-file-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-cow-filter @@ -116,7 +116,7 @@ BuildRequires: glibc-static BuildRequires: gnupg2 %endif -Requires: libguestfs%{?_isa} >= 1:1.57.6-1 +Requires: libguestfs%{?_isa} >= 1:1.58.0-1 Requires: guestfs-tools >= 1.54 # XFS is the default filesystem in Fedora and RHEL. @@ -150,7 +150,7 @@ Requires: libnbd >= 1.22 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo -Requires: nbdkit-server >= 1.45.11 +Requires: nbdkit-server >= 1.46.1 Requires: nbdkit-curl-plugin Requires: nbdkit-file-plugin Requires: nbdkit-nbd-plugin @@ -367,6 +367,10 @@ done %changelog +* Tue Jan 06 2026 Richard W.M. Jones - 1:2.10.0-1 +- New upstream stable branch version 2.10.0 +- Requires libguestfs >= 1.58.0 and nbdkit >= 1.46. + * Tue Nov 4 2025 Richard W.M. Jones - 1:2.9.10-1 - New upstream development version 2.9.10 - Requires libguestfs 1.57.6 for new inspection APIs. From daaa263ad1b2d452da262945e0033122daeb247d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 Jan 2026 10:50:17 +0000 Subject: [PATCH 25/25] Hard depend on libnbd >= 1.24 This is not actually necessary for Fedora. But for RHEL 10.2, where we partially backported some 1.24 APIs to libnbd 1.22, the libnbd 1.22 package now provides LIBNBD_1.24 versioned symbols. However not all of them, so for example virt-v2v can fail with: virt-v2v: symbol lookup error: virt-v2v: undefined symbol: nbd_get_handle_size, version LIBNBD_1.24 Practically this means that you can update virt-v2v to RHEL 10.2, but leave libnbd from RHEL 10.1, and virt-v2v will then fail to run. Adding a hard dependency avoids this problem, and is fine for Fedora too. Related: https://issues.redhat.com/browse/RHEL-140894 --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 7557908..9309b31 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -79,7 +79,7 @@ BuildRequires: bash-completion-devel BuildRequires: file BuildRequires: gettext-devel BuildRequires: json-c-devel -BuildRequires: libnbd-devel >= 1.22 +BuildRequires: libnbd-devel >= 1.24 BuildRequires: libosinfo-devel BuildRequires: libvirt-daemon-kvm BuildRequires: libvirt-devel @@ -146,7 +146,7 @@ Requires: edk2-aarch64 %if !%{with_ovirt} Requires: /usr/bin/python3 %endif -Requires: libnbd >= 1.22 +Requires: libnbd >= 1.24 Requires: %{_bindir}/qemu-nbd Requires: %{_bindir}/nbdcopy Requires: %{_bindir}/nbdinfo