From 1cfa6bcc2c032ba699ebff0b1929d1906f99800e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 17 Apr 2020 11:09:30 +0200 Subject: maint: Build binary tarball without '-K'. This is a followup to 8b292ffd3cd969286ee9cbdb70fde8cf384b9b8b. * Makefile.am (guix-binary.%.tar.xz): Remove '-K' to allow for offloading. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 36f23b4062..afbf4eb20a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -668,7 +668,7 @@ GUIX_FOR_BINARY_TARBALL = guile3.0-guix # The self-contained tarball. guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ - tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ + tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ --fallback \ -s "$*" --localstatedir --profile-name=current-guix \ $(GUIX_FOR_BINARY_TARBALL)` ; \ -- cgit v1.2.3 From 9d0b9c7c6c0b0d45653dea80b499314ea415d3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 17 Apr 2020 22:38:31 +0200 Subject: maint: Provide the configuration file in the VM image. This fixes a bug introduced in 362bcdb1b076c8c46f71781add56dfbe532736dc whereby the VM image would no longer contain /etc/config.scm, contrary to what the manual says. Reported by dbdude on #guix. * Makefile.am (release): Pass '--save-provenance' to 'guix system vm-image'. * doc/guix.texi (Running Guix in a VM): Adjust file name accordingly. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index afbf4eb20a..d9d7ffd6c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -818,6 +818,7 @@ release: dist-with-updated-version for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ + --save-provenance \ --system=$$system --fallback \ gnu/system/examples/vm-image.tmpl` ; \ if [ ! -f "$$image" ] ; then \ -- cgit v1.2.3