From 18ac0d75ebf865b03085256b9701c9630b6e7e8c Mon Sep 17 00:00:00 2001 From: Patrik Polakovič Date: Feb 04 2025 10:56:49 +0000 Subject: Rawhide is now F43 --- diff --git a/README.md b/README.md index 8add76a..afcdf7f 100644 --- a/README.md +++ b/README.md @@ -162,13 +162,13 @@ https://pagure.io/fedora-comps and a `git` checkout of this repository. Using the `comps-sync.py` script, provide the updated input XML file to examine the changes as a dry-run: -`$ ./comps-sync.py /path/to/fedora-comps/comps-f42.xml.in` +`$ ./comps-sync.py /path/to/fedora-comps/comps-f43.xml.in` Examine the changes and cross-reference them with PRs made to the `fedora-comps` repo. When you are satisfied that the changes are accurate and appear safe, re-run the script with the `--save` option: -`$ ./comps-sync.py --save /path/to/fedora-comps/comps-f42.xml.in` +`$ ./comps-sync.py --save /path/to/fedora-comps/comps-f43.xml.in` Create a pull request with the changes and note any PRs from `fedora-comps` in the commit message that are relevant to the changes you have generated. @@ -186,22 +186,22 @@ Make a PR similar to ### On Rawhide / main branch ``` -sed -i "s/42/43/g" *.repo comps-sync.py -sed -i "s/releasever: 42/releasever: 43/" common.yaml -sed -i --follow-symlinks "s/# - fedora-42/# - fedora-43/" *.yaml -mv fedora-42.repo fedora-43.repo -mv fedora-42-updates.repo fedora-43-updates.repo +sed -i "s/43/44/g" *.repo comps-sync.py +sed -i "s/releasever: 43/releasever: 44/" common.yaml +sed -i --follow-symlinks "s/# - fedora-43/# - fedora-44/" *.yaml +mv fedora-43.repo fedora-44.repo +mv fedora-43-updates.repo fedora-44-updates.repo +sed -i "s/44/44/g" README.md sed -i "s/43/44/g" README.md -sed -i "s/42/43/g" README.md ``` -### On the new branch (f42) +### On the new branch (f43) ``` rm fedora-rawhide.repo sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml -sed -i --follow-symlinks "s/# - fedora-42/- fedora-42/" *.yaml -sed -i --follow-symlinks "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml +sed -i --follow-symlinks "s/# - fedora-43/- fedora-43/" *.yaml +sed -i --follow-symlinks "s/ref: fedora\/rawhide/ref: fedora\/43/" *.yaml ``` ## Historical references diff --git a/base-atomic.yaml b/base-atomic.yaml index 1d6d22a..78eab0e 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -24,5 +24,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml index c1daffc..ca027e5 100644 --- a/budgie-atomic-ostree.yaml +++ b/budgie-atomic-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index 5ea7ebe..5a2d9c0 100644 --- a/budgie-atomic.yaml +++ b/budgie-atomic.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index f0898c4..846a8a1 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -21,5 +21,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/common.yaml b/common.yaml index 2793a11..3bdacc4 100644 --- a/common.yaml +++ b/common.yaml @@ -1,4 +1,4 @@ -releasever: 42 +releasever: 43 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" diff --git a/comps-sync.py b/comps-sync.py index 81f0e9b..9ea2291 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 ''' -Usage: ./comps-sync.py [--save] /path/to/comps-f42.xml.in +Usage: ./comps-sync.py [--save] /path/to/comps-f43.xml.in Filter and sync packages from comps groups into rpm-ostree manifests. The sync will remove packages from the manifests which are not mentioned in comps and diff --git a/cosmic-atomic.yaml b/cosmic-atomic.yaml index b3ac9be..d0242a7 100644 --- a/cosmic-atomic.yaml +++ b/cosmic-atomic.yaml @@ -26,5 +26,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index f903617..893de5f 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -22,5 +22,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/fedora-42-updates.repo b/fedora-42-updates.repo deleted file mode 100644 index 9a71b9c..0000000 --- a/fedora-42-updates.repo +++ /dev/null @@ -1,6 +0,0 @@ -[fedora-42-updates] -name=Fedora 42 $basearch Updates -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f42&arch=$basearch -enabled=1 -gpgcheck=1 -metadata_expire=1d diff --git a/fedora-42.repo b/fedora-42.repo deleted file mode 100644 index d87f5dc..0000000 --- a/fedora-42.repo +++ /dev/null @@ -1,6 +0,0 @@ -[fedora-42] -name=Fedora 42 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-42&arch=$basearch -enabled=1 -gpgcheck=1 -metadata_expire=1d diff --git a/fedora-43-updates.repo b/fedora-43-updates.repo new file mode 100644 index 0000000..30aed59 --- /dev/null +++ b/fedora-43-updates.repo @@ -0,0 +1,6 @@ +[fedora-43-updates] +name=Fedora 43 $basearch Updates +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f43&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d diff --git a/fedora-43.repo b/fedora-43.repo new file mode 100644 index 0000000..437e57c --- /dev/null +++ b/fedora-43.repo @@ -0,0 +1,6 @@ +[fedora-43] +name=Fedora 43 $basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-43&arch=$basearch +enabled=1 +gpgcheck=1 +metadata_expire=1d diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index da8a731..2f6e948 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -15,5 +15,5 @@ rojig: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 40d94f6..7cdfdcb 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -8,5 +8,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/kinoite.yaml b/kinoite.yaml index 74a782b..f335856 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -8,5 +8,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 3e6b8ec..4c4c9ff 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -26,5 +26,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/mate-atomic.yaml b/mate-atomic.yaml index bc5e11f..57a8598 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -24,5 +24,5 @@ exclude-packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml index fcf059a..4d8ae8f 100644 --- a/silverblue-ostree.yaml +++ b/silverblue-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/silverblue.yaml b/silverblue.yaml index c3a7fe2..54f175e 100644 --- a/silverblue.yaml +++ b/silverblue.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml index cb2d108..515a10d 100644 --- a/sway-atomic-ostree.yaml +++ b/sway-atomic-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml index f03d0e4..a41663d 100644 --- a/sway-atomic.yaml +++ b/sway-atomic.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 241b8a0..33bae63 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -22,5 +22,5 @@ packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-42 - # - fedora-42-updates + # - fedora-43 + # - fedora-43-updates