mlcustomize: Remove dnf --verbose option
resolves: RHEL-83200
This commit is contained in:
parent
40ec5a8baf
commit
9cb173104b
33
0009-Update-common-submodule.patch
Normal file
33
0009-Update-common-submodule.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From 28d6901c72cb956f1fb13c9b6dd50691f1ccfb49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
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
|
@ -7,7 +7,7 @@ set -e
|
|||||||
# ./copy-patches.sh
|
# ./copy-patches.sh
|
||||||
|
|
||||||
project=guestfs-tools
|
project=guestfs-tools
|
||||||
rhel_version=9.6
|
rhel_version=9.7
|
||||||
|
|
||||||
# Check we're in the right directory.
|
# Check we're in the right directory.
|
||||||
if [ ! -f $project.spec ]; then
|
if [ ! -f $project.spec ]; then
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
Summary: Tools to access and modify virtual machine disk images
|
Summary: Tools to access and modify virtual machine disk images
|
||||||
Name: guestfs-tools
|
Name: guestfs-tools
|
||||||
Version: 1.52.2
|
Version: 1.52.2
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||||
|
|
||||||
# Build only for architectures that have a kernel
|
# Build only for architectures that have a kernel
|
||||||
@ -56,6 +56,7 @@ Patch0005: 0005-builder-Replace-jansson-with-json-c.patch
|
|||||||
Patch0006: 0006-build-Remove-Jansson-dependency.patch
|
Patch0006: 0006-build-Remove-Jansson-dependency.patch
|
||||||
Patch0007: 0007-test-data-phony-fedora-Add-simple-static-bin-sh.patch
|
Patch0007: 0007-test-data-phony-fedora-Add-simple-static-bin-sh.patch
|
||||||
Patch0008: 0008-drivers-Handle-large-output-from-rpm-ql-command.patch
|
Patch0008: 0008-drivers-Handle-large-output-from-rpm-ql-command.patch
|
||||||
|
Patch0009: 0009-Update-common-submodule.patch
|
||||||
|
|
||||||
%if 0%{patches_touch_autotools}
|
%if 0%{patches_touch_autotools}
|
||||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||||
@ -413,6 +414,10 @@ end
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.52.2-4
|
||||||
|
- mlcustomize: Remove dnf --verbose option
|
||||||
|
resolves: RHEL-83200
|
||||||
|
|
||||||
* Tue Feb 25 2025 Richard W.M. Jones <rjones@redhat.com> - 1.52.2-3
|
* Tue Feb 25 2025 Richard W.M. Jones <rjones@redhat.com> - 1.52.2-3
|
||||||
- Fix virt-drivers fails on opensuse guest if kernel-source is installed
|
- Fix virt-drivers fails on opensuse guest if kernel-source is installed
|
||||||
resolves: RHEL-80214
|
resolves: RHEL-80214
|
||||||
|
Loading…
Reference in New Issue
Block a user