Rebase to 9.4

remotes/origin/i9.4
Arkady L. Shane 9 months ago
parent 2ebe6cab92
commit fc6688176a
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -13,7 +13,7 @@ from msvsphere-i686/filter_packages import *
# product information # product information
release_name = 'MSVSphere' release_name = 'MSVSphere'
release_short = 'MSVSphere' release_short = 'MSVSphere'
release_version = '9.3' release_version = '9.4'
treeinfo_version = '9' treeinfo_version = '9'
skip_phases = [ skip_phases = [

@ -13,14 +13,14 @@ from msvsphere/filter_packages import *
# product information # product information
release_name = 'MSVSphere' release_name = 'MSVSphere'
release_short = 'MSVSphere' release_short = 'MSVSphere'
release_version = '9.3' release_version = '9.4'
treeinfo_version = '9' treeinfo_version = '9'
extra_isos = { extra_isos = {
"BaseOS": [{ "BaseOS": [{
"include_variants": ["AppStream", "Extras"], "include_variants": ["AppStream", "Extras"],
#"filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}", #"filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
"filename": "{release_short}-9.3-{arch}-{disc_type}{suffix}", "filename": "{release_short}-9.4-{arch}-{disc_type}{suffix}",
"skip_src": True, "skip_src": True,
"arches": ['x86_64'], "arches": ['x86_64'],
"failable_arches": ['i386'], "failable_arches": ['i386'],
@ -39,7 +39,7 @@ extra_isos = {
}], }],
"Minimal": [{ "Minimal": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-9.3-{arch}-minimal{suffix}", "filename": "{release_short}-9.4-{arch}-minimal{suffix}",
"skip_src": True, "skip_src": True,
"arches": ['x86_64'], "arches": ['x86_64'],
"failable_arches": ['i386'], "failable_arches": ['i386'],
@ -57,7 +57,7 @@ extra_isos = {
}], }],
"Server": [{ "Server": [{
"include_variants": [], "include_variants": [],
"filename": "{release_short}-9.3-{arch}-server{suffix}", "filename": "{release_short}-9.4-{arch}-server{suffix}",
"skip_src": True, "skip_src": True,
"arches": ['x86_64'], "arches": ['x86_64'],
"failable_arches": ['i386'], "failable_arches": ['i386'],

@ -2,7 +2,7 @@
comps_file = { comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'comps.xml', 'file': 'comps.xml',
'command': '' 'command': ''
} }
@ -14,7 +14,7 @@ comps_file = {
variants_file = { variants_file = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'variants-i686.xml', 'file': 'variants-i686.xml',
'command': '' 'command': ''
} }
@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
gather_prepopulate = { gather_prepopulate = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'prepopulate-i686.json', 'file': 'prepopulate-i686.json',
'command': '' 'command': ''
} }
@ -62,9 +62,9 @@ greedy_method = "build"
sigkeys = ['8BDA73A4', '8bda73a4'] sigkeys = ['8BDA73A4', '8bda73a4']
pkgset_source = 'koji' pkgset_source = 'koji'
pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel'] pkgset_koji_tag = ['inferit-9.4-init', 'inferit-9.3-extras', 'inferit-9-devel']
# add modules from those tags to compose # add modules from those tags to compose
pkgset_koji_module_tag = ['inferit-9_3-module-init'] pkgset_koji_module_tag = ['inferit-9.4-module-init']
pkgset_allow_reuse = True pkgset_allow_reuse = True
koji_profile = 'koji' koji_profile = 'koji'
runroot_method = "local" runroot_method = "local"
@ -100,7 +100,7 @@ createrepo_num_threads = 8
createrepo_num_workers = 4 createrepo_num_workers = 4
createrepo_extra_args = [ createrepo_extra_args = [
'--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9', '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9',
'--revision=9.3' '--revision=9.4'
] ]
# CHECKSUMS # CHECKSUMS
@ -119,7 +119,7 @@ lorax_options = [
"*": { "*": {
"noupgrade": False, "noupgrade": False,
"rootfs_size": 3, "rootfs_size": 3,
"version": "9.3" "version": "9.4"
} }
}) })
] ]

@ -2,7 +2,7 @@
comps_file = { comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'comps.xml', 'file': 'comps.xml',
'command': '' 'command': ''
} }
@ -14,7 +14,7 @@ comps_file = {
variants_file = { variants_file = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'variants.xml', 'file': 'variants.xml',
'command': '' 'command': ''
} }
@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
gather_prepopulate = { gather_prepopulate = {
'scm': 'git', 'scm': 'git',
'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere', 'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
'branch': 'i9.3', 'branch': 'i9.4',
'file': 'prepopulate.json', 'file': 'prepopulate.json',
'command': '' 'command': ''
} }
@ -62,9 +62,9 @@ greedy_method = "build"
sigkeys = ['8BDA73A4', '8bda73a4'] sigkeys = ['8BDA73A4', '8bda73a4']
pkgset_source = 'koji' pkgset_source = 'koji'
pkgset_koji_tag = ['inferit-9_3-init', 'inferit-9_3-extras', 'inferit-9-devel'] pkgset_koji_tag = ['inferit-9.4-init', 'inferit-9.3-extras', 'inferit-9-devel']
# add modules from those tags to compose # add modules from those tags to compose
pkgset_koji_module_tag = ['inferit-9_3-module-init'] pkgset_koji_module_tag = ['inferit-9.4-module-init']
pkgset_allow_reuse = True pkgset_allow_reuse = True
koji_profile = 'koji' koji_profile = 'koji'
runroot_method = "local" runroot_method = "local"
@ -100,7 +100,7 @@ createrepo_num_threads = 8
createrepo_num_workers = 4 createrepo_num_workers = 4
createrepo_extra_args = [ createrepo_extra_args = [
'--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9', '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9',
'--revision=9.3' '--revision=9.4'
] ]
# CHECKSUMS # CHECKSUMS
@ -119,7 +119,7 @@ lorax_options = [
"*": { "*": {
"noupgrade": False, "noupgrade": False,
"rootfs_size": 3, "rootfs_size": 3,
"version": "9.3" "version": "9.4"
} }
}) })
] ]

Loading…
Cancel
Save