pool/virt-v2v
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to virt-v2v 2.3.8

Browse Source 
* Various fixes and enhancements to -o kubevirt
  * Various fixes and enhancements to -o libvirt
  * -o qemu: Always use -cpu host unless overridden by source
    hypervisor
  * -o qemu: Set -rtc base=localtime when guest expects RTC set to
    localtime
  * -i ova: Less strict parsing of lines from the manifest file
  * Introduce "block_driver" convert option
  * Various fixes and enhancement to detecting windows virtio
  * Add Inject_virtio_win.Virtio_SCSI as a possible block type
  * write the proper block controller PCI ID to Win registry
  * look for bootloader config in /boot/grub/grub.cfg in case of
    UEFI
  * mltools/libosinfo-c.c: Fix off-by-one error
  * Remove support for RHEL 3
  * Various language translation updates
  * Numerous bug fixes
- Drop patches
  fix-compiler-error-Stdlib.stderr.patch
  fix-linker-error.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-v2v?expand=0&rev=41
This commit is contained in:
Charles Arnold 2024-01-03 21:07:31 +00:00 committed by Git OBS Bridge
parent 217cb9fe15
commit 1744d19edf
8 changed files with 49 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fix-compiler-error-Stdlib.stderr.patch
View File

@ -1,57 +0,0 @@
SLE15-SP5 uses ocamlc version 4.05 where the Pervasives module is
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.2.0/lib/create_ovf.ml
===================================================================
--- 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";
- doc_to_chan Stdlib.stderr ovf
+ doc_to_chan Pervasives.stderr ovf
);
(* Return the OVF document. *)
Index: virt-v2v-2.2.0/output/output_disk.ml
===================================================================
--- 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";
- DOM.doc_to_chan Stdlib.stderr doc;
+ DOM.doc_to_chan Pervasives.stderr doc;
eprintf "\n%!";
)
Index: virt-v2v-2.2.0/output/output_libvirt.ml
===================================================================
--- 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%!";
- DOM.doc_to_chan Stdlib.stderr doc;
+ DOM.doc_to_chan Pervasives.stderr doc;
eprintf "\n%!";
);
Index: virt-v2v-2.2.0/convert/convert.ml
===================================================================
--- 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";
- List.iter (print_mpstat Stdlib.stderr) mpstats
+ List.iter (print_mpstat Pervasives.stderr) mpstats
);
mpstats

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)

