From a8d3ef2ca1966d63e1bf9ea15e5082827a75aadd Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Tue, 13 Mar 2018 14:46:49 +0000
Subject: [PATCH] tools: Clarify the supported architectures

Most of the tools packages are not usable on s390x so
explicitly list them.

Also removed arm64 from mkimage-gcp as GCP does not
support arm machines and fixed a  minor inconsistency
the way the architecture was specified in mkimage-raw-bios.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/mkimage-dynamic-vhd/build.yml | 3 +++
 tools/mkimage-gcp/build.yml         | 2 ++
 tools/mkimage-iso-efi/build.yml     | 3 +++
 tools/mkimage-qcow2-efi/build.yml   | 3 +++
 tools/mkimage-raw-bios/build.yml    | 3 ++-
 tools/mkimage-raw-efi/build.yml     | 3 +++
 tools/mkimage-vhd/build.yml         | 3 +++
 tools/mkimage-vmdk/build.yml        | 3 +++
 8 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/tools/mkimage-dynamic-vhd/build.yml b/tools/mkimage-dynamic-vhd/build.yml
index 5fef466bf..8a606e6af 100644
--- a/tools/mkimage-dynamic-vhd/build.yml
+++ b/tools/mkimage-dynamic-vhd/build.yml
@@ -1 +1,4 @@
 image: mkimage-dynamic-vhd
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-gcp/build.yml b/tools/mkimage-gcp/build.yml
index 29e878945..b0e0a6a85 100644
--- a/tools/mkimage-gcp/build.yml
+++ b/tools/mkimage-gcp/build.yml
@@ -1 +1,3 @@
 image: mkimage-gcp
+arches:
+  - amd64
diff --git a/tools/mkimage-iso-efi/build.yml b/tools/mkimage-iso-efi/build.yml
index 1ea72881e..f9cc476ea 100644
--- a/tools/mkimage-iso-efi/build.yml
+++ b/tools/mkimage-iso-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-iso-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-qcow2-efi/build.yml b/tools/mkimage-qcow2-efi/build.yml
index 555b2859e..0049392be 100644
--- a/tools/mkimage-qcow2-efi/build.yml
+++ b/tools/mkimage-qcow2-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-qcow2-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-raw-bios/build.yml b/tools/mkimage-raw-bios/build.yml
index 54126ac8e..0eedc8d0a 100644
--- a/tools/mkimage-raw-bios/build.yml
+++ b/tools/mkimage-raw-bios/build.yml
@@ -1,2 +1,3 @@
 image: mkimage-raw-bios
-arches: ["amd64"]
+arches:
+  - amd64
diff --git a/tools/mkimage-raw-efi/build.yml b/tools/mkimage-raw-efi/build.yml
index 5647b2574..e71272378 100644
--- a/tools/mkimage-raw-efi/build.yml
+++ b/tools/mkimage-raw-efi/build.yml
@@ -1,2 +1,5 @@
 image: mkimage-raw-efi
 network: true
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-vhd/build.yml b/tools/mkimage-vhd/build.yml
index 8b00b4fda..a516f4bf3 100644
--- a/tools/mkimage-vhd/build.yml
+++ b/tools/mkimage-vhd/build.yml
@@ -1 +1,4 @@
 image: mkimage-vhd
+arches:
+  - amd64
+  - arm64
diff --git a/tools/mkimage-vmdk/build.yml b/tools/mkimage-vmdk/build.yml
index cfad11d0b..b55510a50 100644
--- a/tools/mkimage-vmdk/build.yml
+++ b/tools/mkimage-vmdk/build.yml
@@ -1 +1,4 @@
 image: mkimage-vmdk
+arches:
+  - amd64
+  - arm64