From 8deda3ce35a78d2a9b7f7dea46cb7cd2f74b44f7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Sep 2025 12:02:54 +0000 Subject: [PATCH] import CS guestfs-tools-1.52.2-6.el9 --- SOURCES/0009-Update-common-submodule.patch | 33 ++++++++++++ ...pdate-link-to-templates-to-use-https.patch | 23 +++++++++ SOURCES/0011-Update-common-submodule.patch | 51 +++++++++++++++++++ SOURCES/copy-patches.sh | 2 +- SPECS/guestfs-tools.spec | 19 ++++++- 5 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 SOURCES/0009-Update-common-submodule.patch create mode 100644 SOURCES/0010-builder-Update-link-to-templates-to-use-https.patch create mode 100644 SOURCES/0011-Update-common-submodule.patch diff --git a/SOURCES/0009-Update-common-submodule.patch b/SOURCES/0009-Update-common-submodule.patch new file mode 100644 index 0000000..4877f43 --- /dev/null +++ b/SOURCES/0009-Update-common-submodule.patch @@ -0,0 +1,33 @@ +From 28d6901c72cb956f1fb13c9b6dd50691f1ccfb49 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 11 Mar 2025 11:41:34 +0000 +Subject: [PATCH] Update common submodule + + Richard W.M. Jones (1): + mlcustomize: Remove dnf --verbose option + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2351282 + +Cherry picked from commit bb3d0e5bc5f08300ce36bcccf91d02d9d7f32343 +and modified to only include dnf --verbose fix. +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common ee88791e1..31d279a79: +diff --git a/common/mlcustomize/guest_packages.ml b/common/mlcustomize/guest_packages.ml +index 2602fc718..96614b6cc 100644 +--- a/common/mlcustomize/guest_packages.ml ++++ b/common/mlcustomize/guest_packages.ml +@@ -61,10 +61,7 @@ let install_command packages package_management = + apt-get $apt_opts update + apt-get $apt_opts install %s + " quoted_args +- | "dnf" -> +- sprintf "dnf%s -y install %s" +- (if verbose () then " --verbose" else "") +- quoted_args ++ | "dnf" -> sprintf "dnf -y install %s" quoted_args + | "pisi" -> sprintf "pisi it %s" quoted_args + | "pacman" -> sprintf "pacman -S --noconfirm %s" quoted_args + | "urpmi" -> sprintf "urpmi %s" quoted_args diff --git a/SOURCES/0010-builder-Update-link-to-templates-to-use-https.patch b/SOURCES/0010-builder-Update-link-to-templates-to-use-https.patch new file mode 100644 index 0000000..5a06966 --- /dev/null +++ b/SOURCES/0010-builder-Update-link-to-templates-to-use-https.patch @@ -0,0 +1,23 @@ +From a0fbbc98f5fb069bcbf15a5a8ec51e4c778a2bd5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 3 Jun 2025 08:29:57 +0100 +Subject: [PATCH] builder: Update link to templates to use https + +Fixes: https://issues.redhat.com/browse/RHEL-94873 +Reported-by: Xiang Hua Chen +(cherry picked from commit 5a2458f38d40e5c6f3eceb8e7de162724ff9e374) +--- + builder/libguestfs.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in +index 8d8feab75..08b6a6234 100644 +--- a/builder/libguestfs.conf.in ++++ b/builder/libguestfs.conf.in +@@ -1,5 +1,5 @@ + [libguestfs.org] +-uri=http://builder.libguestfs.org/index.asc ++uri=https://builder.libguestfs.org/index.asc + gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/libguestfs.gpg + + [archive.libguestfs.org] diff --git a/SOURCES/0011-Update-common-submodule.patch b/SOURCES/0011-Update-common-submodule.patch new file mode 100644 index 0000000..21e1216 --- /dev/null +++ b/SOURCES/0011-Update-common-submodule.patch @@ -0,0 +1,51 @@ +From 6fc2e63a599311eeff6f02588b9a8f7851141483 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 15 Aug 2025 16:58:08 +0100 +Subject: [PATCH] Update common submodule + +Pick up the commit below, to ensure that the firstboot.bat file we +inject into Windows is the same as the one from virt-v2v. + + commit b40e534fefb74af32bd496904e44ce9bca1a7b34 + Author: Vadim Rozenfeld + Date: Thu Jul 10 10:48:04 2025 +1000 + + Modify the firstboot script to check the scripts + execution return status + + Related: https://issues.redhat.com/browse/RHEL-100682 + + Signed-off-by: Vadim Rozenfeld + +Fixes: https://issues.redhat.com/browse/RHEL-109521 +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 31d279a79..6a822ba7b: +diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml +index 52e76401e..aa3ea98ad 100644 +--- a/common/mlcustomize/firstboot.ml ++++ b/common/mlcustomize/firstboot.ml +@@ -305,13 +305,19 @@ if not exist \"%%scripts_done%%\" ( + :: Pick the next script to run. + for %%%%f in (\"%%scripts%%\"\\*.bat) do ( + echo running \"%%%%f\" +- move \"%%%%f\" \"%%scripts_done%%\" +- pushd \"%%scripts_done%%\" ++ pushd \"%%scripts%%\" + call \"%%%%~nf\" + set elvl=!errorlevel! + echo .... exit code !elvl! + popd + ++ if !elvl! NEQ 249 ( ++ echo Script succeeded, moving to scripts-done ++ move \"%%%%f\" \"%%scripts_done%%\" ++ ) else ( ++ echo Script failed, will retry on next boot ++ ) ++ + :: Reboot the computer. This is necessary to free any locked + :: files which may prevent later scripts from running. + shutdown /r /t 0 /y diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh index 7b31965..f2d901d 100755 --- a/SOURCES/copy-patches.sh +++ b/SOURCES/copy-patches.sh @@ -7,7 +7,7 @@ set -e # ./copy-patches.sh project=guestfs-tools -rhel_version=9.6 +rhel_version=9.7 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/SPECS/guestfs-tools.spec b/SPECS/guestfs-tools.spec index 106b147..317e619 100644 --- a/SPECS/guestfs-tools.spec +++ b/SPECS/guestfs-tools.spec @@ -19,7 +19,7 @@ Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools Version: 1.52.2 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later # Build only for architectures that have a kernel @@ -45,7 +45,7 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are maintained in the following repository: -# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.6 +# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.7 # Patches. Patch0001: 0001-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -56,6 +56,9 @@ Patch0005: 0005-builder-Replace-jansson-with-json-c.patch Patch0006: 0006-build-Remove-Jansson-dependency.patch Patch0007: 0007-test-data-phony-fedora-Add-simple-static-bin-sh.patch Patch0008: 0008-drivers-Handle-large-output-from-rpm-ql-command.patch +Patch0009: 0009-Update-common-submodule.patch +Patch0010: 0010-builder-Update-link-to-templates-to-use-https.patch +Patch0011: 0011-Update-common-submodule.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -413,6 +416,18 @@ end %changelog +* Fri Aug 15 2025 Richard W.M. Jones - 1.52.2-6 +- Update guestfs-tools firstboot.bat to match virt-v2v + resolves: RHEL-109521 + +* Tue Jun 10 2025 Richard W.M. Jones - 1.52.2-5 +- builder: Update link to templates to use https + resolves: RHEL-94874 + +* Thu Mar 13 2025 Richard W.M. Jones - 1.52.2-4 +- mlcustomize: Remove dnf --verbose option + resolves: RHEL-83200 + * Tue Feb 25 2025 Richard W.M. Jones - 1.52.2-3 - Fix virt-drivers fails on opensuse guest if kernel-source is installed resolves: RHEL-80214