From 71c66fbc37f310299767ccb681e80f4b019d4c44 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Tue, 18 Aug 2026 09:39:52 -0400 Subject: [PATCH] Revert OL modifications --- ...erator-Fix-description-of-xfs_growfs.patch | 0 ...enerator-Fix-description-of-xfs_info.patch | 0 1000-Add-Oracle-Linux-identifier.patch | 39 ------------------- libguestfs.spec | 15 ++----- 4 files changed, 4 insertions(+), 50 deletions(-) mode change 100755 => 100644 0006-generator-Fix-description-of-xfs_growfs.patch mode change 100755 => 100644 0007-generator-Fix-description-of-xfs_info.patch delete mode 100644 1000-Add-Oracle-Linux-identifier.patch diff --git a/0006-generator-Fix-description-of-xfs_growfs.patch b/0006-generator-Fix-description-of-xfs_growfs.patch old mode 100755 new mode 100644 diff --git a/0007-generator-Fix-description-of-xfs_info.patch b/0007-generator-Fix-description-of-xfs_info.patch old mode 100755 new mode 100644 diff --git a/1000-Add-Oracle-Linux-identifier.patch b/1000-Add-Oracle-Linux-identifier.patch deleted file mode 100644 index 2780691..0000000 --- a/1000-Add-Oracle-Linux-identifier.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 39e25217dccb4b49f2ab481f0b026f1498973647 Mon Sep 17 00:00:00 2001 -From: Darren Archibald -Date: Mon, 3 Oct 2022 09:55:14 -0700 -Subject: [PATCH] Add Oracle Linux identifier - -Signed-off-by: Darren Archibald ---- - daemon/inspect_fs_unix.ml | 1 + - m4/guestfs-appliance.m4 | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index d8dce60..ee89ff0 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -159,6 +159,7 @@ and distro_of_os_release_id = function - | "pardus" -> Some DISTRO_PARDUS - | "pld" -> Some DISTRO_PLD_LINUX - | "rhel" -> Some DISTRO_RHEL -+ | "ol" -> Some DISTRO_ORACLE_LINUX - | "rocky" -> Some DISTRO_ROCKY - | "sles" | "sled" -> Some DISTRO_SLES - | "ubuntu" -> Some DISTRO_UBUNTU -diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 -index 4e671d2..dc06d1a 100644 ---- a/m4/guestfs-appliance.m4 -+++ b/m4/guestfs-appliance.m4 -@@ -114,7 +114,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then - fi ) | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' - )" - AS_CASE([$DISTRO], -- [FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \ -+ [FEDORA | RHEL | OL | CENTOS | ALMALINUX | CLOUDLINUX \ - | ROCKY | VIRTUOZZO], - [DISTRO=REDHAT], - [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], --- -2.39.3 - diff --git a/libguestfs.spec b/libguestfs.spec index c667895..195d1bd 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.58.1 -Release: 9.0.1%{?dist} +Release: 9%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -112,8 +112,6 @@ Patch0035: 0035-tests-relabel-test-setfiles.py-Add-a-test-of-setfile.patch # For applying patches: BuildRequires: git -Patch1000: 1000-Add-Oracle-Linux-identifier.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -225,7 +223,9 @@ BuildRequires: attr BuildRequires: augeas-libs BuildRequires: bash BuildRequires: binutils +%if !0%{?rhel} BuildRequires: btrfs-progs +%endif BuildRequires: bzip2 BuildRequires: clevis-luks BuildRequires: coreutils @@ -541,7 +541,7 @@ guests. Install this package if you want libguestfs to be able to inspect non-Linux guests and display icons from them. The only reason this is a separate package is to avoid core libguestfs -having to depend on Perl. +having to depend on Perl. See https://bugzilla.redhat.com/1194158 %package bash-completion @@ -768,7 +768,6 @@ fi --disable-php \ --disable-ruby \ %endif - --with-extra-packages="btrfs-progs" \ $extra # 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the @@ -1122,12 +1121,6 @@ rm ocaml/html/.gitignore %changelog -* Mon Aug 17 2026 EL Errata - 1.58.1-9.0.1 -- Add btrfs-progs to the packages installed in the appliance [Orabug: 34137448] -- Replace upstream references from a description tag -- Fix build on Oracle Linux [Orabug: 29319324] -- Set DISTRO_ORACLE_LINUX correspeonding to ol - * Thu Aug 13 2026 Richard W.M. Jones - 1:1.58.1-9 - Add setfiles optional excludes parameter to libguestfs resolves: RHEL-239808