BIN
virt-v2v-2.2.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

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

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmO9fDsRHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKAa2g//RQunlKur+nTvnmfpY7gYJJxuJqF0XAq0
aWoMF3GTGKbmgsKjvRMd3biVeNSeYRz8+cgy+ns7Ci7rlRw2fxG5INtZXX1rjVRN
9j5xQo+fYLHtp48OB2NIZ9qi5dAqSDgdgZ1oHFzzWJJ4dHw9zoMDUW77g8Hi74g4
jCXoxq61LMAfNpB8hFrN44xgDD3N15A8IWZEy81bBRQBER6yreZ4Ey1WrgCbF/ti
4RjUt98THxbQ1/fP5bDCXpagVSS3h70ZPyYl2gRFVNeEmPekUj4YZP4CvCEb74TF
HFJU6go2YzLah+UeG/z1ln8jl2BZdKd0K58tCHwsYvpOeQ1P0jopR6vtnKEAO9py
6YV2N5JOEA/EQsLDzyn8Hdk70WgceDjCo6Lkpukblk3sL8WfcnoGSysXWrRfQXnC
ktf2yE3vA5IOdd3Bs6yXKSvgp/vmfuLHjAlC7m4Si5MnVuhRWVcrdGmQEKuWb6hO
4GRFNiUWZOSDjxWo93M9U3Ur3iv5chb+i9wYLEceKysk4+IKjbqfutg195m1N3GU
Qn4sF6clXMRM5vzU9BUx4Y6kZLki8dWYgxNirw9/u/APfqHiycT08pCVZ7iCnExP
Q7MpgL6fFNgnwR1hEVHxO6a0kxK0jJh/cWBFHKx6Pkqv4GdXOpUcoKWmugbViLoE
gjRPHbHXzVM=
=bDBY
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmWBrCERHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKC9dxAArTAAQcx57kqql7SG21+yxIoRqotfJcid
XCLnE9z4ns762REzGiW9msYMVXfCsnDcfLvLKoYAjNBtJ62cnGdiyveO7umV/rgm
uAg3qnkvIJGBtDMwAo4bnGd/JbW8dtyHnXw4Ck6fRa2X+ifYquK5MvSE8zCn/SKD
RaWMrHJQ3H9bdvLhZcZ1n7ymTg5ozaO+3W7uadvnDsgybDye8EUv5dJ8vz7VuNDs
gMfGp1VD/N4lNP3UjcSTVs3Z1SzaDvYBbyy1oYvWKHw4IUAHwnf/g5flULFWCu46
Xm6axFu/JdmWo232CGD3pWeUx0zvihMXXElJqI1nOFJSRvWNSs4WlapS662lBkv4
E2ANd+P9GdgRqGgTAaRyCWCxpYBJNOfiH1S4GaDM7FO6Xn4quREqCVOw68/0xAKH
XCo2ysPEydgemhjlAL/qTKN6TDjiMW0SzN9MoUH84ocuwmrfwy6DjjDQgjkyYABr
AAkmMQxjPysQ5Gb9/yFED0vzEHarex6hQpyinv11rfiGSbXZGa4bm4rtHIoRyAFX
7cUusLSYwNz1AAg91GMlUbtTjNzaMHVbLm+IRBI0/0kw9DHjCQq5wx1FwRzMUoi+
xIWSzk3uO5ubYv4hERC1Y0qYluAHmD4IyKzzfwNueXs28e1ttVT2kCpVaPf6kFYV
r2LgCyicQ8g=
=mG/K
-----END PGP SIGNATURE-----

25
virt-v2v.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Jan 3 13:06:31 MST 2024 - carnold@suse.com
- Update to virt-v2v 2.3.8
* Various fixes and enhancements to -o kubevirt
* Various fixes and enhancements to -o libvirt
* -o qemu: Always use -cpu host unless overridden by source
hypervisor
* -o qemu: Set -rtc base=localtime when guest expects RTC set to
localtime
* -i ova: Less strict parsing of lines from the manifest file
* Introduce "block_driver" convert option
* Various fixes and enhancement to detecting windows virtio
* Add Inject_virtio_win.Virtio_SCSI as a possible block type
* write the proper block controller PCI ID to Win registry
* look for bootloader config in /boot/grub/grub.cfg in case of
UEFI
* mltools/libosinfo-c.c: Fix off-by-one error
* Remove support for RHEL 3
* Various language translation updates
* Numerous bug fixes
- Drop patches
fix-compiler-error-Stdlib.stderr.patch
fix-linker-error.patch
-------------------------------------------------------------------
Thu Nov 30 22:22:22 UTC 2023 - olaf@aepfle.de

10
virt-v2v.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package virt-v2v
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,16 +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 2.2-stable
%global source_directory 2.3-development
Name: virt-v2v
Version: 2.2.0
Version: 2.3.8
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
Patch1: fix-compiler-error-Stdlib.stderr.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
@ -45,7 +43,6 @@ BuildRequires: libosinfo-devel
BuildRequires: libvirt-devel
BuildRequires: libxml2-devel
BuildRequires: mkisofs
BuildRequires: ocaml(ocaml_base_version) >= 4.07
BuildRequires: ocaml-fileutils-devel
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-gettext-devel
@ -58,6 +55,7 @@ BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: po4a
BuildRequires: qemu-tools
BuildRequires: ocaml(ocaml_base_version) >= 4.07
BuildRequires: perl(Sys::Guestfs)
BuildRequires: pkgconfig(bash-completion) >= 2.0
BuildRequires: pkgconfig(libnbd)