Rebase to virt-v2v 2.11.9

resolves: RHEL-153361 Skip fsck after conversion for RHEL 7 resolves: RHEL-191749 Add new --collect option to collect pre-conversion information resolves: RHEL-188772 Add disk boot-order to inspector and in-place XML output resolves: RHEL-184508 Allow conversion with immutable resolv.conf related: RHEL-178556 Add note about PowerShell ExecutionPolicy AllSigned (MTV-4424)
2026-07-03 11:02:43 +01:00 · 2026-07-03 11:02:43 +01:00 · 2d284b6337
commit 2d284b6337
parent 4524ded32c
11 changed files with 36 additions and 27 deletions
--- a/0001-RHEL-Fixes-for-libguestfs-winsupport.patch
+++ b/0001-RHEL-Fixes-for-libguestfs-winsupport.patch
@ -1,4 +1,4 @@
-From a99d845e891743f9ace2d6d1efe66aab21b2d681 Mon Sep 17 00:00:00 2001
+From 5e2fa898c5cf667a851cb55b6bdd0a2284aa7a46 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 30 Aug 2015 03:21:57 -0400
 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.
@ -19,10 +19,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=2187961#c1
 7 files changed, 40 insertions(+), 5 deletions(-)

 diff --git a/convert/convert.ml b/convert/convert.ml
-index bab2b23c..3740a764 100644
+index ce0134d4..05c183e7 100644
 --- a/convert/convert.ml
 +++ b/convert/convert.ml
-@@ -56,6 +56,7 @@ let rec convert input_disks options source =
+@@ -58,6 +58,7 @@ let rec convert input_disks options source =
 
   message (f_"Opening the source");
   let g = open_guestfs ~identifier:"v2v" () in
--- 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 20e46bcc6d582462055d6531d57ac52a840f8e3a Mon Sep 17 00:00:00 2001
+From 0035a238ddb9ca49725cf15256d4d66fdfda6d68 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 28 Sep 2014 19:14:43 +0100
 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode
--- 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 f33ecc35533c6dcbf9415e88341c39e97bb448dd Mon Sep 17 00:00:00 2001
+From b5e2de4f816c7129c5fa57816520925b9361e40a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 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 9aede74f..6b90cbe7 100644
+index b735a97b..b1344592 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -170,11 +170,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
+@@ -172,11 +172,6 @@ Since F<guest-domain.xml> 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 9aede74f..6b90cbe7 100644
 =head1 OPTIONS
 
 =over 4
