From 49db8be8e2c4ed1c1b16f76aac39fc94d1e01f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 14 Feb 2024 11:09:16 +0100
Subject: [PATCH] manifests: Move repos config to common manifest

Should simplify branching.
---
 README.md                 | 2 +-
 fedora-base.yaml          | 5 -----
 fedora-cinnamon.yaml      | 5 -----
 fedora-common-ostree.yaml | 5 +++++
 fedora-deepin.yaml        | 5 -----
 fedora-kinoite.yaml       | 5 -----
 fedora-lazurite.yaml      | 5 -----
 fedora-mate.yaml          | 5 -----
 fedora-onyx.yaml          | 5 -----
 fedora-sericea.yaml       | 5 -----
 fedora-silverblue.yaml    | 5 -----
 fedora-vauxite.yaml       | 5 -----
 12 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 35a4607..d4882d6 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Make a PR similar to
 ### On Rawhide / main branch
 
 ```
-sed -i "s/41/42/g" *.repo *.yaml comps-sync.py
+sed -i "s/41/42/g" *.repo fedora-common-ostree.yaml comps-sync.py
 mv fedora-41.repo fedora-42.repo
 mv fedora-41-updates.repo fedora-42-updates.repo
 sed -i "s/42/42/g" README.md
diff --git a/fedora-base.yaml b/fedora-base.yaml
index 041455c..6a2c335 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -14,8 +14,3 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal
   - xdg-desktop-portal-gtk
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml
index 2027b08..5df0893 100644
--- a/fedora-cinnamon.yaml
+++ b/fedora-cinnamon.yaml
@@ -10,8 +10,3 @@ packages:
   - xdg-desktop-portal-gtk
   # Include GUI to manage updates & Flatpaks
   - gnome-software
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 3138f5b..1b857f6 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -137,3 +137,8 @@ postprocess:
     ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
 
 postprocess-script: "postprocess.sh"
+
+repos:
+  - fedora-rawhide
+  # - fedora-41
+  # - fedora-41-updates
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index 196439b..8bfa221 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -11,8 +11,3 @@ packages:
   - fedora-release-ostree-desktop
   # GUI to manage updates & Flatpaks
   - gnome-software
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 7f7cb9d..17b38cf 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -45,8 +45,3 @@ postprocess:
 
     # Enable auto updates in Discover
     echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml
index 6abee52..ed69623 100644
--- a/fedora-lazurite.yaml
+++ b/fedora-lazurite.yaml
@@ -15,8 +15,3 @@ packages:
   - plasma-systemsettings
   # Portals for Flatpak
   - xdg-desktop-portal-kde
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index e652a0e..8eb0014 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -13,8 +13,3 @@ packages:
 
 exclude-packages:
   - python3-unbound
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml
index 2cf112d..3681ec5 100644
--- a/fedora-onyx.yaml
+++ b/fedora-onyx.yaml
@@ -12,8 +12,3 @@ exclude-packages:
   # Not needed in Budgie Desktop
   - tracker
   - tracker-miners
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml
index 31465ba..8044d24 100644
--- a/fedora-sericea.yaml
+++ b/fedora-sericea.yaml
@@ -18,8 +18,3 @@ exclude-packages:
   # nothing in the tree would use these
   - tracker
   - tracker-miners
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index 6d373ba..20b8262 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -29,8 +29,3 @@ packages:
 exclude-packages:
   # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue
   - gnome-software-fedora-langpacks
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates
diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml
index c5c9e44..e5f880c 100644
--- a/fedora-vauxite.yaml
+++ b/fedora-vauxite.yaml
@@ -11,8 +11,3 @@ packages:
   - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
-
-repos:
-  - fedora-rawhide
-  # - fedora-41
-  # - fedora-41-updates