From 2a58902adb5da60c67fde4589a68cec8fa344b4e Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Feb 21 2024 01:46:16 +0000
Subject: Revert: manifests: Move repos config to common manifest


Repos are overwritten by Pungi during composes in the Fedora infra and
Pungi currently only overwrites the leaf manifest.

See: https://pagure.io/releng/issue/11969
Reverts: 49a0fcf manifests: Move repos config to common manifest

---

diff --git a/fedora-base.yaml b/fedora-base.yaml
index 0c19433..c112dac 100644
--- a/fedora-base.yaml
+++ b/fedora-base.yaml
@@ -14,3 +14,8 @@ packages:
   # Portals for Flatpak
   - xdg-desktop-portal
   - xdg-desktop-portal-gtk
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml
index 18866d8..c2186d1 100644
--- a/fedora-cinnamon.yaml
+++ b/fedora-cinnamon.yaml
@@ -10,3 +10,8 @@ packages:
   - xdg-desktop-portal-gtk
   # Include GUI to manage updates & Flatpaks
   - gnome-software
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 7e9b3dd..c94035e 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -137,7 +137,3 @@ postprocess:
     ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
 
 postprocess-script: "postprocess.sh"
-
-repos:
-  - fedora-40
-  - fedora-40-updates
diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml
index 3ff4228..7670409 100644
--- a/fedora-deepin.yaml
+++ b/fedora-deepin.yaml
@@ -11,3 +11,8 @@ packages:
   - fedora-release-ostree-desktop
   # GUI to manage updates & Flatpaks
   - gnome-software
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml
index 26f3a4e..0955cf5 100644
--- a/fedora-kinoite.yaml
+++ b/fedora-kinoite.yaml
@@ -36,3 +36,8 @@ exclude-packages:
   # Ensure we do not include X11 support
   - plasma-x11
   - plasma-workspace-x11
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml
index d1f7033..1df89a4 100644
--- a/fedora-lazurite.yaml
+++ b/fedora-lazurite.yaml
@@ -15,3 +15,8 @@ packages:
   - plasma-systemsettings
   # Portals for Flatpak
   - xdg-desktop-portal-kde
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-mate.yaml b/fedora-mate.yaml
index ede19bb..a1ceb28 100644
--- a/fedora-mate.yaml
+++ b/fedora-mate.yaml
@@ -13,3 +13,8 @@ packages:
 
 exclude-packages:
   - python3-unbound
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml
index 19c2917..f66ead4 100644
--- a/fedora-onyx.yaml
+++ b/fedora-onyx.yaml
@@ -12,3 +12,8 @@ exclude-packages:
   # Not needed in Budgie Desktop
   - tracker
   - tracker-miners
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml
index 1bc1ba1..be95b80 100644
--- a/fedora-sericea.yaml
+++ b/fedora-sericea.yaml
@@ -18,3 +18,8 @@ exclude-packages:
   # nothing in the tree would use these
   - tracker
   - tracker-miners
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index 33c2e99..96b7703 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -29,3 +29,8 @@ packages:
 exclude-packages:
   # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue
   - gnome-software-fedora-langpacks
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates
diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml
index 1c0e291..1420dd6 100644
--- a/fedora-vauxite.yaml
+++ b/fedora-vauxite.yaml
@@ -11,3 +11,8 @@ packages:
   - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-40
+  - fedora-40-updates