From ce6be2d4d764533de7c9040c797d9ad307cf7ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 2 Dec 2019 13:28:18 +0100
Subject: Try to fix armhf compilation

---
 jobs/alpine-armhf.env | 1 +
 scripts/uchroot       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/alpine-armhf.env b/jobs/alpine-armhf.env
index bdbedae..73642e4 100644
--- a/jobs/alpine-armhf.env
+++ b/jobs/alpine-armhf.env
@@ -1 +1,2 @@
 ARCH=armhf
+QEMU_ARCH=arm
diff --git a/scripts/uchroot b/scripts/uchroot
index 5a876c2..fe07178 100755
--- a/scripts/uchroot
+++ b/scripts/uchroot
@@ -3,6 +3,7 @@
 # Configuration has to be passed trough envrionment.
 #   ROOT: path to directory to chroot in
 #   ARCH: optional target architecture (if qemu should be used)
+#   QEMU_ARCH: optional qemu architecture to replace ARCH
 #   MOUNT: pairs of two paths separated by colon (LOCAL:INROOT)
 set -e
 if [ "$(id -u)" != "0" ]; then
@@ -37,7 +38,7 @@ done <<<"$MOUNT"
 cp -f /etc/resolv.conf "$ROOT/etc/resolv.conf"
 cp -f /etc/hosts "$ROOT/etc/hosts"
 if [ "$ARCH" != "$(arch)" ]; then
-	qemu_exec="$(which "qemu-$ARCH")"
+	qemu_exec="$(which "qemu-${QEMU_ARCH:-$ARCH}")"
 	cp -f "$qemu_exec" "$ROOT$qemu_exec"
 fi
 
-- 
cgit v1.2.3