diff --git a/0034-Update-common-submodule.patch b/0034-Update-common-submodule.patch new file mode 100644 index 0000000..f36532d --- /dev/null +++ b/0034-Update-common-submodule.patch @@ -0,0 +1,31 @@ +From b9259a577edf5532d936af491afd8789e5f7d874 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 11 Mar 2025 11:43:05 +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 97b73320fe8f65e48c514064e4cb1acffa8e1573) +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 18310179..57c2b3f0: +diff --git a/common/mlcustomize/guest_packages.ml b/common/mlcustomize/guest_packages.ml +index 2602fc71..96614b6c 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/copy-patches.sh b/copy-patches.sh index bca1935..8b76a26 100755 --- a/copy-patches.sh +++ b/copy-patches.sh @@ -7,7 +7,7 @@ set -e # ./copy-patches.sh project=virt-v2v -rhel_version=9.6 +rhel_version=9.7 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/virt-v2v.spec b/virt-v2v.spec index 6b5223e..8b62b6b 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -61,6 +61,7 @@ Patch0030: 0030-Update-common-submodule.patch Patch0031: 0031-convert-Use-yum-apt-.-for-package-removals-not-rpm-d.patch Patch0032: 0032-test-data-phony-fedora-Add-simple-static-bin-sh.patch Patch0033: 0033-convert-Handle-large-output-from-rpm-ql-command.patch +Patch0034: 0034-Update-common-submodule.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -362,6 +363,10 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check %changelog +* Thu Mar 13 2025 Richard W.M. Jones - 1:2.7.1-6 +- mlcustomize: Remove dnf --verbose option + resolves: RHEL-83289 + * Tue Feb 25 2025 Richard W.M. Jones - 1:2.7.1-5 - Rebase to upstream development version 2.7.1 resolves: RHEL-56813