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

hybrid for all vairants

Browse Source
This commit is contained in:
soksanichenko 2023-03-14 18:45:01 +02:00
parent fb4e2c52ea
commit e5a8474afc
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
i686/variants_options.json
View File

@ -1,11 +1,11 @@
{ {
"BaseOS": { "BaseOS": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"AppStream": { "AppStream": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true, "createiso_skip": true,
"variant_as_lookaside": [ "variant_as_lookaside": [
@ -13,7 +13,7 @@
] ]
}, },
"PowerTools": { "PowerTools": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true, "createiso_skip": true,
"variant_as_lookaside": [ "variant_as_lookaside": [
@ -22,7 +22,7 @@
] ]
}, },
"HighAvailability": { "HighAvailability": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true, "createiso_skip": true,
"variant_as_lookaside": [ "variant_as_lookaside": [
@ -31,7 +31,7 @@
] ]
}, },
"ResilientStorage": { "ResilientStorage": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true, "createiso_skip": true,
"variant_as_lookaside": [ "variant_as_lookaside": [
@ -40,32 +40,32 @@
] ]
}, },
"Minimal": { "Minimal": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"NFV": { "NFV": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"RT": { "RT": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"SAP": { "SAP": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"SAPHANA": { "SAPHANA": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true "createiso_skip": true
}, },
"extras": { "extras": {
"gather_methods": {"*": "nodeps"}, "gather_methods": "hybrid",
"buildinstall_skip": true, "buildinstall_skip": true,
"createiso_skip": true, "createiso_skip": true,
"variant_as_lookaside": [ "variant_as_lookaside": [

27
pungi-build.conf.j2
View File

@ -73,20 +73,19 @@ gather_prepopulate = {
"file": "{{ arch }}/packages.json", "file": "{{ arch }}/packages.json",
} }
gather_method = "nodeps" gather_method = {
#gather_method = { {% for variant, options in variants.items() %}
# {% for variant, options in variants.items() %} {% if options['gather_methods'] is string %}
# {% if options['gather_methods'] is string %} "^{{ variant }}$": "{{ options['gather_methods'] }}",
# "^{{ variant }}$": "{{ options['gather_methods'] }}", {% else %}
# {% else %} "^{{ variant }}$": {
# "^{{ variant }}$": { {% for source_name, gather_method in options['gather_methods'].items() %}
# {% for source_name, gather_method in options['gather_methods'].items() %} "{{ source_name }}": "{{ gather_method }}",
# "{{ source_name }}": "{{ gather_method }}", {% endfor %}
# {% endfor %} },
# }, {% endif %}
# {% endif %} {% endfor %}
# {% endfor %} }
#}
gather_backend = "dnf" gather_backend = "dnf"
check_deps = True check_deps = True