diff options
| author | Rutherther <rutherther@ditigal.xyz> | 2025-10-29 19:04:11 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2025-11-23 10:52:25 +0200 |
| commit | 48ca0285116331e5fe29494191d64988f68fc4ff (patch) | |
| tree | e205aac2f8dc9eab5758ef0d7fa13c3e252147da /Makefile.am | |
| parent | 5baaa0da3ab2cb969942acfc6d2ae09ee8561365 (diff) | |
manifests: Split release manifest to two.
As stated in the manifest, use two release manifests:
1. Minimal one
2. Full one with all the desktop services enabled.
* etc/manifests/release.scm: Move to etc/manifests/release-minimal.scm.
* etc/manifests/release-minimal.scm (%system-packages):
Add packages from default privileged-programs.
Add %base-firmware.
Add %base-packages.
Remove desktops.
Remove xorg modules.
* etc/teams.scm (release): Add new splitted manifests.
* Makefile.am
(EXTRA_DIST): Remove release manifest; Add manifests release-minimal and
release-desktop.
(assert-binaries-available): Use new splitted release manifest.
* etc/manifests/release-desktop.scm (%system-packages):
Add desktops.
Add xorg modules.
* CODEOWNERS: Regenerate file.
Change-Id: I40de8b5d0f9c8b630e8af7969d4c195dd9e2c3e2
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 459f3f4b6b7..301fa97f402 100644 --- a/Makefile.am +++ b/Makefile.am @@ -784,7 +784,8 @@ EXTRA_DIST += \ etc/manifests/disarchive.scm \ etc/manifests/hurd.scm \ etc/manifests/kernels.scm \ - etc/manifests/release.scm \ + etc/manifests/release-minimal.scm \ + etc/manifests/release-desktop.scm \ etc/manifests/source.scm \ etc/manifests/system-tests.scm \ etc/manifests/time-travel.scm \ @@ -1240,9 +1241,10 @@ assert-no-store-file-names: # Make sure installer substitutes are available. Check only the primary # server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) - $(AM_V_at)$(top_builddir)/pre-inst-env \ - guix weather -m "$(top_srcdir)/etc/manifests/release.scm" \ - --substitute-urls="https://ci.guix.gnu.org" \ + $(AM_V_at)$(top_builddir)/pre-inst-env \ + guix weather -m "$(top_srcdir)/etc/manifests/release-minimal.scm" \ + -m "$(top_srcdir)/etc/manifests/release-desktop.scm" \ + --substitute-urls="https://ci.guix.gnu.org" \ --display-missing # Make sure the final inputs don't refer to bootstrap tools. |