From 15a04b97815ed7c6bfea19c7383b93579186eafd Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 18 Jun 2025 09:03:06 +0200 Subject: [PATCH 1/2] Add support for the amd64v3 variant --- britney.conf | 2 +- britney2/inputs/suiteloader.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/britney.conf b/britney.conf index 4eb745f..0a2ec6b 100644 --- a/britney.conf +++ b/britney.conf @@ -24,7 +24,7 @@ STATE_DIR = data/%(SERIES)/state # List of architectures that Britney should consider. # - defaults to the value in testing's Release file (if it is present). # - Required for the legacy layout. -ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el riscv64 +ARCHITECTURES = amd64 amd64v3 arm64 armhf i386 powerpc ppc64el riscv64 # if you're not in this list, arch: all packages are allowed to break on you NOBREAKALL_ARCHES = amd64 diff --git a/britney2/inputs/suiteloader.py b/britney2/inputs/suiteloader.py index 964f239..5fc9332 100644 --- a/britney2/inputs/suiteloader.py +++ b/britney2/inputs/suiteloader.py @@ -382,6 +382,11 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader): provides = [] raw_arch = intern(get_field('Architecture')) + # FIXME: Make this configurable. + # If a base architecture is used in an architecture variant package file, promote + # it to the variant architecture. + if arch == "amd64v3" and raw_arch == "amd64": + raw_arch = "amd64v3" if raw_arch not in {'all', arch}: # pragma: no cover raise AssertionError("%s has wrong architecture (%s) - should be either %s or all" % ( str(pkg_id), raw_arch, arch)) From 6927aa29c32d6880c051b41608bd2be5f55b771a Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 30 Sep 2025 12:07:57 +1300 Subject: [PATCH 2/2] add amd64v3 to BREAK_ARCHES --- britney.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/britney.conf b/britney.conf index 0a2ec6b..7e88555 100644 --- a/britney.conf +++ b/britney.conf @@ -39,7 +39,7 @@ HAS_ARCH_ALL_BUILDDS = no OUTOFSYNC_ARCHES = # if you're in this list, your uninstallability count may increase -BREAK_ARCHES = +BREAK_ARCHES = amd64v3 # if you're in this list, you are a new architecture NEW_ARCHES =