From 4591410607d4d6a36ba72fa4cae3691eba24bdfb Mon Sep 17 00:00:00 2001
From: Alice Frosi <alice@linux.vnet.ibm.comx>
Date: Fri, 3 Nov 2017 17:11:07 +0100
Subject: [PATCH] Add s390x support for linuxkit docker images

Add support for s390 architecture for linuxkit/alpine and the
other docker images in tools and pkg.

Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com>
---
 tools/alpine/Makefile         | 4 ++++
 tools/alpine/packages         | 2 --
 tools/alpine/packages.aarch64 | 2 ++
 tools/alpine/packages.s390x   | 1 +
 tools/alpine/packages.x86_64  | 2 ++
 tools/alpine/push-manifest.sh | 5 +++++
 6 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 tools/alpine/packages.s390x

diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile
index 675191d98..8b62087b2 100644
--- a/tools/alpine/Makefile
+++ b/tools/alpine/Makefile
@@ -19,6 +19,10 @@ ifeq ($(ARCH), aarch64)
 DEPS += packages.aarch64
 SUFFIX=-arm64
 endif
+ifeq ($(ARCH), s390x)
+DEPS += packages.s390x
+SUFFIX=-s390x
+endif
 
 default: push
 
diff --git a/tools/alpine/packages b/tools/alpine/packages
index 40b022cc5..6d3ee1eab 100644
--- a/tools/alpine/packages
+++ b/tools/alpine/packages
@@ -46,7 +46,6 @@ gmp-dev
 gnupg
 go
 grep
-gummiboot
 hvtools
 installkernel
 iperf3
@@ -65,7 +64,6 @@ libressl-dev
 libseccomp-dev
 libtirpc-dev
 libtool
-libunwind-dev
 linux-headers
 lsscsi
 make
diff --git a/tools/alpine/packages.aarch64 b/tools/alpine/packages.aarch64
index 67d66ec9e..c5dad8524 100644
--- a/tools/alpine/packages.aarch64
+++ b/tools/alpine/packages.aarch64
@@ -1 +1,3 @@
+gummiboot
+libunwind-dev
 qemu-system-aarch64
diff --git a/tools/alpine/packages.s390x b/tools/alpine/packages.s390x
new file mode 100644
index 000000000..967d16fd4
--- /dev/null
+++ b/tools/alpine/packages.s390x
@@ -0,0 +1 @@
+qemu-system-s390x
diff --git a/tools/alpine/packages.x86_64 b/tools/alpine/packages.x86_64
index 612e87b8c..e6d2aa72b 100644
--- a/tools/alpine/packages.x86_64
+++ b/tools/alpine/packages.x86_64
@@ -1,3 +1,5 @@
+gummiboot
+libunwind-dev
 open-vm-tools
 ovmf
 syslinux
diff --git a/tools/alpine/push-manifest.sh b/tools/alpine/push-manifest.sh
index e7ae1903a..1293caae7 100755
--- a/tools/alpine/push-manifest.sh
+++ b/tools/alpine/push-manifest.sh
@@ -19,6 +19,7 @@ IMAGE=$2
 
 IMG_X86_64=$(head -1 versions.x86_64 | sed 's,[#| ]*,,')
 IMG_ARM64=$(head -1 versions.aarch64 | sed 's,[#| ]*,,')
+IMG_s390x=$(head -1 versions.s390x | sed 's,[#| ]*,,')
 # Extract the TAG from the x86_64 name and build the manifest target name
 TAG=$(echo "$IMG_X86_64" | sed 's,\-.*$,,' | cut -d':' -f2)
 TARGET="$ORG/$IMAGE:$TAG"
@@ -35,6 +36,10 @@ manifests:
     platform:
       architecture: amd64
       os: linux
+  - image: $IMG_s390x
+    platform:
+      architecture: s390x
+      os: linux
 EOF
 
 # Work out credentials. On macOS they are needed for manifest-tool and