diff --git a/fix-compiler-error-Stdlib.stderr.patch b/fix-compiler-error-Stdlib.stderr.patch index cc2ed11..1cac218 100644 --- a/fix-compiler-error-Stdlib.stderr.patch +++ b/fix-compiler-error-Stdlib.stderr.patch @@ -3,11 +3,11 @@ used and it has no Stdlib module. In ocamlc version 4.07 and newer, Pervasives is deprecated and Stdlib should be used. -Index: virt-v2v-2.0.7/lib/create_ovf.ml +Index: virt-v2v-2.2.0/lib/create_ovf.ml =================================================================== ---- virt-v2v-2.0.7.orig/lib/create_ovf.ml -+++ virt-v2v-2.0.7/lib/create_ovf.ml -@@ -769,7 +769,7 @@ let rec create_ovf source inspect +--- virt-v2v-2.2.0.orig/lib/create_ovf.ml ++++ virt-v2v-2.2.0/lib/create_ovf.ml +@@ -787,7 +787,7 @@ let rec create_ovf source inspect if verbose () then ( eprintf "OVF:\n"; @@ -16,11 +16,11 @@ Index: virt-v2v-2.0.7/lib/create_ovf.ml ); (* Return the OVF document. *) -Index: virt-v2v-2.0.7/output/output_disk.ml +Index: virt-v2v-2.2.0/output/output_disk.ml =================================================================== ---- virt-v2v-2.0.7.orig/output/output_disk.ml -+++ virt-v2v-2.0.7/output/output_disk.ml -@@ -109,7 +109,7 @@ module Disk = struct +--- virt-v2v-2.2.0.orig/output/output_disk.ml ++++ virt-v2v-2.2.0/output/output_disk.ml +@@ -122,7 +122,7 @@ module Disk = struct if verbose () then ( eprintf "resulting local libvirt XML:\n"; @@ -29,24 +29,11 @@ Index: virt-v2v-2.0.7/output/output_disk.ml eprintf "\n%!"; ) -Index: virt-v2v-2.0.7/output/output_json.ml +Index: virt-v2v-2.2.0/output/output_libvirt.ml =================================================================== ---- virt-v2v-2.0.7.orig/output/output_json.ml -+++ virt-v2v-2.0.7/output/output_json.ml -@@ -138,7 +138,7 @@ module Json = struct - - if verbose () then ( - eprintf "resulting JSON:\n"; -- output_string Stdlib.stderr doc_string; -+ output_string Pervasives.stderr doc_string; - eprintf "\n\n%!"; - ); - -Index: virt-v2v-2.0.7/output/output_libvirt.ml -=================================================================== ---- virt-v2v-2.0.7.orig/output/output_libvirt.ml -+++ virt-v2v-2.0.7/output/output_libvirt.ml -@@ -171,7 +171,7 @@ module Libvirt_ = struct +--- virt-v2v-2.2.0.orig/output/output_libvirt.ml ++++ virt-v2v-2.2.0/output/output_libvirt.ml +@@ -184,7 +184,7 @@ module Libvirt_ = struct if verbose () then ( eprintf "resulting XML for libvirt:\n%!"; @@ -55,11 +42,11 @@ Index: virt-v2v-2.0.7/output/output_libvirt.ml eprintf "\n%!"; ); -Index: virt-v2v-2.0.7/convert/convert.ml +Index: virt-v2v-2.2.0/convert/convert.ml =================================================================== ---- virt-v2v-2.0.7.orig/convert/convert.ml -+++ virt-v2v-2.0.7/convert/convert.ml -@@ -130,7 +130,7 @@ and get_mpstats g = +--- virt-v2v-2.2.0.orig/convert/convert.ml ++++ virt-v2v-2.2.0/convert/convert.ml +@@ -131,7 +131,7 @@ and get_mpstats g = if verbose () then ( (* This is useful for debugging speed / fstrim issues. *) eprintf "mpstats:\n"; diff --git a/virt-v2v-2.0.7.tar.gz b/virt-v2v-2.0.7.tar.gz deleted file mode 100644 index 1ef9bb5..0000000 --- a/virt-v2v-2.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89b8cdabd04a57c0addb11be043e0f8102d2586590ace493ee849201efde7ba3 -size 7702629 diff --git a/virt-v2v-2.0.7.tar.gz.sig b/virt-v2v-2.0.7.tar.gz.sig deleted file mode 100644 index 7eb3c74..0000000 --- a/virt-v2v-2.0.7.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmLFq4sRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKCdDg/+LQr8ro5P9iKSDRNwLJ4jHmoXOqZVkSqO -KHk+kHuqFwSruEHxVGZwf9jYBNOuGD9K1d6AFWfYbRS2jEZpiA22ZX1Ym67PF5Fp -dw72BmWHBOzJ8YO6vauvpaRNLPypSgr3RwJUPlRYw847MFDrn71EVOBv7dqwVp0q -LqBk1wj/M3wKVV2DL8u0JE+CArSmqYSCCnyl2oq0VfIlhYbPQ4iprqTr5HWdd2fs -Mc0JkQiuYLoV3V7MP8U0qncktABZ/6gNuTSiUAsWLGSLaH67MNEfqjF4OyEU95cA -qivB53LEIebIAO07E9bLeFeXx7WLZsPI3Ms5m+aFWqjCLHl7h0qarHsrMMe+SBI6 -aSK+BzPzVHfzrqGRnL+95EQI0Vw9g5yLkxkm69KYGbukMulFdGgI24cGqHKEFadu -NbrSE/6ydkdKS8NGKeyM+Y5RMoWh379nQcksj8dB6Vv2NV31KQvde9mFxnV92FOn -1gYbIRwKPM1cc3VF6E3qlmIuBq59vagsJ/rcKg8fe8LNpNiOfi+Cmk8gYs9WuDFH -/RWCYd3XMWxYQ5ZGi3rCVw4ijZbdHGwc1+sH9/ExLGDVuUJQfJ0fpdjR4mYnghav -tFKc6EjxJknCR7D4HahVdzFbT/XrD0KpQ5JxToLDA3o7ecPJ42ExfKL53OwYjM/t -LUUDntYK6sk= -=Grra ------END PGP SIGNATURE----- diff --git a/virt-v2v-2.2.0.tar.gz b/virt-v2v-2.2.0.tar.gz new file mode 100644 index 0000000..77899e4 --- /dev/null +++ b/virt-v2v-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05cafc2b91241ecc0f2111cf2a710dbc823269ebf681b83534d83951a66d30a5 +size 239 diff --git a/virt-v2v-2.2.0.tar.gz.sig b/virt-v2v-2.2.0.tar.gz.sig new file mode 100644 index 0000000..464fb73 --- /dev/null +++ b/virt-v2v-2.2.0.tar.gz.sig @@ -0,0 +1,7 @@ + +
+The requested URL /virt-v2v/2.0-stable/virt-v2v-2.2.0.tar.gz.sig was not found on this server.
+ diff --git a/virt-v2v.changes b/virt-v2v.changes index 39aa1fc..1bf1534 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Feb 8 16:08:19 MST 2023 - carnold@suse.com + +- Update to virt-v2v 2.2.0 + * New virt-v2v-inspector(1) tool. This tool can be used before + conversion to collect facts about the source guest, such as + number of disks, and to estimate the disk space required after + conversion. + * Add support for NVMe devices and SATA hard disks when importing + from VMware VMX files (Laszlo Ersek). + * Add support for importing to KubeVirt using the new + experimental -o kubevirt mode. + * Windows 11 guests are now supported. + * Rocky Linux guest support has been added (Andrey Drobyshev). + * The -o json mode was removed. It was intended to be used with + KubeVirt but was never actually used there. Use -o kubevirt + instead. + * Numerous bug fixes and build changes + ------------------------------------------------------------------- Tue Oct 4 14:00:46 MDT 2022 - carnold@suse.com diff --git a/virt-v2v.spec b/virt-v2v.spec index 528c21e..4dff0ed 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -1,7 +1,7 @@ # # spec file for package virt-v2v # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ # If there are patches which touch autotools files, set this to 1. %global patches_touch_autotools 1 # The source directory. -%global source_directory 2.0-stable +%global source_directory 2.2-stable Name: virt-v2v -Version: 2.0.7 +Version: 2.2.0 Release: 0 Summary: Tools to convert a virtual machine to run on KVM License: GPL-2.0-or-later @@ -190,6 +190,7 @@ mkdir -p %{buildroot}/%{_datadir}/virt-tools #doc README %{_bindir}/virt-v2v %{_bindir}/virt-v2v-in-place +%{_bindir}/virt-v2v-inspector %{_mandir}/man1/virt-v2v.1%{?ext_man} %{_mandir}/man1/virt-v2v-in-place.1%{?ext_man} %{_mandir}/man1/virt-v2v-hacking.1%{?ext_man} @@ -201,6 +202,8 @@ mkdir -p %{buildroot}/%{_datadir}/virt-tools %{_mandir}/man1/virt-v2v-release-notes-1.42.1%{?ext_man} %{_mandir}/man1/virt-v2v-release-notes-2.0.1%{?ext_man} %{_mandir}/man1/virt-v2v-support.1%{?ext_man} +%{_mandir}/man1/virt-v2v-inspector.1.gz +%{_mandir}/man1/virt-v2v-release-notes-2.2.1.gz %{_datadir}/virt-tools %files bash-completion