Backport patch: "dnf copr enable" on "Asahi Fedora Linux Remix" guesses

Resolves: https://issues.redhat.com/browse/RHEL-56143
This commit is contained in:
Jan Kolarik 2024-12-16 11:13:22 +01:00
parent 32b466a0fd
commit bbd560e761
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,45 @@
From 275b858c8b90f880fe71c99bd07aeb76637a0926 Mon Sep 17 00:00:00 2001
From: Eric Curtin <ecurtin@redhat.com>
Date: Wed, 7 Jun 2023 20:04:25 +0100
Subject: [PATCH] "dnf copr enable" on "Asahi Fedora Linux Remix" guesses
epel..x86_64
Resolves https://issues.redhat.com/browse/RHEL-56143.
On Asahi Fedora Linux Remix, this can occur when doing a dnf copr
enable:
Repository 'epel-37-x86_64' does not exist in project '@asahi/mesa'
There are two bugs here, the code doesn't recongize this as a Fedora
distro and defaults to x86_64 when in this case it's actually an aarch64
system.
---
plugins/copr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/copr.py b/plugins/copr.py
index 16946b7..ae4f2e0 100644
--- a/plugins/copr.py
+++ b/plugins/copr.py
@@ -444,7 +444,7 @@ Bugzilla. In case of problems, contact the owner of this repository.
dist = linux_distribution()
# Get distribution architecture
distarch = self.base.conf.substitutions['basearch']
- if any([name in dist for name in ["Fedora", "Fedora Linux"]]):
+ if "Fedora" in dist[0]:
if "Rawhide" in dist:
chroot = ("fedora-rawhide-" + distarch)
# workaround for enabling repos in Rawhide when VERSION in os-release
@@ -470,7 +470,7 @@ Bugzilla. In case of problems, contact the owner of this repository.
else:
chroot = ("opensuse-leap-{0}-{1}".format(dist[1], distarch))
else:
- chroot = ("epel-%s-x86_64" % dist[1].split(".", 1)[0])
+ chroot = ("epel-{}-{}".format(dist[1].split(".", 1)[0], distarch if distarch else "x86_64"))
return chroot
def _download_repo(self, project_name, repo_filename):
--
2.47.1

View File

@ -34,7 +34,7 @@
Name: dnf-plugins-core
Version: 4.3.0
Release: 18%{?dist}
Release: 19%{?dist}
Summary: Core Plugins for DNF
License: GPLv2+
URL: https://github.com/rpm-software-management/dnf-plugins-core
@ -56,6 +56,7 @@ Patch14: 0014-needs-restarting-Add-microcode_ctl-to-a-reboot-list.patch
Patch18: 0018-system-upgrade-change-http-to-https-in-unit-file.patch
Patch19: 0019-reposync-Respect-norepopath-with-metadata-path.patch
Patch20: 0020-needs-restarting-Get-boot-time-from-systemd-UnitsLoa.patch
Patch21: 0021-dnf-copr-enable-on-Asahi-Fedora-Linux-Remix-guesses.patch
BuildArch: noarch
BuildRequires: cmake