From 3f606198df9092377acfe2550d54ee370110a900 Mon Sep 17 00:00:00 2001 From: Pro-pra Date: Fri, 24 Oct 2025 15:26:02 +0900 Subject: [PATCH 1/2] change order build arch for Rosa platform --- abf.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/abf.py b/abf.py index 9ab4e8d..d1a21ec 100755 --- a/abf.py +++ b/abf.py @@ -1412,20 +1412,23 @@ def auto_resolve(): exit(1) arches.append(a) else: - try_arches = ['i586','i686','x86_64'] + try_arches = ['x86_64', 'aarch64'] # rosa2014.1, rosa2016.1 etc. (Rosa Fresh), but not e.g. rosa-server75 (Rosa-RHEL) if str(build_repositories[0]).find("rosa2019.0") >= 0 or str(build_repositories[0]).find("rosa2016.1") >= 0: - try_arches = ['i586', 'x86_64'] + try_arches = ['x86_64','i586'] if str(build_repositories[0]).find("rosa2019.05") >= 0: - try_arches = ['i686', 'x86_64'] + try_arches = ['x86_64', 'i686'] - if str(build_repositories[0]).find("rosa2021.1") >= 0 or str(build_repositories[0]).find("rosa13") >= 0: - try_arches = ['i686', 'x86_64', 'aarch64', 'riscv64', 'loongarch64'] + if str(build_repositories[0]).find("rosa2021.1"): + try_arches = ['x86_64', 'aarch64', 'i686'] + + if str(build_repositories[0]).find("rosa2023.1") >= 0 or str(build_repositories[0]).find("rosa13") >= 0: + try_arches = ['x86_64', 'aarch64', 'i686', 'riscv64', 'loongarch64'] if str(build_repositories[0]).find("rosa2021.15") >= 0: - try_arches = ['i686', 'x86_64', 'aarch64'] + try_arches = ['x86_64', 'aarch64', 'i686'] if str(build_repositories[0]).find("openmandriva") >= 0 or str(build_repositories[0]).find("4.2") >= 0: try_arches = ['x86_64', 'znver1', 'aarch64'] From d0a77fc183daab0b704f358d257063565fcd0b7f Mon Sep 17 00:00:00 2001 From: Pro-pra Date: Fri, 24 Oct 2025 15:27:56 +0900 Subject: [PATCH 2/2] add compare condition --- abf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abf.py b/abf.py index d1a21ec..051a9fd 100755 --- a/abf.py +++ b/abf.py @@ -1421,7 +1421,7 @@ def auto_resolve(): if str(build_repositories[0]).find("rosa2019.05") >= 0: try_arches = ['x86_64', 'i686'] - if str(build_repositories[0]).find("rosa2021.1"): + if str(build_repositories[0]).find("rosa2021.1") >= 0: try_arches = ['x86_64', 'aarch64', 'i686'] if str(build_repositories[0]).find("rosa2023.1") >= 0 or str(build_repositories[0]).find("rosa13") >= 0: