Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
e043f877
Commit
e043f877
authored
Dec 04, 2017
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build-vm, pack: implement qcow2c support
This is a compressed version of good ol' qcow2. Suggested-by:
Alexey Shabalin
<
shaba@altlinux.org
>
parent
0f2411ec
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+4
-2
config.mk
features.in/pack/config.mk
+1
-1
No files found.
features.in/build-vm/lib/90-build-vm.mk
View file @
e043f877
...
@@ -33,16 +33,18 @@ prepare-image: check-sudo
...
@@ -33,16 +33,18 @@ prepare-image: check-sudo
fi
fi
convert-image: prepare-image
convert-image: prepare-image
@case "$(IMAGE_TYPE)" in \
@VM_COMPRESS=; \
case "$(IMAGE_TYPE)" in \
"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
"img") mv "$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; exit 0;; \
"vhd") VM_FORMAT="vpc";; \
"vhd") VM_FORMAT="vpc";; \
"qcow2c") VM_FORMAT="qcow2"; VM_COMPRESS="-c";; \
*) VM_FORMAT="$(IMAGE_TYPE)"; \
*) VM_FORMAT="$(IMAGE_TYPE)"; \
esac; \
esac; \
if ! type -t qemu-img >&/dev/null; then \
if ! type -t qemu-img >&/dev/null; then \
echo "** error: qemu-img not available" >&2; \
echo "** error: qemu-img not available" >&2; \
exit 1; \
exit 1; \
else \
else \
qemu-img convert -O "$$VM_FORMAT" \
qemu-img convert
$$VM_COMPRESS
-O "$$VM_FORMAT" \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
"$(VM_RAWDISK)" "$(IMAGE_OUTPATH)"; \
rm "$(VM_RAWDISK)"; \
rm "$(VM_RAWDISK)"; \
if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
if [ "0$(DEBUG)" -le 1 ]; then rm "$(VM_TARBALL)"; fi; \
...
...
features.in/pack/config.mk
View file @
e043f877
...
@@ -40,6 +40,6 @@ $(foreach c,$(VE_ARCHIVES), \
...
@@ -40,6 +40,6 @@ $(foreach c,$(VE_ARCHIVES), \
$(eval $(call PACK_compressors,$(c),$(z)))))
$(eval $(call PACK_compressors,$(c),$(z)))))
# virtual machines
# virtual machines
VM_EXTS := .img .qcow2 .vdi .vmdk .vhd
VM_EXTS := .img .qcow2 .
qcow2c .
vdi .vmdk .vhd
$(VM_EXTS:.%=use/pack/%): use/pack; @:
$(VM_EXTS:.%=use/pack/%): use/pack; @:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment