From 1d000d9b907bd1a64aa5cae9a05b0a6de3aa159e Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Wed, 14 Aug 2024 00:08:29 +0200
Subject: [PATCH] configs: branch F41

---
 mock-core-configs/etc/mock/fedora-41-aarch64.cfg        | 6 +++++-
 mock-core-configs/etc/mock/fedora-41-i386.cfg           | 6 +++++-
 mock-core-configs/etc/mock/fedora-41-ppc64le.cfg        | 6 +++++-
 mock-core-configs/etc/mock/fedora-41-s390x.cfg          | 6 +++++-
 mock-core-configs/etc/mock/fedora-41-x86_64.cfg         | 6 +++++-
 mock-core-configs/etc/mock/fedora-42-aarch64.cfg        | 1 +
 mock-core-configs/etc/mock/fedora-42-i386.cfg           | 1 +
 mock-core-configs/etc/mock/fedora-42-ppc64le.cfg        | 1 +
 mock-core-configs/etc/mock/fedora-42-s390x.cfg          | 1 +
 mock-core-configs/etc/mock/fedora-42-x86_64.cfg         | 1 +
 mock-core-configs/etc/mock/templates/fedora-eln.tpl     | 2 +-
 mock-core-configs/etc/mock/templates/fedora-rawhide.tpl | 2 +-
 mock-core-configs/mock-core-configs.spec                | 4 ++--
 releng/release-notes-next/fedora-41-branching.feature   | 2 ++
 14 files changed, 36 insertions(+), 9 deletions(-)
 mode change 120000 => 100644 mock-core-configs/etc/mock/fedora-41-aarch64.cfg
 mode change 120000 => 100644 mock-core-configs/etc/mock/fedora-41-i386.cfg
 mode change 120000 => 100644 mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
 mode change 120000 => 100644 mock-core-configs/etc/mock/fedora-41-s390x.cfg
 mode change 120000 => 100644 mock-core-configs/etc/mock/fedora-41-x86_64.cfg
 create mode 120000 mock-core-configs/etc/mock/fedora-42-aarch64.cfg
 create mode 120000 mock-core-configs/etc/mock/fedora-42-i386.cfg
 create mode 120000 mock-core-configs/etc/mock/fedora-42-ppc64le.cfg
 create mode 120000 mock-core-configs/etc/mock/fedora-42-s390x.cfg
 create mode 120000 mock-core-configs/etc/mock/fedora-42-x86_64.cfg
 create mode 100644 releng/release-notes-next/fedora-41-branching.feature

diff --git a/mock-core-configs/etc/mock/fedora-41-aarch64.cfg b/mock-core-configs/etc/mock/fedora-41-aarch64.cfg
deleted file mode 120000
index e435ce19d..000000000
--- a/mock-core-configs/etc/mock/fedora-41-aarch64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-41-aarch64.cfg b/mock-core-configs/etc/mock/fedora-41-aarch64.cfg
new file mode 100644
index 000000000..309130622
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-41-aarch64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '41'
+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-41-i386.cfg b/mock-core-configs/etc/mock/fedora-41-i386.cfg
deleted file mode 120000
index 1f22dd229..000000000
--- a/mock-core-configs/etc/mock/fedora-41-i386.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-41-i386.cfg b/mock-core-configs/etc/mock/fedora-41-i386.cfg
new file mode 100644
index 000000000..74a96d5db
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-41-i386.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '41'
+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-41-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
deleted file mode 120000
index 976749565..000000000
--- a/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
new file mode 100644
index 000000000..212626336
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-41-ppc64le.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '41'
+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-41-s390x.cfg b/mock-core-configs/etc/mock/fedora-41-s390x.cfg
deleted file mode 120000
index 37220789b..000000000
--- a/mock-core-configs/etc/mock/fedora-41-s390x.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-41-s390x.cfg b/mock-core-configs/etc/mock/fedora-41-s390x.cfg
new file mode 100644
index 000000000..1d64f7573
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-41-s390x.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '41'
+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-41-x86_64.cfg b/mock-core-configs/etc/mock/fedora-41-x86_64.cfg
deleted file mode 120000
index cddd6e15a..000000000
--- a/mock-core-configs/etc/mock/fedora-41-x86_64.cfg
+++ /dev/null
@@ -1 +0,0 @@
-fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-41-x86_64.cfg b/mock-core-configs/etc/mock/fedora-41-x86_64.cfg
new file mode 100644
index 000000000..c3e4f08e5
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-41-x86_64.cfg
@@ -0,0 +1,5 @@
+config_opts['releasever'] = '41'
+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-42-aarch64.cfg b/mock-core-configs/etc/mock/fedora-42-aarch64.cfg
new file mode 120000
index 000000000..e435ce19d
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-42-aarch64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-aarch64.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-42-i386.cfg b/mock-core-configs/etc/mock/fedora-42-i386.cfg
new file mode 120000
index 000000000..1f22dd229
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-42-i386.cfg
@@ -0,0 +1 @@
+fedora-rawhide-i386.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-42-ppc64le.cfg b/mock-core-configs/etc/mock/fedora-42-ppc64le.cfg
new file mode 120000
index 000000000..976749565
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-42-ppc64le.cfg
@@ -0,0 +1 @@
+fedora-rawhide-ppc64le.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-42-s390x.cfg b/mock-core-configs/etc/mock/fedora-42-s390x.cfg
new file mode 120000
index 000000000..37220789b
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-42-s390x.cfg
@@ -0,0 +1 @@
+fedora-rawhide-s390x.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/fedora-42-x86_64.cfg b/mock-core-configs/etc/mock/fedora-42-x86_64.cfg
new file mode 120000
index 000000000..cddd6e15a
--- /dev/null
+++ b/mock-core-configs/etc/mock/fedora-42-x86_64.cfg
@@ -0,0 +1 @@
+fedora-rawhide-x86_64.cfg
\ No newline at end of file
diff --git a/mock-core-configs/etc/mock/templates/fedora-eln.tpl b/mock-core-configs/etc/mock/templates/fedora-eln.tpl
index f2e9526a0..5a981afda 100644
--- 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'] = '41'
+config_opts['eln_rawhide_releasever'] = '42'
 
 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
index 2ebbca1de..158997cad 100644
--- 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'] = '41'
+config_opts['releasever'] = '42'
 
 # 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
index 93d87bd48..43c5bc71d 100644
--- 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:    40.6
+Version:    41.0.post1
 Release:    1%{?dist}
 Summary:    Mock core config files basic chroots
 
@@ -22,7 +22,7 @@ BuildArch:  noarch
 Provides: mock-configs
 
 # distribution-gpg-keys contains GPG keys used by mock configs
-Requires:   distribution-gpg-keys >= 1.104
+Requires:   distribution-gpg-keys >= 1.105
 # specify minimal compatible version of mock
 Requires:   mock >= 5.4.post1
 Requires:   mock-filesystem
diff --git a/releng/release-notes-next/fedora-41-branching.feature b/releng/release-notes-next/fedora-41-branching.feature
new file mode 100644
index 000000000..69d9a83cd
--- /dev/null
+++ b/releng/release-notes-next/fedora-41-branching.feature
@@ -0,0 +1,2 @@
+Configuration files for Fedora 41 have been branched from Rawhide,
+according to the [Fedora 41 Schedule](https://fedorapeople.org/groups/schedule/f-41/f-41-all-tasks.html).