Update alpine_to_hostspec mappings (!1812)
The important part about this patch is the change for armhf, which adjusts the hostspec to the one used by Alpine. Fixes a part of postmarketOS/pmaports#363
This commit is contained in:
parent
1e00ce49b9
commit
f853c0da20
|
@ -92,8 +92,13 @@ def alpine_to_hostspec(arch):
|
||||||
"""
|
"""
|
||||||
mapping = {
|
mapping = {
|
||||||
"aarch64": "aarch64-alpine-linux-musl",
|
"aarch64": "aarch64-alpine-linux-musl",
|
||||||
"armhf": "armv6-alpine-linux-muslgnueabihf",
|
"armel": "armv5-alpine-linux-musleabi",
|
||||||
|
"armhf": "armv6-alpine-linux-musleabihf",
|
||||||
"armv7": "armv7-alpine-linux-musleabihf",
|
"armv7": "armv7-alpine-linux-musleabihf",
|
||||||
|
"mips": "mips-alpine-linux-musl",
|
||||||
|
"mips64": "mips64-alpine-linux-musl",
|
||||||
|
"mipsel": "mipsel-alpine-linux-musl",
|
||||||
|
"mips64el": "mips64el-alpine-linux-musl",
|
||||||
"ppc": "powerpc-alpine-linux-musl",
|
"ppc": "powerpc-alpine-linux-musl",
|
||||||
"ppc64": "powerpc64-alpine-linux-musl",
|
"ppc64": "powerpc64-alpine-linux-musl",
|
||||||
"ppc64le": "powerpc64le-alpine-linux-musl",
|
"ppc64le": "powerpc64le-alpine-linux-musl",
|
||||||
|
|
|
@ -272,8 +272,8 @@ def test_run_abuild(args, monkeypatch):
|
||||||
# cross=native
|
# cross=native
|
||||||
env = {"CARCH": "armhf",
|
env = {"CARCH": "armhf",
|
||||||
"SUDO_APK": "abuild-apk --no-progress",
|
"SUDO_APK": "abuild-apk --no-progress",
|
||||||
"CROSS_COMPILE": "armv6-alpine-linux-muslgnueabihf-",
|
"CROSS_COMPILE": "armv6-alpine-linux-musleabihf-",
|
||||||
"CC": "armv6-alpine-linux-muslgnueabihf-gcc"}
|
"CC": "armv6-alpine-linux-musleabihf-gcc"}
|
||||||
cmd = ["abuild", "-D", "postmarketOS", "-d"]
|
cmd = ["abuild", "-D", "postmarketOS", "-d"]
|
||||||
assert func(args, apkbuild, "armhf", cross="native") == (output, cmd, env)
|
assert func(args, apkbuild, "armhf", cross="native") == (output, cmd, env)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue