diff options
| author | Dillon Dixon <dillondixon@gmail.com> | 2016-07-03 13:14:24 -0700 |
|---|---|---|
| committer | Dillon Dixon <dillondixon@gmail.com> | 2016-07-10 18:46:35 -0700 |
| commit | 84d285d28f4f8091b76a8b09e2f3b399cb33c626 (patch) | |
| tree | decf3c6bf2ee8ffcc7ab7f3cc6a5d46eaffbc809 /contrib/mkimage-arch.sh | |
| parent | 4ebe4e83eed97471f0117462f853ed9c27a8c8ea (diff) | |
| download | docker-84d285d28f4f8091b76a8b09e2f3b399cb33c626.tar.gz | |
Fixed arm arch image maker to support arm versions other than 7
Signed-off-by: Dillon Dixon <dillondixon@gmail.com>
Diffstat (limited to 'contrib/mkimage-arch.sh')
| -rwxr-xr-x | contrib/mkimage-arch.sh | 16 |
1 files changed, 12 insertions, 4 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 |