Merge branch 'a8.7' into a8.7-dev

# Conflicts:
#	pungi-build.conf.j2
This commit is contained in:
soksanichenko 2022-12-07 15:59:46 +02:00
commit e20de40bcf
148 changed files with 1353 additions and 14 deletions

View File

@ -0,0 +1,8 @@
data:
module: ant
profiles:
'1.10':
- common
stream: '1.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: container-tools
profiles:
'1.0':
- common
'2.0':
- common
'3.0':
- common
'4.0':
- common
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: freeradius
profiles:
'3.0':
- server
stream: '3.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: gimp
profiles:
'2.8':
- common
stream: '2.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: go-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: httpd
profiles:
'2.4':
- common
stream: '2.4'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: idm
profiles:
DL1:
- common
client:
- common
stream: client
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: inkscape
profiles:
0.92.3:
- common
stream: 0.92.3
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: javapackages-runtime
profiles:
'201801':
- common
stream: '201801'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,7 @@
data:
module: javapackages-tools
profiles:
'202201':
- default
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: jmc
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: llvm-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: log4j
profiles:
'2':
- common
stream: '2'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mailman
profiles:
'2.1':
- common
stream: '2.1'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: mariadb
profiles:
'10.3':
- server
'10.5':
- server
stream: '10.3'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,13 @@
data:
modified: '201912051051'
module: maven
profiles:
'3.5':
- common
'3.6':
- common
'3.8':
- common
stream: '3.5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: mercurial
profiles:
'4.8':
- common
'6.2':
- common
stream: '4.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mod_auth_openidc
profiles:
'2.3':
- default
stream: '2.3'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mysql
profiles:
'8.0':
- server
stream: '8.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: nginx
profiles:
'1.14':
- common
'1.16':
- common
'1.18':
- common
'1.20':
- common
stream: '1.14'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: nodejs
profiles:
'10':
- common
'12':
- common
'14':
- common
'16':
- common
'18':
- common
stream: '10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-App-cpanminus
profiles:
'1.7044':
- common
stream: '1.7044'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-MySQL
profiles:
'4.046':
- common
stream: '4.046'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-Pg
profiles:
'3.7':
- common
stream: '3.7'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-SQLite
profiles:
'1.58':
- common
stream: '1.58'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBI
profiles:
'1.641':
- common
stream: '1.641'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-FCGI
profiles:
'0.78':
- common
stream: '0.78'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-IO-Socket-SSL
profiles:
'2.066':
- common
stream: '2.066'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-YAML
profiles:
'1.24':
- common
stream: '1.24'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-libwww-perl
profiles:
'6.34':
- common
stream: '6.34'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: perl
profiles:
'5.24':
- common
'5.26':
- common
'5.30':
- common
'5.32':
- common
stream: '5.26'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: php
profiles:
'7.2':
- common
'7.3':
- common
'7.4':
- common
'8.0':
- common
stream: '7.2'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: postgresql
profiles:
'10':
- server
'12':
- server
'13':
- server
'9.6':
- server
stream: '10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python27
profiles:
'2.7':
- common
stream: '2.7'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python36
profiles:
'3.6':
- common
stream: '3.6'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python38
profiles:
'3.8':
- common
stream: '3.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python39
profiles:
'3.9':
- common
stream: '3.9'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: redis
profiles:
'5':
- common
'6':
- common
stream: '5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: rhn-tools
profiles:
'1.0':
- common
stream: '1.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: ruby
profiles:
'2.5':
- common
'2.6':
- common
'2.7':
- common
'3.0':
- common
'3.1':
- common
stream: '2.5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: rust-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: satellite-5-client
profiles:
'1.0':
- common
stream: '1.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: scala
profiles:
'2.10':
- common
stream: '2.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: squid
profiles:
'4':
- common
stream: '4'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: subversion
profiles:
'1.10':
- common
'1.14':
- common
stream: '1.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: swig
profiles:
'3.0':
- common
'4.0':
- common
stream: '3.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: varnish
profiles:
'6':
- common
stream: '6'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: virt
profiles:
rhel:
- common
stream: rhel
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: ant
profiles:
'1.10':
- common
stream: '1.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: container-tools
profiles:
'1.0':
- common
'2.0':
- common
'3.0':
- common
'4.0':
- common
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: freeradius
profiles:
'3.0':
- server
stream: '3.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: gimp
profiles:
'2.8':
- common
stream: '2.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: go-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: httpd
profiles:
'2.4':
- common
stream: '2.4'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: idm
profiles:
DL1:
- common
client:
- common
stream: client
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: inkscape
profiles:
0.92.3:
- common
stream: 0.92.3
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: javapackages-runtime
profiles:
'201801':
- common
stream: '201801'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,7 @@
data:
module: javapackages-tools
profiles:
'202201':
- default
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: jmc
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: llvm-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: log4j
profiles:
'2':
- common
stream: '2'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mailman
profiles:
'2.1':
- common
stream: '2.1'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: mariadb
profiles:
'10.3':
- server
'10.5':
- server
stream: '10.3'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,13 @@
data:
modified: '201912051051'
module: maven
profiles:
'3.5':
- common
'3.6':
- common
'3.8':
- common
stream: '3.5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: mercurial
profiles:
'4.8':
- common
'6.2':
- common
stream: '4.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mod_auth_openidc
profiles:
'2.3':
- default
stream: '2.3'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: mysql
profiles:
'8.0':
- server
stream: '8.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: nginx
profiles:
'1.14':
- common
'1.16':
- common
'1.18':
- common
'1.20':
- common
stream: '1.14'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: nodejs
profiles:
'10':
- common
'12':
- common
'14':
- common
'16':
- common
'18':
- common
stream: '10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-App-cpanminus
profiles:
'1.7044':
- common
stream: '1.7044'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-MySQL
profiles:
'4.046':
- common
stream: '4.046'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-Pg
profiles:
'3.7':
- common
stream: '3.7'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBD-SQLite
profiles:
'1.58':
- common
stream: '1.58'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-DBI
profiles:
'1.641':
- common
stream: '1.641'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-FCGI
profiles:
'0.78':
- common
stream: '0.78'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-IO-Socket-SSL
profiles:
'2.066':
- common
stream: '2.066'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-YAML
profiles:
'1.24':
- common
stream: '1.24'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: perl-libwww-perl
profiles:
'6.34':
- common
stream: '6.34'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: perl
profiles:
'5.24':
- common
'5.26':
- common
'5.30':
- common
'5.32':
- common
stream: '5.26'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: php
profiles:
'7.2':
- common
'7.3':
- common
'7.4':
- common
'8.0':
- common
stream: '7.2'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,14 @@
data:
module: postgresql
profiles:
'10':
- server
'12':
- server
'13':
- server
'9.6':
- server
stream: '10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python27
profiles:
'2.7':
- common
stream: '2.7'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python36
profiles:
'3.6':
- common
stream: '3.6'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python38
profiles:
'3.8':
- common
stream: '3.8'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: python39
profiles:
'3.9':
- common
stream: '3.9'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: redis
profiles:
'5':
- common
'6':
- common
stream: '5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: rhn-tools
profiles:
'1.0':
- common
stream: '1.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,16 @@
data:
module: ruby
profiles:
'2.5':
- common
'2.6':
- common
'2.7':
- common
'3.0':
- common
'3.1':
- common
stream: '2.5'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: rust-toolset
profiles:
rhel8:
- common
stream: rhel8
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: satellite-5-client
profiles:
'1.0':
- common
stream: '1.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: scala
profiles:
'2.10':
- common
stream: '2.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: squid
profiles:
'4':
- common
stream: '4'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: subversion
profiles:
'1.10':
- common
'1.14':
- common
stream: '1.10'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,10 @@
data:
module: swig
profiles:
'3.0':
- common
'4.0':
- common
stream: '3.0'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: varnish
profiles:
'6':
- common
stream: '6'
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,8 @@
data:
module: virt
profiles:
rhel:
- common
stream: rhel
document: modulemd-defaults
version: '1'

