From f1855b9376c8b711905e8640bd864c1d6ba3c5f3 Mon Sep 17 00:00:00 2001
From: Lachlan Mackenzie <lachlan.mackenzie@codethink.co.uk>
Date: Thu, 10 Jan 2019 17:23:44 +0000
Subject: Fix architectures to be consistent with buildstream list

* This fixes the architecture list for changes in buildstream.
---
 project.conf | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'project.conf')

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}"
-- 
cgit v1.2.1