Branch Fedora 41

Branching event planned for the next week, 2024-02-13. Generate using the ./releng/rawhide-branching.sh command. Closes: rpm-software-management#1309 Relates: rpm-software-management#1307
praiskup · Feb 6, 2024 · 7057015 · 7057015
1 parent f81f986
commit 7057015
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 8 deletions.
diff --git a/mock-core-configs/etc/mock/fedora-40-aarch64.cfg b/mock-core-configs/etc/mock/fedora-40-aarch64.cfg
diff --git a/mock-core-configs/etc/mock/fedora-40-aarch64.cfg b/mock-core-configs/etc/mock/fedora-40-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'aarch64'
+config_opts['legal_host_arches'] = ('aarch64',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock-core-configs/etc/mock/fedora-40-i386.cfg b/mock-core-configs/etc/mock/fedora-40-i386.cfg
diff --git a/mock-core-configs/etc/mock/fedora-40-i386.cfg b/mock-core-configs/etc/mock/fedora-40-i386.cfg
@@ -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')
diff --git a/mock-core-configs/etc/mock/fedora-40-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-40-ppc64le.cfg
diff --git a/mock-core-configs/etc/mock/fedora-40-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-40-ppc64le.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock-core-configs/etc/mock/fedora-40-s390x.cfg b/mock-core-configs/etc/mock/fedora-40-s390x.cfg
diff --git a/mock-core-configs/etc/mock/fedora-40-s390x.cfg b/mock-core-configs/etc/mock/fedora-40-s390x.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '40'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
+
+include('templates/fedora-branched.tpl')
diff --git a/mock-core-configs/etc/mock/fedora-40-x86_64.cfg b/mock-core-configs/etc/mock/fedora-40-x86_64.cfg
diff --git a/mock-core-configs/etc/mock/fedora-40-x86_64.cfg b/mock-core-configs/etc/mock/fedora-40-x86_64.cfg
@@ -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')
diff --git a/mock-core-configs/etc/mock/fedora-41-aarch64.cfg b/mock-core-configs/etc/mock/fedora-41-aarch64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-aarch64.cfg
diff --git a/mock-core-configs/etc/mock/fedora-41-i386.cfg b/mock-core-configs/etc/mock/fedora-41-i386.cfg
@@ -0,0 +1 @@
+fedora-rawhide-i386.cfg
diff --git a/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
@@ -0,0 +1 @@
+fedora-rawhide-ppc64le.cfg
diff --git a/mock-core-configs/etc/mock/fedora-41-s390x.cfg b/mock-core-configs/etc/mock/fedora-41-s390x.cfg
@@ -0,0 +1 @@
+fedora-rawhide-s390x.cfg
diff --git a/mock-core-configs/etc/mock/fedora-41-x86_64.cfg b/mock-core-configs/etc/mock/fedora-41-x86_64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-x86_64.cfg
diff --git a/mock-core-configs/etc/mock/templates/fedora-eln.tpl b/mock-core-configs/etc/mock/templates/fedora-eln.tpl
@@ -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 }}'
 

diff --git a/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl b/mock-core-configs/etc/mock/templates/fedora-rawhide.tpl
@@ -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'

diff --git a/mock-core-configs/mock-core-configs.spec b/mock-core-configs/mock-core-configs.spec
@@ -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
 

diff --git a/releng/rawhide-branching.sh b/releng/rawhide-branching.sh
@@ -57,6 +57,7 @@ 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'".

diff --git a/releng/release-notes-next/fedora-40-branching.feature b/releng/release-notes-next/fedora-40-branching.feature
@@ -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).