Skip to content

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

build-vm, image.in: Fix parameter VM_SAVE_TAR -> VM_SAVE_TARBALL

The code is given in accordance with the documentation See-also: commit 2987fa8f
parent efec47fa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
features.in/build-vm/lib/90-build-vm.mk
View file @ 366f6a6b
...@@ -30,11 +30,10 @@ VM_XZ_COMMAND ?= xz -T0 ...@@ -30,11 +30,10 @@ VM_XZ_COMMAND ?= xz -T0
RECOVERY_LINE ?= Press ENTER to start RECOVERY_LINE ?= Press ENTER to start
# tarball save # tarball save
#SAVE_TARBALL := convert-image/tar ifdef VM_SAVE_TARBALL
ifdef VM_SAVE_TAR
ifeq (,$(filter-out img img.xz qcow2 qcow2c vdi vmdk vhd,$(IMAGE_TYPE))) ifeq (,$(filter-out img img.xz qcow2 qcow2c vdi vmdk vhd,$(IMAGE_TYPE)))
ifeq (,$(filter-out tar tar.gz tar.xz,$(VM_SAVE_TAR))) ifeq (,$(filter-out tar tar.gz tar.xz,$(VM_SAVE_TARBALL)))
SAVE_TARBALL := convert-image/$(VM_SAVE_TAR) SAVE_TARBALL := convert-image/$(VM_SAVE_TARBALL)
endif endif
endif endif
endif endif
......
image.in/Makefile
View file @ 366f6a6b
...@@ -95,8 +95,8 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS))) ...@@ -95,8 +95,8 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
echo "** error: $(IMAGE_OUTPATH) missing" >&2; \ echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
exit 1; \ exit 1; \
fi; \ fi; \
if [ -n "$(VM_SAVE_TAR)" ]; then \ if [ -n "$(VM_SAVE_TARBALL)" ]; then \
echo "** tarball saved: $(IMAGE_OUTPATH)/$(IMAGE_OUTNAME).$(VM_SAVE_TAR)" >&2; \ echo "** tarball saved: $(IMAGE_OUTPATH)/$(IMAGE_OUTNAME).$(VM_SAVE_TARBALL)" >&2; \
fi; \ fi; \
echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \ echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \ echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \
......
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