From c8a648c39e2d93fe04441fdbd7a3c0e31c90c9ac Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 17 2025 10:05:31 +0000
Subject: [PATCH 1/2] base-atomic: Move fedora-release package to fedora manifest


---

diff --git a/base-atomic.yaml b/base-atomic.yaml
index 94a6fa0..d9cbbb4 100644
--- a/base-atomic.yaml
+++ b/base-atomic.yaml
@@ -8,9 +8,6 @@ include:
   - common.yaml
 
 packages:
-  # Generic release package for desktop variants
-  - fedora-release
-  - fedora-release-ostree-desktop
   # XWayland support
   - xorg-x11-server-Xwayland
   # Portals for Flatpak
diff --git a/fedora.yaml b/fedora.yaml
index f11747b..3b6d173 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -38,6 +38,11 @@ conditional-include:
     include:
       packages:
         - fedora-release-cosmic-atomic
+  - if: variant == "base-atomic"
+    include:
+      packages:
+        - fedora-release
+        - fedora-release-ostree-desktop
   # Include ostree remote configuration only on classic ostree variants
   - if: bootable_container == false
     include:

From 9ff17decab03896e0d71a82862b2cc34abbbdcaa Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 17 2025 10:16:29 +0000
Subject: [PATCH 2/2] kinoite: Re-split shared manifest to not depend on variant


Variant names are Fedora specific, so we should not depend on those in
shared manifests. Thus re-split the shared config into a shared
manifests for Kinoite and Kinoite Mobile.

---

diff --git a/kinoite-common.yaml b/kinoite-common.yaml
index 23a9498..2d20d67 100644
--- a/kinoite-common.yaml
+++ b/kinoite-common.yaml
@@ -1,65 +1,10 @@
 metadata:
   summary: "Fedora Kinoite"
 
-# Default to Kinoite and override in Kinoite Mobile manifests
 variables:
   variant: "kinoite"
 
 include:
+  - kinoite-shared.yaml
   - common.yaml
-
-conditional-include:
-  - if: variant == "kinoite"
-    include:
-      - packages/kinoite.yaml
-  - if: variant == "kinoite-mobile"
-    include:
-      - packages/kinoite-mobile.yaml
-
-packages:
-  # Install some minor optional tools for KInfoCenter
-  - vulkan-tools
-  - xdpyinfo
-  # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview
-  # See https://pagure.io/fedora-kde/SIG/issue/291
-  - kamera
-  # Make sure that previous Anaconda dependencies are kept in the image
-  # See: https://pagure.io/fedora-kde/SIG/issue/243
-  - mobile-broadband-provider-info
-  # Make sure that modem support is installed
-  - NetworkManager-ppp
-  # Install gdb to make getting backtraces work with DrKonqi
-  - gdb
-  # Make sure rpm-ostree support is installed
-  - plasma-discover-rpm-ostree
-
-# Make sure the following are not pulled in when Recommended by other packages
-exclude-packages:
-  - plasma-discover-offline-updates
-  - plasma-discover-packagekit
-  - plasma-pk-updates
-  # Manually excluded as recommended by gtk3 (and likely gtk4 in the future)
-  # See https://pagure.io/fedora-kde/SIG/issue/124
-  - tracker
-  - tracker-miners
-  - localsearch
-  - tinysparql
-  # Ensure we do not include X11 support
-  - plasma-x11
-  - plasma-workspace-x11
-  # Exclude mariadb server tools that bring in Perl
-  - mariadb-server-utils
-
-# Kinoite specific workarounds and configuration
-postprocess:
-  - |
-    #!/bin/bash
-    set -xeuo pipefail
-
-    # Enable weekly auto updates in Discover. In the future, Flatpaks will be
-    # updated daily. See: https://bugs.kde.org/show_bug.cgi?id=454422
-    cat > /etc/xdg/PlasmaDiscoverUpdates <<EOF
-    [Global]
-    UseUnattendedUpdates=true
-    RequiredNotificationInterval=604800
-    EOF
+  - packages/kinoite.yaml
diff --git a/kinoite-mobile-common.yaml b/kinoite-mobile-common.yaml
new file mode 100644
index 0000000..a469b3c
--- /dev/null
+++ b/kinoite-mobile-common.yaml
@@ -0,0 +1,10 @@
+metadata:
+  summary: "Fedora Kinoite Mobile"
+
+variables:
+  variant: "kinoite-mobile"
+
+include:
+  - kinoite-shared.yaml
+  - common.yaml
+  - packages/kinoite-mobile.yaml
diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml
index f14f761..bff657b 100644
--- a/kinoite-mobile.yaml
+++ b/kinoite-mobile.yaml
@@ -1,11 +1,5 @@
-metadata:
-  summary: "Fedora Kinoite Mobile"
-
-variables:
-  variant: "kinoite-mobile"
-
 include:
-  - kinoite-common.yaml
+  - kinoite-mobile-common.yaml
 
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
diff --git a/kinoite-shared.yaml b/kinoite-shared.yaml
new file mode 100644
index 0000000..8227797
--- /dev/null
+++ b/kinoite-shared.yaml
@@ -0,0 +1,49 @@
+# Shared manifest between Kinoite & Kinoite Mobile
+
+packages:
+  # Install some minor optional tools for KInfoCenter
+  - vulkan-tools
+  - xdpyinfo
+  # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview
+  # See https://pagure.io/fedora-kde/SIG/issue/291
+  - kamera
+  # Make sure that previous Anaconda dependencies are kept in the image
+  # See: https://pagure.io/fedora-kde/SIG/issue/243
+  - mobile-broadband-provider-info
+  # Make sure that modem support is installed
+  - NetworkManager-ppp
+  # Install gdb to make getting backtraces work with DrKonqi
+  - gdb
+  # Make sure rpm-ostree support is installed
+  - plasma-discover-rpm-ostree
+
+# Make sure the following are not pulled in when Recommended by other packages
+exclude-packages:
+  - plasma-discover-offline-updates
+  - plasma-discover-packagekit
+  - plasma-pk-updates
+  # Manually excluded as recommended by gtk3 (and likely gtk4 in the future)
+  # See https://pagure.io/fedora-kde/SIG/issue/124
+  - tracker
+  - tracker-miners
+  - localsearch
+  - tinysparql
+  # Ensure we do not include X11 support
+  - plasma-x11
+  - plasma-workspace-x11
+  # Exclude mariadb server tools that bring in Perl
+  - mariadb-server-utils
+
+# Kinoite specific workarounds and configuration
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+
+    # Enable weekly auto updates in Discover. In the future, Flatpaks will be
+    # updated daily. See: https://bugs.kde.org/show_bug.cgi?id=454422
+    cat > /etc/xdg/PlasmaDiscoverUpdates <<EOF
+    [Global]
+    UseUnattendedUpdates=true
+    RequiredNotificationInterval=604800
+    EOF

