guix system: Simplify bootloader package handling.

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

diff --git a/Makefile.am b/Makefile.am
index af6870c..c63b65b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,9 +63,6 @@ MODULES =                                     \
   guix/base64.scm                              \
   guix/cpio.scm                                        \
   guix/records.scm                             \
-  guix/gcrypt.scm                              \
-  guix/hash.scm                                        \
-  guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
   guix/progress.scm                            \
   guix/combinators.scm                         \
@@ -134,6 +131,7 @@ MODULES =                                   \
   guix/svn-download.scm                                \
   guix/i18n.scm                                        \
   guix/ui.scm                                  \
+  guix/status.scm                              \
   guix/build/android-ndk-build-system.scm      \
   guix/build/ant-build-system.scm              \
   guix/build/download.scm                      \
@@ -203,10 +201,12 @@ MODULES =                                 \
   guix/scripts/hash.scm                                \
   guix/scripts/pack.scm                                \
   guix/scripts/pull.scm                                \
+  guix/scripts/processes.scm                   \
   guix/scripts/substitute.scm                  \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
   guix/scripts/repl.scm                                \
+  guix/scripts/describe.scm                    \
   guix/scripts/system.scm                      \
   guix/scripts/system/search.scm               \
   guix/scripts/lint.scm                                \
@@ -280,10 +280,10 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
 # Auxiliary files for packages.
 AUX_FILES =                                            \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
-  gnu/packages/aux-files/linux-libre/4.18-arm.conf     \
-  gnu/packages/aux-files/linux-libre/4.18-arm64.conf   \
-  gnu/packages/aux-files/linux-libre/4.18-i686.conf    \
-  gnu/packages/aux-files/linux-libre/4.18-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    \
+  gnu/packages/aux-files/linux-libre/4.19-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/4.14-arm.conf     \
   gnu/packages/aux-files/linux-libre/4.14-i686.conf    \
   gnu/packages/aux-files/linux-libre/4.14-x86_64.conf  \
@@ -331,8 +331,6 @@ SCM_TESTS =                                 \
   tests/base32.scm                             \
   tests/base64.scm                             \
   tests/cpio.scm                               \
-  tests/hash.scm                               \
-  tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
   tests/print.scm                              \
   tests/sets.scm                               \
@@ -344,7 +342,9 @@ SCM_TESTS =                                 \
   tests/glob.scm                               \
   tests/grafts.scm                             \
   tests/ui.scm                                 \
+  tests/status.scm                             \
   tests/records.scm                            \
+  tests/processes.scm                          \
   tests/upstream.scm                           \
   tests/combinators.scm                                \
   tests/discovery.scm                          \
@@ -406,6 +406,7 @@ SH_TESTS =                                  \
   tests/guix-gc.sh                             \
   tests/guix-hash.sh                           \
   tests/guix-pack.sh                           \
+  tests/guix-pack-relocatable.sh               \
   tests/guix-package.sh                                \
   tests/guix-package-net.sh                    \
   tests/guix-system.sh                         \
@@ -414,6 +415,7 @@ SH_TESTS =                                  \
   tests/guix-environment.sh                    \
   tests/guix-environment-container.sh          \
   tests/guix-graph.sh                          \
+  tests/guix-describe.sh                       \
   tests/guix-lint.sh
 
 TESTS = $(SCM_TESTS) $(SH_TESTS)
@@ -461,8 +463,8 @@ check-system: $(GOBJECTS)
 
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =                            \
-  hydra.gnu.org.pub                            \
-  berlin.guixsd.org.pub
+  etc/substitutes/hydra.gnu.org.pub            \
+  etc/substitutes/berlin.guixsd.org.pub
 
 # Bash completion file.
 dist_bashcompletion_DATA = etc/completion/bash/guix    \