[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: build: Do not compress the (already compressed) VM qcow2 images.
From: |
guix-commits |
Subject: |
03/04: build: Do not compress the (already compressed) VM qcow2 images. |
Date: |
Wed, 5 May 2021 16:36:54 -0400 (EDT) |
apteryx pushed a commit to branch version-1.3.0
in repository guix.
commit b1b41a23f4e48e35bafe282029190bba32cb7218
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed May 5 15:18:05 2021 -0400
build: Do not compress the (already compressed) VM qcow2 images.
The qcow2 format supports compression, and the qcow2 type supported by 'guix
system image' produces compressed qcow2 images.
* Makefile.am (release): Do not re-compress the qcow2 VM images with xz.
* doc/guix.texi (Running Guix in a VM): Adjust VM image URL.
---
Makefile.am | 4 +---
doc/guix.texi | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c6028c5..d06e177 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -900,9 +900,7 @@ release: dist-with-updated-version all
echo "failed to produced Guix VM image for $$system" >&2 ;
\
exit 1 ;
\
fi ;
\
- xz < "$$image" >
"$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.qcow2.xz.tmp" ; \
- mv "$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.qcow2.xz.tmp"
\
- "$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.qcow2.xz" ;
\
+ cp "$$image"
"$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.qcow2"; \
done
@echo
@echo "Congratulations! All the release files are now in
$(releasedir)."
diff --git a/doc/guix.texi b/doc/guix.texi
index 7f54ddf..9beef61 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -33491,7 +33491,7 @@ Whether or not the droplet should be created with IPv6
networking.
@cindex virtual machine
To run Guix in a virtual machine (VM), one can use the pre-built Guix VM image
distributed at
-@url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2.xz}.
+@url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2}.
This image is a compressed image in QCOW format. You will first need to
decompress with @command{xz -d}, and then you can pass it to an emulator such
as QEMU (see below for details).