From a52625492bec6f251971cf350086cc435adc86e8 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Mon, 12 Aug 2024 15:28:54 +0530 Subject: [PATCH] Rawhide is now f42 Signed-off-by: Samyak Jain --- README.md | 24 +++++++++---------- base-atomic.yaml | 4 ++-- budgie-atomic-ostree.yaml | 4 ++-- budgie-atomic.yaml | 4 ++-- cinnamon-atomic.yaml | 4 ++-- common.yaml | 2 +- comps-sync.py | 2 +- deepin-atomic.yaml | 4 ++-- ...-41-updates.repo => fedora-42-updates.repo | 6 ++--- fedora-41.repo => fedora-42.repo | 6 ++--- fedora-kinoite.yaml | 12 +++++++++- fedora-onyx.yaml | 12 +++++++++- fedora-sericea.yaml | 12 +++++++++- fedora-silverblue.yaml | 12 +++++++++- kinoite-mobile.yaml | 4 ++-- kinoite-ostree.yaml | 4 ++-- kinoite.yaml | 4 ++-- lxqt-atomic.yaml | 4 ++-- mate-atomic.yaml | 4 ++-- silverblue-ostree.yaml | 4 ++-- silverblue.yaml | 4 ++-- sway-atomic-ostree.yaml | 4 ++-- sway-atomic.yaml | 4 ++-- xfce-atomic.yaml | 4 ++-- 24 files changed, 94 insertions(+), 54 deletions(-) rename fedora-41-updates.repo => fedora-42-updates.repo (55%) rename fedora-41.repo => fedora-42.repo (64%) mode change 120000 => 100644 fedora-kinoite.yaml mode change 120000 => 100644 fedora-onyx.yaml mode change 120000 => 100644 fedora-sericea.yaml mode change 120000 => 100644 fedora-silverblue.yaml diff --git a/README.md b/README.md index 3919ad4..fe1a064 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-f41.xml.in` +`$ ./comps-sync.py /path/to/fedora-comps/comps-f42.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-f41.xml.in` +`$ ./comps-sync.py --save /path/to/fedora-comps/comps-f42.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/41/42/g" *.repo comps-sync.py -sed -i "s/releasever: 41/releasever: 42/" common.yaml -sed -i "s/# - fedora-41/# - fedora-42/" *.yaml -mv fedora-41.repo fedora-42.repo -mv fedora-41-updates.repo fedora-42-updates.repo -sed -i "s/42/42/g" README.md -sed -i "s/41/42/g" README.md +sed -i "s/42/43/g" *.repo comps-sync.py +sed -i "s/releasever: 42/releasever: 43/" common.yaml +sed -i "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" README.md +sed -i "s/42/43/g" README.md ``` -### On the new branch (f41) +### On the new branch (f42) ``` rm fedora-rawhide.repo sed -i "/- fedora-rawhide/d" fedora-*.yaml -sed -i "s/# - fedora-41/- fedora-41/" *.yaml -sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml +sed -i "s/# - fedora-42/- fedora-42/" *.yaml +sed -i "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml ``` ## Historical references diff --git a/base-atomic.yaml b/base-atomic.yaml index 80df8b4..1d6d22a 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/budgie-atomic-ostree.yaml b/budgie-atomic-ostree.yaml index 6ca0f61..c1daffc 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/budgie-atomic.yaml b/budgie-atomic.yaml index bb0d843..5ea7ebe 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index f93cc88..f0898c4 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/common.yaml b/common.yaml index ac1196e..8ac01c2 100644 --- a/common.yaml +++ b/common.yaml @@ -1,4 +1,4 @@ -releasever: 41 +releasever: 42 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" diff --git a/comps-sync.py b/comps-sync.py index 72dacce..f6542be 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 ''' -Usage: ./comps-sync.py [--save] /path/to/comps-f41.xml.in +Usage: ./comps-sync.py [--save] /path/to/comps-f42.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/deepin-atomic.yaml b/deepin-atomic.yaml index e2ed9c4..f903617 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/fedora-41-updates.repo b/fedora-42-updates.repo similarity index 55% rename from fedora-41-updates.repo rename to fedora-42-updates.repo index 717965b..9a71b9c 100644 --- a/fedora-41-updates.repo +++ b/fedora-42-updates.repo @@ -1,6 +1,6 @@ -[fedora-41-updates] -name=Fedora 41 $basearch Updates -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f41&arch=$basearch +[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-41.repo b/fedora-42.repo similarity index 64% rename from fedora-41.repo rename to fedora-42.repo index cbde6cd..d87f5dc 100644 --- a/fedora-41.repo +++ b/fedora-42.repo @@ -1,6 +1,6 @@ -[fedora-41] -name=Fedora 41 $basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-41&arch=$basearch +[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-kinoite.yaml b/fedora-kinoite.yaml deleted file mode 120000 index c2542a6..0000000 --- a/fedora-kinoite.yaml +++ /dev/null @@ -1 +0,0 @@ -kinoite-ostree.yaml \ No newline at end of file diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml new file mode 100644 index 0000000..6d15d96 --- /dev/null +++ b/fedora-kinoite.yaml @@ -0,0 +1,11 @@ +variables: + bootable_container: false + +include: + - kinoite-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-42 + # - fedora-42-updates diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml deleted file mode 120000 index f9283ac..0000000 --- a/fedora-onyx.yaml +++ /dev/null @@ -1 +0,0 @@ -budgie-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml new file mode 100644 index 0000000..c1daffc --- /dev/null +++ b/fedora-onyx.yaml @@ -0,0 +1,11 @@ +variables: + bootable_container: false + +include: + - budgie-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-42 + # - fedora-42-updates diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml deleted file mode 120000 index 0728c62..0000000 --- a/fedora-sericea.yaml +++ /dev/null @@ -1 +0,0 @@ -sway-atomic-ostree.yaml \ No newline at end of file diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml new file mode 100644 index 0000000..cb2d108 --- /dev/null +++ b/fedora-sericea.yaml @@ -0,0 +1,11 @@ +variables: + bootable_container: false + +include: + - sway-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-42 + # - fedora-42-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml deleted file mode 120000 index 0c5ed77..0000000 --- a/fedora-silverblue.yaml +++ /dev/null @@ -1 +0,0 @@ -silverblue-ostree.yaml \ No newline at end of file diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml new file mode 100644 index 0000000..fcf059a --- /dev/null +++ b/fedora-silverblue.yaml @@ -0,0 +1,11 @@ +variables: + bootable_container: false + +include: + - silverblue-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-42 + # - fedora-42-updates diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 155d4d6..d8ce7df 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -46,5 +46,5 @@ exclude-packages: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/kinoite-ostree.yaml b/kinoite-ostree.yaml index 5951235..6d15d96 100644 --- a/kinoite-ostree.yaml +++ b/kinoite-ostree.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/kinoite.yaml b/kinoite.yaml index 3101586..b0cb079 100644 --- a/kinoite.yaml +++ b/kinoite.yaml @@ -7,5 +7,5 @@ include: # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-rawhide - # - fedora-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 8721e92..3e6b8ec 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/mate-atomic.yaml b/mate-atomic.yaml index eb36df4..bc5e11f 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/silverblue-ostree.yaml b/silverblue-ostree.yaml index ac1dd0c..fcf059a 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/silverblue.yaml b/silverblue.yaml index eaba398..c3a7fe2 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/sway-atomic-ostree.yaml b/sway-atomic-ostree.yaml index b09226e..cb2d108 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/sway-atomic.yaml b/sway-atomic.yaml index 89c7c18..f03d0e4 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index d05aa2f..241b8a0 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-41 - # - fedora-41-updates + # - fedora-42 + # - fedora-42-updates