| |
@@ -6,15 +6,15 @@
|
| |
# PRODUCT INFO
|
| |
release_name = 'Fedora'
|
| |
release_short = 'Fedora'
|
| |
- release_version = 'Rawhide'
|
| |
+ release_version = '41'
|
| |
|
| |
# GENERAL SETTINGS
|
| |
comps_file = {
|
| |
'scm': 'git',
|
| |
'repo': 'https://pagure.io/fedora-comps.git',
|
| |
'branch': 'main',
|
| |
- 'file': 'comps-rawhide.xml',
|
| |
- 'command': 'make comps-rawhide.xml'
|
| |
+ 'file': 'comps-f41.xml',
|
| |
+ 'command': 'make comps-f41.xml'
|
| |
}
|
| |
|
| |
variants_file='variants-fedora.xml'
|
| |
@@ -61,7 +61,7 @@
|
| |
createrepo_deltas = False
|
| |
createrepo_database = True
|
| |
createrepo_use_xz = True
|
| |
- createrepo_extra_args = ['--general-compress-type', 'gz', '--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
|
| |
+ createrepo_extra_args = ['--general-compress-type', 'gz', '--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/41']
|
| |
createrepo_num_workers = 10
|
| |
|
| |
# CHECKSUMS
|
| |
@@ -197,9 +197,9 @@
|
| |
|
| |
|
| |
# These will be inherited by live_media, live_images and image_build
|
| |
- global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
| |
+ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f41'
|
| |
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
| |
- global_version = 'Rawhide'
|
| |
+ global_version = '41'
|
| |
# live_images ignores this in favor of live_target
|
| |
global_target = 'f41'
|
| |
# kiwi images need another target that uses old mock chroot
|
| |
@@ -366,7 +366,7 @@
|
| |
kiwibuild = {
|
| |
'^Cloud$': [
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-Generic',
|
| |
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
@@ -375,7 +375,7 @@
|
| |
'failable': ['ppc64le', 's390x'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-AmazonEC2',
|
| |
'arches': ['aarch64', 'x86_64'],
|
| |
@@ -384,7 +384,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-Azure',
|
| |
'arches': ['aarch64', 'x86_64'],
|
| |
@@ -393,7 +393,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-GCE',
|
| |
'arches': ['aarch64', 'x86_64'],
|
| |
@@ -402,7 +402,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-UEFI-UKI',
|
| |
'arches': ['aarch64', 'x86_64'],
|
| |
@@ -411,7 +411,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-Vagrant-libvirt',
|
| |
'arches': ['aarch64', 'x86_64'],
|
| |
@@ -420,7 +420,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox',
|
| |
'arches': ['x86_64'],
|
| |
@@ -431,7 +431,7 @@
|
| |
],
|
| |
'^Container$': [
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Container-Base-Generic',
|
| |
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
@@ -441,7 +441,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Container-Base-Generic-Minimal',
|
| |
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
@@ -451,7 +451,7 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
{
|
| |
- 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD',
|
| |
+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f41',
|
| |
'description_path': 'Fedora.kiwi',
|
| |
'kiwi_profile': 'Container-Toolbox',
|
| |
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
@@ -672,11 +672,11 @@
|
| |
"unified_core": True,
|
| |
"treefile": "silverblue-ostree.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
- "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
|
| |
+ "ostree_ref": "fedora/41/${basearch}/silverblue",
|
| |
"runroot_packages": ["selinux-policy-targeted"],
|
| |
"arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -687,11 +687,11 @@
|
| |
"unified_core": True,
|
| |
"treefile": "kinoite-ostree.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
- "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
|
| |
+ "ostree_ref": "fedora/41/${basearch}/kinoite",
|
| |
"runroot_packages": ["selinux-policy-targeted"],
|
| |
"arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -702,11 +702,11 @@
|
| |
"unified_core": True,
|
| |
"treefile": "sway-atomic-ostree.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
- "ostree_ref": "fedora/rawhide/${basearch}/sericea",
|
| |
+ "ostree_ref": "fedora/41/${basearch}/sericea",
|
| |
"runroot_packages": ["selinux-policy-targeted"],
|
| |
"arches": ["x86_64", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -717,11 +717,11 @@
|
| |
"unified_core": True,
|
| |
"treefile": "budgie-atomic-ostree.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
- "ostree_ref": "fedora/rawhide/${basearch}/onyx",
|
| |
+ "ostree_ref": "fedora/41/${basearch}/onyx",
|
| |
"runroot_packages": ["selinux-policy-targeted"],
|
| |
"arches": ["x86_64"],
|
| |
"failable": ['*'],
|
| |
@@ -732,7 +732,7 @@
|
| |
"^Silverblue$": {
|
| |
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"treefile": "silverblue.yaml",
|
| |
"arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -740,7 +740,7 @@
|
| |
"^Kinoite$": {
|
| |
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"treefile": "kinoite.yaml",
|
| |
"arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -748,7 +748,7 @@
|
| |
"^Sericea$": {
|
| |
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"treefile": "sway-atomic.yaml",
|
| |
"arches": ["x86_64", "aarch64"],
|
| |
"failable": ['*'],
|
| |
@@ -756,7 +756,7 @@
|
| |
"^Onyx$": {
|
| |
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
- "config_branch": "main",
|
| |
+ "config_branch": "f41",
|
| |
"treefile": "budgie-atomic.yaml",
|
| |
"arches": ["x86_64"],
|
| |
"failable": ['*'],
|
| |
@@ -778,8 +778,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/x86_64/silverblue",
|
| |
- "ostree_update_ref=fedora/rawhide/x86_64/silverblue",
|
| |
+ "ostree_install_ref=fedora/41/x86_64/silverblue",
|
| |
+ "ostree_update_ref=fedora/41/x86_64/silverblue",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -806,8 +806,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
|
| |
- "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
|
| |
+ "ostree_install_ref=fedora/41/ppc64le/silverblue",
|
| |
+ "ostree_update_ref=fedora/41/ppc64le/silverblue",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -834,8 +834,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/aarch64/silverblue",
|
| |
- "ostree_update_ref=fedora/rawhide/aarch64/silverblue",
|
| |
+ "ostree_install_ref=fedora/41/aarch64/silverblue",
|
| |
+ "ostree_update_ref=fedora/41/aarch64/silverblue",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -864,8 +864,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/x86_64/kinoite",
|
| |
- "ostree_update_ref=fedora/rawhide/x86_64/kinoite",
|
| |
+ "ostree_install_ref=fedora/41/x86_64/kinoite",
|
| |
+ "ostree_update_ref=fedora/41/x86_64/kinoite",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -892,8 +892,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
|
| |
- "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
|
| |
+ "ostree_install_ref=fedora/41/ppc64le/kinoite",
|
| |
+ "ostree_update_ref=fedora/41/ppc64le/kinoite",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -920,8 +920,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/aarch64/kinoite",
|
| |
- "ostree_update_ref=fedora/rawhide/aarch64/kinoite",
|
| |
+ "ostree_install_ref=fedora/41/aarch64/kinoite",
|
| |
+ "ostree_update_ref=fedora/41/aarch64/kinoite",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -949,8 +949,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/x86_64/sericea",
|
| |
- "ostree_update_ref=fedora/rawhide/x86_64/sericea",
|
| |
+ "ostree_install_ref=fedora/41/x86_64/sericea",
|
| |
+ "ostree_update_ref=fedora/41/x86_64/sericea",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
@@ -977,8 +977,8 @@
|
| |
"ostree_osname=fedora",
|
| |
"ostree_oskey=fedora-41-primary",
|
| |
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
| |
- "ostree_install_ref=fedora/rawhide/x86_64/onyx",
|
| |
- "ostree_update_ref=fedora/rawhide/x86_64/onyx",
|
| |
+ "ostree_install_ref=fedora/41/x86_64/onyx",
|
| |
+ "ostree_update_ref=fedora/41/x86_64/onyx",
|
| |
"flatpak_remote_name=fedora",
|
| |
# using registry-no-cdn avoids redirects to the CDN;
|
| |
# needed because of network restrictions on koji runroot
|
| |
Please do not merge this before August 13; It is open for review.
Signed-off-by: Samyak Jain samyak.jn11@gmail.com