From fc6688176a296109fdbe50be2ba5fd52ada0aae2 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 3 Apr 2024 16:59:37 +0300
Subject: [PATCH] Rebase to 9.4

---
 msvsphere-9-i686.conf       |  2 +-
 msvsphere-9.conf            |  8 ++++----
 msvsphere-i686/general.conf | 14 +++++++-------
 msvsphere/general.conf      | 14 +++++++-------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/msvsphere-9-i686.conf b/msvsphere-9-i686.conf
index 5314309..f47b44c 100644
--- a/msvsphere-9-i686.conf
+++ b/msvsphere-9-i686.conf
@@ -13,7 +13,7 @@ from msvsphere-i686/filter_packages import *
 # product information
 release_name = 'MSVSphere'
 release_short = 'MSVSphere'
-release_version = '9.3'
+release_version = '9.4'
 treeinfo_version = '9'
 
 skip_phases = [
diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index 6fb9722..0695b7b 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -13,14 +13,14 @@ from msvsphere/filter_packages import *
 # product information
 release_name = 'MSVSphere'
 release_short = 'MSVSphere'
-release_version = '9.3'
+release_version = '9.4'
 treeinfo_version = '9'
 
 extra_isos = {
     "BaseOS": [{
         "include_variants": ["AppStream", "Extras"],
         #"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,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
@@ -39,7 +39,7 @@ extra_isos = {
     }],
     "Minimal": [{
         "include_variants": [],
-        "filename": "{release_short}-9.3-{arch}-minimal{suffix}",
+        "filename": "{release_short}-9.4-{arch}-minimal{suffix}",
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
@@ -57,7 +57,7 @@ extra_isos = {
     }],
     "Server": [{
         "include_variants": [],
-        "filename": "{release_short}-9.3-{arch}-server{suffix}",
+        "filename": "{release_short}-9.4-{arch}-server{suffix}",
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index 690f558..c03b94a 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -2,7 +2,7 @@
 comps_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'comps.xml',
     'command': ''
 }
@@ -14,7 +14,7 @@ comps_file = {
 variants_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'variants-i686.xml',
     'command': ''
 }
@@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
 gather_prepopulate = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'prepopulate-i686.json',
     'command': ''
 }
@@ -62,9 +62,9 @@ greedy_method = "build"
 sigkeys = ['8BDA73A4', '8bda73a4']
 
 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
-pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-9.4-module-init']
 pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
@@ -100,7 +100,7 @@ createrepo_num_threads = 8
 createrepo_num_workers = 4
 createrepo_extra_args = [
     '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9',
-    '--revision=9.3'
+    '--revision=9.4'
 ]
 
 # CHECKSUMS
@@ -119,7 +119,7 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "9.3"
+            "version": "9.4"
         }
     })
 ]
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index a4257ea..e5cd10b 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -2,7 +2,7 @@
 comps_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'comps.xml',
     'command': ''
 }
@@ -14,7 +14,7 @@ comps_file = {
 variants_file = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere.git',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'variants.xml',
     'command': ''
 }
@@ -52,7 +52,7 @@ repoclosure_backend = 'dnf'
 gather_prepopulate = {
     'scm': 'git',
     'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
-    'branch': 'i9.3',
+    'branch': 'i9.4',
     'file': 'prepopulate.json',
     'command': ''
 }
@@ -62,9 +62,9 @@ greedy_method = "build"
 sigkeys = ['8BDA73A4', '8bda73a4']
 
 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
-pkgset_koji_module_tag = ['inferit-9_3-module-init']
+pkgset_koji_module_tag = ['inferit-9.4-module-init']
 pkgset_allow_reuse = True
 koji_profile = 'koji'
 runroot_method = "local"
@@ -100,7 +100,7 @@ createrepo_num_threads = 8
 createrepo_num_workers = 4
 createrepo_extra_args = [
     '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9',
-    '--revision=9.3'
+    '--revision=9.4'
 ]
 
 # CHECKSUMS
@@ -119,7 +119,7 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "9.3"
+            "version": "9.4"
         }
     })
 ]