From 6cff1cb106a811e90039af75ed923de48178ec2e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Jun 26 2025 19:19:37 +0000 Subject: [PATCH 1/2] distrepos: support "x86_64_v2" arch This fixes a KeyError when trying to make a distrepo for the arch "x86_64_v2". --- diff --git a/builder/kojid b/builder/kojid index b79f1db..57b7a40 100755 --- a/builder/kojid +++ b/builder/kojid @@ -6219,7 +6219,8 @@ class createDistRepoTask(BaseTaskHandler): archmap = {'s390x': 's390', 'ppc64': 'ppc', 'x86_64': 'i686'} compat = {"i386": ("athlon", "i686", "i586", "i486", "i386", "noarch"), - "x86_64": ("amd64", "ia32e", "x86_64", "noarch"), + "x86_64": ("amd64", "ia32e", "x86_64", "x86_64_v2", "noarch"), + "x86_64_v2": ("amd64", "ia32e", "x86_64", "x86_64_v2", "noarch"), "ia64": ("ia64", "noarch"), "ppc": ("ppc", "noarch"), "ppc64": ("ppc64p7", "ppc64pseries", "ppc64iseries", "ppc64", "noarch"), From 10b85cd77b5a1ea7a59939ef6e6e4bc67e50370b Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Jul 30 2025 14:37:22 +0000 Subject: [PATCH 2/2] Do not list x86_64_v2 as a compatible arch for x86_64 --- diff --git a/builder/kojid b/builder/kojid index 57b7a40..8a60ddc 100755 --- a/builder/kojid +++ b/builder/kojid @@ -6219,7 +6219,7 @@ class createDistRepoTask(BaseTaskHandler): archmap = {'s390x': 's390', 'ppc64': 'ppc', 'x86_64': 'i686'} compat = {"i386": ("athlon", "i686", "i586", "i486", "i386", "noarch"), - "x86_64": ("amd64", "ia32e", "x86_64", "x86_64_v2", "noarch"), + "x86_64": ("amd64", "ia32e", "x86_64", "noarch"), "x86_64_v2": ("amd64", "ia32e", "x86_64", "x86_64_v2", "noarch"), "ia64": ("ia64", "noarch"), "ppc": ("ppc", "noarch"),