Add more ARM archs

2m · Feb 26, 2016 · 34dfea0 · 34dfea0
1 parent 9792308
commit 34dfea0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh
@@ -62,7 +62,7 @@ case "$(uname -m)" in
 		PACMAN_EXTRA_PKGS='archlinuxarm-keyring'
 		EXPECT_TIMEOUT=120
 		ARCH_KEYRING=archlinuxarm
-		DOCKER_IMAGE_NAME=archlinuxarm
+		DOCKER_IMAGE_NAME=$(uname -m)-archlinux
 		;;
 	*)
 		PACMAN_CONF='./mkimage-arch-pacman.conf'
@@ -74,6 +74,20 @@ case "$(uname -m)" in
 		;;
 esac
 
+case "$(uname -m)" in
+        armv6*)
+                PACMAN_ARCH=armv6h
+                ;;
+        armv7*)
+                PACMAN_ARCH=armv7h
+                ;;
+        *)
+                PACMAN_ARCH=arm
+                ;;
+esac
+
+sed s/%ARCH%/$PACMAN_ARCH/g mkimage-archarm-pacman.conf.template > mkimage-archarm-pacman.conf
+
 export PACMAN_MIRRORLIST
 
 expect <<EOF

diff --git a/contrib/mkimage-archarm-pacman.conf → contrib/mkimage-archarm-pacman.conf.template b/contrib/mkimage-archarm-pacman.conf → contrib/mkimage-archarm-pacman.conf.template
@@ -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 = %ARCH%
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =