almalinux/pungi-almalinux
14
2
Fork 0
Code Issues Pull Requests Releases Activity

- Other naming of ISO images and volume ids

Browse Source
This commit is contained in:
Stepan Oksanichenko 2024-09-27 01:11:57 +03:00
parent 919b1cd024
commit a8734de548
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aarch64/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": { "BaseOS": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"buildinstall_skip": false, "buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [ "include_variants": [
"AppStream" "AppStream"
], ],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",
@ -79,12 +79,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

8
ppc64le/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": { "BaseOS": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"buildinstall_skip": false, "buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [ "include_variants": [
"AppStream" "AppStream"
], ],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",
@ -79,12 +79,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

4
pungi-build.conf.j2
View File

@ -143,11 +143,11 @@ image_name_format = {
"^{{ variant }}$": "{{ options['image_name_format'] }}", "^{{ variant }}$": "{{ options['image_name_format'] }}",
{% endif %} {% endif %}
{% endfor %} {% endfor %}
".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", ".*": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
} }
image_volid_formats = [ image_volid_formats = [
'{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}', '{release_short}-{{ distribution_major_version }}-{arch}',
] ]
# CREATEISO # CREATEISO

8
s390x/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": { "BaseOS": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"buildinstall_skip": false, "buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [ "include_variants": [
"AppStream" "AppStream"
], ],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",
@ -79,12 +79,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

8
x86_64/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": { "BaseOS": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"buildinstall_skip": false, "buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [ "include_variants": [
"AppStream" "AppStream"
], ],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",
@ -97,12 +97,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

8
x86_64_v2/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": { "BaseOS": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"buildinstall_skip": false, "buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [ "include_variants": [
"AppStream" "AppStream"
], ],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",
@ -97,12 +97,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "gather_methods": "hybrid",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"buildinstall_skip": false, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
"skip_src": true, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",