diff options
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 106 |
1 files changed, 64 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index 8f7c9f60e9..a5b57ce11c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012-2023 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> @@ -167,6 +167,7 @@ MODULES = \ guix/build-system/maven.scm \ guix/build-system/node.scm \ guix/build-system/perl.scm \ + guix/build-system/pyproject.scm \ guix/build-system/python.scm \ guix/build-system/renpy.scm \ guix/build-system/ocaml.scm \ @@ -223,6 +224,7 @@ MODULES = \ guix/build/minetest-build-system.scm \ guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ + guix/build/pyproject-build-system.scm \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ guix/build/qt-build-system.scm \ @@ -236,6 +238,7 @@ MODULES = \ guix/build/waf-build-system.scm \ guix/build/haskell-build-system.scm \ guix/build/julia-build-system.scm \ + guix/build/kconfig.scm \ guix/build/linux-module-build-system.scm \ guix/build/store-copy.scm \ guix/build/json.scm \ @@ -287,6 +290,7 @@ MODULES = \ guix/import/print.scm \ guix/import/pypi.scm \ guix/import/stackage.scm \ + guix/import/test.scm \ guix/import/texlive.scm \ guix/import/utils.scm \ guix/scripts.scm \ @@ -398,10 +402,10 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/guix.vim \ - gnu/packages/aux-files/linux-libre/5.19-arm.conf \ - gnu/packages/aux-files/linux-libre/5.19-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.19-i686.conf \ - gnu/packages/aux-files/linux-libre/5.19-x86_64.conf \ + gnu/packages/aux-files/linux-libre/6.1-arm.conf \ + gnu/packages/aux-files/linux-libre/6.1-arm64.conf \ + gnu/packages/aux-files/linux-libre/6.1-i686.conf \ + gnu/packages/aux-files/linux-libre/6.1-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.15-arm.conf \ gnu/packages/aux-files/linux-libre/5.15-arm64.conf \ gnu/packages/aux-files/linux-libre/5.15-i686.conf \ @@ -421,10 +425,9 @@ AUX_FILES = \ 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 \ - gnu/packages/aux-files/linux-libre/4.9-i686.conf \ - gnu/packages/aux-files/linux-libre/4.9-x86_64.conf \ gnu/packages/aux-files/pack-audit.c \ gnu/packages/aux-files/python/sanity-check.py \ + gnu/packages/aux-files/python/sanity-check-next.py \ gnu/packages/aux-files/python/sitecustomize.py \ gnu/packages/aux-files/renpy/renpy.in \ gnu/packages/aux-files/run-in-namespace.c @@ -438,6 +441,8 @@ EXAMPLES = \ gnu/system/examples/desktop.tmpl \ gnu/system/examples/lightweight-desktop.tmpl \ gnu/system/examples/docker-image.tmpl \ + gnu/system/examples/raspberry-pi-64.tmpl \ + gnu/system/examples/raspberry-pi-64-nfs-root.tmpl \ gnu/system/examples/vm-image.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) @@ -590,6 +595,7 @@ SH_TESTS = \ tests/guix-authenticate.sh \ tests/guix-environment.sh \ tests/guix-environment-container.sh \ + tests/guix-refresh.sh \ tests/guix-shell.sh \ tests/guix-shell-export-manifest.sh \ tests/guix-graph.sh \ @@ -659,49 +665,50 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish nodist_selinux_policy_DATA = etc/guix-daemon.cil EXTRA_DIST += \ - HACKING \ - ROADMAP \ - TODO \ - CODE-OF-CONDUCT \ .dir-locals.el \ .guix-authorizations \ .guix-channel \ - scripts/guix.in \ - etc/disarchive-manifest.scm \ - etc/guix-install.sh \ - etc/news.scm \ - etc/release-manifest.scm \ - etc/source-manifest.scm \ - etc/system-tests.scm \ - etc/time-travel-manifest.scm \ - etc/historical-authorizations \ + CODE-OF-CONDUCT \ + HACKING \ + ROADMAP \ + TODO \ + bootstrap \ build-aux/build-self.scm \ - build-aux/compile-all.scm \ - build-aux/cuirass/hurd-manifest.scm \ - build-aux/check-final-inputs-self-contained.scm \ build-aux/check-channel-news.scm \ + build-aux/check-final-inputs-self-contained.scm \ + build-aux/compile-all.scm \ build-aux/compile-as-derivation.scm \ + build-aux/config.rpath \ build-aux/convert-xref.scm \ + build-aux/cuirass/hurd-manifest.scm \ build-aux/generate-authors.scm \ build-aux/test-driver.scm \ - build-aux/update-guix-package.scm \ build-aux/update-NEWS.scm \ - tests/test.drv \ + build-aux/update-guix-package.scm \ + doc/build.scm \ + etc/disarchive-manifest.scm \ + etc/guix-install.sh \ + etc/historical-authorizations \ + etc/news.scm \ + etc/kernels-manifest.scm \ + etc/release-manifest.scm \ + etc/source-manifest.scm \ + etc/system-tests.scm \ + etc/time-travel-manifest.scm \ + scripts/guix.in \ tests/cve-sample.json \ - tests/keys/signing-key.pub \ - tests/keys/signing-key.sec \ tests/keys/civodul.pub \ - tests/keys/rsa.pub \ tests/keys/dsa.pub \ - tests/keys/ed25519.pub \ - tests/keys/ed25519.sec \ tests/keys/ed25519-2.pub \ tests/keys/ed25519-2.sec \ tests/keys/ed25519-3.pub \ tests/keys/ed25519-3.sec \ - build-aux/config.rpath \ - bootstrap \ - doc/build.scm \ + tests/keys/ed25519.pub \ + tests/keys/ed25519.sec \ + tests/keys/rsa.pub \ + tests/keys/signing-key.pub \ + tests/keys/signing-key.sec \ + tests/test.drv \ $(TESTS) if !BUILD_DAEMON_OFFLOAD @@ -750,20 +757,35 @@ endef # in <https://issues.guix.gnu.org/48963>. Each 'eval' call below creates a # 'make-*-go' phony target that builds the corresponding subset. -MODULES_CORE = guix.scm $(filter-out guix/scripts/%,$(filter guix/%,$(MODULES))) -MODULES_PACKAGES = $(filter gnu/packages/%,$(MODULES)) -MODULES_SYSTEM = gnu.scm $(filter-out gnu/packages/%,$(filter gnu/%,$(MODULES))) -MODULES_CLI = $(filter guix/scripts/%,$(MODULES)) -MODULES_PO = guix/build/po.scm +first_half := \ + gnu/packages/a% gnu/packages/b% gnu/packages/c% gnu/packages/d% \ + gnu/packages/e% gnu/packages/f% gnu/packages/g% gnu/packages/h% \ + gnu/packages/i% gnu/packages/j% gnu/packages/k% gnu/packages/l% + +MODULES_CORE := guix.scm $(filter-out guix/scripts/%,$(filter guix/%,$(MODULES))) +MODULES_PACKAGES1 := $(filter $(first_half),$(MODULES)) +MODULES_PACKAGES2 := $(filter-out $(first_half),$(filter gnu/packages/%,$(MODULES))) +MODULES_PACKAGES := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2) +MODULES_SYSTEM := gnu.scm $(filter-out gnu/packages/%,$(filter gnu/%,$(MODULES))) +MODULES_CLI := $(filter guix/scripts/%,$(MODULES)) +MODULES_PO := guix/build/po.scm $(eval $(call guile-compilation-rule,make-core-go, \ $(MODULES_CORE) guix/config.scm $(dist_noinst_DATA), \ 0)) .PHONY: make-core-go -$(eval $(call guile-compilation-rule,make-packages-go, \ - $(MODULES_PACKAGES) make-core-go, \ +$(eval $(call guile-compilation-rule,make-packages1-go, \ + $(MODULES_PACKAGES1) make-core-go, \ $(words $(MODULES_CORE)))) +.PHONY: make-packages1-go + +$(eval $(call guile-compilation-rule,make-packages2-go, \ + $(MODULES_PACKAGES2) make-core-go make-packages1-go, \ + $(words $(MODULES_CORE) $(MODULES_PACKAGES1)))) +.PHONY: make-packages2-go + +make-packages-go: make-packages1-go make-packages2-go .PHONY: make-packages-go $(eval $(call guile-compilation-rule,make-system-go, \ @@ -986,7 +1008,7 @@ release: dist-with-updated-version all -v1 --no-grafts --fallback # Generate the ISO installation images. for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ - GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \ + GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//'`" ; \ image=`$(top_builddir)/pre-inst-env \ guix system image -t iso9660 \ --label="GUIX_$${system}_$(VERSION)" \ @@ -1002,7 +1024,7 @@ release: dist-with-updated-version all done # Generate the VM images. for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ - GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \ + GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//'`" ; \ image=`$(top_builddir)/pre-inst-env \ guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ --save-provenance \ |