Skip to content

Commit

Permalink
Move Rawhide to F43
Browse files Browse the repository at this point in the history
$ ./releng/rawhide-branching.sh
Set:    rawhide == Fedora 43
Move:   41 => 42
Arches: aarch64 i386 ppc64le s390x x86_64
WARNING: Make sure Fedora Copr maintainers are informed that
WARNING: they should run 'copr-frontend branch-fedora 42'.
WARNING: That has to be done right on time when branching is done.
WARNING: Please check that distribution-gpg-keys have the N+1 key,
         you likely want to bump Requires: distribution-gpg-keys!
  • Loading branch information
praiskup committed Jan 16, 2025
1 parent a508043 commit 74bdc61
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 10 deletions.
1 change: 0 additions & 1 deletion mock-core-configs/etc/mock/fedora-42-aarch64.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-42-aarch64.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
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-42-i386.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-42-i386.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
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-42-ppc64le.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-42-ppc64le.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
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-42-s390x.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-42-s390x.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
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-42-x86_64.cfg

This file was deleted.

5 changes: 5 additions & 0 deletions mock-core-configs/etc/mock/fedora-42-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config_opts['releasever'] = '42'
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-43-aarch64.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-43-i386.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-43-ppc64le.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-43-s390x.cfg
1 change: 1 addition & 0 deletions mock-core-configs/etc/mock/fedora-43-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'] = '42'
config_opts['eln_rawhide_releasever'] = '43'

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'] = '42'
config_opts['releasever'] = '43'

# https://fedoraproject.org/wiki/Changes/BuildWithDNF5
config_opts['package_manager'] = 'dnf5'
Expand Down
4 changes: 2 additions & 2 deletions 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: 41.5
Version: 42.0
Release: 1%{?dist}
Summary: Mock core config files basic chroots

Expand All @@ -22,7 +22,7 @@ BuildArch: noarch
Provides: mock-configs

# distribution-gpg-keys contains GPG keys used by mock configs
Requires: distribution-gpg-keys >= 1.105
Requires: distribution-gpg-keys >= 1.107
# specify minimal compatible version of mock
Requires: mock >= 5.4.post1
Requires: mock-filesystem
Expand Down
2 changes: 1 addition & 1 deletion releng/rawhide-branching.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ done


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

echo "WARNING: Make sure Fedora Copr maintainers are informed that"
Expand Down
4 changes: 4 additions & 0 deletions releng/release-notes-next/fedora-42-branching.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Configuration files for Fedora 42 have been branched from Rawhide. This has
been done done before the actual branching, to make the users' transition fluent
before, during and after the branching event according to the [Fedora 42
Schedule](https://fedorapeople.org/groups/schedule/f-42/f-42-all-tasks.html).

0 comments on commit 74bdc61

Please sign in to comment.