From 377f13e57b290bb512a60b998c4d3a4fc4fa924c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 22 Dec 2025 06:20:12 +0000 Subject: [PATCH] import OL virt-v2v-2.8.1-13.0.1.el10_1 --- ...Fix-ESP-conversion-if-C-Windows-Temp.patch | 69 ++++ 0034-Update-common-submodule.patch | 34 ++ 1001-replaced-upstream-references.patch | 351 ++++++++++++++++++ copy-patches.sh | 0 virt-v2v.spec | 23 +- 5 files changed, 474 insertions(+), 3 deletions(-) create mode 100644 0033-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch create mode 100644 0034-Update-common-submodule.patch create mode 100644 1001-replaced-upstream-references.patch mode change 100755 => 100644 copy-patches.sh diff --git a/0033-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch b/0033-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch new file mode 100644 index 0000000..23a957e --- /dev/null +++ b/0033-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch @@ -0,0 +1,69 @@ +From e0f472c42409b157e32e0c8efd0af3a2bd02f0e7 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 28 Oct 2025 11:34:22 +0000 +Subject: [PATCH] convert: windows: Fix ESP conversion if C:\Windows\Temp has + alternate case + +We found a Windows guest which had the expected C:\Windows\Temp path, +but the actual name was TEMP rather than Temp. It's unclear if this +had been renamed, or if Windows can create this normally. In any +case, the unexpected casing caused this failure: + + virt-v2v: error: libguestfs error: mkdtemp: /Windows/Temp/ESP_XXXXXX: No such file or directory + +We have to use g#case_sensitive_path here since the directory is on +NTFS. + +I also removed the hard-coded "\Windows" in favour of %systemroot%, +and fixed the indentation. + +Fixes: https://issues.redhat.com/browse/RHEL-124569 +Reported-by: Ulhas Surse +(cherry picked from commit 277ddd1a9b84d9c1b1fa93ef9a2e7f52b68d7930) +--- + convert/convert_windows.ml | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml +index f416b3ad..b7a7727b 100644 +--- a/convert/convert_windows.ml ++++ b/convert/convert_windows.ml +@@ -961,21 +961,25 @@ let convert (g : G.guestfs) source inspect i_firmware + match i_firmware with + | Firmware.I_BIOS -> () + | I_UEFI esp_list -> +- let esp_temp_path = g#mkdtemp "/Windows/Temp/ESP_XXXXXX" in +- let uefi_arch = get_uefi_arch_suffix inspect.i_arch in ++ let esp_temp_path = ++ let temp = inspect.i_windows_systemroot ^ "/Temp" in ++ let mp = g#case_sensitive_path temp in ++ let template = mp ^ "/ESP_XXXXXX" in ++ g#mkdtemp template in ++ let uefi_arch = get_uefi_arch_suffix inspect.i_arch in + +- List.iter ( +- fun dev_path -> +- g#mount dev_path esp_temp_path; +- fix_win_uefi_bcd esp_temp_path; +- (match uefi_arch with +- | Some uefi_arch -> fix_win_uefi_fallback esp_temp_path uefi_arch +- | None -> () +- ); +- g#umount esp_temp_path; +- ) esp_list; ++ List.iter ( ++ fun dev_path -> ++ g#mount dev_path esp_temp_path; ++ fix_win_uefi_bcd esp_temp_path; ++ (match uefi_arch with ++ | Some uefi_arch -> fix_win_uefi_fallback esp_temp_path uefi_arch ++ | None -> () ++ ); ++ g#umount esp_temp_path; ++ ) esp_list; + +- g#rmdir esp_temp_path ++ g#rmdir esp_temp_path + in + + do_convert () diff --git a/0034-Update-common-submodule.patch b/0034-Update-common-submodule.patch new file mode 100644 index 0000000..791e27d --- /dev/null +++ b/0034-Update-common-submodule.patch @@ -0,0 +1,34 @@ +From 519ccf9d812093c0c54625d14f835652c07cf0dc Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 20 Sep 2025 17:20:25 +0100 +Subject: [PATCH] Update common submodule + + Richard W.M. Jones (2): + daemon, generator: Use power of 2 for initial size of Hashtbl.create + mlcustomize/inject_virtio_win.ml: Use viostor.inf instead of guestor + +Fixes: https://issues.redhat.com/browse/RHEL-128908 +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 5be8d552..54a5b4ce: +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index b26b14d3..114df064 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -310,8 +310,13 @@ and ddb_regedits inspect drv_name drv_pciid = + * one must add keys into the DriverDatabase. + *) + ++ let winarch = ++ match inspect.i_arch with ++ | "i386" -> "x86" | "x86_64" -> "amd64" ++ | _ -> assert false in ++ + let drv_inf = "guestor.inf" in +- let drv_inf_label = drv_inf ^ "_tmp" in ++ let drv_inf_label = sprintf "%s_%s_0000000000000000" drv_inf winarch in + let drv_config = "guestor_conf" in + + [ diff --git a/1001-replaced-upstream-references.patch b/1001-replaced-upstream-references.patch new file mode 100644 index 0000000..b5bc13e --- /dev/null +++ b/1001-replaced-upstream-references.patch @@ -0,0 +1,351 @@ +From 9bd7e17d0b34f939eab0c18cef7fd4bb74269c20 Mon Sep 17 00:00:00 2001 +From: Darren Archibald +Date: Tue, 9 Sep 2025 04:07:35 -0700 +Subject: [PATCH] replaced upstream references + +Signed-off-by: Darren Archibald +Signed-off-by: Akshata Konala +--- + po/Makefile.am | 2 +- + po/cs.po | 3 +-- + po/de.po | 3 +-- + po/es.po | 3 +-- + po/fi.po | 3 +-- + po/fr.po | 3 +-- + po/gu.po | 3 +-- + po/hi.po | 3 +-- + po/ja.po | 3 +-- + po/ka.po | 3 +-- + po/kn.po | 3 +-- + po/ml.po | 3 +-- + po/mr.po | 3 +-- + po/nl.po | 3 +-- + po/or.po | 3 +-- + po/pa.po | 3 +-- + po/pl.po | 3 +-- + po/si.po | 3 +-- + po/uk.po | 3 +-- + po/virt-v2v.pot | 3 +-- + podwrapper.pl.in | 4 ++-- + website/index.html.in | 6 +++--- + 22 files changed, 25 insertions(+), 44 deletions(-) + +diff --git a/po/Makefile.am b/po/Makefile.am +index 08d9dbe..61f472b 100644 +--- a/po/Makefile.am ++++ b/po/Makefile.am +@@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk + + DOMAIN = $(PACKAGE_NAME) + COPYRIGHT_HOLDER = Red Hat Inc. +-MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools ++MSGID_BUGS_ADDRESS = https://github.com/oracle/oracle-linux + + # Languages. + # Don't use LINGUAS (uppercase) as Gentoo defines it (RHBZ#804464). +diff --git a/po/cs.po b/po/cs.po +index 55c4fdc..5003e14 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -2,8 +2,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2023-04-08 18:20+0000\n" + "Last-Translator: Pavel Borecki \n" +diff --git a/po/de.po b/po/de.po +index e8d9053..835535e 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:48+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/es.po b/po/es.po +index 1a63337..8800235 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -10,8 +10,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-03-16 07:04+0000\n" + "Last-Translator: Alex Puchades \n" +diff --git a/po/fi.po b/po/fi.po +index 56f9917..b077010 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -6,8 +6,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 1.43.4\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2025-01-09 11:33+0000\n" + "Last-Translator: Ricky Tigg \n" +diff --git a/po/fr.po b/po/fr.po +index 2db1ae1..2ba25d0 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -10,8 +10,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2023-03-21 09:20+0000\n" + "Last-Translator: grimst \n" +diff --git a/po/gu.po b/po/gu.po +index 5b4e798..9c540cd 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/hi.po b/po/hi.po +index a3983ed..0364d75 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/ja.po b/po/ja.po +index 23d34f2..c14299e 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2017-02-24 07:33+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/ka.po b/po/ka.po +index 78ebee4..b116e86 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -6,8 +6,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 2.1.1\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2025-01-09 09:27+0000\n" + "Last-Translator: Weblate Translation Memory \n" +diff --git a/po/ml.po b/po/ml.po +index 7a3f071..7de8c16 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:50+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/mr.po b/po/mr.po +index 8222d63..7f55091 100644 +--- a/po/mr.po ++++ b/po/mr.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/nl.po b/po/nl.po +index 06df912..b25b908 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -9,8 +9,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/or.po b/po/or.po +index 2422cc3..92a2500 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/pa.po b/po/pa.po +index e2465b6..73a8db6 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -8,8 +8,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2015-02-21 10:52+0000\n" + "Last-Translator: Copied by Zanata \n" +diff --git a/po/pl.po b/po/pl.po +index 77f4651..16c7459 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -11,8 +11,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-02-27 18:15+0000\n" + "PO-Revision-Date: 2024-01-15 13:36+0000\n" + "Last-Translator: Weblate Translation Memory \n" +diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot +index 60bbf0c..ea2fb85 100644 +--- a/po/virt-v2v.pot ++++ b/po/virt-v2v.pot +@@ -7,8 +7,7 @@ + msgid "" + msgstr "" + "Project-Id-Version: virt-v2v 2.8.1\n" +-"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" +-"component=libguestfs&product=Virtualization+Tools\n" ++"Report-Msgid-Bugs-To: https://github.com/oracle/oracle-linux\n" + "POT-Creation-Date: 2025-06-26 16:05+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" +diff --git a/podwrapper.pl.in b/podwrapper.pl.in +index d7973fc..0a196f3 100755 +--- a/podwrapper.pl.in ++++ b/podwrapper.pl.in +@@ -432,10 +432,10 @@ my $reporting_bugs = + "=head1 BUGS + + To get a list of bugs against libguestfs, use this link: +-L ++L + + To report a new bug against libguestfs, use this link: +-L ++L + + When reporting a bug, please supply: + +diff --git a/website/index.html.in b/website/index.html.in +index f578523..e1e1592 100644 +--- a/website/index.html.in ++++ b/website/index.html.in +@@ -160,12 +160,12 @@ For testers: +

Bug reports

+ +

+-List of bugs in libguestfs and +-in Fedora packaging of libguestfs ++List of bugs in libguestfs and ++in Community packaging of libguestfs +

+ +

+-Enter a new bug report ++Enter a new bug report +

+ + +-- +2.31.1 + diff --git a/copy-patches.sh b/copy-patches.sh old mode 100755 new mode 100644 diff --git a/virt-v2v.spec b/virt-v2v.spec index b68179c..34144a6 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.8.1 -Release: 10%{?dist} +Release: 13.0.1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -59,6 +59,11 @@ Patch0029: 0029-convert-Detect-target-boot-device-for-Linux-guests.patch Patch0030: 0030-output-kubevirt-Add-bootOrder-to-Kubevirt-YAML.patch Patch0031: 0031-convert-Look-for-GRUB-signature-first-to-identify-bo.patch Patch0032: 0032-lib-types.ml-Fix-formatting-of-debug-message.patch +Patch0033: 0033-convert-windows-Fix-ESP-conversion-if-C-Windows-Temp.patch +Patch0034: 0034-Update-common-submodule.patch + +# Oracle patch +Patch1001: 1001-replaced-upstream-references.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -349,13 +354,25 @@ done %changelog -* Sep 25 2025 Richard W.M. Jones - 1:2.8.1-10 +* Thu Dec 18 2025 EL Errata - 2.8.1-13.0.1 +- Replaced bugzilla.oracle.com references [Orabug: 34202300] +- replaced upstream references [Orabug:34089586] + +* Mon Nov 17 2025 Richard W.M. Jones - 1:2.8.1-13 +- Fix pnputil driver store after conversion + resolves: RHEL-128908 + +* Wed Oct 29 2025 Richard W.M. Jones - 1:2.8.1-12 +- Fix ESP conversion if C:\Windows\Temp has alternate case + resolves: RHEL-124791 + +* Thu Sep 25 2025 Richard W.M. Jones - 1:2.8.1-10 - Fix setting boot order for Linux BIOS guests resolves: RHEL-108991 - Set boot order for guests in -o kubevirt output mode resolves: RHEL-110742 -* Aug 21 2025 Richard W.M. Jones - 1:2.8.1-9 +* Thu Aug 21 2025 Richard W.M. Jones - 1:2.8.1-9 - Rebase to virt-v2v 2.8.1 related: RHEL-81735 - Fix virt-v2v -v --install dnf5 error