Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.arch: Add support for s390x

Browse source 
This commit adds s390x to the list of supported architectures, to allow
users/developers to experiment with it.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/2536
This commit is contained in:
J. Neuschäfer 2025-05-20 11:39:33 +02:00 • committed by Oliver Smith
parent 0d672a7dc7
commit 5c03cdd37f
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pmb/core/arch.py
View file

@ -87,6 +87,7 @@ class Arch(enum.Enum):
Arch.x86_64, Arch.x86_64,
Arch.x86, Arch.x86,
Arch.riscv64, Arch.riscv64,
Arch.s390x,
Arch.ppc64le, Arch.ppc64le,
Arch.native(), Arch.native(),
} }

1
test/core/test_arch.py
View file

@ -32,6 +32,7 @@ def test_valid_arches():
assert Arch.armv7 in Arch.supported() assert Arch.armv7 in Arch.supported()
assert Arch.riscv64 in Arch.supported() assert Arch.riscv64 in Arch.supported()
assert Arch.ppc64le in Arch.supported() assert Arch.ppc64le in Arch.supported()
assert Arch.s390x in Arch.supported()
# kernel arch # kernel arch
assert Arch.x86.kernel() == "x86" assert Arch.x86.kernel() == "x86"

2
test/core/test_chroot.py
View file

@ -47,7 +47,7 @@ def test_invalid_chroots(pmb_args):
Chroot(ChrootType.BUILDROOT, "BAD_ARCH") Chroot(ChrootType.BUILDROOT, "BAD_ARCH")
assert ( assert (
str(excinfo.value) str(excinfo.value)
== "Invalid architecture: 'BAD_ARCH', expected something like: aarch64, armhf, armv7, ppc64le, riscv64, x86, x86_64" == "Invalid architecture: 'BAD_ARCH', expected something like: aarch64, armhf, armv7, ppc64le, riscv64, s390x, x86, x86_64"
) )
with pytest.raises(ValueError) as excinfo: with pytest.raises(ValueError) as excinfo: