diff options
author | Lachlan Mackenzie <lachlan.mackenzie@codethink.co.uk> | 2019-01-10 17:23:44 +0000 |
---|---|---|
committer | Lachlan Mackenzie <lachlan.mackenzie@codethink.co.uk> | 2019-01-10 17:31:11 +0000 |
commit | fa0d4dc58d7aa405c8981c4f33a37f6c871edc86 (patch) | |
tree | 344d14f8b8a4fbe914291522fd498c1595efae63 | |
parent | 6c1e98e3953f6771694a85d118c55d5d5de14500 (diff) | |
download | definitions-fa0d4dc58d7aa405c8981c4f33a37f6c871edc86.tar.gz |
Fix architectures to be consistent with buildstream list
-rw-r--r-- | project.conf | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/project.conf b/project.conf index d2674f7c..314efc70 100644 --- a/project.conf +++ b/project.conf @@ -28,8 +28,7 @@ options: type: arch variable: build_arch values: [ - armv5l, armv7b, armv7l, armv7lhf, armv8l64, armv8b64, mips64b, mips64l, - mips32b, mips32l, ppc64b, ppc64l, x86_32, x86_64 + armv8l, armv8b, ppc64, ppc64le, x86_32, x86_64 ] arch: @@ -45,8 +44,7 @@ options: type: arch variable: arch values: [ - armv5l, armv7b, armv7l, armv7lhf, armv8l64, armv8b64, mips64b, mips64l, - mips32b, mips32l, ppc64b, ppc64l, x86_32, x86_64 + armv8l, armv8b, ppc64, ppc64le, x86_32, x86_64 ] variables: @@ -56,25 +54,13 @@ variables: (?): - arch == "x86_32": cpu: i686 - - arch in ["armv5l", "armv7b", "armv7l", "armv7lhf"]: - cpu: "%{arch}" - abi: gnueabi - - arch == "armv8l64": + - arch == "armv8l": cpu: aarch64 - - arch == "armv8b64": + - arch == "armv8b": cpu: aarch64_be - - arch == "mips64b": - cpu: mips64 - abi: gnuabi64 - - arch == "mips64l": - cpu: mips64el - - arch == "mips32b": - cpu: mips - - arch == "mips32l": - cpu: mipsel - - arch == "ppc64b": + - arch == "ppc64": cpu: powerpc64 - - arch == "ppc64l": + - arch == "ppc64le": cpu: powerpc64le target-stage1: "%{cpu}-bootstrap-linux-%{abi}" |