diff --git a/fix-linker-error.patch b/fix-linker-error.patch deleted file mode 100644 index b8a73e8..0000000 --- a/fix-linker-error.patch +++ /dev/null @@ -1,90 +0,0 @@ -Resolves the following error. -Similar to libguestfs commit 489b14b75e5f30010d8a8c8d3a10ecc52b629563 - -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_finalize': -/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:86: undefined reference to `rpl_free' -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:88: undefined reference to `rpl_free' -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_set_event_callback': -/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:239: undefined reference to `rpl_free' -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_delete_event_callback': -/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:266: undefined reference to `rpl_free' -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c.o): in function `guestfs_int_ocaml_event_to_string': -/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c.c:290: undefined reference to `rpl_free' -/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/ocaml/guestfs/libmlguestfs.a(libguestfsocaml_a-guestfs-c-actions.o):/home/abuild/rpmbuild/BUILD/libguestfs-1.44.2/ocaml/guestfs-c-actions.c:1188: more undefined references to `rpl_free' follow -collect2: error: ld returned 1 exit status -File "caml_startup", line 1: -Error: Error during linking - - -Index: virt-v2v-1.44.0/gnulib/lib/free.c -=================================================================== ---- /dev/null -+++ virt-v2v-1.44.0/gnulib/lib/free.c -@@ -0,0 +1,53 @@ -+/* Make free() preserve errno. -+ -+ Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. -+ -+ This file is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation; either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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 Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ -+ -+/* written by Paul Eggert */ -+ -+#include -+ -+/* Specification. */ -+#include -+ -+/* A function definition is only needed if HAVE_FREE_POSIX is not defined. */ -+#if !HAVE_FREE_POSIX -+ -+# include -+ -+void -+rpl_free (void *p) -+# undef free -+{ -+# if defined __GNUC__ && !defined __clang__ -+ /* An invalid GCC optimization -+ -+ would optimize away the assignments in the code below, when link-time -+ optimization (LTO) is enabled. Make the code more complicated, so that -+ GCC does not grok how to optimize it. */ -+ int err[2]; -+ err[0] = errno; -+ err[1] = errno; -+ errno = 0; -+ free (p); -+ errno = err[errno == 0]; -+# else -+ int err = errno; -+ free (p); -+ errno = err; -+# endif -+} -+ -+#endif -Index: virt-v2v-1.44.0/gnulib/lib/Makefile.am -=================================================================== ---- virt-v2v-1.44.0.orig/gnulib/lib/Makefile.am -+++ virt-v2v-1.44.0/gnulib/lib/Makefile.am -@@ -35,7 +35,8 @@ libgnu_la_SOURCES = \ - xstrtoll.c \ - xstrtoul.c \ - xstrtoull.c \ -- xstrtoumax.c -+ xstrtoumax.c \ -+ free.c - libutils_la_CFLAGS = \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(GCC_VISIBILITY_HIDDEN) diff --git a/virt-v2v-1.44.2.tar.gz b/virt-v2v-1.44.2.tar.gz deleted file mode 100644 index c213a52..0000000 --- a/virt-v2v-1.44.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c99ecabb93d1e6c81f0070b951e7bf42cee2a65a3ece387e01217f06080447fc -size 3823064 diff --git a/virt-v2v-1.44.2.tar.gz.sig b/virt-v2v-1.44.2.tar.gz.sig deleted file mode 100644 index 58ab6c7..0000000 --- a/virt-v2v-1.44.2.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmGfzZkRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKD6yhAAzGORDnbJcqVeFg6zrrQm+BJGriucYDD1 -De6vFtRLDXiG6fhdwWCOxEgkhSNp0HxhqmcqmK056zkkhKhfpUEfWmrlcaCzgarU -bb+YL4EyvmNu+EaxTYnNKICHpXiktEp5xOTN+fEbmK5cdSWo/cJrh6XSeir79tc+ -SZ7uXLx6x7C26CAt625B/uSOpR6ta33Kp9LScu+pxeA99zkEJXpvgPagS/1F9pEw -JOo/YcVjPNsN+u9Ywv1RBe6vXA2VuWS2CSgKD/dDd1vBGQgTJydaZP2HoQfbG0Sf -L9nyF1OKJV0r/WaLDG1Y9kEw3Ku0JFN+cJK7cK3ucU7h+wSj9sXg/Phium7J9zJY -VAdzor8mUevizEi1HjXaEEQyK4qMp86FHJ/Yy/fOV+n8KEsOBuzuBaeIlYOXVOcJ -5IXquIR9kzVnobp19Jmw+ZhxU4w7I5gDrSw6Zy/9LcYvKwc8FqHdgdxQ1xWHb3nt -pZuqILTvhJM6w18KpTF4/g3I4bikVmWlDgnwv6YNhluGgQwyDASqH8APmeeyPqa5 -CnRaEyMxsZDTVP7LoSr/m1vs/B1wKaaywEG+TNdn01XDsbt6Co9JaizqdLkXdHHx -g/MYvg5PvD/pOu5HUlmeIxkSooTEQM/qWYOOJe9pxOg36X2h/i3594F3atDVsWMo -QfdLxQFlsJw= -=U2vB ------END PGP SIGNATURE----- diff --git a/virt-v2v-2.0.5.tar.gz b/virt-v2v-2.0.5.tar.gz new file mode 100644 index 0000000..d8ce6b5 --- /dev/null +++ b/virt-v2v-2.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69cb9d34a9a461c1a85db864484280c058b64ea871eea64c412cf667f417195c +size 4024158 diff --git a/virt-v2v-2.0.5.tar.gz.sig b/virt-v2v-2.0.5.tar.gz.sig new file mode 100644 index 0000000..8146e0d --- /dev/null +++ b/virt-v2v-2.0.5.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmJ9CMARHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKBpbA/8CJCqJchoGAVrCxkR0QBIW4dqAHemjmfW +T8+r0o4CDqg97TUAPaAUfDSccIJ09sfoopuo87kYL4OMIKCFk42lCW4vOEjC+pBi +CG2PxQK27R+YLen0dR9kIcTHgek3O4DcelQ6bgLbyLoNK8CkhpRvHHEtbgLNSeZ2 +9rh3V6Af8X2oOV4At6PJ8G7+ZO2H3s5mvxcH/kKmWVRFXCTPPqB1/4vTy7udi1x+ +FG9cGNaI8jftJZrWO2pVAmC4EIowvuWeRp1Uvulr9oHe6fUKaBf+cu3qzgrvZvF8 +kDSTr1AMhE8ez6XjLrSKclyg86OUbMdAf4VfpXsuZ14UOot3pQj562vZJ5J3QJR3 +i5kuiSETfoMT608+h1CWwpdPKwvpnmGzQKV+WhT497plv7sLf8N1pJXBYxJ6bY+s +iDAdw+ZYTeNM69KjFp+ej9CxJUXUgIATzb86NdlyxCKicbx/HGiGqNzjcfMSeA2Y +qmFu8k0Hcpz82eugOd/ECKi7HJSta//VlmSfUXkySW6C7kFympKHqlOdfRJge1yC +Q8PlDoruHFVnsYjZHkmlcCvIYzrgIMD2k2tujtP+7LTGC+JZdb9n9hQ7LhUQ8Arq +xve3GX689a1MR6CZkcCFW9cycvTUPvZGYhxyvTgk+I0YBE6G3sFKNQlym2ULxrVt +UbYIGpEd+gg= +=CHoG +-----END PGP SIGNATURE----- diff --git a/virt-v2v.changes b/virt-v2v.changes index 9030050..3a7e002 100644 --- a/virt-v2v.changes +++ b/virt-v2v.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu May 12 14:40:29 MDT 2022 - carnold@suse.com + +- Update to version 2.0.5 + * Virt-v2v has been modularised allowing external programs to + examine the state of the conversion and inject their own + copying step. Further enhancements will be made to this new + architecture in forthcoming releases. + * The command line is almost identical apart from some debugging + features that were removed (see below). The only significant + difference is that the output format (-of) now has to be + specified if it is different from the input format, whereas + previous versions of virt-v2v would use the same output format + as input format automatically. + * A lot of time was spent improving the performance of virt-v2v + in common cases. + * Implement conversion of ALT Linux guests (Mikhail Gordeev). + * Many bug fixes and performance enhancements were made to oVirt + imageio output (Nir Soffer). + * There is a new virt-v2v-in-place(1) tool which replaces the + existing virt-v2v --in-place option. + * Virt-v2v can now convert guests which use LUKS encrypted + logical volumes (Laszlo Ersek). + * Option -oo rhv-direct has been replaced by -oo rhv-proxy, and + direct mode (which is much faster) is now the default when + writing to oVirt, with proxy mode available for restricted + network configurations (thanks: Nir Soffer). + * The following command line options were removed: + --print-estimate, --debug-overlays, --no-copy. + * Virt-v2v no longer installs the RHEV-APT tool in Windows + guests. This tool was deprecated and then removed in oVirt 4.3. + * Deprecated tool virt-v2v-copy-to-local has been removed. + This was deprecated in November 2018. + ------------------------------------------------------------------- Thu Jan 6 15:56:46 MST 2022 - carnold@suse.com diff --git a/virt-v2v.spec b/virt-v2v.spec index b69f434..ee87651 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -20,15 +20,14 @@ # If there are patches which touch autotools files, set this to 1. %global patches_touch_autotools 1 # The source directory. -%global source_directory 1.44-stable +%global source_directory 2.0-stable Name: virt-v2v -Version: 1.44.2 +Version: 2.0.5 Release: 0 Summary: Tools to convert a virtual machine to run on KVM License: GPL-2.0-or-later Group: System/Management URL: https://github.com/libguestfs/virt-v2v -Patch0: fix-linker-error.patch Source0: https://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz Source1: https://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{version}.tar.gz.sig BuildRequires: augeas-devel @@ -39,6 +38,7 @@ BuildRequires: gettext-devel BuildRequires: glib2-devel BuildRequires: libguestfs-devel >= 1.42 BuildRequires: libjansson-devel +BuildRequires: libnbd BuildRequires: libosinfo-devel BuildRequires: libvirt-devel BuildRequires: libxml2-devel @@ -59,6 +59,7 @@ BuildRequires: po4a BuildRequires: qemu-tools BuildRequires: perl(Sys::Guestfs) BuildRequires: pkgconfig(bash-completion) >= 2.0 +BuildRequires: pkgconfig(libnbd) Requires: %{_bindir}/gawk Requires: %{_bindir}/gzip Requires: %{_bindir}/virsh @@ -145,8 +146,8 @@ find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}/%{_datadir}/virt-tools # Delete the v2v test harness (except for the man page). -rm -r %{buildroot}/%{_libdir}/ocaml/v2v_test_harness -rm -r %{buildroot}/%{_libdir}/ocaml/stublibs/dllv2v_test_harness* +#rm -r %{buildroot}/%{_libdir}/ocaml/v2v_test_harness +#rm -r %{buildroot}/%{_libdir}/ocaml/stublibs/dllv2v_test_harness* # Find locale files. %find_lang %{name} @@ -182,9 +183,9 @@ rm -r %{buildroot}/%{_libdir}/ocaml/stublibs/dllv2v_test_harness* %license COPYING #doc README %{_bindir}/virt-v2v -%{_bindir}/virt-v2v-copy-to-local +%{_bindir}/virt-v2v-in-place %{_mandir}/man1/virt-v2v.1%{?ext_man} -%{_mandir}/man1/virt-v2v-copy-to-local.1%{?ext_man} +%{_mandir}/man1/virt-v2v-in-place.1%{?ext_man} %{_mandir}/man1/virt-v2v-hacking.1%{?ext_man} %{_mandir}/man1/virt-v2v-input-vmware.1%{?ext_man} %{_mandir}/man1/virt-v2v-input-xen.1%{?ext_man} @@ -192,14 +193,13 @@ rm -r %{buildroot}/%{_libdir}/ocaml/stublibs/dllv2v_test_harness* %{_mandir}/man1/virt-v2v-output-openstack.1%{?ext_man} %{_mandir}/man1/virt-v2v-output-rhv.1%{?ext_man} %{_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-test-harness.1%{?ext_man} %{_datadir}/virt-tools %files bash-completion %license COPYING %{_datadir}/bash-completion/completions/virt-v2v -%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %files man-pages-ja %license COPYING