keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-vm: Don't copy in .host/qemu* if tar2fs won't be called

Browse Source 
(gkebfm@ thinks it was a terrible idea in the first place
and mike@ agrees; this is a rework TODO item)
This commit is contained in:
Ivan A. Melnikov 2019-06-19 17:45:15 +04:00 committed by Michael Shigorin
parent 1ef77caf70
commit 2e70a8f895
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
features.in/build-vm/lib/90-build-vm.mk
View File

@ -36,7 +36,7 @@ check-qemu:
exit 1; \ exit 1; \
fi fi
tar2fs: check-sudo tar2fs: check-sudo prepare-tarball-qemu
@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \ @if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
TOPDIR=/usr/share/mkimage-profiles; \ TOPDIR=/usr/share/mkimage-profiles; \
fi; \ fi; \
@ -47,9 +47,8 @@ tar2fs: check-sudo
exit 1; \ exit 1; \
fi fi
prepare-image: # copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot if qemu is used
@# need to copy $(BUILDDIR)/.work/chroot/.host/qemu* into chroot prepare-tarball-qemu:
@#if qemu is used
@(cd "$(BUILDDIR)/.work/chroot/"; \ @(cd "$(BUILDDIR)/.work/chroot/"; \
tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||: tar -rf "$(VM_TARBALL)" ./.host/qemu*) ||:
@ -80,7 +79,7 @@ post-convert:
@rm -f "$(VM_RAWDISK)"; \ @rm -f "$(VM_RAWDISK)"; \
if [ "0$(DEBUG)" -le 1 ]; then rm -f "$(VM_TARBALL)"; fi if [ "0$(DEBUG)" -le 1 ]; then rm -f "$(VM_TARBALL)"; fi
convert-image: prepare-image convert-image/$(IMAGE_TYPE) post-convert; @: convert-image: convert-image/$(IMAGE_TYPE) post-convert; @:
run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES) run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)