rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to stable branch version 2.0.2

Browse Source 
resolves: rhbz#2059287
This commit is contained in:
Richard W.M. Jones 2022-04-04 13:52:11 +01:00
parent 855feb8b45
commit 48c7f08e4f
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
View File

@ -1,4 +1,4 @@
From e1a59b187513907d9a5261530c4d9fd56611f671 Mon Sep 17 00:00:00 2001
From e1764beecaf2ae760ba0af12518397ca22cfcc9c 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

8
0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
View File

@ -1,4 +1,4 @@
From 65a36d39e059329dd9d187f2e73938d317ba65c0 Mon Sep 17 00:00:00 2001
From f22a51d2f2d7baa34df574dc5c086da75bd899d5 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
@ -44,7 +44,7 @@ index a5f155cb..3a2e6238 100644
=item B<-o json -os> C<DIRECTORY>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 60305397..8fd37567 100644
index 69bdbbd4..ea7bc942 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -139,11 +139,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
@ -95,10 +95,10 @@ index 700de058..3ad98a58 100644
let output_storage =
match options.output_storage with
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 695152f2..1cbc5b50 100644
index 9790416e..97b4e4ec 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -282,8 +282,6 @@ let rec main () =
@@ -270,8 +270,6 @@ let rec main () =
s_"Same as ‘-ip filename’";
[ L"print-source" ], Getopt.Set print_source,
s_"Print source and stop";

6
0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
View File

@ -1,4 +1,4 @@
From bde88886f3d6557185b3a77e885535015d7df211 Mon Sep 17 00:00:00 2001
From 4df024b5248ef1ed61ac42b9e439b4b09df90d3b 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
@ -9,10 +9,10 @@ Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/utils.ml b/lib/utils.ml
index 4c8998c2..7b16dd8b 100644
index 128bb697..7116a4f9 100644
--- a/lib/utils.ml
+++ b/lib/utils.ml
@@ -59,13 +59,14 @@ let kvm_arch = function
@@ -60,13 +60,14 @@ let kvm_arch = function
(* Does qemu support the given sound card? *)
let qemu_supports_sound_card = function
| Types.AC97

2
0004-RHEL-Fixes-for-libguestfs-winsupport.patch
View File

@ -1,4 +1,4 @@
From c0350436e2a30868862df25377ae8d031e4d8a37 Mon Sep 17 00:00:00 2001
From 79acbb6c0c06375cdee6dd8fc0eb711298065cb2 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.

4
0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
View File

@ -1,4 +1,4 @@
From 83698cb485f00bbccb779daf9018f464b53fbc47 Mon Sep 17 00:00:00 2001
From ad3b85ab5a33a1a05fa1ef4aaab1539c27f81e57 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)
@ -9,7 +9,7 @@ The SDL output mode is not supported in RHEL's qemu-kvm.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/input/input_disk.ml b/input/input_disk.ml
index bdb8a510..7efa2eb5 100644
index 508adf9d..20f2e898 100644
--- a/input/input_disk.ml
+++ b/input/input_disk.ml
@@ -76,7 +76,7 @@ module Disk = struct

2
0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
View File

@ -1,4 +1,4 @@
From 0517548d74e19368edf6260c7cf59878a533b2dd Mon Sep 17 00:00:00 2001
From ffde3eac49231c33b70df01e3a79b5169222664b Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Mar 2017 11:03:40 +0100
Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

2
0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
View File

@ -1,4 +1,4 @@
From 5484c157624ac72b20095e1c50529995b99b7170 Mon Sep 17 00:00:00 2001
From b5dd57d100044dfa39784ea52a6a6c2b2bd23623 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

16
0008-RHEL-Disable-o-glance.patch
View File

