From 151741d8c006ca88dab23f5f2633074c0dca2615 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Mar 2021 12:25:36 +0000 Subject: [PATCH 01/17] Bump and rebuild for ocaml-gettext update. --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 671a21f..9c00a2c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -10,7 +10,7 @@ Name: virt-v2v Epoch: 1 Version: 1.43.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -263,6 +263,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Mon Mar 8 2021 Richard W.M. Jones - 1:1.43.3-3 +- Bump and rebuild for ocaml-gettext update. + * Wed Jan 27 2021 Fedora Release Engineering - 1:1.43.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 35c632ec40178ee69e4faa331ba22273cc764475 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 18 Mar 2021 13:24:45 +0000 Subject: [PATCH 02/17] Make ocaml-ounit dependency conditional on !RHEL. It's only needed to run some unit tests. (cherry picked from commit 65fcab520f704bee13494fdc2def179b09be1b3a) --- virt-v2v.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index 9c00a2c..e5278b9 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -71,7 +71,9 @@ BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-libguestfs-devel BuildRequires: ocaml-fileutils-devel BuildRequires: ocaml-gettext-devel +%if !0%{?rhel} BuildRequires: ocaml-ounit-devel +%endif BuildRequires: nbdkit-python-plugin From 6d77fcae475931a0763638092562ef8ed0addcee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 18 Mar 2021 13:28:29 +0000 Subject: [PATCH 03/17] Make ocaml-ounit dependency conditional on !RHEL. --- virt-v2v.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index e5278b9..ef97278 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -10,7 +10,7 @@ Name: virt-v2v Epoch: 1 Version: 1.43.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -265,6 +265,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Thu Mar 18 2021 Richard W.M. Jones - 1:1.43.3-4 +- Make ocaml-ounit dependency conditional on !RHEL. + * Mon Mar 8 2021 Richard W.M. Jones - 1:1.43.3-3 - Bump and rebuild for ocaml-gettext update. From cf9d64fbf6723c70780ef9327d3c48165d66d739 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Mar 2021 12:07:53 +0100 Subject: [PATCH 04/17] Add downstream (RHEL-only) patches (RHBZ#1931724). (cherry picked from commit 6be9aa8e5f805c2dbe02f1d93ed855fb888621fc) --- ...correct-qemu-binary-for-o-qemu-mode-.patch | 33 ++ ...le-the-qemu-boot-option-RHBZ-1147313.patch | 105 +++++++ ...-supported-sound-cards-to-match-RHEL.patch | 34 +++ ...-Fix-tests-for-libguestfs-winsupport.patch | 66 ++++ ...Disable-the-virt-v2v-in-place-option.patch | 288 ++++++++++++++++++ ...sk-force-VNC-as-display-RHBZ-1372671.patch | 26 ++ ...-mention-SUSE-Xen-hosts-RHBZ-1430203.patch | 26 ++ ...load-Remove-restriction-on-oa-sparse.patch | 89 ++++++ ...-for-supported-v2v-hypervisors-guest.patch | 127 ++++++++ virt-v2v.spec | 23 +- 10 files changed, 816 insertions(+), 1 deletion(-) create mode 100644 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch create mode 100644 0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch create mode 100644 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch create mode 100644 0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch create mode 100644 0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch create mode 100644 0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch create mode 100644 0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch create mode 100644 0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch create mode 100644 0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch new file mode 100644 index 0000000..94f2e9c --- /dev/null +++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -0,0 +1,33 @@ +From 9918c857eca2ce4efddb4ed9f17dccfc6144471f Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 28 Sep 2014 19:14:43 +0100 +Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode + (RHBZ#1147313). + +RHEL does not have qemu-system-x86_64 (etc), and in addition the +qemu binary is located in /usr/libexec. Encode the path to this +binary directly in the script. + +Note that we don't support people running qemu directly like this. +It's just for quick testing of converted VMs, and to help us with +support cases. +--- + v2v/output_qemu.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml +index d6d70c23..490576e9 100644 +--- a/v2v/output_qemu.ml ++++ b/v2v/output_qemu.ml +@@ -81,7 +81,7 @@ object + * module deals with shell and qemu comma quoting. + *) + let cmd = Qemuopts.create () in +- Qemuopts.set_binary_by_arch cmd (Some guestcaps.gcaps_arch); ++ Qemuopts.set_binary cmd "/usr/libexec/qemu-kvm"; + + let flag = Qemuopts.flag cmd + and arg = Qemuopts.arg cmd +-- +2.30.1 + diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch new file mode 100644 index 0000000..1ccfcbd --- /dev/null +++ b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch @@ -0,0 +1,105 @@ +From 51d18cc8da56f5b8395ae2f5edd6b11cda5c84df Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 30 Sep 2014 10:50:27 +0100 +Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313). + +This cannot work because there is no Gtk or SDL output mode +in RHEL's qemu-kvm. + +In addition you will have to edit the -display option in the +qemu script. +--- + docs/virt-v2v-output-local.pod | 6 ++---- + docs/virt-v2v.pod | 13 ------------- + v2v/cmdline.ml | 3 ++- + 3 files changed, 4 insertions(+), 18 deletions(-) + +diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod +index a5f155cb..3a2e6238 100644 +--- a/docs/virt-v2v-output-local.pod ++++ b/docs/virt-v2v-output-local.pod +@@ -9,7 +9,7 @@ or libvirt + + virt-v2v [-i* options] -o local -os DIRECTORY + +- virt-v2v [-i* options] -o qemu -os DIRECTORY [--qemu-boot] ++ virt-v2v [-i* options] -o qemu -os DIRECTORY + + virt-v2v [-i* options] -o json -os DIRECTORY + [-oo json-disks-pattern=PATTERN] +@@ -50,12 +50,10 @@ where C is the guest name. + + =item B<-o qemu -os> C + +-=item B<-o qemu -os> C B<--qemu-boot> +- + This converts the guest to files in C. Unlike I<-o local> + above, a shell script is created which contains the raw qemu command + you would need to boot the guest. However the shell script is not +-run, I you also add the I<--qemu-boot> option. ++run. + + =item B<-o json -os> C + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index 9323ff52..06ddd781 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -144,11 +144,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. + +-To convert a local disk image and immediately boot it in local +-qemu, do: +- +- virt-v2v -i disk disk.img -o qemu -os /var/tmp --qemu-boot +- + =head1 OPTIONS + + =over 4 +@@ -537,9 +532,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>. + +-When using this output mode, you can also specify the I<--qemu-boot> +-option which boots the guest under qemu immediately. +- + =item B<-o> B + + This is the same as I<-o rhv>. +@@ -815,11 +807,6 @@ Print information about the source guest and stop. This option is + useful when you are setting up network and bridge maps. + See L. + +-=item B<--qemu-boot> +- +-When using I<-o qemu> only, this boots the guest immediately after +-virt-v2v finishes. +- + =item B<-q> + + =item B<--quiet> +diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml +index 3b74f307..df69e2e0 100644 +--- a/v2v/cmdline.ml ++++ b/v2v/cmdline.ml +@@ -284,7 +284,6 @@ let parse_cmdline () = + s_"Estimate size of source and stop"; + [ L"print-source" ], Getopt.Set print_source, + s_"Print source and stop"; +- [ L"qemu-boot" ], Getopt.Set qemu_boot, s_"Boot in qemu (-o qemu only)"; + [ L"root" ], Getopt.String ("ask|... ", set_root_choice), + s_"How to choose root filesystem"; + [ L"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"), +@@ -668,6 +667,8 @@ read the man page virt-v2v(1). + | Some d when not (is_directory d) -> + error (f_"-os %s: output directory does not exist or is not a directory") d + | Some d -> d in ++ if qemu_boot then ++ error (f_"-o qemu: the --qemu-boot option cannot be used in RHEL"); + Output_qemu.output_qemu os qemu_boot, + output_format, output_alloc + +-- +2.30.1 + diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch new file mode 100644 index 0000000..418df08 --- /dev/null +++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -0,0 +1,34 @@ +From e51db3fdf2b3abde05235f6c14c396eae0048320 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 24 Apr 2015 09:45:41 -0400 +Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL + qemu (RHBZ#1176493). + +--- + v2v/utils.ml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/v2v/utils.ml b/v2v/utils.ml +index 7136e4be..a6c359f0 100644 +--- a/v2v/utils.ml ++++ b/v2v/utils.ml +@@ -59,13 +59,14 @@ let kvm_arch = function + (* Does qemu support the given sound card? *) + let qemu_supports_sound_card = function + | Types.AC97 +- | Types.ES1370 + | Types.ICH6 + | Types.ICH9 + | Types.PCSpeaker ++ -> true ++ | Types.ES1370 + | Types.SB16 + | Types.USBAudio +- -> true ++ -> false + + (* Find the UEFI firmware. *) + let find_uefi_firmware guest_arch = +-- +2.30.1 + diff --git a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch new file mode 100644 index 0000000..7a57f6b --- /dev/null +++ b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch @@ -0,0 +1,66 @@ +From 709e21ab98a6d207301161e6463dab8a77c87749 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 30 Aug 2015 03:21:57 -0400 +Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport. + +It doesn't let us use guestfish for arbitrary Windows edits. +--- + tests/test-v2v-virtio-win-iso.sh | 8 +++++++- + tests/test-v2v-windows-conversion.sh | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/tests/test-v2v-virtio-win-iso.sh b/tests/test-v2v-virtio-win-iso.sh +index 6e99f0f1..a8e572c5 100755 +--- a/tests/test-v2v-virtio-win-iso.sh ++++ b/tests/test-v2v-virtio-win-iso.sh +@@ -79,6 +79,12 @@ mktest () + :> "$script" + :> "$expected" + ++cat >> "$script" < "$response" ++guestfish --ro -a "$d/windows-sda" < "$script" > "$response" + diff -u "$expected" "$response" + + rm -r $d +diff --git a/tests/test-v2v-windows-conversion.sh b/tests/test-v2v-windows-conversion.sh +index f1da222a..ff94fe39 100755 +--- a/tests/test-v2v-windows-conversion.sh ++++ b/tests/test-v2v-windows-conversion.sh +@@ -73,6 +73,12 @@ mktest () + :> "$script" + :> "$expected" + ++cat >> "$script" < "$response" ++guestfish --ro -a "$d/windows-sda" < "$script" > "$response" + diff -u "$expected" "$response" + + # We also update the Registry several times, for firstboot, and (ONLY +-- +2.30.1 + diff --git a/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch b/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch new file mode 100644 index 0000000..e558ae3 --- /dev/null +++ b/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch @@ -0,0 +1,288 @@ +From 4773fdcb0be3517e658c8bf08ed65537851e43dc Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 14 Jan 2016 11:53:42 -0500 +Subject: [PATCH 5/9] RHEL: v2v: Disable the virt-v2v --in-place option. + +This disables the virt-v2v --in-place option which we do not +wish to support in RHEL. +(See commit d0069559a939e47e5f29973ed9a69a13f0b58301). +--- + docs/test-v2v-docs.sh | 1 + + docs/virt-v2v.pod | 50 +---------------- + tests/Makefile.am | 2 - + tests/test-v2v-in-place.sh | 108 ------------------------------------- + v2v/cmdline.ml | 8 +-- + 5 files changed, 8 insertions(+), 161 deletions(-) + delete mode 100755 tests/test-v2v-in-place.sh + +diff --git a/docs/test-v2v-docs.sh b/docs/test-v2v-docs.sh +index dd2b1233..8fef46cc 100755 +--- a/docs/test-v2v-docs.sh ++++ b/docs/test-v2v-docs.sh +@@ -27,6 +27,7 @@ $top_srcdir/podcheck.pl virt-v2v.pod virt-v2v \ + --debug-overlay,\ + --ic,\ + --if,\ ++--in-place,\ + --io,\ + --ip,\ + --it,\ +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index 06ddd781..50b0bc8e 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM + [-o mode] [other -o* options] + [guest|filename] + +- virt-v2v --in-place +- [-i mode] [other -i* options] +- [guest|filename] +- + =head1 DESCRIPTION + + Virt-v2v converts a single guest from a foreign hypervisor to run on +@@ -39,9 +35,6 @@ these sides of virt-v2v are documented separately in this manual. + + Virt-v2v normally copies from the input to the output, called "copying + mode". In this case the source guest is always left unchanged. +-In-place conversion (I<--in-place>) only uses the I<-i*> options and +-modifies the source guest in-place. (See L +-below.) + + =head2 Other virt-v2v topics + +@@ -301,20 +294,6 @@ For I<-i disk> only, this specifies the format of the input disk + image. For other input methods you should specify the input + format in the metadata. + +-=item B<--in-place> +- +-Do not create an output virtual machine in the target hypervisor. +-Instead, adjust the guest OS in the source VM to run in the input +-hypervisor. +- +-This mode is meant for integration with other toolsets, which take the +-responsibility of converting the VM configuration, providing for +-rollback in case of errors, transforming the storage, etc. +- +-See L below. +- +-Conflicts with all I<-o *> options. +- + =item B<-io> OPTION=VALUE + + Set input option(s) related to the current input mode or transport. +@@ -1332,8 +1311,8 @@ have at least 100 available inodes. + =head3 Minimum free space check in the host + + You must have sufficient free space in the host directory used to +-store large temporary overlays (except in I<--in-place> mode). To +-find out which directory this is, use: ++store large temporary overlays. To find out ++which directory this is, use: + + $ df -h "`guestfish get-cachedir`" + Filesystem Size Used Avail Use% Mounted on +@@ -1471,31 +1450,6 @@ that instead. + + + +-=head2 In-place conversion +- +-It is also possible to use virt-v2v in scenarios where a foreign VM +-has already been imported into a KVM-based hypervisor, but still needs +-adjustments in the guest to make it run in the new virtual hardware. +- +-In that case it is assumed that a third-party tool has created the +-target VM in the supported KVM-based hypervisor based on the source VM +-configuration and contents, but using virtual devices more appropriate +-for KVM (e.g. virtio storage and network, etc.). +- +-Then, to make the guest OS boot and run in the changed environment, +-one can use: +- +- virt-v2v -ic qemu:///system converted_vm --in-place +- +-Virt-v2v will analyze the configuration of C in the +-C libvirt instance, and apply various fixups to the +-guest OS configuration to make it match the VM configuration. This +-may include installing virtio drivers, configuring the bootloader, the +-mountpoints, the network interfaces, and so on. +- +-Should an error occur during the operation, virt-v2v exits with an +-error code leaving the VM in an undefined state. +- + =head2 Machine readable output + + The I<--machine-readable> option can be used to make the output more +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 871dc3c9..eee4e1af 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -76,7 +76,6 @@ TESTS = \ + test-v2v-floppy.sh \ + test-v2v-i-disk.sh \ + test-v2v-i-ova.sh \ +- test-v2v-in-place.sh \ + test-v2v-mac.sh \ + test-v2v-machine-readable.sh \ + test-v2v-networks-and-bridges.sh \ +@@ -225,7 +224,6 @@ EXTRA_DIST += \ + test-v2v-i-vmx-3.vmx \ + test-v2v-i-vmx-4.vmx \ + test-v2v-i-vmx-5.vmx \ +- test-v2v-in-place.sh \ + test-v2v-it-vddk-io-query.sh \ + test-v2v-machine-readable.sh \ + test-v2v-mac-expected.xml \ +diff --git a/tests/test-v2v-in-place.sh b/tests/test-v2v-in-place.sh +deleted file mode 100755 +index 6f7d78f3..00000000 +--- a/tests/test-v2v-in-place.sh ++++ /dev/null +@@ -1,108 +0,0 @@ +-#!/bin/bash - +-# libguestfs virt-v2v test script +-# Copyright (C) 2014 Red Hat Inc. +-# Copyright (C) 2015 Parallels IP Holdings GmbH. +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- +-# Test --in-place. +- +-unset CDPATH +-export LANG=C +-set -e +- +-$TEST_FUNCTIONS +-skip_if_skipped +-skip_if_backend uml +-skip_unless_phony_guest windows.img +- +-img_base="$abs_top_builddir/test-data/phony-guests/windows.img" +- +-export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" +-export VIRTIO_WIN="$top_srcdir/test-data/fake-virtio-win" +- +-d=$PWD/test-v2v-in-place.d +-rm -rf $d +-mkdir $d +- +-img="$d/test.qcow2" +-rm -f $img +-qemu-img create -f qcow2 -b $img_base -o compat=1.1,backing_fmt=raw $img +-md5="$(do_md5 $img_base)" +- +-libvirt_xml="$d/test.xml" +-rm -f $libvirt_xml +-n=windows-overlay +-cat > $libvirt_xml < +- +- $n +- 1048576 +- +- hvm +- +- +- +- +- +- +- +- +- +- +- +-EOF +- +-$VG virt-v2v --debug-gc -i libvirt -ic "test://$libvirt_xml" $n --in-place +- +-# Test that the drivers have been copied over into the guest +-script="$d/test.fish" +-expected="$d/expected" +-response="$d/response" +- +-mktest () +-{ +- local cmd="$1" exp="$2" +- +- echo "echo '$cmd'" >> "$script" +- echo "$cmd" >> "$expected" +- +- echo "$cmd" >> "$script" +- echo "$exp" >> "$expected" +-} +- +-:> "$script" +-:> "$expected" +- +-firstboot_dir="/Program Files/Guestfs/Firstboot" +-mktest "is-dir \"$firstboot_dir\"" true +-mktest "is-file \"$firstboot_dir/firstboot.bat\"" true +-mktest "is-dir \"$firstboot_dir/scripts\"" true +-virtio_dir="/Windows/Drivers/VirtIO" +-mktest "is-dir \"$virtio_dir\"" true +-for drv in netkvm qxl vioscsi viostor; do +- for sfx in cat inf sys; do +- mktest "is-file \"$virtio_dir/$drv.$sfx\"" true +- done +-done +- +-guestfish --ro -a "$img" -i < "$script" > "$response" +-diff -u "$expected" "$response" +- +-# Test the base image remained untouched +-test "$md5" = "$(do_md5 $img_base)" +- +-# Clean up. +-rm -r $d +diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml +index df69e2e0..7b79d462 100644 +--- a/v2v/cmdline.ml ++++ b/v2v/cmdline.ml +@@ -252,8 +252,7 @@ let parse_cmdline () = + 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"; +- [ L"in-place" ], Getopt.Set in_place, +- s_"Only tune the guest in the input VM"; ++ [ L"in-place" ], Getopt.Set in_place, Getopt.hidden_option_description; + [ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac), + s_"Map NIC to network or bridge or assign static IP"; + [ S 'n'; L"network" ], Getopt.String ("in:out", add_network), +@@ -396,7 +395,6 @@ read the man page virt-v2v(1). + pr "vddk\n"; + pr "colours-option\n"; + pr "vdsm-compat-option\n"; +- pr "in-place\n"; + pr "io/oo\n"; + pr "mac-option\n"; + pr "bandwidth-option\n"; +@@ -572,6 +570,10 @@ read the man page virt-v2v(1). + error (f_"only ‘-it ssh’ can be used here") in + Input_vmx.input_vmx input_password input_transport arg in + ++ (* Prevent use of --in-place option in RHEL. *) ++ if in_place then ++ error (f_"--in-place cannot be used in RHEL"); ++ + (* Common error message. *) + let error_option_cannot_be_used_in_output_mode mode opt = + error (f_"-o %s: %s option cannot be used in this output mode") mode opt +-- +2.30.1 + diff --git a/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch new file mode 100644 index 0000000..fe04aed --- /dev/null +++ b/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -0,0 +1,26 @@ +From a128631fded7e2c4e45fcf4304945ca430296944 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 2 Mar 2017 14:21:37 +0100 +Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) + +The SDL output mode is not supported in RHEL's qemu-kvm. +--- + v2v/input_disk.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml +index d146e84c..4e403003 100644 +--- a/v2v/input_disk.ml ++++ b/v2v/input_disk.ml +@@ -89,7 +89,7 @@ class input_disk input_format disk = object + s_features = [ "acpi"; "apic"; "pae" ]; + s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *) + s_display = +- Some { s_display_type = Window; s_keymap = None; s_password = None; ++ Some { s_display_type = VNC; s_keymap = None; s_password = None; + s_listen = LNoListen; s_port = None }; + s_video = None; + s_sound = None; +-- +2.30.1 + diff --git a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch new file mode 100644 index 0000000..bf4b946 --- /dev/null +++ b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -0,0 +1,26 @@ +From c72bbcd9b22408023c686e64040db2693dd70467 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Wed, 8 Mar 2017 11:03:40 +0100 +Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) + +They are not supported in RHEL. +--- + docs/virt-v2v-input-xen.pod | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod +index 3b3cf0f0..32da2848 100644 +--- a/docs/virt-v2v-input-xen.pod ++++ b/docs/virt-v2v-input-xen.pod +@@ -12,7 +12,7 @@ virt-v2v-input-xen - Using virt-v2v to convert guests from Xen + =head1 DESCRIPTION + + This page documents how to use L to convert guests from +-RHEL 5 Xen, or SLES and OpenSUSE Xen hosts. ++RHEL 5 Xen hosts. + + =head1 INPUT FROM XEN + +-- +2.30.1 + diff --git a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch new file mode 100644 index 0000000..c2d55e3 --- /dev/null +++ b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch @@ -0,0 +1,89 @@ +From 4663022f13c209260341b4586ef8787cfe158ea5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 14 May 2018 10:16:58 +0100 +Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=1565681 +and the v2v-devel private thread "Do we already support migration using FC?" +--- + docs/virt-v2v-output-rhv.pod | 8 +------- + v2v/output_rhv_upload.ml | 10 +--------- + v2v/rhv-upload-plugin.py | 4 +--- + 3 files changed, 3 insertions(+), 19 deletions(-) + +diff --git a/docs/virt-v2v-output-rhv.pod b/docs/virt-v2v-output-rhv.pod +index 7c9b478a..36c3676f 100644 +--- a/docs/virt-v2v-output-rhv.pod ++++ b/docs/virt-v2v-output-rhv.pod +@@ -5,7 +5,7 @@ virt-v2v-output-rhv - Using virt-v2v to convert guests to oVirt or RHV + =head1 SYNOPSIS + + virt-v2v [-i* options] -o rhv-upload [-oc ENGINE_URL] -os STORAGE +- [-op PASSWORD] [-of raw] ++ [-op PASSWORD] + [-oo rhv-cafile=FILE] + [-oo rhv-cluster=CLUSTER] + [-oo rhv-direct] +@@ -79,12 +79,6 @@ username is not specified then virt-v2v defaults to using + C which is the typical superuser account for oVirt + instances. + +-=item I<-of raw> +- +-Currently you must use I<-of raw> and you cannot use I<-oa preallocated>. +- +-These restrictions will be loosened in a future version. +- + =item I<-op> F + + A file containing a password to be used when connecting to the oVirt +diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml +index dbef7011..27925d7d 100644 +--- a/v2v/output_rhv_upload.ml ++++ b/v2v/output_rhv_upload.ml +@@ -135,17 +135,10 @@ let error_unless_nbdkit_compiled_with_selinux config = + error (f_"nbdkit was compiled without SELinux support. You will have to recompile nbdkit with libselinux-devel installed, or else set SELinux to Permissive mode while doing the conversion.") + ) + +-(* Output sparse must be sparse. We may be able to +- * lift this limitation in future, but it requires changes on the +- * RHV side. See TODO file for details. XXX +- *) ++(* Output format must be raw. *) + let error_current_limitation required_param = + error (f_"rhv-upload: currently you must use ‘%s’. This restriction will be loosened in a future version.") required_param + +-let error_unless_output_alloc_sparse output_alloc = +- if output_alloc <> Sparse then +- error_current_limitation "-oa sparse" +- + let json_optstring = function + | Some s -> JSON.String s + | None -> JSON.Null +@@ -253,7 +246,6 @@ object + error_unless_nbdkit_min_version config; + error_unless_nbdkit_python_plugin_working plugin_script; + error_unless_nbdkit_compiled_with_selinux config; +- error_unless_output_alloc_sparse output_alloc; + + (* Python code prechecks. *) + let precheck_fn = tmpdir // "v2vprecheck.json" in +diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py +index 2b0178a9..d817d915 100644 +--- a/v2v/rhv-upload-plugin.py ++++ b/v2v/rhv-upload-plugin.py +@@ -491,10 +491,8 @@ def create_disk(connection): + # size, based on qemu-img measure of the overlay. + initial_size=params['disk_size'], + provisioned_size=params['disk_size'], +- # XXX Ignores params['output_sparse']. +- # Handling this properly will be complex, see: + # https://www.redhat.com/archives/libguestfs/2018-March/msg00177.html +- sparse=True, ++ sparse=params['output_sparse'], + storage_domains=[ + types.StorageDomain( + name=params['output_storage'], +-- +2.30.1 + diff --git a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch new file mode 100644 index 0000000..8e3f7e0 --- /dev/null +++ b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -0,0 +1,127 @@ +From 3fcf10ae7beaaf2de969b732afb35c9a5c36f52b Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 26 Mar 2019 09:42:25 +0100 +Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests + +--- + docs/virt-v2v-support.pod | 104 ++------------------------------------ + 1 file changed, 4 insertions(+), 100 deletions(-) + +diff --git a/docs/virt-v2v-support.pod b/docs/virt-v2v-support.pod +index 9815f51f..1ffc0f9d 100644 +--- a/docs/virt-v2v-support.pod ++++ b/docs/virt-v2v-support.pod +@@ -8,106 +8,10 @@ systems and guests in virt-v2v + This page documents which foreign hypervisors, virtualization + management systems and guest types that L can support. + +-Note this page applies to upstream virt-v2v from +-L and in downstream distributions of virt-v2v +-sometimes features are intentionally removed, or are present but not +-supported. +- +-=head2 Hypervisors (Input) +- +-=over 4 +- +-=item VMware ESXi +- +-Must be managed by VMware vCenter E 5.0 unless VDDK is available. +- +-=item OVA exported from VMware +- +-OVAs from other hypervisors will not work. +- +-=item VMX from VMware +- +-VMX files generated by other hypervisors will not work. +- +-=item RHEL 5 Xen +- +-=item SUSE Xen +- +-=item Citrix Xen +- +-Citrix Xen has not been recently tested. +- +-=item Hyper-V +- +-Not recently tested. Requires that you export the disk or use +-L on Hyper-V. +- +-=item Direct from disk images +- +-Only disk images exported from supported hypervisors, and using +-container formats supported by qemu. +- +-=item Physical machines +- +-Using the L tool. +- +-=back +- +-=head2 Hypervisors (Output) +- +-QEMU and KVM only. +- +-=head2 Virtualization management systems (Output) +- +-=over 4 +- +-=item OpenStack +- +-=item Red Hat Virtualization (RHV) 4.1 and up +- +-=item Local libvirt +- +-And hence L, L, and similar tools. +- +-=item Local disk +- +-=back +- +-=head2 Guests +- +-=over 4 +- +-=item Red Hat Enterprise Linux 3, 4, 5, 6, 7 +- +-=item CentOS 3, 4, 5, 6, 7 +- +-=item Scientific Linux 3, 4, 5, 6, 7 +- +-=item Oracle Linux +- +-=item Fedora +- +-=item SLES 10 and up +- +-=item OpenSUSE 10 and up +- +-=item ALT Linux 9 and up +- +-=item Debian 6 and up +- +-=item Ubuntu 10.04, 12.04, 14.04, 16.04, and up +- +-=item Windows XP to Windows 10 / Windows Server 2016 +- +-We use Windows internal version numbers, see +-L +- +-Currently NT 5.2 to NT 6.3 are supported. +- +-See L below for additional notes on converting Windows +-guests. +- +-=back ++For more information on supported hypervisors, and guest types in ++RHEL, please consult the following Knowledgebase article on these ++Red Hat Customer Portal: ++L. + + =head2 Guest firmware + +-- +2.30.1 + diff --git a/virt-v2v.spec b/virt-v2v.spec index ef97278..ab77c15 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -2,7 +2,12 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. +%if !0%{?rhel} %global patches_touch_autotools %{nil} +%else +# On RHEL the downstream patches always touch autotools files. +%global patches_touch_autotools 1 +%endif # The source directory. %global source_directory 1.43-development @@ -10,7 +15,7 @@ Name: virt-v2v Epoch: 1 Version: 1.43.3 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -43,6 +48,19 @@ ExcludeArch: %{ix86} ExclusiveArch: x86_64 %endif +# Downstream (RHEL-only) patches. +%if 0%{?rhel} +Patch9001: 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +Patch9002: 0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch +Patch9003: 0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +Patch9004: 0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch +Patch9005: 0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch +Patch9006: 0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +Patch9007: 0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +Patch9008: 0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch +Patch9009: 0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +%endif + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -265,6 +283,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Tue Mar 30 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.1 +- Add downstream (RHEL-only) patches (RHBZ#1931724). + * Thu Mar 18 2021 Richard W.M. Jones - 1:1.43.3-4 - Make ocaml-ounit dependency conditional on !RHEL. From e602b312d3442351a2fa10c89538285c592abeb5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 31 Mar 2021 20:17:41 +0100 Subject: [PATCH 05/17] Add BR xorriso. This will be required by virt-v2v >= 1.43.5. Previously genisoimage was being implicitly pulled in (via libguestfs) but recent changes to libguestfs mean that this will no longer happen. (cherry picked from commit bed8938b69de8ef6fb46a7b55e11f0ef5a7bd783) --- virt-v2v.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index ab77c15..b0b4faf 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -84,6 +84,7 @@ BuildRequires: pcre-devel BuildRequires: perl(Sys::Guestfs) BuildRequires: po4a BuildRequires: /usr/bin/virsh +BuildRequires: xorriso BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-libguestfs-devel From f6d223fb64dc5570485e7ddbfaf9cf1eebed756b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Apr 2021 09:37:59 +0100 Subject: [PATCH 06/17] Add upstream patch to depend on xorriso. (cherry picked from commit 4c68cfae2025e1505a308e760d7b47364622e1e4) --- ...riso-over-genisoimage-to-generate-te.patch | 62 +++++++++++++++++++ virt-v2v.spec | 8 ++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch diff --git a/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch b/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch new file mode 100644 index 0000000..b9ff242 --- /dev/null +++ b/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch @@ -0,0 +1,62 @@ +From 7a346548c052d535015f98874ea52dee4b392947 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 30 Mar 2021 12:41:58 +0100 +Subject: [PATCH] tests: Prefer xorriso over genisoimage to generate test.iso + +This Debian page explains the upstream situation: +https://wiki.debian.org/genisoimage + +On Fedora, xorriso provides a compatibility program called "mkisofs". +However this is not present in Debian. Hence the choice to look for +the program called "xorrisofs". + +(cherry picked from commit 2216ab2e328457ef172d6bfa534272edf2f81a3a) +--- + m4/guestfs-progs.m4 | 6 +++--- + test-data/Makefile.am | 2 +- + test-data/fake-virtio-win/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/m4/guestfs-progs.m4 b/m4/guestfs-progs.m4 +index 4575a72a9..8f34faefa 100644 +--- a/m4/guestfs-progs.m4 ++++ b/m4/guestfs-progs.m4 +@@ -39,10 +39,10 @@ AC_PROG_AWK + + AC_PROG_LN_S + +-dnl Check for genisoimage/mkisofs +-AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no], ++dnl Check for xorriso/genisoimage/mkisofs. ++AC_PATH_PROGS([MKISOFS],[xorrisofs genisoimage mkisofs],[no], + [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) +-test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed]) ++test "x$MKISOFS" = "xno" && AC_MSG_ERROR([xorriso or genisoimage or mkisofs must be installed]) + + dnl po4a for translating man pages and POD files (optional). + AC_CHECK_PROG([PO4A_GETTEXTIZE],[po4a-gettextize],[po4a-gettextize],[no]) +diff --git a/test-data/Makefile.am b/test-data/Makefile.am +index 8a60c72f6..69170516e 100644 +--- a/test-data/Makefile.am ++++ b/test-data/Makefile.am +@@ -97,6 +97,6 @@ test.iso: $(images_files) + cp $(image_files) d/ + mkdir -p d/directory + cd d && ln -sf /10klines abssymlink +- cd d && $(GENISOIMAGE) -J -r -o ../$@-t . ++ cd d && $(MKISOFS) -J -r -o ../$@-t . + rm -rf d + mv $@-t $@ +diff --git a/test-data/fake-virtio-win/Makefile.am b/test-data/fake-virtio-win/Makefile.am +index 9851ca07d..55b91a95a 100644 +--- a/test-data/fake-virtio-win/Makefile.am ++++ b/test-data/fake-virtio-win/Makefile.am +@@ -598,4 +598,4 @@ check_DATA = fake-virtio-win.iso + CLEANFILES += fake-virtio-win.iso + + fake-virtio-win.iso: $(cd_files) +- $(GENISOIMAGE) -J -r -o $@ $(srcdir)/cd ++ $(MKISOFS) -J -r -o $@ $(srcdir)/cd +-- +2.29.0.rc2 + diff --git a/virt-v2v.spec b/virt-v2v.spec index b0b4faf..18bcffc 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -15,7 +15,7 @@ Name: virt-v2v Epoch: 1 Version: 1.43.3 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -48,6 +48,9 @@ ExcludeArch: %{ix86} ExclusiveArch: x86_64 %endif +# Upstream patch to replace genisoimage with xorriso. +Patch0001: 0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch + # Downstream (RHEL-only) patches. %if 0%{?rhel} Patch9001: 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -284,6 +287,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.2 +- Add upstream patch to depend on xorriso. + * Tue Mar 30 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.1 - Add downstream (RHEL-only) patches (RHBZ#1931724). From ed8b8dfab46b3ddace0bf63aca9978769139c8d9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Apr 2021 09:52:51 +0100 Subject: [PATCH 07/17] Previous patch touches autotools. (cherry picked from commit 3b8b4a23579b5b9ed68c9aba3066de1abfc991f9) --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 18bcffc..28b884e 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -3,7 +3,7 @@ # If there are patches which touch autotools files, set this to 1. %if !0%{?rhel} -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 %else # On RHEL the downstream patches always touch autotools files. %global patches_touch_autotools 1 From 3dd2f548a01b7ffd7f6de76a705c3a1ea95906eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Apr 2021 14:33:55 +0100 Subject: [PATCH 08/17] Change libguestfs-tools-c -> guestfs-tools. Thanks: Ming Xie (cherry picked from commit d81b7720bf7a95a1c6eb8da965da6f389a21a1eb) --- virt-v2v.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 28b884e..954f679 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -15,7 +15,7 @@ Name: virt-v2v Epoch: 1 Version: 1.43.3 -Release: 4%{?dist}.2 +Release: 4%{?dist}.3 Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -104,7 +104,7 @@ BuildRequires: gnupg2 %endif Requires: libguestfs%{?_isa} >= 1:1.42 -Requires: libguestfs-tools-c >= 1:1.42 +Requires: guestfs-tools >= 1.42 %if 0%{?rhel} # For Windows conversions on RHEL. @@ -287,8 +287,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog -* Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.2 +* Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.3 - Add upstream patch to depend on xorriso. +- Change libguestfs-tools-c -> guestfs-tools. * Tue Mar 30 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.1 - Add downstream (RHEL-only) patches (RHBZ#1931724). From 02d88ce8e3ad18371542c492253a06f5106cf80a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Apr 2021 14:36:00 +0100 Subject: [PATCH 09/17] Fix incorrect versions in some %changelog entries. --- virt-v2v.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 954f679..f12583f 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -287,11 +287,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog -* Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.3 +* Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.3-4.fc34.3 - Add upstream patch to depend on xorriso. - Change libguestfs-tools-c -> guestfs-tools. -* Tue Mar 30 2021 Richard W.M. Jones - 1:1.43.4-4.fc34.1 +* Tue Mar 30 2021 Richard W.M. Jones - 1:1.43.3-4.fc34.1 - Add downstream (RHEL-only) patches (RHBZ#1931724). * Thu Mar 18 2021 Richard W.M. Jones - 1:1.43.3-4 From 392ac337b6fef2da719c8ec66a2455c29e270228 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Apr 2021 12:42:59 +0100 Subject: [PATCH 10/17] New upstream version 1.43.5. (cherry picked from commit 989dd6b636a1f2a3504ff0f4887a199992fa528e) --- ...riso-over-genisoimage-to-generate-te.patch | 62 ------------------- sources | 4 +- virt-v2v.spec | 12 ++-- 3 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch diff --git a/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch b/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch deleted file mode 100644 index b9ff242..0000000 --- a/0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 7a346548c052d535015f98874ea52dee4b392947 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 30 Mar 2021 12:41:58 +0100 -Subject: [PATCH] tests: Prefer xorriso over genisoimage to generate test.iso - -This Debian page explains the upstream situation: -https://wiki.debian.org/genisoimage - -On Fedora, xorriso provides a compatibility program called "mkisofs". -However this is not present in Debian. Hence the choice to look for -the program called "xorrisofs". - -(cherry picked from commit 2216ab2e328457ef172d6bfa534272edf2f81a3a) ---- - m4/guestfs-progs.m4 | 6 +++--- - test-data/Makefile.am | 2 +- - test-data/fake-virtio-win/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/m4/guestfs-progs.m4 b/m4/guestfs-progs.m4 -index 4575a72a9..8f34faefa 100644 ---- a/m4/guestfs-progs.m4 -+++ b/m4/guestfs-progs.m4 -@@ -39,10 +39,10 @@ AC_PROG_AWK - - AC_PROG_LN_S - --dnl Check for genisoimage/mkisofs --AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no], -+dnl Check for xorriso/genisoimage/mkisofs. -+AC_PATH_PROGS([MKISOFS],[xorrisofs genisoimage mkisofs],[no], - [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) --test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed]) -+test "x$MKISOFS" = "xno" && AC_MSG_ERROR([xorriso or genisoimage or mkisofs must be installed]) - - dnl po4a for translating man pages and POD files (optional). - AC_CHECK_PROG([PO4A_GETTEXTIZE],[po4a-gettextize],[po4a-gettextize],[no]) -diff --git a/test-data/Makefile.am b/test-data/Makefile.am -index 8a60c72f6..69170516e 100644 ---- a/test-data/Makefile.am -+++ b/test-data/Makefile.am -@@ -97,6 +97,6 @@ test.iso: $(images_files) - cp $(image_files) d/ - mkdir -p d/directory - cd d && ln -sf /10klines abssymlink -- cd d && $(GENISOIMAGE) -J -r -o ../$@-t . -+ cd d && $(MKISOFS) -J -r -o ../$@-t . - rm -rf d - mv $@-t $@ -diff --git a/test-data/fake-virtio-win/Makefile.am b/test-data/fake-virtio-win/Makefile.am -index 9851ca07d..55b91a95a 100644 ---- a/test-data/fake-virtio-win/Makefile.am -+++ b/test-data/fake-virtio-win/Makefile.am -@@ -598,4 +598,4 @@ check_DATA = fake-virtio-win.iso - CLEANFILES += fake-virtio-win.iso - - fake-virtio-win.iso: $(cd_files) -- $(GENISOIMAGE) -J -r -o $@ $(srcdir)/cd -+ $(MKISOFS) -J -r -o $@ $(srcdir)/cd --- -2.29.0.rc2 - diff --git a/sources b/sources index 0c8e824..0944d2f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.43.3.tar.gz) = 39f6b4ad8b18a32dd3b584fb007f9c5b34140dde87874280b4df2e97f997aedef14312db032bff3ce6215ad5c7a58974789a41a7537fa06deac86e3a7cd04a8b -SHA512 (virt-v2v-1.43.3.tar.gz.sig) = 34dd70ad265af89aa9d9e971fdc0927e20d0926dc269c6125a95c139b0cfd0aaf040da4baeac8d81af3ae43f8d90a5ff5a6f53f30daa4c1374af002964f77975 +SHA512 (virt-v2v-1.43.5.tar.gz) = 7d9222a98894683d7f399fe62fa9bd2a2d01eebcd68484a38dec1fee0b477f977c56773e3ddb8fd7283f493795217f36e4272bc8d8905484492e6bb38ec1b1f2 +SHA512 (virt-v2v-1.43.5.tar.gz.sig) = 107c3c6716b13ee7d8482d4a5592fcfd25a39cc6e983fe95da5d712a2316bc3543fc00005abe426b835c7c9a9264c724693c73db2940f787e329460f35e601c8 diff --git a/virt-v2v.spec b/virt-v2v.spec index f12583f..bf4928c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -3,7 +3,7 @@ # If there are patches which touch autotools files, set this to 1. %if !0%{?rhel} -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} %else # On RHEL the downstream patches always touch autotools files. %global patches_touch_autotools 1 @@ -14,8 +14,8 @@ Name: virt-v2v Epoch: 1 -Version: 1.43.3 -Release: 4%{?dist}.3 +Version: 1.43.5 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -48,9 +48,6 @@ ExcludeArch: %{ix86} ExclusiveArch: x86_64 %endif -# Upstream patch to replace genisoimage with xorriso. -Patch0001: 0001-tests-Prefer-xorriso-over-genisoimage-to-generate-te.patch - # Downstream (RHEL-only) patches. %if 0%{?rhel} Patch9001: 0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -287,6 +284,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Wed Apr 14 2021 Richard W.M. Jones - 1:1.43.5-1 +- New upstream version 1.43.5. + * Thu Apr 01 2021 Richard W.M. Jones - 1:1.43.3-4.fc34.3 - Add upstream patch to depend on xorriso. - Change libguestfs-tools-c -> guestfs-tools. From 3be3fed23d83c76400834d2cee5cf7bddc0d1572 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 27 Apr 2021 17:58:39 +0100 Subject: [PATCH 11/17] Update RHEL patches. (cherry picked from commit 4ba366e0fbe7a5b33f55f30225e7e5a0f259b9fd) --- ...correct-qemu-binary-for-o-qemu-mode-.patch | 2 +- ...le-the-qemu-boot-option-RHBZ-1147313.patch | 4 ++-- ...-supported-sound-cards-to-match-RHEL.patch | 2 +- ...-Fix-tests-for-libguestfs-winsupport.patch | 21 +++++++++++++++---- ...Disable-the-virt-v2v-in-place-option.patch | 8 +++---- ...sk-force-VNC-as-display-RHBZ-1372671.patch | 2 +- ...-mention-SUSE-Xen-hosts-RHBZ-1430203.patch | 2 +- ...load-Remove-restriction-on-oa-sparse.patch | 2 +- ...-for-supported-v2v-hypervisors-guest.patch | 2 +- 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 94f2e9c..69fcfc1 100644 --- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From 9918c857eca2ce4efddb4ed9f17dccfc6144471f Mon Sep 17 00:00:00 2001 +From 21781d79e323f7eaee7deb6981ecb783e35a39af Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch index 1ccfcbd..837d7de 100644 --- a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch +++ b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch @@ -1,4 +1,4 @@ -From 51d18cc8da56f5b8395ae2f5edd6b11cda5c84df Mon Sep 17 00:00:00 2001 +From 05de88f9fe2415664adff793351f916cc6a01485 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313). @@ -42,7 +42,7 @@ index a5f155cb..3a2e6238 100644 =item B<-o json -os> C diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 9323ff52..06ddd781 100644 +index fb8b6a5d..924e1d2d 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -144,11 +144,6 @@ Since F contains the path(s) to the guest disk diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index 418df08..61b73d2 100644 --- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From e51db3fdf2b3abde05235f6c14c396eae0048320 Mon Sep 17 00:00:00 2001 +From f3c0c18b122b55e3f94b3bb757addaf18c2c5b6f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL diff --git a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch index 7a57f6b..41ecc50 100644 --- a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch +++ b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch @@ -1,14 +1,27 @@ -From 709e21ab98a6d207301161e6463dab8a77c87749 Mon Sep 17 00:00:00 2001 +From 2a4386e45aa52ebfdd501a8189458e2a6bad4708 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport. It doesn't let us use guestfish for arbitrary Windows edits. --- - tests/test-v2v-virtio-win-iso.sh | 8 +++++++- - tests/test-v2v-windows-conversion.sh | 8 +++++++- - 2 files changed, 14 insertions(+), 2 deletions(-) + test-data/phony-guests/make-windows-img.sh | 1 + + tests/test-v2v-virtio-win-iso.sh | 8 +++++++- + tests/test-v2v-windows-conversion.sh | 8 +++++++- + 3 files changed, 15 insertions(+), 2 deletions(-) +diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh +index 30908a91..73cf5144 100755 +--- a/test-data/phony-guests/make-windows-img.sh ++++ b/test-data/phony-guests/make-windows-img.sh +@@ -37,6 +37,7 @@ fi + + # Create a disk image. + guestfish < Date: Thu, 14 Jan 2016 11:53:42 -0500 Subject: [PATCH 5/9] RHEL: v2v: Disable the virt-v2v --in-place option. @@ -28,7 +28,7 @@ index dd2b1233..8fef46cc 100755 --ip,\ --it,\ diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 06ddd781..50b0bc8e 100644 +index 924e1d2d..4016c724 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM @@ -73,7 +73,7 @@ index 06ddd781..50b0bc8e 100644 =item B<-io> OPTION=VALUE Set input option(s) related to the current input mode or transport. -@@ -1332,8 +1311,8 @@ have at least 100 available inodes. +@@ -1338,8 +1317,8 @@ have at least 100 available inodes. =head3 Minimum free space check in the host You must have sufficient free space in the host directory used to @@ -84,7 +84,7 @@ index 06ddd781..50b0bc8e 100644 $ df -h "`guestfish get-cachedir`" Filesystem Size Used Avail Use% Mounted on -@@ -1471,31 +1450,6 @@ that instead. +@@ -1477,31 +1456,6 @@ that instead. diff --git a/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index fe04aed..8ffe091 100644 --- a/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From a128631fded7e2c4e45fcf4304945ca430296944 Mon Sep 17 00:00:00 2001 +From bf5b711b261a6a577a441235db68ad58b20711bd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch index bf4b946..1e0fd47 100644 --- a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +++ b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -1,4 +1,4 @@ -From c72bbcd9b22408023c686e64040db2693dd70467 Mon Sep 17 00:00:00 2001 +From d3eece67059c836c88f6001a5a928a3063a1aaa2 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 8 Mar 2017 11:03:40 +0100 Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) diff --git a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch index c2d55e3..a1ad4a0 100644 --- a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch +++ b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch @@ -1,4 +1,4 @@ -From 4663022f13c209260341b4586ef8787cfe158ea5 Mon Sep 17 00:00:00 2001 +From fba7d8bf5dad6fce2a0122570f6b69e0db9ce697 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 14 May 2018 10:16:58 +0100 Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse. diff --git a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 8e3f7e0..a7b5eb3 100644 --- a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From 3fcf10ae7beaaf2de969b732afb35c9a5c36f52b Mon Sep 17 00:00:00 2001 +From b003d781dacf76572e11fad17ea699a99a324f54 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests From 241e33463de0c7b6897e06d56b675c704f33a88a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 30 Apr 2021 15:52:35 +0100 Subject: [PATCH 12/17] New upstream stable branch version 1.44.0. (cherry picked from commit 7dd7c798f39488f705947f4f32f2b40a9e8d0bf6) --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 0944d2f..e06fc6f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.43.5.tar.gz) = 7d9222a98894683d7f399fe62fa9bd2a2d01eebcd68484a38dec1fee0b477f977c56773e3ddb8fd7283f493795217f36e4272bc8d8905484492e6bb38ec1b1f2 -SHA512 (virt-v2v-1.43.5.tar.gz.sig) = 107c3c6716b13ee7d8482d4a5592fcfd25a39cc6e983fe95da5d712a2316bc3543fc00005abe426b835c7c9a9264c724693c73db2940f787e329460f35e601c8 +SHA512 (virt-v2v-1.44.0.tar.gz) = 9d8de6c6376dd33a5fb4d5fd10fac13a8bce7d834bbb65274a09ae6558b2c3107c5ccb8b39b330a27ccff09313eb72cf7139f378d5e427af67589443168d7e17 +SHA512 (virt-v2v-1.44.0.tar.gz.sig) = e6b830389d475bb5514b8f6c6f273d06ed90bc31ff785c709964e4f492cbca6a5d78b25ad60605f9778ac9300754d62630481c80d4232d0fa17fefde65d22a90 diff --git a/virt-v2v.spec b/virt-v2v.spec index bf4928c..d3c8007 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -10,11 +10,11 @@ %endif # The source directory. -%global source_directory 1.43-development +%global source_directory 1.44-stable Name: virt-v2v Epoch: 1 -Version: 1.43.5 +Version: 1.44.0 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -284,6 +284,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Fri Apr 30 2021 Richard W.M. Jones - 1:1.44.0-1 +- New upstream stable branch version 1.44.0. + * Wed Apr 14 2021 Richard W.M. Jones - 1:1.43.5-1 - New upstream version 1.43.5. From 7ad78afc402a293e1a176d7e0959909fb10ec40e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 6 May 2021 17:50:21 +0100 Subject: [PATCH 13/17] Recommend libguestfs-xfs It is the default filesystem on Fedora and RHEL so usually required in order to convert those guests. (cherry picked from commit 6e9ced10a55236a45c6b2203d7c8ecd1a94758d2) --- virt-v2v.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt-v2v.spec b/virt-v2v.spec index d3c8007..d9aa97c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -103,6 +103,9 @@ BuildRequires: gnupg2 Requires: libguestfs%{?_isa} >= 1:1.42 Requires: guestfs-tools >= 1.42 +# XFS is the default filesystem in Fedora and RHEL. +Recommends: libguestfs-xfs + %if 0%{?rhel} # For Windows conversions on RHEL. Requires: libguestfs-winsupport >= 7.2 From 06244484393cfb13f0dfb2db541062c5d82cb218 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 7 May 2021 11:57:58 +0100 Subject: [PATCH 14/17] Change Recommends -> Requires for libguestfs-xfs. Just using Recommends is insufficient to get RHEL to pull in libguestfs-xfs as a dependency. Thanks: Josh Boyer (cherry picked from commit 7599291a166126f123e4e51281a6726eb6576974) --- virt-v2v.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index d9aa97c..2ded34c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -104,7 +104,7 @@ Requires: libguestfs%{?_isa} >= 1:1.42 Requires: guestfs-tools >= 1.42 # XFS is the default filesystem in Fedora and RHEL. -Recommends: libguestfs-xfs +Requires: libguestfs-xfs %if 0%{?rhel} # For Windows conversions on RHEL. From 50834669e6350a9d98a0f5d186470ac30888c398 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 10 Jun 2021 09:04:27 +0100 Subject: [PATCH 15/17] nbdkit-vddk-plugin dep only exists on x86-64 (cherry picked from commit 41e9bece4c65761d85af8cb3bfae0f32314d7c14) --- virt-v2v.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/virt-v2v.spec b/virt-v2v.spec index 2ded34c..605843c 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -15,7 +15,7 @@ Name: virt-v2v Epoch: 1 Version: 1.44.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -131,7 +131,9 @@ Requires: nbdkit Requires: nbdkit-curl-plugin Requires: nbdkit-python-plugin Requires: nbdkit-ssh-plugin +%ifarch x86_64 Requires: nbdkit-vddk-plugin +%endif # For rhsrvany.exe, used to install firstboot scripts in Windows guests. Requires: mingw32-srvany >= 1.0-13 @@ -287,6 +289,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Thu Jun 10 2021 Richard W.M. Jones - 1:1.44.0-2 +- nbdkit-vddk-plugin dep only exists on x86-64. + * Fri Apr 30 2021 Richard W.M. Jones - 1:1.44.0-1 - New upstream stable branch version 1.44.0. From ec03e356f9a96b5a680def93999a2f462e34ad23 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Nov 2021 10:56:38 +0000 Subject: [PATCH 16/17] New upstream stable branch version 1.44.1. --- sources | 4 ++-- virt-v2v.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index e06fc6f..ab5f4e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.44.0.tar.gz) = 9d8de6c6376dd33a5fb4d5fd10fac13a8bce7d834bbb65274a09ae6558b2c3107c5ccb8b39b330a27ccff09313eb72cf7139f378d5e427af67589443168d7e17 -SHA512 (virt-v2v-1.44.0.tar.gz.sig) = e6b830389d475bb5514b8f6c6f273d06ed90bc31ff785c709964e4f492cbca6a5d78b25ad60605f9778ac9300754d62630481c80d4232d0fa17fefde65d22a90 +SHA512 (virt-v2v-1.44.1.tar.gz) = 1d705a8e02b6560f09b8e31a33066efafc605adcec44a6effcf45dfa8d196e9c12df02558007bdcb96fc8c040370f23995828f39df7ced02f9bc52779c50c7d8 +SHA512 (virt-v2v-1.44.1.tar.gz.sig) = 0f1764c6cd42ce1b306cb17a349da5c15025fd75110092520c72ec911f38732eb3c637934975d4561fe17e2c5d0f5204cbfd41eacbe7f8b9b9d3d841b312c266 diff --git a/virt-v2v.spec b/virt-v2v.spec index 605843c..18f6831 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -14,8 +14,8 @@ Name: virt-v2v Epoch: 1 -Version: 1.44.0 -Release: 2%{?dist} +Version: 1.44.1 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -289,6 +289,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Tue Nov 23 2021 Richard W.M. Jones - 1:1.44.1-1 +- New upstream stable branch version 1.44.1. + * Thu Jun 10 2021 Richard W.M. Jones - 1:1.44.0-2 - nbdkit-vddk-plugin dep only exists on x86-64. From 86f63972e2fc9db00cc9f23aabbfa12acb913ace Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Nov 2021 17:56:08 +0000 Subject: [PATCH 17/17] New upstream stable branch version 1.44.2 --- sources | 4 ++-- virt-v2v.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ab5f4e1..0114a80 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.44.1.tar.gz) = 1d705a8e02b6560f09b8e31a33066efafc605adcec44a6effcf45dfa8d196e9c12df02558007bdcb96fc8c040370f23995828f39df7ced02f9bc52779c50c7d8 -SHA512 (virt-v2v-1.44.1.tar.gz.sig) = 0f1764c6cd42ce1b306cb17a349da5c15025fd75110092520c72ec911f38732eb3c637934975d4561fe17e2c5d0f5204cbfd41eacbe7f8b9b9d3d841b312c266 +SHA512 (virt-v2v-1.44.2.tar.gz) = 60c8f6cb137de4bf9133342498278e95678cbab2881d514ef37b77a220daaf861cf1d68c8f33e36b0c815b6ac0876357a3ea776aa87399093bd2fc478b4c8b73 +SHA512 (virt-v2v-1.44.2.tar.gz.sig) = 12766b2484d6d2b2ff5ddb5379b3681befc14ecd6a6eb1bb7d24466be72c9fd3a24e996493c88797ed676c396855a94d254e5f4f5c77319d3cd97b874e009b5b diff --git a/virt-v2v.spec b/virt-v2v.spec index 18f6831..a148a69 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -14,7 +14,7 @@ Name: virt-v2v Epoch: 1 -Version: 1.44.1 +Version: 1.44.2 Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM @@ -289,6 +289,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %changelog +* Thu Nov 25 2021 Richard W.M. Jones - 1:1.44.2-1 +- New upstream stable branch version 1.44.2 + * Tue Nov 23 2021 Richard W.M. Jones - 1:1.44.1-1 - New upstream stable branch version 1.44.1.