Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-10-15 09:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'variants-wg/amd64v3'

Browse Source
This commit is contained in:
Paride Legovini 2025-09-30 23:38:34 +02:00
commit d9a0606519
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
britney.conf
View File

@ -24,7 +24,7 @@ STATE_DIR = data/%(SERIES)/state
# List of architectures that Britney should consider. # List of architectures that Britney should consider.
# - defaults to the value in testing's Release file (if it is present). # - defaults to the value in testing's Release file (if it is present).
# - Required for the legacy layout. # - 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 # if you're not in this list, arch: all packages are allowed to break on you
NOBREAKALL_ARCHES = amd64 NOBREAKALL_ARCHES = amd64
@ -39,7 +39,7 @@ HAS_ARCH_ALL_BUILDDS = no
OUTOFSYNC_ARCHES = OUTOFSYNC_ARCHES =
# if you're in this list, your uninstallability count may increase # 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 # if you're in this list, you are a new architecture
NEW_ARCHES = NEW_ARCHES =

5
britney2/inputs/suiteloader.py
View File

@ -382,6 +382,11 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader):
provides = [] provides = []
raw_arch = intern(get_field('Architecture')) 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 if raw_arch not in {'all', arch}: # pragma: no cover
raise AssertionError("%s has wrong architecture (%s) - should be either %s or all" % ( raise AssertionError("%s has wrong architecture (%s) - should be either %s or all" % (
str(pkg_id), raw_arch, arch)) str(pkg_id), raw_arch, arch))