@ -1,4 +1,4 @@
From b3dc49fab99f54b9eec4db3672a7a7a4507a710d Mon Sep 17 00:00:00 2001
From 6b49387ee275dfa7ab9946195a61700a609bdcea Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 30 Jun 2021 11:15:52 +0100
Subject: [PATCH] RHEL: Disable -o glance
@ -100,7 +100,7 @@ index f5a3abad..1ab356e8 100644
=head1 AUTHOR
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 8fd37567..73a43b76 100644
index ea7bc942..9a2df647 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -416,14 +416,6 @@ See L</Networks and bridges> below.
@ -169,10 +169,10 @@ index c0db9115..074b5e16 100755
set -e
set -x
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 1cbc5b50..1a04b26b 100644
index 97b4e4ec..41e020cb 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -204,7 +204,6 @@ let rec main () =
@@ -192,7 +192,6 @@ let rec main () =
if !output_mode <> `Not_set then
error (f_"%s option used more than once on the command line") "-o";
match mode with
@ -180,7 +180,7 @@ index 1cbc5b50..1a04b26b 100644
| "libvirt" -> output_mode := `Libvirt
| "disk" | "local" -> output_mode := `Disk
| "json" -> output_mode := `JSON
@@ -262,7 +261,7 @@ let rec main () =
@@ -250,7 +249,7 @@ let rec main () =
s_"Map network ‘in’ to ‘out’";
[ L"no-trim" ], Getopt.String ("-", no_trim_warning),
s_"Ignored for backwards compatibility";
@ -189,7 +189,7 @@ index 1cbc5b50..1a04b26b 100644
s_"Set output mode (default: libvirt)";
[ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc),
s_"Set output allocation mode";
@@ -330,8 +329,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp
@@ -318,8 +317,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp
virt-v2v -i disk disk.img -o local -os /var/tmp
@ -198,7 +198,7 @@ index 1cbc5b50..1a04b26b 100644
There is a companion front-end called \"virt-p2v\" which comes as an
ISO or CD image that can be booted on physical machines.
@@ -396,7 +393,6 @@ read the man page virt-v2v(1).
@@ -387,7 +384,6 @@ read the man page virt-v2v(1).
pr "input:libvirtxml\n";
pr "input:ova\n";
pr "input:vmx\n";
@ -206,7 +206,7 @@ index 1cbc5b50..1a04b26b 100644
pr "output:json\n";
pr "output:libvirt\n";
pr "output:local\n";
@@ -490,7 +486,6 @@ read the man page virt-v2v(1).
@@ -481,7 +477,6 @@ read the man page virt-v2v(1).
| `Disk -> (module Output_disk.Disk)
| `Null -> (module Output_null.Null)
| `QEmu -> (module Output_qemu.QEMU)

12
0009-RHEL-Remove-the-in-place-option.patch
View File

@ -1,4 +1,4 @@
From 3fe42109385e17597f0a91fa9a7a19320a9a2588 Mon Sep 17 00:00:00 2001
From 75e25e23b6e64fff7b397c827de9530c2f56b009 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Dec 2021 11:56:05 +0000
Subject: [PATCH] RHEL: Remove the --in-place option
@ -11,7 +11,7 @@ wish to support in RHEL.
2 files changed, 16 deletions(-)
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 73a43b76..53c9afae 100644
index 9a2df647..abfae1c1 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -21,9 +21,6 @@ There is also a companion front-end called L<virt-p2v(1)> which comes
@ -35,7 +35,7 @@ index 73a43b76..53c9afae 100644
=head2 Other virt-v2v topics
L<virt-v2v-support(1)> — Supported hypervisors, virtualization
@@ -1586,7 +1579,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
@@ -1594,7 +1587,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
=head1 SEE ALSO
L<virt-p2v(1)>,
@ -44,10 +44,10 @@ index 73a43b76..53c9afae 100644
L<virt-df(1)>,
L<virt-filesystems(1)>,
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 1a04b26b..08d5a34c 100644
index 41e020cb..e00f9814 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -226,12 +226,6 @@ let rec main () =
@@ -214,12 +214,6 @@ let rec main () =
warning (f_"the --vmtype option has been removed and now does nothing")
in
@ -60,7 +60,7 @@ index 1a04b26b..08d5a34c 100644
let argspec = [
[ L"bandwidth" ], Getopt.String ("bps", set_string_option_once "--bandwidth" bandwidth),
s_"Set bandwidth to bits per sec";
@@ -253,8 +247,6 @@ let rec main () =
@@ -241,8 +235,6 @@ let rec main () =
s_"Use password from file to connect to input hypervisor";
[ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport),
s_"Input transport";

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.0.1.tar.gz) = ca976c1ceba3ef9c759dd3b43effcbc15e50eaa0ec3c2e84e0e5ca03afe222f992602cf24f6a0567c63d605afc3da2628c15901c62b2de3e23dda31d84b6a191
SHA512 (virt-v2v-2.0.1.tar.gz.sig) = c17c0d07800db8019ad5bc64dce71322fb8066a4c5e35f8861e8eb9d2db1dedb8df01d82e5dbd01361386c5ce7d9da2210de72a1981d6d229f587e036f0a3077
SHA512 (virt-v2v-2.0.2.tar.gz) = 63a198e407df47dc4afffeb147453449e36d9f82952fef5af490888f8708a44f3a75d1dcd233e2a1fe9b58715f61a9875dac9c406a1fced08da6574bf577ffe9
SHA512 (virt-v2v-2.0.2.tar.gz.sig) = 6dc0da82c92243fc11071c569dd49a11a035589722a00b5a7d592f2266ba30eb7ded02746bfd6a88f1cb78d116ac1f6f4de5708f3bd226b9585fd7e0bbe02e05

6
virt-v2v.spec
View File

@ -15,7 +15,7 @@
Name: virt-v2v
Epoch: 1
Version: 2.0.1
Version: 2.0.2
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
@ -315,8 +315,8 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
%changelog
* Wed Mar 23 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.1-1
- Rebase to stable branch version 2.0.1
* Mon Apr 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.2-1
- Rebase to stable branch version 2.0.2
resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
- Fix openssh-clients dependency
resolves: rhbz#2064178