diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-08-09 10:46:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-09 15:16:06 +0200 |
| commit | 95a03aa5c507d48e2cde19ea007b8f90a4e0108a (patch) | |
| tree | fa93b5e9f4cca5eee91f00ee30538e96705dedd2 /Makefile.am | |
| parent | 57f1892d366ea28083391577f90c4aa06b90aaf1 (diff) | |
| download | guix-95a03aa5c507d48e2cde19ea007b8f90a4e0108a.tar guix-95a03aa5c507d48e2cde19ea007b8f90a4e0108a.tar.gz | |
system: install: Always use 'current-guix'.
Fixes <https://issues.guix.gnu.org/53210>.
Reported by Mathieu Othacehe <othacehe@gnu.org>.
* gnu/system/install.scm (%installation-services): Set 'guix' to
use (current-guix) in 'guix-configuration'.
* gnu/system/examples/vm-image.tmpl: Likewise.
* gnu/tests/install.scm (operating-system-with-current-guix): Remove.
(run-install, installation-os-for-gui-tests): Remove its uses.
* Makefile.am (release): Remove intermediate use of
'update-guix-package.scm' and subsequent 'git commit' invocation.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index f707b930b2..ac6df11c85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -977,14 +977,9 @@ release: dist-with-updated-version all mv "guix-binary.$$system.tar.xz" \ "$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ; \ done -# Bump the Guix package version and build it (again). - GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \ - $(top_builddir)/pre-inst-env "$(GUILE)" \ - $(top_srcdir)/build-aux/update-guix-package.scm \ - "`git rev-parse HEAD`" - git add $(top_srcdir)/gnu/packages/package-management.scm - git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." - $(top_builddir)/pre-inst-env guix build guix \ +# Build 'current-guix' to speed things up for the next step. + $(top_builddir)/pre-inst-env guix build \ + -e '((@ (gnu packages package-management) current-guix))' \ $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ -v1 --no-grafts --fallback # Generate the ISO installation images. |