From 12ba9417e635aa031a1a637117ebe54988cb12e9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 5 Dec 2017 23:51:42 +0100
Subject: [PATCH] addons: use GOARM=7 for more arm cpus

---
 packages/addons/addon-depends/containerd/package.mk | 6 +++---
 packages/addons/addon-depends/libnetwork/package.mk | 6 +++---
 packages/addons/addon-depends/runc/package.mk       | 6 +++---
 packages/addons/service/docker/package.mk           | 6 +++---
 packages/addons/service/syncthing/package.mk        | 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk
index 487cbe314a..e729e7433c 100644
--- a/packages/addons/addon-depends/containerd/package.mk
+++ b/packages/addons/addon-depends/containerd/package.mk
@@ -41,9 +41,9 @@ pre_make_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7)
-         export GOARM=7
-         ;;
+        *)
+          export GOARM=7
+          ;;
       esac
       ;;
     aarch64)
diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk
index 0e8d9039d9..ec37f3bbdf 100644
--- a/packages/addons/addon-depends/libnetwork/package.mk
+++ b/packages/addons/addon-depends/libnetwork/package.mk
@@ -41,9 +41,9 @@ pre_make_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7)
-         export GOARM=7
-         ;;
+        *)
+          export GOARM=7
+          ;;
       esac
       ;;
     aarch64)
diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk
index 19f5338936..b91f6ee9cc 100644
--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -41,9 +41,9 @@ pre_make_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7)
-         export GOARM=7
-         ;;
+        *)
+          export GOARM=7
+          ;;
       esac
       ;;
     aarch64)
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index bd2c359ea2..6d642d6434 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -56,9 +56,9 @@ configure_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7|cortex-a9)
-         export GOARM=7
-         ;;
+        *)
+          export GOARM=7
+          ;;
       esac
       ;;
     aarch64)
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
index a8968d2dec..f21c61fcb9 100644
--- a/packages/addons/service/syncthing/package.mk
+++ b/packages/addons/service/syncthing/package.mk
@@ -65,7 +65,7 @@ configure_target() {
         arm1176jzf-s)
           export GOARM=6
           ;;
-        cortex-a7|cortex-a9)
+        *)
           export GOARM=7
           ;;
       esac