mirror of
https://git.rockylinux.org/rocky/pungi-rocky.git
synced 2024-10-11 01:35:08 +00:00
up to 8.5
This commit is contained in:
parent
ac65306dc3
commit
c9ca7cd038
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -43,7 +43,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 4
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -72,7 +72,7 @@ image_build = {
|
||||
"format": [("docker", "tar.gz")],
|
||||
"name": "Rocky-8-Container",
|
||||
"target": "image-rocky-8",
|
||||
"version": "8.4",
|
||||
"version": "8.5",
|
||||
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD",
|
||||
"kickstart": "Rocky-8-Container.ks",
|
||||
"ksversion": "F26",
|
||||
@ -80,9 +80,9 @@ image_build = {
|
||||
"disk-size": "10",
|
||||
"arches": ["x86_64","ppc64le","aarch64"],
|
||||
"repo": [
|
||||
'http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os',
|
||||
'http://dl.rockylinux.org/pub/rocky/8.5/BaseOS/$arch/os',
|
||||
],
|
||||
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.4/BaseOS/$arch/os',
|
||||
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.5/BaseOS/$arch/os',
|
||||
"failable": ["ppc64le","aarch64"],
|
||||
},
|
||||
"factory-parameters": {
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
check_deps = False
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -5,7 +5,7 @@ image_build = {
|
||||
"format": [("qcow2", "qcow2")],
|
||||
"name": "Rocky-8-GenericCloud",
|
||||
"subvariant": "generic",
|
||||
"version": "8.4",
|
||||
"version": "8.5",
|
||||
"release": "!RELEASE_FROM_DATE_RESPIN"
|
||||
"target": "image-rocky-8",
|
||||
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD",
|
||||
@ -15,10 +15,10 @@ image_build = {
|
||||
"disk-size": "8",
|
||||
"arches": ["x86_64","ppc64le","aarch64"],
|
||||
"repo": [
|
||||
"http://dl.rockylinux.org/stg/rocky/8.4/BaseOS/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.4/AppStream/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.5/BaseOS/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.5/AppStream/$arch/os/",
|
||||
],
|
||||
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.4/BaseOS/$arch/os/",
|
||||
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.5/BaseOS/$arch/os/",
|
||||
},
|
||||
"factory-parameters": {
|
||||
"generate_icicle": False,
|
||||
@ -29,7 +29,7 @@ image_build = {
|
||||
"format": [("qcow2", "qcow2")],
|
||||
"name": "Rocky-8-ec2",
|
||||
"subvariant": "ec2",
|
||||
"version": "8.4",
|
||||
"version": "8.5",
|
||||
"release": "!RELEASE_FROM_DATE_RESPIN"
|
||||
"target": "image-rocky-8",
|
||||
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD",
|
||||
@ -39,10 +39,10 @@ image_build = {
|
||||
"disk-size": "8",
|
||||
"arches": ["x86_64", "aarch64"],
|
||||
"repo": [
|
||||
"http://dl.rockylinux.org/stg/rocky/8.4/BaseOS/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.4/AppStream/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.5/BaseOS/$arch/os/",
|
||||
"http://dl.rockylinux.org/stg/rocky/8.5/AppStream/$arch/os/",
|
||||
],
|
||||
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.4/BaseOS/$arch/os/",
|
||||
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.5/BaseOS/$arch/os/",
|
||||
},
|
||||
"factory-parameters": {
|
||||
"generate_icicle": False,
|
||||
|
2
nfv.conf
2
nfv.conf
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -23,7 +23,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
pkgset_koji_tag='dist-rocky8-plus-compose'
|
||||
|
@ -14,7 +14,7 @@ skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.4.xml',
|
||||
'file': 'comps-rocky-8.4.xml', # leaving as 8.4 for now
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -23,7 +23,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.4',
|
||||
'branch': 'r8.5',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,7 @@ skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.4.xml',
|
||||
'file': 'comps-rocky-8.5.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -23,7 +23,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.4',
|
||||
'branch': 'r8.5',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
|
20
r8-i686.conf
20
r8-i686.conf
@ -6,14 +6,14 @@ from common/include-excludes import *
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky-i686"
|
||||
release_version = "8"
|
||||
version = "8.4"
|
||||
version = "8.5"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.4-i686.xml',
|
||||
'file': 'comps-rocky-8.5-i686.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.4',
|
||||
'branch': 'r8.5',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -110,12 +110,12 @@ buildinstall_skip = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.4-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.5-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.5-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
@ -130,12 +130,12 @@ createiso_skip = [
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.4-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.5-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
22
r8.conf
22
r8.conf
@ -6,14 +6,14 @@ from common/include-excludes import *
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky"
|
||||
release_version = "8"
|
||||
version = "8.4"
|
||||
version = "8.5"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.4.xml',
|
||||
'file': 'comps-rocky-8.5.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.4',
|
||||
'branch': 'r8.5',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ multilib = [
|
||||
variants_file = 'variants.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
# Change to true for 8.5
|
||||
hashed_directories = False
|
||||
hashed_directories = True
|
||||
|
||||
tree_arches = ['aarch64', 'i386', 'x86_64']
|
||||
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -110,12 +110,12 @@ buildinstall_skip = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.4-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.5-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.5-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
@ -130,12 +130,12 @@ createiso_skip = [
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.4-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.5-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
Loading…
Reference in New Issue
Block a user