Skip to content

M
mkimage-profiles
Commit fc67e5a8 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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.
parent 8117194b
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
bin/tar2fs
View file @ fc67e5a8
...@@ -35,7 +35,11 @@ EFIPART= ...@@ -35,7 +35,11 @@ EFIPART=
BOOTLOADER="$5" 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 case "$ARCH" in
e2k) e2k)
......
features.in/build-vm/lib/90-build-vm.mk
View file @ fc67e5a8
...@@ -45,7 +45,7 @@ tar2fs: check-sudo prepare-tarball-qemu ...@@ -45,7 +45,7 @@ tar2fs: check-sudo prepare-tarball-qemu
fi; \ fi; \
if ! sudo $$TOPDIR/bin/tar2fs \ if ! sudo $$TOPDIR/bin/tar2fs \
"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \ "$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \
"$(VM_BOOTLOADER)"; then \ "$(VM_BOOTLOADER)" "$(ARCH)"; then \
echo "** error: sudo tar2fs failed, see build log" >&2; \ echo "** error: sudo tar2fs failed, see build log" >&2; \
exit 1; \ exit 1; \
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment