summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-04-21 14:08:32 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-04-23 23:37:10 -0400
commit7aeef7ee3dbf8d8f4e4c741de021ad4eba4149aa (patch)
treed1e67a25f8ab03fd7d128350180ee6695ed856ce
parent52d71fe8dd924a28ff39a988cc65d660dab989f8 (diff)
build: Use guix system image instead of disk-image, vm-image.
These older system actions are deprecated and cause warnings to be emitted. * Makefile.am (release) <guix system disk-image> <guix system vm-image>: Replace by... <guix system image>: ... this. Specify the type of the VM image as qcow2.
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5600bd55038..062a7ba154f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -880,7 +880,7 @@ release: dist-with-updated-version
880 -v1 --no-grafts --fallback 880 -v1 --no-grafts --fallback
881 for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ 881 for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \
882 image=`$(top_builddir)/pre-inst-env \ 882 image=`$(top_builddir)/pre-inst-env \
883 guix system disk-image -t iso9660 \ 883 guix system image -t iso9660 \
884 --label="GUIX_$${system}_$(VERSION)" \ 884 --label="GUIX_$${system}_$(VERSION)" \
885 --system=$$system --fallback \ 885 --system=$$system --fallback \
886 gnu/system/install.scm` ; \ 886 gnu/system/install.scm` ; \
@@ -894,7 +894,7 @@ release: dist-with-updated-version
894 done 894 done
895 for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ 895 for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \
896 image=`$(top_builddir)/pre-inst-env \ 896 image=`$(top_builddir)/pre-inst-env \
897 guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ 897 guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
898 --save-provenance \ 898 --save-provenance \
899 --system=$$system --fallback \ 899 --system=$$system --fallback \
900 gnu/system/examples/vm-image.tmpl` ; \ 900 gnu/system/examples/vm-image.tmpl` ; \