diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-04 15:28:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-04 16:35:43 +0100 |
| commit | aa1d47e72ee23aa38bbd9d216d68c8ebef351420 (patch) | |
| tree | 460b9754b85d7df51e988b207a6cb23e14d79d36 | |
| parent | 9d163ec133c55abf4d63b4f6e242d8da731d91eb (diff) | |
maint: Let 'guix system vm-image' determine the right size.
* Makefile.am (GUIXSD_VM_IMAGE_BASE): Remove.
(release): Remoev --image-size argument to 'guix system vm-image'.
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6d340f57201..7cc46d4ac21 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -602,9 +602,6 @@ GUIXSD_IMAGE_BASE = guixsd-install-$(PACKAGE_VERSION) | |||
| 602 | # Prefix of the GuixSD VM image file name. | 602 | # Prefix of the GuixSD VM image file name. |
| 603 | GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION) | 603 | GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION) |
| 604 | 604 | ||
| 605 | # Size of the VM image (for x86_64 typically). | ||
| 606 | GUIXSD_VM_IMAGE_SIZE ?= 2GiB | ||
| 607 | |||
| 608 | # The release process works in several phases: | 605 | # The release process works in several phases: |
| 609 | # | 606 | # |
| 610 | # 0. We assume the developer created a 'vX.Y' tag. | 607 | # 0. We assume the developer created a 'vX.Y' tag. |
| @@ -663,7 +660,6 @@ release: dist | |||
| 663 | image=`$(top_builddir)/pre-inst-env \ | 660 | image=`$(top_builddir)/pre-inst-env \ |
| 664 | guix system vm-image \ | 661 | guix system vm-image \ |
| 665 | --system=$$system \ | 662 | --system=$$system \ |
| 666 | --image-size=$(GUIXSD_VM_IMAGE_SIZE) \ | ||
| 667 | gnu/system/examples/vm-image.tmpl` ; \ | 663 | gnu/system/examples/vm-image.tmpl` ; \ |
| 668 | if [ ! -f "$$image" ] ; then \ | 664 | if [ ! -f "$$image" ] ; then \ |
| 669 | echo "failed to produced GuixSD VM image for $$system" >&2 ; \ | 665 | echo "failed to produced GuixSD VM image for $$system" >&2 ; \ |
