rpm/virt-v2v
SHA256
1
0
Fork 0
forked from pool/virt-v2v
Code Pull Requests Activity

Accepting request 980412 from Virtualization

Browse Source 
Update to version 2.0.6. Drop extraneous Requires: libnbd

OBS-URL: https://build.opensuse.org/request/show/980412
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-v2v?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2022-06-02 19:54:17 +00:00 committed by Git OBS Bridge
commit 0ef1c722dc
7 changed files with 74 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
fix-linker-error.patch
View File

@ -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 <https://www.gnu.org/licenses/>. */
+
+/* written by Paul Eggert */
+
+#include <config.h>
+
+/* Specification. */
+#include <stdlib.h>
+
+/* A function definition is only needed if HAVE_FREE_POSIX is not defined. */
+#if !HAVE_FREE_POSIX
+
+# include <errno.h>
+
+void
+rpl_free (void *p)
+# undef free
+{
+# if defined __GNUC__ && !defined __clang__
+ /* An invalid GCC optimization
+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98396>
+ 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)

3
virt-v2v-1.44.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c99ecabb93d1e6c81f0070b951e7bf42cee2a65a3ece387e01217f06080447fc
size 3823064

17
virt-v2v-1.44.2.tar.gz.sig
View File

@ -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-----

3
virt-v2v-2.0.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5eba9f7960340334100c06e1380bf84d0d730c53cdf587fefbfab7c889aca15
size 4022694

17
virt-v2v-2.0.6.tar.gz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmKPUfYRHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKAr5Q/9E5XizPbQPS47zjQqwY1oS12+R26rRBHR
WEoBXz8t64xAfUpsYN+LNp/auYKel/Bs7k4br34DzjqtxNOR4HZINbQUyd/cY/nI
iP9803liXX9z09X2cn52+H2HQ+GGnQhmls3y9d2asZJosw5wjDArUUgvr8Wv+5zn
DPYfdqauBNLvHSs1Sbhol5mExofW4L6l/rgPLCyO205uPYylPwZH1E8AfAew4dmW
8iQ2K/AJHBFNKD85ntwV3DKeTRlQxGrh4DkMtVOea+YOKRoqNZVAN5I+WkYQTSWj
beY4CYnNdfxEO81bNbA1r1sLGpSKf0Dyj/CFzjfYr3nxWMJevmmv1DdkKZGgE0o8
ve7Coy32WR0b/uCWq4DlFylhYb3PwKoVbcwmHSu18Hd9OZWsltm97ddFqrGLnQg9
9b9TPtBnhmQRnBY+0AD/lU0xneMfpLZrXo9GstVmH0WvVt5NCyjYxC9xMJvF1S3j
1m9FZXiLkspB7vvA4aRi6o98AhbGQmRPNe2BZ7SYmJyCleRecWx1Ikv+1ryctbLj
piWXBBKYZ/ESA1X3LDK9l6JhY0uMGlvqQq3o7W1dCS5UkviSIo9rZOJ7OVAZaED+
WvphZ4ScUQWgKzqj6wp6ysQscIMaQ1C9qaRjFFt46Ma1KnQo2rnoZ5xdNhE0Ha7w
osjxDokdICA=
=nBN0
-----END PGP SIGNATURE-----

41
virt-v2v.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Thu May 26 11:39:38 MDT 2022 - carnold@suse.com
- Update to version 2.0.6
* This is a bug fix release on top of 2.0.5
-------------------------------------------------------------------
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.
- Drop fix-linker-error.patch
-------------------------------------------------------------------
Thu Jan 6 15:56:46 MST 2022 - carnold@suse.com

23
virt-v2v.spec
View File

@ -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.6
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
@ -59,15 +58,20 @@ 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}/qemu-nbd
Requires: %{_bindir}/virsh
Requires: curl
Requires: guestfs-tools >= 1.42
Requires: libguestfs0%{?_isa} >= 1.42
Requires: libguestfs0 >= 1.42
Requires: openssh-clients >= 8.8p1
Requires: ovmf
Requires: unzip
Recommends: nbdkit
Recommends: nbdkit-curl-plugin
Recommends: nbdkit-nbd-plugin
Recommends: nbdkit-python-plugin
Recommends: nbdkit-ssh-plugin
Recommends: nbdkit-vddk-plugin
@ -145,8 +149,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 +186,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 +196,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