From 5ee7d29412baa6b1ccec1c6c799e384480ee79af Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 15 2025 10:15:24 +0000
Subject: [PATCH 1/5] fedora: Add case for kinoite-mobile variant


Missed during the split in [1].

[1] a70ce6b manifests: Split Fedora specific config into its own manifest

---

diff --git a/fedora.yaml b/fedora.yaml
index f7e6957..20c87cc 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -22,6 +22,13 @@ conditional-include:
         # Explicitely not included via comps
         # See: https://pagure.io/fedora-kde/SIG/issue/295
         - plasma-welcome-fedora
+  - if: variant == "kinoite-mobile"
+    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:

From 340f4501d6a5b3842a4baff979ddbbde17dd7c1c Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 15 2025 10:15:24 +0000
Subject: [PATCH 2/5] common: Re-add explicit license info


Initial dropped in [1], but better to be explicit.

[1] fe766a8 manifests: Update metadata

---

diff --git a/common.yaml b/common.yaml
index 5f67613..af45c4b 100644
--- a/common.yaml
+++ b/common.yaml
@@ -3,6 +3,9 @@ releasever: 44
 automatic-version-prefix: "${releasever}.<date:%Y%m%d>"
 mutate-os-release: "${releasever}"
 
+metadata:
+  license: MIT
+
 variables:
   # Default to Bootable Containers and override in classic ostree manifests
   bootable_container: true

From b03e07a88554f256b1b02b5b54484eef3083f481 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 15 2025 11:36:13 +0000
Subject: [PATCH 3/5] manifests: Set ref using variables


Remove duplication and a common soure of conflicts during backports.

---

diff --git a/README.md b/README.md
index 487bca7..409955e 100644
--- a/README.md
+++ b/README.md
@@ -236,7 +236,7 @@ sed -i "s/44/45/g" README.md
 rm fedora-rawhide.repo
 sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml
 sed -i --follow-symlinks "s/# - fedora-44/- fedora-44/" *.yaml
-sed -i --follow-symlinks "s/ref: fedora\/rawhide/ref: fedora\/44/" *.yaml
+sed -i "s/releasever_ref: \"rawhide\"/releasever_ref: \"44\"/" common.yaml
 ```
 
 ## Historical references
diff --git a/base-atomic.yaml b/base-atomic.yaml
index d5c1362..94a6fa0 100644
--- a/base-atomic.yaml
+++ b/base-atomic.yaml
@@ -4,8 +4,6 @@ metadata:
 variables:
   variant: "base-atomic"
 
-ref: fedora/rawhide/${basearch}/base-atomic
-
 include:
   - common.yaml
 
diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml
index 89087a4..a6fd037 100644
--- a/budgie-atomic-common.yaml
+++ b/budgie-atomic-common.yaml
@@ -4,7 +4,8 @@ metadata:
 variables:
   variant: "budgie-atomic"
 
-ref: fedora/rawhide/${basearch}/onyx
+# Overriden to keep the legacy name used in Fedora
+ref: fedora/${releasever_ref}/${basearch}/onyx
 
 include:
   - common.yaml
diff --git a/common.yaml b/common.yaml
index af45c4b..99b118d 100644
--- a/common.yaml
+++ b/common.yaml
@@ -11,6 +11,11 @@ variables:
   bootable_container: true
   # Default to including Fedora branding and specific packages
   distro: "fedora"
+  # Used in ref. Equal to releasever, unless it's for Rawhide
+  releasever_ref: "rawhide"
+
+# Default ref, overriden for some variants with legacy names
+ref: ${distro}/${releasever_ref}/${basearch}/${variant}
 
 # Default to `bash` in our container, the same as other containers we ship.
 container-cmd:
diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml
index 195c7bd..428747e 100644
--- a/cosmic-atomic-common.yaml
+++ b/cosmic-atomic-common.yaml
@@ -4,8 +4,6 @@ metadata:
 variables:
   variant: "cosmic-atomic"
 
-ref: fedora/rawhide/${basearch}/cosmic-atomic
-
 include:
   - common.yaml
   - packages/cosmic-atomic.yaml
diff --git a/kinoite-common.yaml b/kinoite-common.yaml
index 5f381e0..23a9498 100644
--- a/kinoite-common.yaml
+++ b/kinoite-common.yaml
@@ -5,9 +5,6 @@ metadata:
 variables:
   variant: "kinoite"
 
-# Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest
-ref: fedora/rawhide/${basearch}/kinoite
-
 include:
   - common.yaml
 
diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml
index 2561b04..f14f761 100644
--- a/kinoite-mobile.yaml
+++ b/kinoite-mobile.yaml
@@ -4,9 +4,6 @@ metadata:
 variables:
   variant: "kinoite-mobile"
 
-# Override the default Kinoite ref from the kinoite-common.yaml manifest
-ref: fedora/rawhide/${basearch}/kinoite-mobile
-
 include:
   - kinoite-common.yaml
 
diff --git a/silverblue-common.yaml b/silverblue-common.yaml
index b260db0..5d90521 100644
--- a/silverblue-common.yaml
+++ b/silverblue-common.yaml
@@ -4,8 +4,6 @@ metadata:
 variables:
   variant: "silverblue"
 
-ref: fedora/rawhide/${basearch}/silverblue
-
 include:
   - common.yaml
   - packages/silverblue.yaml
diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml
index 36febee..79bb0e8 100644
--- a/sway-atomic-common.yaml
+++ b/sway-atomic-common.yaml
@@ -4,7 +4,8 @@ metadata:
 variables:
   variant: "sway-atomic"
 
-ref: fedora/rawhide/${basearch}/sericea
+# Overriden to keep the legacy name used in Fedora
+ref: fedora/${releasever_ref}/${basearch}/sericea
 
 include:
   - common.yaml

From bc2dd946e65731ba292b092becc3c240f55e8399 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 15 2025 11:36:13 +0000
Subject: [PATCH 4/5] fedora: Skip ostree repo config for Bootable Containers


Ostree repo config is only needed on the classic ostree variants.

---

diff --git a/fedora.yaml b/fedora.yaml
index 20c87cc..801f2d9 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -5,9 +5,6 @@ packages:
   - 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:
@@ -41,6 +38,11 @@ conditional-include:
     include:
       packages:
         - fedora-release-cosmic-atomic
+  # Include ostree remote configuration only on classic ostree variants
+  - if: bootable_container == false
+    include:
+      packages:
+        - fedora-repos-ostree
 
 # Remove the Google Chrome repo from the list of Fedora Third Party enabled
 # repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494

From a5674070500ab8976465712cdc303655740a1f4f Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 15 2025 11:36:13 +0000
Subject: [PATCH 5/5] manifests: Fix PackageKit-glib exclude


Only exclude it for vairants without GNOME Software.

Fixes: a8f2e39 common: Always exclude PackageKit-glib

---

diff --git a/common.yaml b/common.yaml
index 99b118d..cfa23fb 100644
--- a/common.yaml
+++ b/common.yaml
@@ -141,7 +141,6 @@ packages-x86_64:
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages:
   - PackageKit
-  - PackageKit-glib
   # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
   - gstreamer1-plugin-openh264
   - mozilla-openh264
diff --git a/fedora.yaml b/fedora.yaml
index 801f2d9..f11747b 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -43,6 +43,11 @@ conditional-include:
     include:
       packages:
         - fedora-repos-ostree
+  # Can only be excluded on variants that do not include GNOME Software
+  - if: variant != "silverblue"
+    include:
+      exclude-packages:
+        - PackageKit-glib
 
 # Remove the Google Chrome repo from the list of Fedora Third Party enabled
 # repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494