Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch Fedora 41 #1309

Merged
merged 1 commit into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-40-aarch64.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-40-aarch64.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 'aarch64'
config_opts['legal_host_arches'] = ('aarch64',)

include('templates/fedora-branched.tpl')
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-40-i386.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-40-i386.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 'i686'
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')

include('templates/fedora-branched.tpl')
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-40-ppc64le.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-40-ppc64le.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 'ppc64le'
config_opts['legal_host_arches'] = ('ppc64le',)

include('templates/fedora-branched.tpl')
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-40-s390x.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-40-s390x.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 's390x'
config_opts['legal_host_arches'] = ('s390x',)

include('templates/fedora-branched.tpl')
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-40-x86_64.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-40-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '40'
config_opts['target_arch'] = 'x86_64'
config_opts['legal_host_arches'] = ('x86_64',)

include('templates/fedora-branched.tpl')
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-41-aarch64.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-41-i386.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-41-s390x.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-41-x86_64.cfg
2 changes: 1 addition & 1 deletion mock-core-configs/etc/mock/templates/fedora-eln.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config_opts['releasever'] = 'eln'
config_opts['eln_rawhide_releasever'] = '40'
config_opts['eln_rawhide_releasever'] = '41'

config_opts['root'] = 'fedora-eln-{{ target_arch }}'

Expand Down
2 changes: 1 addition & 1 deletion mock-core-configs/etc/mock/templates/fedora-rawhide.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %

config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['releasever'] = '40'
config_opts['releasever'] = '41'

# https://fedoraproject.org/wiki/Changes/BuildWithDNF5
config_opts['package_manager'] = 'dnf5'
Expand Down
2 changes: 1 addition & 1 deletion mock-core-configs/mock-core-configs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%endif

Name: mock-core-configs
Version: 39.4.post1
Version: 40.0.post1
Release: 1%{?dist}
Summary: Mock core config files basic chroots

Expand Down
16 changes: 15 additions & 1 deletion releng/rawhide-branching.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
## arguments).

set -e
cd "$(dirname "$(readlink -f "$0")")/../mock-core-configs/etc/mock"
topdir=$(git rev-parse --show-toplevel)

cd "$topdir/mock-core-configs/etc/mock"

for config in fedora-??-x86_64.cfg; do
prev_version=$version
Expand Down Expand Up @@ -37,6 +39,13 @@ for arch in "${architectures[@]}"; do
git add "fedora-$next_version-$arch.cfg" "fedora-$version-$arch.cfg"
done

towncrier_file=$topdir/releng/release-notes-next/fedora-$version-branching.feature
cat > "$towncrier_file" <<EOF
Configuration files for Fedora $version have been branched from Rawhide,
according to the [Fedora $version Schedule](https://fedorapeople.org/groups/schedule/f-$version/f-$version-all-tasks.html).
EOF
git add "$towncrier_file"

# Use updated relasever in rawhide template, because we need to reference
# updated GPG keys (of $next_version and $versiono).

Expand All @@ -45,6 +54,11 @@ for file in templates/fedora-rawhide.tpl templates/fedora-eln.tpl; do
git add "$file"
done


config_spec=$topdir/mock-core-configs/mock-core-configs.spec
sed -i "s/\(Version:[[:space:]]\+\).*/\1$version.0.post1/" "$config_spec"
git add "$config_spec"

echo "WARNING: Make sure Fedora Copr maintainers are informed that"
echo "WARNING: they should run 'copr-frontend branch-fedora $version'".
echo "WARNING: That has to be done right on time when branching is done."
Expand Down
2 changes: 2 additions & 0 deletions releng/release-notes-next/fedora-40-branching.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Configuration files for Fedora 40 have been branched from Rawhide,
according to the [Fedora 40 Schedule](https://fedorapeople.org/groups/schedule/f-40/f-40-all-tasks.html).
Loading