rpms/libguestfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL changes

Browse Source
This commit is contained in:
eabdullin 2025-05-06 16:35:18 +03:00
parent 5d2b6dccb1
commit 48070c5d69
3 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SOURCES/1000-Add-Oracle-Linux-identifier.patch
View File

@ -1,39 +0,0 @@
From 39e25217dccb4b49f2ab481f0b026f1498973647 Mon Sep 17 00:00:00 2001
From: Darren Archibald <darren.archibald@oracle.com>
Date: Mon, 3 Oct 2022 09:55:14 -0700
Subject: [PATCH] Add Oracle Linux identifier
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
---
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

0
SOURCES/copy-patches.sh Normal file → Executable file
View File

15
SPECS/libguestfs.spec
View File

@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.50.2
Release: 4.0.1%{?dist}
Release: 4%{?dist}
License: LGPLv2+
# Build only for architectures that have a kernel
@ -142,8 +142,6 @@ Patch0048: 0048-daemon-inspect-Resolve-Ubuntu-22-dev-disk-by-id-dm-u.patch
Patch0049: 0049-daemon-fstrim.c-Issue-sync_disks-after-fstrim.patch
Patch0050: 0050-daemon-fstrim.c-Run-the-fstrim-command-twice.patch
Patch1000: 1000-Add-Oracle-Linux-identifier.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
@ -258,7 +256,9 @@ BuildRequires: attr
BuildRequires: augeas-libs
BuildRequires: bash
BuildRequires: binutils
%if !0%{?rhel}
BuildRequires: btrfs-progs
%endif
BuildRequires: bzip2
BuildRequires: clevis-luks
BuildRequires: coreutils
@ -589,7 +589,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
@ -808,7 +808,6 @@ fi
%endif
--without-java \
--disable-erlang \
--with-extra-packages="btrfs-progs" \
$extra
# 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the
@ -1158,12 +1157,6 @@ rm ocaml/html/.gitignore
%changelog
* Sun May 04 2025 EL Errata <el-errata_ww@oracle.com> - 1.50.2-4.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
* Wed Apr 30 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.50.2-4
- Run the fstrim command twice to workaround RHEL 9.5 kernel trimming bug
resolves: RHEL-89045