etc: Move manifests to a separate directory.

* etc/disarchive-manifest.scm, etc/hurd-manifest.scm,
etc/kernels-manifest.scm, etc/release-manifest.scm,
etc/source-manifest.scm, etc/system-tests.scm,
etc/time-travel-manifest.scm, etc/upgrade-manifest.scm: Move to…
* etc/manifests: … here, and drop “-manifest” from file name.
* Makefile.am (EXTRA_DIST, assert-binaries-available, check-system):
Adjust accordingly.

Change-Id: Iedee3d0cdd42e72ef8bbf654ea5d3b47dca95874
This commit is contained in:
Ludovic Courtès 2024-12-02 15:04:46 +01:00
parent b8a45bd047
commit 12d00767f0
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
9 changed files with 11 additions and 11 deletions

View file

@ -694,7 +694,7 @@ endif !CAN_RUN_TESTS
check-system: $(GOBJECTS) check-system: $(GOBJECTS)
$(AM_V_at)$(top_builddir)/pre-inst-env \ $(AM_V_at)$(top_builddir)/pre-inst-env \
guix build -m $(top_srcdir)/etc/system-tests.scm -K guix build -m $(top_srcdir)/etc/manifests/system-tests.scm -K
# Public keys used to sign substitutes. # Public keys used to sign substitutes.
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
@ -741,17 +741,17 @@ EXTRA_DIST += \
build-aux/update-guix-package.scm \ build-aux/update-guix-package.scm \
build-aux/xgettext.scm \ build-aux/xgettext.scm \
doc/build.scm \ doc/build.scm \
etc/disarchive-manifest.scm \
etc/guix-install.sh \ etc/guix-install.sh \
etc/historical-authorizations \ etc/historical-authorizations \
etc/news.scm \ etc/news.scm \
etc/hurd-manifest.scm \ etc/manifests/disarchive.scm \
etc/kernels-manifest.scm \ etc/manifests/hurd.scm \
etc/release-manifest.scm \ etc/manifests/kernels.scm \
etc/source-manifest.scm \ etc/manifests/release.scm \
etc/system-tests.scm \ etc/manifests/source.scm \
etc/time-travel-manifest.scm \ etc/manifests/system-tests.scm \
etc/upgrade-manifest.scm \ etc/manifests/time-travel.scm \
etc/manifests/upgrade.scm \
scripts/guix.in \ scripts/guix.in \
tests/cve-sample.json \ tests/cve-sample.json \
tests/keys/civodul.pub \ tests/keys/civodul.pub \
@ -1202,7 +1202,7 @@ assert-no-store-file-names:
# server so that '--display-missing' doesn't print two lists. # server so that '--display-missing' doesn't print two lists.
assert-binaries-available: $(GOBJECTS) assert-binaries-available: $(GOBJECTS)
$(AM_V_at)$(top_builddir)/pre-inst-env \ $(AM_V_at)$(top_builddir)/pre-inst-env \
guix weather -m "$(top_srcdir)/etc/release-manifest.scm" \ guix weather -m "$(top_srcdir)/etc/manifests/release.scm" \
--substitute-urls="https://ci.guix.gnu.org" \ --substitute-urls="https://ci.guix.gnu.org" \
--display-missing --display-missing

View file

@ -24,7 +24,7 @@
(guix base16) (guix base16)
(gnu packages)) (gnu packages))
(include "source-manifest.scm") (include "source.scm")
(define (tarball-origin? origin) (define (tarball-origin? origin)
(match (origin-actual-file-name origin) (match (origin-actual-file-name origin)