Compare commits

..

No commits in common. "a10s" and "a8-stream-rhel" have entirely different histories.

2 changed files with 41 additions and 11 deletions

View File

@ -2,17 +2,16 @@ actions:
- replace: - replace:
- target: "spec" - target: "spec"
find: | find: |
%if 0%{?rhel} if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
# No qemu-kvm on POWER (RHBZ#1946532). extra=
ExcludeArch: %{power64} else
%endif
replace: | replace: |
%if 0%{?rhel} if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
%if 0%{?almalinux} < 10 # AlmaLinux: avoid permission denied for yum/dnf cache
# No qemu-kvm on POWER (RHBZ#1946532). mkdir cachedir
ExcludeArch: %{power64} sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
%endif extra=--with-supermin-packager-config=$(pwd)/yum.conf
%endif else
count: 1 count: 1
- modify_release: - modify_release:
@ -23,4 +22,10 @@ actions:
- name: "Eduard Abdullin" - name: "Eduard Abdullin"
email: "eabdullin@almalinux.org" email: "eabdullin@almalinux.org"
line: line:
- "Enable building for ppc64le" - "Fix build for AlmaLinux"
- "Avoid permission denied for yum/dnf cache"
- add_files:
- type: "patch"
name: "1000-Add-AlmaLinux-detection.patch"
number: 1000

View File

@ -0,0 +1,25 @@
From 3b01a0e630c2e0ccc08b78544dcfd35e6a948b07 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Fri, 8 Apr 2022 16:09:38 +0000
Subject: [PATCH] Add AlmaLinux detection
---
m4/guestfs-appliance.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4
index b0a6ab4..66eef8a 100644
--- a/m4/guestfs-appliance.m4
+++ b/m4/guestfs-appliance.m4
@@ -105,7 +105,7 @@ AC_ARG_WITH([distro],
( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD
DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`"
AS_CASE([$DISTRO],
- [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT],
+ [FEDORA | RHEL | CENTOS | ALMALINUX],[DISTRO=REDHAT],
[OPENSUSE* | SLED | SLES],[DISTRO=SUSE],
[ARCH],[DISTRO=ARCHLINUX],
[OPENMANDRIVA],[DISTRO=OPENMANDRIVA])
--
2.27.0