From 84d285d28f4f8091b76a8b09e2f3b399cb33c626 Mon Sep 17 00:00:00 2001
From: Dillon Dixon <dillondixon@gmail.com>
Date: Sun, 3 Jul 2016 13:14:24 -0700
Subject: [PATCH] Fixed arm arch image maker to support arm versions other than
 7

Signed-off-by: Dillon Dixon <dillondixon@gmail.com>
---
 contrib/mkimage-arch.sh             | 16 ++++++++++++----
 contrib/mkimage-archarm-pacman.conf |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh
index 793b21e3c6..5692a1b104 100755
--- a/contrib/mkimage-arch.sh
+++ b/contrib/mkimage-arch.sh
@@ -48,7 +48,8 @@ IFS=','
 PKGIGNORE="${PKGIGNORE[*]}"
 unset IFS
 
-case "$(uname -m)" in
+arch="$(uname -m)"
+case "$arch" in
 	armv*)
 		if pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then
 			pacman-key --init
@@ -57,12 +58,18 @@ case "$(uname -m)" in
 			echo "Could not find archlinuxarm-keyring. Please, install it and run pacman-key --populate archlinuxarm"
 			exit 1
 		fi
-		PACMAN_CONF='./mkimage-archarm-pacman.conf'
+		PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX)
+		version="$(echo $arch | cut -c 5)"
+		sed "s/Architecture = armv/Architecture = armv${version}h/g" './mkimage-archarm-pacman.conf' > "${PACMAN_CONF}"
 		PACMAN_MIRRORLIST='Server = http://mirror.archlinuxarm.org/$arch/$repo'
 		PACMAN_EXTRA_PKGS='archlinuxarm-keyring'
-		EXPECT_TIMEOUT=120
+		if [ "$version" -lt 7 ]; then
+			EXPECT_TIMEOUT=1800 # Some armv6 based devices can be very slow (e.g. RPiv1)
+		else
+			EXPECT_TIMEOUT=120
+		fi
 		ARCH_KEYRING=archlinuxarm
-		DOCKER_IMAGE_NAME=archlinuxarm
+		DOCKER_IMAGE_NAME="armv${version}h/archlinux"
 		;;
 	*)
 		PACMAN_CONF='./mkimage-arch-pacman.conf'
@@ -89,6 +96,7 @@ expect <<EOF
 		-exact "anyway? \[Y/n\] " { send -- "n\r"; exp_continue }
 		-exact "(default=all): " { send -- "\r"; exp_continue }
 		-exact "installation? \[Y/n\]" { send -- "y\r"; exp_continue }
+		-exact "delete it? \[Y/n\]" { send -- "y\r"; exp_continue }
 	}
 EOF
 
diff --git a/contrib/mkimage-archarm-pacman.conf b/contrib/mkimage-archarm-pacman.conf
index 38b01bf40b..f4b45f54d7 100644
--- a/contrib/mkimage-archarm-pacman.conf
+++ b/contrib/mkimage-archarm-pacman.conf
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
-Architecture = armv7h
+Architecture = armv
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =