Merge branch 'core-updates'

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

diff --git a/Makefile.am b/Makefile.am
index 344ecdb..6cd6e79 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ MODULES =                                     \
   guix/docker.scm                              \
   guix/json.scm                                        \
   guix/records.scm                             \
+  guix/openpgp.scm                             \
   guix/pki.scm                                 \
   guix/progress.scm                            \
   guix/combinators.scm                         \
@@ -174,6 +175,7 @@ MODULES =                                   \
   guix/build/git.scm                           \
   guix/build/hg.scm                            \
   guix/build/glib-or-gtk-build-system.scm      \
+  guix/build/gnu-bootstrap.scm                 \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
   guix/build/guile-build-system.scm            \
@@ -414,6 +416,7 @@ SCM_TESTS =                                 \
   tests/nar.scm                                \
   tests/networking.scm                         \
   tests/opam.scm                               \
+  tests/openpgp.scm                            \
   tests/packages.scm                           \
   tests/pack.scm                               \
   tests/pki.scm                                \
@@ -564,6 +567,11 @@ EXTRA_DIST +=                                              \
   tests/signing-key.pub                                        \
   tests/signing-key.sec                                        \
   tests/cve-sample.json                                        \
+  tests/civodul.key                                    \
+  tests/rsa.key                                                \
+  tests/dsa.key                                                \
+  tests/ed25519.key                                    \
+  tests/ed25519.sec                                    \
   build-aux/config.rpath                               \
   bootstrap                                            \
   doc/build.scm                                                \
@@ -662,11 +670,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" "$@"
 
 
@@ -700,6 +713,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.
@@ -755,7 +778,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 ; \
@@ -769,9 +792,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                                 \
@@ -785,12 +808,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 ;        \
@@ -803,7 +826,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 ;                  \