Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f905f2e..bb243fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,7 +323,6 @@ AUX_FILES =                                         \
   gnu/packages/aux-files/chromium/master-preferences.json              \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
   gnu/packages/aux-files/linux-libre/5.4-arm.conf      \
-  gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf       \
   gnu/packages/aux-files/linux-libre/5.4-arm64.conf    \
   gnu/packages/aux-files/linux-libre/5.4-i686.conf     \
   gnu/packages/aux-files/linux-libre/5.4-x86_64.conf   \
@@ -664,11 +663,16 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                    \
   --enable-daemon                              \
   ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
 
+# Name of the 'guix' package shipped in the binary tarball.
+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        \
-         -s "$*" --localstatedir --profile-name=current-guix guix` ;   \
+       tarball=`$(top_builddir)/pre-inst-env guix pack -C xz           \
+         --fallback                                                    \
+         -s "$*" --localstatedir --profile-name=current-guix           \
+         $(GUIX_FOR_BINARY_TARBALL)` ;                                 \
        cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
 
 
@@ -702,6 +706,16 @@ gen-AUTHORS:
            "$(top_srcdir)" "$(distdir)/AUTHORS";               \
        fi
 
+# Like 'dist', but regenerate 'configure' so we get an up-to-date
+# 'PACKAGE_VERSION' string.  (In Gnulib, 'GNUmakefile' has a special trick to
+# do that whenever a 'dist' target is used.)
+dist-with-updated-version:
+       @echo "Running './bootstrap' for new version string..."
+       $(top_srcdir)/bootstrap
+       $(MAKE) $(AM_MAKEFLAGS) $(top_srcdir)/.version dist
+
+.PHONY: dist-with-updated-version
+
 \f
 #
 # Release management.
@@ -757,7 +771,7 @@ system_flags = $(foreach system,$(1),-s $(system))
 #
 # XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext
 # issue described at <https://savannah.gnu.org/bugs/index.php?51027>.
-release: dist
+release: dist-with-updated-version
        cd po; git checkout .
        @if ! git diff-index --quiet HEAD; then                 \
          echo "There are uncommitted changes; stopping." >&2 ; \
@@ -771,9 +785,9 @@ release: dist
           "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
        git add $(top_srcdir)/gnu/packages/package-management.scm
        git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
-       $(top_builddir)/pre-inst-env guix build guix    \
+       $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL)      \
              $(call system_flags,$(SUPPORTED_SYSTEMS)) \
-             -v1 --no-grafts -K
+             -v1 --no-grafts --fallback
        rm -f $(BINARY_TARBALLS)
        $(MAKE) $(BINARY_TARBALLS)
        for system in $(SUPPORTED_SYSTEMS) ; do                                 \
@@ -787,12 +801,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 -K
+             -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 ;        \
@@ -805,7 +819,8 @@ 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                                                           \
+           --save-provenance                                                           \
+           --system=$$system --fallback                                                \
            gnu/system/examples/vm-image.tmpl` ;                                        \
          if [ ! -f "$$image" ] ; then                                                  \
            echo "failed to produced Guix VM image for $$system" >&2 ;                  \