diff --git a/0001-RHEL-Fixes-for-libguestfs-winsupport.patch b/0001-RHEL-Fixes-for-libguestfs-winsupport.patch index 47784ae..355b8c7 100644 --- a/0001-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0001-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From e3f234e9a3a6f56c455c5fe3189a3fb91da3a9f8 Mon Sep 17 00:00:00 2001 +From 72b3c62beef8edb39c95e89f28c35ac6ca0104c1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. diff --git a/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 1d7f24c..4da8c8a 100644 --- a/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From 22cd3a31ccf7ae81008a311c9c8df6630e64dda3 Mon Sep 17 00:00:00 2001 +From 00f6b5abfdbd500c855a2ffd1b8e7f08409572a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index f7ffb9a..1246c4f 100644 --- a/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From 541c26ca0004bbc7a3eb7826fee17ef7ee0b013b Mon Sep 17 00:00:00 2001 +From 2a2a6aeea212fd5659b0b567c1fa94f873508040 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option @@ -43,10 +43,10 @@ index 49f00754..bdf12c5d 100644 =item B<-o null> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 3d5fcba8..f9e24e6d 100644 +index a3cacb82..871ca521 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -167,11 +167,6 @@ Since F contains the path(s) to the guest disk +@@ -169,11 +169,6 @@ Since F contains the path(s) to the guest disk image(s) you do not need to specify the name of the disk image on the command line. @@ -58,7 +58,7 @@ index 3d5fcba8..f9e24e6d 100644 =head1 OPTIONS =over 4 -@@ -576,9 +571,6 @@ This is similar to I<-o local>, except that a shell script is written +@@ -578,9 +573,6 @@ This is similar to I<-o local>, except that a shell script is written which you can use to boot the guest in qemu. The converted disks and shell script are written to the directory specified by I<-os>. @@ -68,7 +68,7 @@ index 3d5fcba8..f9e24e6d 100644 ifelse(ENABLE_OVIRT, yes, ` =item B<-o> B -@@ -651,11 +643,6 @@ For I<-o openstack> (L) only, set a guest ID +@@ -653,11 +645,6 @@ For I<-o openstack> (L) only, set a guest ID which is saved on each Cinder volume in the C volume property. diff --git a/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index 416d6df..f468502 100644 --- a/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From b6a7c919aa5cbe34f55864eb15c41efeb0939693 Mon Sep 17 00:00:00 2001 +From ad349c5f50b8dcdb82aa013a0ca0df48ea66922e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index d2d3ec9..7eed181 100644 --- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From 5b29ce6469ca66c2ed793f7b14edba7942564026 Mon Sep 17 00:00:00 2001 +From a2980cacdf00c3b084221eb68e650baba3968fed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 64bdcd8..05ac1ba 100644 --- a/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From 4536ac70a854ff76d730d1e4256d9182119960bd Mon Sep 17 00:00:00 2001 +From 8a30bcc814beb241afbbdb648823062b4d193ae0 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0007-RHEL-tests-Remove-btrfs-test.patch b/0007-RHEL-tests-Remove-btrfs-test.patch index 2b671cb..5d6cafa 100644 --- a/0007-RHEL-tests-Remove-btrfs-test.patch +++ b/0007-RHEL-tests-Remove-btrfs-test.patch @@ -1,4 +1,4 @@ -From 945f36b5e0c74a11bc0c92987f65984ad39d5e36 Mon Sep 17 00:00:00 2001 +From a3957a346947d7ce27c696248978dbd1d2e6e74a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:58:09 +0100 Subject: [PATCH] RHEL: tests: Remove btrfs test diff --git a/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch b/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch index b6da961..24c78bf 100644 --- a/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +++ b/0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch @@ -1,4 +1,4 @@ -From 801cc4e5858bf4c7c0655de64053b8264f207a71 Mon Sep 17 00:00:00 2001 +From 8327cde7c2dd27883cbcb517ace6808d9bbde7b1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:30:09 +0100 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported diff --git a/0009-RHEL-output-output.ml-Remove-cache-none.patch b/0009-RHEL-output-output.ml-Remove-cache-none.patch index 79606bb..3fb109f 100644 --- a/0009-RHEL-output-output.ml-Remove-cache-none.patch +++ b/0009-RHEL-output-output.ml-Remove-cache-none.patch @@ -1,4 +1,4 @@ -From 30c03c7e308b063843a7848d15890871566bbbc0 Mon Sep 17 00:00:00 2001 +From 7850f0c47d365579fda8da4b76263542ae05ae4f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Dec 2025 16:18:15 +0000 Subject: [PATCH] RHEL: output/output.ml: Remove cache=none 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 480afdc..823409a 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,8 +44,8 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.9.10 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -84,7 +84,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 @@ -117,7 +117,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 @@ -130,7 +130,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. @@ -164,7 +164,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 @@ -378,8 +378,8 @@ done %changelog -* Fri Dec 12 2025 Richard W.M. Jones - 1:2.9.10-2 -- Rebase to virt-v2v 2.9.10 +* Tue Jan 06 2026 Richard W.M. Jones - 1:2.10.0-1 +- Rebase to virt-v2v 2.10.0 resolves: RHEL-111241 - Synchronize spec file with Fedora. - Tighten permissions on windows C:\Program Files\Guestfs