config.yaml

@@ -2,33 +2,16 @@ actions:
   - replace:
       - target: "spec"
         find: |
-              if ping -c 3 -w 20 8.8.8.8 && curl http://libguestfs.org -o /dev/null; then
+              if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
                 extra=
               else
-                mkdir cachedir repo
-                  # -n 1 because of RHBZ#980502.
-                  find /var/cache/{dnf,yum} -type f -name '*.rpm' -print0 | \
-                    xargs -0 -n 1 cp -t repo
-                  createrepo_c repo
-                  sed -e "s|@PWD@|$(pwd)|" %{SOURCE6} > yum.conf
-                  extra=--with-supermin-packager-config=$(pwd)/yum.conf
-                fi
         replace: |
-              # AlmaLinux: avoid permission denied for yum/dnf cache
-              mkdir cachedir
-              sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
-              extra=--with-supermin-packager-config=$(pwd)/yum.conf
-        count: 1
-
-      - target: "spec"
-        find: |
-              # No qemu-kvm on POWER (RHBZ#1946532).
-              ExcludeArch: %{power64}
-        replace: |
-              %if 0%{?almalinux} < 9
-              # No qemu-kvm on POWER (RHBZ#1946532).
-              ExcludeArch: %{power64}
-              %endif
+              if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
+                # AlmaLinux: avoid permission denied for yum/dnf cache
+                mkdir cachedir
+                sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
+                extra=--with-supermin-packager-config=$(pwd)/yum.conf
+              else
         count: 1
 
   - modify_release:
@@ -41,4 +24,8 @@ actions:
         line:
           - "Fix build for AlmaLinux"
           - "Avoid permission denied for yum/dnf cache"
-          - "Enable building for ppc64le"
+
+  - add_files:
+      - type: "patch"
+        name: "1000-Add-AlmaLinux-detection.patch"
+        number: 1000

files/1000-Add-AlmaLinux-detection.patch

@@ -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
+