build-vm, tar2fs: get ARCH from command line argument

tar2fs does not run in hasher and without qemu. This causes build problems for an architecture other than the host.

build-vm, tar2fs: get ARCH from command line argument
fc67e5a8 · Anton Midyukov · 8117194b · fc67e5a8 · fc67e5a8
Commit fc67e5a8 authored Jan 22, 2020 by Anton Midyukov
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

tar2fs bin/tar2fs +5 -1

90-build-vm.mk features.in/build-vm/lib/90-build-vm.mk +1 -1

No files found.
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -35,7 +35,11 @@ EFIPART=

 BOOTLOADER="$5"

-ARCH="$(arch)"		# NB: sudo => no GLOBAL_ will do either; mind qemu-*
+if [ -n "$6" ]; then
+	ARCH="$6"
+else
+	ARCH="$(arch)"
+fi

 case "$ARCH" in
 e2k)

--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -45,7 +45,7 @@ tar2fs: check-sudo prepare-tarball-qemu
 	fi; \
 	if ! sudo $$TOPDIR/bin/tar2fs \
 		"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
-			"$(VM_BOOTLOADER)"; then \
+			"$(VM_BOOTLOADER)" "$(ARCH)"; then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi