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: 49db8be manifests: Move repos config to common manifest
This commit is contained in:
Timothée Ravier 2024-02-21 02:24:40 +01:00
parent a252f7a2b5
commit 8ad09dc672
12 changed files with 64 additions and 8 deletions

View file

@ -85,6 +85,7 @@ Make a PR similar to
``` ```
sed -i "s/41/42/g" *.repo comps-sync.py sed -i "s/41/42/g" *.repo comps-sync.py
sed -i "s/releasever: 41/releasever: 42/" fedora-common-ostree.yaml sed -i "s/releasever: 41/releasever: 42/" fedora-common-ostree.yaml
sed -i "s/# - fedora-41/# - fedora-42/" fedora-*.yaml
mv fedora-41.repo fedora-42.repo mv fedora-41.repo fedora-42.repo
mv fedora-41-updates.repo fedora-42-updates.repo mv fedora-41-updates.repo fedora-42-updates.repo
sed -i "s/42/42/g" README.md sed -i "s/42/42/g" README.md
@ -95,9 +96,9 @@ sed -i "s/41/42/g" README.md
``` ```
rm fedora-rawhide.repo rm fedora-rawhide.repo
sed -i "/- fedora-rawhide/d" *.yaml sed -i "/- fedora-rawhide/d" fedora-*.yaml
sed -i "s/# - fedora-41/- fedora-41/" *.yaml sed -i "s/# - fedora-41/- fedora-41/" fedora-*.yaml
sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" fedora-*.yaml
``` ```
## Historical references ## Historical references

View file

@ -14,3 +14,9 @@ packages:
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal - xdg-desktop-portal
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -10,3 +10,9 @@ packages:
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
# Include GUI to manage updates & Flatpaks # Include GUI to manage updates & Flatpaks
- gnome-software - gnome-software
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -138,8 +138,3 @@ postprocess:
ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb
postprocess-script: "postprocess.sh" postprocess-script: "postprocess.sh"
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -11,3 +11,9 @@ packages:
- fedora-release-ostree-desktop - fedora-release-ostree-desktop
# GUI to manage updates & Flatpaks # GUI to manage updates & Flatpaks
- gnome-software - gnome-software
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -45,3 +45,9 @@ postprocess:
# Enable auto updates in Discover # Enable auto updates in Discover
echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates echo -e "[Global]\nUseUnattendedUpdates=true\n" > /etc/xdg/PlasmaDiscoverUpdates
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -15,3 +15,9 @@ packages:
- plasma-systemsettings - plasma-systemsettings
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal-kde - xdg-desktop-portal-kde
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -13,3 +13,9 @@ packages:
exclude-packages: exclude-packages:
- python3-unbound - python3-unbound
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -12,3 +12,9 @@ exclude-packages:
# Not needed in Budgie Desktop # Not needed in Budgie Desktop
- tracker - tracker
- tracker-miners - tracker-miners
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -18,3 +18,9 @@ exclude-packages:
# nothing in the tree would use these # nothing in the tree would use these
- tracker - tracker
- tracker-miners - tracker-miners
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -29,3 +29,9 @@ packages:
exclude-packages: exclude-packages:
# Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue
- gnome-software-fedora-langpacks - gnome-software-fedora-langpacks
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates

View file

@ -11,3 +11,9 @@ packages:
- fedora-release-ostree-desktop - fedora-release-ostree-desktop
# Portals for Flatpak # Portals for Flatpak
- xdg-desktop-portal-gtk - xdg-desktop-portal-gtk
# Kept in the leaf manifest as they are overwritten by Pungi in composes
repos:
- fedora-rawhide
# - fedora-41
# - fedora-41-updates