View File

@ -1,20 +1,17 @@
{% set full_version = distribution_major_version + "." + distribution_minor_version %}
{% set branch = "a" + full_version + beta_suffix if beta_suffix is defined and beta_suffix else "" %}
from include_exclude import *
from multilib import *
# PRODUCT INFO
release_name = "{{ product_name }}"
release_short = "{{ product_name }}"
release_version = "{{ full_version }}"
release_version = "{{ distribution_major_version }}.{{ distribution_minor_version }}"
treeinfo_version = "{{ distribution_major_version }}"
# GENERAL SETTINGS
comps_file = {
"scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "{{ branch }}",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}",
"file": "{{ arch }}/comps.xml",
}
@ -23,22 +20,20 @@ link_type = 'hardlink'
module_defaults_dir = {
"scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "{{ branch }}",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}",
"dir": "{{ arch }}/modules_defaults",
}
variants_file = {
"scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "{{ branch }}",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}",
"file": "{{ arch }}/variants.xml",
}
hashed_directories = False
tree_arches = ['{{ arch }}']
symlink_isos_to = 'isos/{{ arch }}'
# PKGSET
pkgset_source = "kojimock"
koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}"
@ -62,7 +57,7 @@ filter_system_release_packages = False
gather_prepopulate = {
"scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "{{ branch }}",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}",
"file": "{{ arch }}/packages.json",
}
@ -95,7 +90,7 @@ createrepo_num_threads = 8
createrepo_num_workers = 4
createrepo_extra_args = [
'--distro=cpe:/o:{{ product_name.lower() }}:{{ product_name.lower() }}:{{ distribution_major_version }},{{ product_name }} {{ distribution_major_version }}',
'--revision={{ full_version }}',
'--revision={{ distribution_major_version }}.{{ distribution_minor_version }}',
]
# CHECKSUMS
@ -112,7 +107,7 @@ lorax_options = [
"*": {
"noupgrade": False,
"rootfs_size": 3,
"version": "{{ full_version }}"
"version": "{{ distribution_major_version }}.{{ distribution_minor_version }}"
}
})
]
@ -133,11 +128,11 @@ image_name_format = {
"^{{ variant }}$": "{{ options['image_name_format'] }}",
{% endif %}
{% endfor %}
".*": "{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
".*": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
}
image_volid_formats = [
'{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}',
'{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}',
]
# CREATEISO

Some files were not shown because too many files have changed in this diff Show More