summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-09 16:31:45 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-09 16:32:38 +0200
commit98148830c0afb9adc8acf150afc48f09aae42ac1 (patch)
tree0414f3aa02e0dbc7cfe76944395cc37d25f61cb7
parent8b292ffd3cd969286ee9cbdb70fde8cf384b9b8b (diff)
maint: 'release' builds with '--fallback'.v1.1.0rc1
* Makefile.am (guix-binary.%.tar.xz): Pass '--fallback' to 'guix pack'. (release): Pass '--fallback' to 'guix build' and 'guix system'.
-rw-r--r--Makefile.am9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index e9b84d8e4e..654734a991 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -669,6 +669,7 @@ GUIX_FOR_BINARY_TARBALL = guile3.0-guix
guix-binary.%.tar.xz:
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \
+ --fallback \
-s "$*" --localstatedir --profile-name=current-guix \
$(GUIX_FOR_BINARY_TARBALL)` ; \
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
@@ -775,7 +776,7 @@ release: dist
git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
$(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \
$(call system_flags,$(SUPPORTED_SYSTEMS)) \
- -v1 --no-grafts
+ -v1 --no-grafts --fallback
rm -f $(BINARY_TARBALLS)
$(MAKE) $(BINARY_TARBALLS)
for system in $(SUPPORTED_SYSTEMS) ; do \
@@ -789,12 +790,12 @@ release: dist
git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
$(top_builddir)/pre-inst-env guix build guix \
$(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \
- -v1 --no-grafts
+ -v1 --no-grafts --fallback
for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \
image=`$(top_builddir)/pre-inst-env \
guix system disk-image \
--file-system-type=iso9660 \
- --system=$$system \
+ --system=$$system --fallback \
gnu/system/install.scm` ; \
if [ ! -f "$$image" ] ; then \
echo "failed to produced Guix installation image for $$system" >&2 ; \
@@ -807,7 +808,7 @@ release: dist
for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \
image=`$(top_builddir)/pre-inst-env \
guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
- --system=$$system \
+ --system=$$system --fallback \
gnu/system/examples/vm-image.tmpl` ; \
if [ ! -f "$$image" ] ; then \
echo "failed to produced Guix VM image for $$system" >&2 ; \