manifests: Split Fedora specific config into its own manifest

This will make things easier for downstream builds which have to change
the release and logo packages.

budgie-atomic-common.yaml

@@ -10,9 +10,6 @@ include:
   - common.yaml
   - packages/budgie-atomic.yaml
 
-packages:
-  - fedora-release-budgie-atomic
-
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:
   # Not needed in Budgie Desktop

common.yaml

@@ -6,6 +6,8 @@ mutate-os-release: "${releasever}"
 variables:
   # Default to Bootable Containers and override in classic ostree manifests
   bootable_container: true
+  # Default to including Fedora branding and specific packages
+  distro: "fedora"
 
 # Default to `bash` in our container, the same as other containers we ship.
 container-cmd:
@@ -24,8 +26,6 @@ include:
   - kernel-install.yaml
   # Enable composefs
   - composefs.yaml
-  # Fixes for Fedora Third Party
-  - fedora.yaml
 
 arch-include:
   x86_64:
@@ -34,6 +34,10 @@ arch-include:
     - qemu-user-static-non-x86_64.yaml
 
 conditional-include:
+  # Manifests included only if we are building for Fedora
+  - if: distro == "fedora"
+    include:
+      - fedora.yaml
   # Manifests included only for classic ostree variants
   - if: bootable_container == false
     include:
@@ -72,9 +76,6 @@ packages:
   # Flatpak support
   - flatpak
   - xdg-desktop-portal
-  # Contains default ostree remote config to be used on client's
-  # system for fetching ostree update
-  - fedora-repos-ostree
   # the archive repo for more reliable package layering
   # https://github.com/coreos/fedora-coreos-tracker/issues/400
   - fedora-repos-archive

comps-sync-exclude-list.yml

@@ -98,6 +98,14 @@ exclude_list:
     - qadwaitadecorations-qt5
     # X11 specific
     - xorg-x11-drv-libinput
+    # Included explicitly in the fedora.yaml manifest
+    - fedora-chromium-config
+    - fedora-flathub-remote
+    - fedora-workstation-backgrounds
+    - fedora-workstation-repositories
+  firefox:
+    # Included explicitly in the fedora.yaml manifest
+    - fedora-bookmarks
   networkmanager-submodules:
     # Let's use the builtin one by default
     - dhcp-client
@@ -160,7 +168,7 @@ desktop_exclude_list:
     - NetworkManager-libreswan-gnome
     - NetworkManager-sstp-gnome
     - NetworkManager-strongswan-gnome
-    # Pulled-in via the common set of packages
+    # Included explicitly in the fedora.yaml manifest
     - fedora-flathub-remote
     - fedora-workstation-repositories
   budgie-desktop-apps:
@@ -196,7 +204,7 @@ desktop_exclude_list:
   kde-mobile:
     # Already included by default for all variants
     - glibc-all-langpacks
-    # Pulled-in via the common set of packages
+    # Included explicitly in the fedora.yaml manifest
     - fedora-flathub-remote
     - fedora-workstation-repositories
   swaywm-extended:

cosmic-atomic-common.yaml

@@ -11,6 +11,5 @@ include:
   - packages/cosmic-atomic.yaml
 
 packages:
-  - fedora-release-cosmic-atomic
   # Portals for Flatpak
   - xdg-desktop-portal-gtk

fedora.yaml

@@ -1,3 +1,40 @@
+# All Fedora specific packages and configuration
+packages:
+  - fedora-bookmarks
+  - fedora-chromium-config
+  - fedora-flathub-remote
+  - fedora-workstation-backgrounds
+  - fedora-workstation-repositories
+  # Contains default ostree remote config to be used on client's
+  # system for fetching ostree update
+  - fedora-repos-ostree
+
+# Fedora specific packages for each variant
+conditional-include:
+  - if: variant == "silverblue"
+    include:
+      packages:
+        - fedora-release-silverblue
+  - if: variant == "kinoite"
+    include:
+      packages:
+        - fedora-release-kinoite
+        # Explicitely not included via comps
+        # See: https://pagure.io/fedora-kde/SIG/issue/295
+        - plasma-welcome-fedora
+  - if: variant == "sway-atomic"
+    include:
+      packages:
+        - fedora-release-sway-atomic
+  - if: variant == "budgie-atomic"
+    include:
+      packages:
+        - fedora-release-budgie-atomic
+  - if: variant == "cosmic-atomic"
+    include:
+      packages:
+        - fedora-release-cosmic-atomic
+
 # Remove the Google Chrome repo from the list of Fedora Third Party enabled
 # repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494
 postprocess:

kinoite-common.yaml

@@ -20,7 +20,6 @@ conditional-include:
       - packages/kinoite-mobile.yaml
 
 packages:
-  - fedora-release-kinoite
   # Install some minor optional tools for KInfoCenter
   - vulkan-tools
   - xdpyinfo
@@ -34,9 +33,6 @@ packages:
   - NetworkManager-ppp
   # Install gdb to make getting backtraces work with DrKonqi
   - gdb
-  # Explicitely not included via comps
-  # See: https://pagure.io/fedora-kde/SIG/issue/295
-  - plasma-welcome-fedora
   # Make sure rpm-ostree support is installed
   - plasma-discover-rpm-ostree
 

packages/common.yaml

@@ -54,11 +54,6 @@ packages:
   - e2fsprogs
   - ethtool
   - exfatprogs
-  - fedora-bookmarks
-  - fedora-chromium-config
-  - fedora-flathub-remote
-  - fedora-workstation-backgrounds
-  - fedora-workstation-repositories
   - file
   - filesystem
   - firefox

silverblue-common.yaml

@@ -11,7 +11,6 @@ include:
   - packages/silverblue.yaml
 
 packages:
-  - fedora-release-silverblue
   - desktop-backgrounds-gnome
   - gnome-shell-extension-background-logo
   - pinentry-gnome3

sway-atomic-common.yaml

@@ -11,7 +11,6 @@ include:
   - packages/sway-atomic.yaml
 
 packages:
-  - fedora-release-sway-atomic
   # explicitly list some defaults
   - firefox