Bootable Containers: Remove ostree-grub2

Remove ostree-grub2 to avoid issues with composefs. We can not remove it yet from the classic ostree ones as we need at least two Fedora releases where bootupd is included and enabled by default as a transition period to make sure we don't break users. See: https://gitlab.com/fedora/ostree/sig/-/issues/35 See: fedora-silverblue/issue-tracker#120 See: https://gitlab.com/fedora/ostree/sig/-/issues/1
evan-goode · Jul 17, 2024 · 599c862 · 599c862
1 parent 4bb588b
commit 599c862
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/common-ostree.yaml b/common-ostree.yaml
@@ -1,5 +1,10 @@
 # Manifest common to classic ostree varaints only and not Bootable Containers
 
+# Packages only included in the legacy ostree variants and not in Bootable
+# Containers
+packages:
+  - ostree-grub2
+
 # We do not include any version of DNF in the classic ostree Atomic Desktops
 # See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora
 exclude-packages:

diff --git a/common-packages.yaml b/common-packages.yaml
@@ -124,7 +124,6 @@ packages:
   - openssh-clients
   - openssh-server
   - orca
-  - ostree-grub2
   - pam_afs_session
   - paps
   - passwdqc

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
@@ -106,6 +106,9 @@ exclude_list:
     - cups-pk-helper
     # For now...
     - ghostscript
+  workstation-ostree-support:
+    # Now only included in the legacy ostree variants
+    - ostree-grub2
 
 # Desktop environment specific exclude lists
 desktop_exclude_list: