diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-09 16:31:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-09 16:32:38 +0200 |
| commit | 98148830c0afb9adc8acf150afc48f09aae42ac1 (patch) | |
| tree | 0414f3aa02e0dbc7cfe76944395cc37d25f61cb7 | |
| parent | 8b292ffd3cd969286ee9cbdb70fde8cf384b9b8b (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.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index e9b84d8e4e6..654734a9911 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -669,6 +669,7 @@ GUIX_FOR_BINARY_TARBALL = guile3.0-guix | |||
| 669 | guix-binary.%.tar.xz: | 669 | guix-binary.%.tar.xz: |
| 670 | $(AM_V_GEN)GUIX_PACKAGE_PATH= \ | 670 | $(AM_V_GEN)GUIX_PACKAGE_PATH= \ |
| 671 | tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ | 671 | tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ |
| 672 | --fallback \ | ||
| 672 | -s "$*" --localstatedir --profile-name=current-guix \ | 673 | -s "$*" --localstatedir --profile-name=current-guix \ |
| 673 | $(GUIX_FOR_BINARY_TARBALL)` ; \ | 674 | $(GUIX_FOR_BINARY_TARBALL)` ; \ |
| 674 | cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" | 675 | cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" |
| @@ -775,7 +776,7 @@ release: dist | |||
| 775 | git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." | 776 | git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." |
| 776 | $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ | 777 | $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ |
| 777 | $(call system_flags,$(SUPPORTED_SYSTEMS)) \ | 778 | $(call system_flags,$(SUPPORTED_SYSTEMS)) \ |
| 778 | -v1 --no-grafts | 779 | -v1 --no-grafts --fallback |
| 779 | rm -f $(BINARY_TARBALLS) | 780 | rm -f $(BINARY_TARBALLS) |
| 780 | $(MAKE) $(BINARY_TARBALLS) | 781 | $(MAKE) $(BINARY_TARBALLS) |
| 781 | for system in $(SUPPORTED_SYSTEMS) ; do \ | 782 | for system in $(SUPPORTED_SYSTEMS) ; do \ |
| @@ -789,12 +790,12 @@ release: dist | |||
| 789 | git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." | 790 | git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." |
| 790 | $(top_builddir)/pre-inst-env guix build guix \ | 791 | $(top_builddir)/pre-inst-env guix build guix \ |
| 791 | $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ | 792 | $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ |
| 792 | -v1 --no-grafts | 793 | -v1 --no-grafts --fallback |
| 793 | for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ | 794 | for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ |
| 794 | image=`$(top_builddir)/pre-inst-env \ | 795 | image=`$(top_builddir)/pre-inst-env \ |
| 795 | guix system disk-image \ | 796 | guix system disk-image \ |
| 796 | --file-system-type=iso9660 \ | 797 | --file-system-type=iso9660 \ |
| 797 | --system=$$system \ | 798 | --system=$$system --fallback \ |
| 798 | gnu/system/install.scm` ; \ | 799 | gnu/system/install.scm` ; \ |
| 799 | if [ ! -f "$$image" ] ; then \ | 800 | if [ ! -f "$$image" ] ; then \ |
| 800 | echo "failed to produced Guix installation image for $$system" >&2 ; \ | 801 | echo "failed to produced Guix installation image for $$system" >&2 ; \ |
| @@ -807,7 +808,7 @@ release: dist | |||
| 807 | for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ | 808 | for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ |
| 808 | image=`$(top_builddir)/pre-inst-env \ | 809 | image=`$(top_builddir)/pre-inst-env \ |
| 809 | guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ | 810 | guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ |
| 810 | --system=$$system \ | 811 | --system=$$system --fallback \ |
| 811 | gnu/system/examples/vm-image.tmpl` ; \ | 812 | gnu/system/examples/vm-image.tmpl` ; \ |
| 812 | if [ ! -f "$$image" ] ; then \ | 813 | if [ ! -f "$$image" ] ; then \ |
| 813 | echo "failed to produced Guix VM image for $$system" >&2 ; \ | 814 | echo "failed to produced Guix VM image for $$system" >&2 ; \ |
