Rawhide is now f42

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
This commit is contained in:
Samyak Jain 2024-08-12 15:28:54 +05:30
parent 1c417f05b4
commit a52625492b
24 changed files with 94 additions and 54 deletions

View file

@ -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 Using the `comps-sync.py` script, provide the updated input XML file to examine
the changes as a dry-run: 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` 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, repo. When you are satisfied that the changes are accurate and appear safe,
re-run the script with the `--save` option: 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` 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. 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 ### On Rawhide / main branch
``` ```
sed -i "s/41/42/g" *.repo comps-sync.py sed -i "s/42/43/g" *.repo comps-sync.py
sed -i "s/releasever: 41/releasever: 42/" common.yaml sed -i "s/releasever: 42/releasever: 43/" common.yaml
sed -i "s/# - fedora-41/# - fedora-42/" *.yaml sed -i "s/# - fedora-42/# - fedora-43/" *.yaml
mv fedora-41.repo fedora-42.repo mv fedora-42.repo fedora-43.repo
mv fedora-41-updates.repo fedora-42-updates.repo mv fedora-42-updates.repo fedora-43-updates.repo
sed -i "s/42/42/g" README.md sed -i "s/43/44/g" README.md
sed -i "s/41/42/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 rm fedora-rawhide.repo
sed -i "/- fedora-rawhide/d" fedora-*.yaml sed -i "/- fedora-rawhide/d" fedora-*.yaml
sed -i "s/# - fedora-41/- fedora-41/" *.yaml sed -i "s/# - fedora-42/- fedora-42/" *.yaml
sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml sed -i "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml
``` ```
## Historical references ## Historical references

View file

@ -24,5 +24,5 @@ packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -21,5 +21,5 @@ packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -1,4 +1,4 @@
releasever: 41 releasever: 42
automatic-version-prefix: "${releasever}.<date:%Y%m%d>" automatic-version-prefix: "${releasever}.<date:%Y%m%d>"
mutate-os-release: "${releasever}" mutate-os-release: "${releasever}"

View file

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/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 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 will remove packages from the manifests which are not mentioned in comps and

View file

@ -22,5 +22,5 @@ packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -1,6 +1,6 @@
[fedora-41-updates] [fedora-42-updates]
name=Fedora 41 $basearch Updates name=Fedora 42 $basearch Updates
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f41&arch=$basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f42&arch=$basearch
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
metadata_expire=1d metadata_expire=1d

View file

@ -1,6 +1,6 @@
[fedora-41] [fedora-42]
name=Fedora 41 $basearch name=Fedora 42 $basearch
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-41&arch=$basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-42&arch=$basearch
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
metadata_expire=1d metadata_expire=1d

View file

@ -1 +0,0 @@
kinoite-ostree.yaml

11
fedora-kinoite.yaml Normal file
View file

@ -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

View file

@ -1 +0,0 @@
budgie-atomic-ostree.yaml

11
fedora-onyx.yaml Normal file
View file

@ -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

View file

@ -1 +0,0 @@
sway-atomic-ostree.yaml

11
fedora-sericea.yaml Normal file
View file

@ -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

View file

@ -1 +0,0 @@
silverblue-ostree.yaml

11
fedora-silverblue.yaml Normal file
View file

@ -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

View file

@ -46,5 +46,5 @@ exclude-packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -26,5 +26,5 @@ packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -24,5 +24,5 @@ exclude-packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -7,5 +7,5 @@ include:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates

View file

@ -22,5 +22,5 @@ packages:
# Kept in the leaf manifest as they are overwritten by Pungi in composes # Kept in the leaf manifest as they are overwritten by Pungi in composes
repos: repos:
- fedora-rawhide - fedora-rawhide
# - fedora-41 # - fedora-42
# - fedora-41-updates # - fedora-42-updates