Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / Makefile.am
index 36767c2..bb243fe 100644 (file)
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
 # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -122,6 +122,7 @@ MODULES =                                   \
   guix/build-system/meson.scm                  \
   guix/build-system/minify.scm                 \
   guix/build-system/asdf.scm                   \
+  guix/build-system/copy.scm                   \
   guix/build-system/glib-or-gtk.scm            \
   guix/build-system/gnu.scm                    \
   guix/build-system/guile.scm                  \
@@ -132,6 +133,7 @@ MODULES =                                   \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
   guix/build-system/ocaml.scm                  \
+  guix/build-system/qt.scm                     \
   guix/build-system/waf.scm                    \
   guix/build-system/r.scm                      \
   guix/build-system/rakudo.scm                 \
@@ -168,9 +170,11 @@ MODULES =                                  \
   guix/build/go-build-system.scm               \
   guix/build/asdf-build-system.scm             \
   guix/build/bzr.scm                           \
+  guix/build/copy-build-system.scm             \
   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            \
@@ -178,6 +182,7 @@ MODULES =                                   \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
   guix/build/ocaml-build-system.scm            \
+  guix/build/qt-build-system.scm               \
   guix/build/r-build-system.scm                        \
   guix/build/rakudo-build-system.scm           \
   guix/build/ruby-build-system.scm             \
@@ -278,6 +283,7 @@ MODULES =                                   \
   guix/scripts/container.scm                   \
   guix/scripts/container/exec.scm              \
   guix/scripts/deploy.scm                      \
+  guix/scripts/time-machine.scm                        \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
@@ -316,16 +322,10 @@ dist_noinst_DATA =                                \
 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.3-arm.conf      \
-  gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf       \
-  gnu/packages/aux-files/linux-libre/5.3-arm64.conf    \
-  gnu/packages/aux-files/linux-libre/5.3-i686.conf     \
-  gnu/packages/aux-files/linux-libre/5.3-x86_64.conf   \
-  gnu/packages/aux-files/linux-libre/5.2-arm.conf      \
-  gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf       \
-  gnu/packages/aux-files/linux-libre/5.2-arm64.conf    \
-  gnu/packages/aux-files/linux-libre/5.2-i686.conf     \
-  gnu/packages/aux-files/linux-libre/5.2-x86_64.conf   \
+  gnu/packages/aux-files/linux-libre/5.4-arm.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   \
   gnu/packages/aux-files/linux-libre/4.19-arm.conf     \
   gnu/packages/aux-files/linux-libre/4.19-arm64.conf   \
   gnu/packages/aux-files/linux-libre/4.19-i686.conf    \
@@ -428,6 +428,7 @@ SCM_TESTS =                                 \
   tests/scripts-build.scm                      \
   tests/search-paths.scm                       \
   tests/services.scm                           \
+  tests/services/linux.scm                     \
   tests/sets.scm                               \
   tests/size.scm                               \
   tests/snix.scm                               \
@@ -509,9 +510,7 @@ endif !CAN_RUN_TESTS
 
 check-system: $(GOBJECTS)
        $(AM_V_at)$(top_builddir)/pre-inst-env                  \
-          $(GUILE) --no-auto-compile                           \
-          -e '(@@ (run-system-tests) run-system-tests)'        \
-          $(top_srcdir)/build-aux/run-system-tests.scm
+         guix build -m $(top_srcdir)/etc/system-tests.scm -K
 
 # Public keys used to sign substitutes.
 dist_pkgdata_DATA =                            \
@@ -542,6 +541,8 @@ EXTRA_DIST +=                                               \
   scripts/guix.in                                      \
   etc/guix-install.sh                                  \
   etc/news.scm                                         \
+  etc/release-manifest.scm                             \
+  etc/system-tests.scm                                 \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
   build-aux/hydra/evaluate.scm                         \
@@ -551,20 +552,19 @@ EXTRA_DIST +=                                             \
   build-aux/cuirass/gnu-system.scm                     \
   build-aux/cuirass/guix-modular.scm                   \
   build-aux/cuirass/hydra-to-cuirass.scm               \
-  build-aux/check-available-binaries.scm               \
   build-aux/check-final-inputs-self-contained.scm      \
   build-aux/compile-as-derivation.scm                  \
   build-aux/generate-authors.scm                       \
+  build-aux/git-authenticate.scm                       \
   build-aux/test-driver.scm                            \
   build-aux/update-guix-package.scm                    \
   build-aux/update-NEWS.scm                            \
-  build-aux/run-system-tests.scm                       \
   d3.v3.js                                             \
   graph.js                                             \
   tests/test.drv                                       \
   tests/signing-key.pub                                        \
   tests/signing-key.sec                                        \
-  tests/cve-sample.xml                                 \
+  tests/cve-sample.json                                        \
   build-aux/config.rpath                               \
   bootstrap                                            \
   doc/build.scm                                                \
@@ -617,6 +617,18 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
 install-data-hook:
        touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
 
+# Commit corresponding to the 'v1.0.1' tag.
+commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac
+
+# Authenticate the current Git checkout by checking signatures on every commit
+# starting from $(commit_v1_0_1).
+authenticate:
+       $(AM_V_at)echo "Authenticating Git checkout..." ;       \
+       "$(top_builddir)/pre-inst-env" $(GUILE)                 \
+         --no-auto-compile -e git-authenticate                 \
+         "$(top_srcdir)/build-aux/git-authenticate.scm"        \
+         "$(commit_v1_0_1)"
+
 # Assuming Guix is already installed and the daemon is up and running, this
 # rule builds from $(srcdir), creating and building derivations.
 as-derivation:
@@ -651,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" "$@"
 
 
@@ -689,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.
@@ -744,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 ; \
@@ -758,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                                 \
@@ -774,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 ;        \
@@ -792,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 ;                  \
@@ -839,8 +867,9 @@ assert-no-store-file-names:
 
 # Make sure important substitutes are available.
 assert-binaries-available: $(GOBJECTS)
-       $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"                       \
-         "$(top_srcdir)/build-aux/check-available-binaries.scm"
+       $(AM_V_at)$(top_builddir)/pre-inst-env                          \
+         guix weather -m "$(top_srcdir)/etc/release-manifest.scm"      \
+                       --display-missing
 
 # Make sure the final inputs don't refer to bootstrap tools.
 assert-final-inputs-self-contained: $(GOBJECTS)
@@ -867,7 +896,7 @@ cuirass-jobs.scm: $(GOBJECTS)
 .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained
-.PHONY: clean-go make-go as-derivation
+.PHONY: clean-go make-go as-derivation authenticate
 .PHONY: update-guix-package update-NEWS release
 
 # Downloading up-to-date PO files.