build-vm: fix PATH to tar2fs with future mkimage

The definition of the TOPDIR variable has been fixed in a future mkimage. Will $(TOPDIR)=$(BUILDDIR).

build-vm: fix PATH to tar2fs with future mkimage
7318e05d · Anton Midyukov · f9dffdb9 · 7318e05d
Commit 7318e05d authored Feb 18, 2022 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

90-build-vm.mk features.in/build-vm/lib/90-build-vm.mk +2 -0

No files found.
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -52,6 +52,8 @@ check-qemu:
 tar2fs: $(SAVE_TARBALL) check-sudo prepare-tarball-qemu
 	@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
 		TOPDIR=/usr/share/mkimage-profiles; \
+	else \
+		[ -z "$(MKIMAGE_PROFILES)" ] || TOPDIR=$(MKIMAGE_PROFILES); \
 	fi; \
 	if ! sudo $$TOPDIR/bin/tar2fs \
 		"$(VM_TARBALL)" "$(VM_RAWDISK)" "$(VM_SIZE)" "$(VM_FSTYPE)" \