-@@ -590,9 +585,6 @@ This is similar to I<-o local>, except that a shell script is written
+@@ -598,9 +593,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 9aede74f..6b90cbe7 100644
 ifelse(ENABLE_OVIRT, yes, `
 
 =item B<-o> B<vdsm>
-@@ -666,11 +658,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID
+@@ -674,11 +666,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID
 which is saved on each Cinder volume in the C<virt_v2v_guest_id>
 volume property.
 
--- 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 2a1089da34e1e23860a22e493dda7262c05dd87f Mon Sep 17 00:00:00 2001
+From 9ea23b3797ae96d72785208d3c75671af4bd3327 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Apr 2015 09:45:41 -0400
 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu
--- 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 6481a80c22536cfac48813effb4333f56817e469 Mon Sep 17 00:00:00 2001
+From 9e5e43621c401073bb7724e2b6d8ddf94f22db97 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)
--- 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 8668bf77a05e6a4ece59709dad4d9766dbcd9395 Mon Sep 17 00:00:00 2001
+From 7dc7cac974638d11c26b2e64a0e5239332141395 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests
--- a/0007-RHEL-tests-Remove-btrfs-test.patch
+++ b/0007-RHEL-tests-Remove-btrfs-test.patch
@ -1,4 +1,4 @@
-From c6084db870635910fb47de4e32f993510805c795 Mon Sep 17 00:00:00 2001
+From 7fca49d2fea16df6b8952ca1da748c3bd8fc3f0e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:58:09 +0100
 Subject: [PATCH] RHEL: tests: Remove btrfs test
@ -9,12 +9,12 @@ RHEL does not have btrfs so this test always fails.
 1 file changed, 1 deletion(-)

 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 43d785a1..702edb39 100644
+index 8f3958b4..bbd3b9b6 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -64,7 +64,6 @@ TESTS = \
- 	test-checksum-good.sh \
+@@ -65,7 +65,6 @@ TESTS = \
 	test-checksum-print.sh \
+ 	test-collect.sh \
 	test-customize.sh \
 -	test-fedora-btrfs-conversion.sh \
 	test-fedora-conversion.sh \
--- 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 06d576ef1d1e3dc95aa37177a29b146fc3aa4712 Mon Sep 17 00:00:00 2001
+From 81cdb246add2579bc49378f97f3b70decb1b3a46 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Jul 2024 11:30:09 +0100
 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported
@ -10,10 +10,10 @@ Fixes: https://issues.redhat.com/browse/RHEL-40903
 2 files changed, 7 insertions(+)

 diff --git a/in-place/in_place.ml b/in-place/in_place.ml
-index e84266ab..a96d55d9 100644
+index 3539c64c..148d6e46 100644
 --- a/in-place/in_place.ml
 +++ b/in-place/in_place.ml
-@@ -232,6 +232,9 @@ read the man page virt-v2v-in-place(1).
+@@ -241,6 +241,9 @@ read the man page virt-v2v-in-place(1).
   let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true ~machine_readable:true usage_msg in
   Getopt.parse opthandle.getopt;
 
@ -24,7 +24,7 @@ index e84266ab..a96d55d9 100644
   debug "info: %s: %s %s (%s)"
         prog Config.package_name Config.package_version_full
 diff --git a/in-place/virt-v2v-in-place.pod b/in-place/virt-v2v-in-place.pod
-index 540635d2..24e32afb 100644
+index f3a95409..6a1e556d 100644
 --- a/in-place/virt-v2v-in-place.pod
 +++ b/in-place/virt-v2v-in-place.pod
@@ -16,6 +16,10 @@ virt-v2v-in-place - Convert a guest to use KVM in-place
--- a/0009-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
+++ b/0009-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
@ -1,4 +1,4 @@
-From 613acd43bccd1e9bfc2a0e33ca389f184741e9fe Mon Sep 17 00:00:00 2001
+From 1c5da60697537726fd79636e88c893307743bd41 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 12 Dec 2025 16:18:15 +0000
 Subject: [PATCH] RHEL: output/output.ml: Remove reduce-memory-pressure=on
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.11.8.tar.gz) = f00b0a8bbb65aad4ed2d218ed871facf35d00220fe67ca3993052befd7c547034007ee7e1eb648db3b566d0056405e947a9955ff9b71dce42083b43b1143f6fd
-SHA512 (virt-v2v-2.11.8.tar.gz.sig) = 92d37b8eab6a7b907fff5c845569eff0907fdb4b733bb6d46de6796eb08e80d69fd71576cb2262c9ccab5e0c209698655d927f1559b19c4dca367e6c062e860b
+SHA512 (virt-v2v-2.11.9.tar.gz) = c4c677443b8a44aab19de6f68ab8ecea8cabf48a8fb4b51b1517351a9b836e645984648300d827a9a848a8132d4e217a9813e053023b246ba3e3396347209f25
+SHA512 (virt-v2v-2.11.9.tar.gz.sig) = 6d6e515f485f258150ae623651bffb9637c089bb33aa5e2048257c53b560e7837f42878c631f5438da131b376794c84b2edf5a8617cdcae9b1ebcc54b2b318e9
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@ -44,7 +44,7 @@ ExclusiveArch: x86_64

 Name:          virt-v2v
 Epoch:         1
-Version:       2.11.8
+Version:       2.11.9
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM

@ -379,8 +379,8 @@ done


 %changelog
-* Thu May 07 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.11.8-1
- Rebase to virt-v2v 2.11.8
+* Fri Jul 03 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.11.9-1
+- Rebase to virt-v2v 2.11.9
  Synchronize spec file with Fedora
  resolves: RHEL-153361
 - Fixes incorrect driver location for Windows 2008 SP2
@ -390,7 +390,7 @@ done
 - Obey cgroups when computing SMP
  resolves: RHEL-152766
 - Fix encrypted Ubuntu guest fail to boot after conversion
-  resolves: RHEL-137121
+  resolves: RHEL-137121, RHEL-178432
 - Stop using maxmem (xfs_repair -m option)
  resolves: RHEL-165677
 - Fix CHS geometry error for Veritas/Sun partitions
@ -400,6 +400,15 @@ done
 - Windows firstboot: Add exit code 250 to skip reboots
  Rework documentation for firstboot feature
  resolves: RHEL-174312
+- Skip fsck after conversion for RHEL 7
+  resolves: RHEL-191749
+- Add new --collect option to collect pre-conversion information
+  resolves: RHEL-188772
+- Add disk boot-order to inspector and in-place XML output
+  resolves: RHEL-184508
+- Allow conversion with immutable resolv.conf
+  related: RHEL-178556
+- Add note about PowerShell ExecutionPolicy AllSigned (MTV-4424)

 * Fri Apr 03 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.10.0-9
 - Add --no-fstrim option