config.yaml

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

files/1000-Add-AlmaLinux-detection.patch

@@ -1,25 +0,0 @@
-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
-