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

- Use separate variables for a branch name and a full version

Browse Source
This commit is contained in:
soksanichenko 2022-12-07 13:39:27 +02:00
parent c65c8f0db4
commit 22e5f6b4ae
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pungi-build.conf.j2
View File

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