Fix branch

This reverts commit c6885f80e6.

msvsphere-9.conf

@@ -0,0 +1,38 @@
+#
+# MSVSphere 9 Pungi configuration file
+#
+# Notes:
+#   - there is a problem with accessing git.inferitos.ru repositories via
+#     HTTPs from our internal network, so we have to use HTTP for now.
+
+from msvsphere/general import *
+from msvsphere/multilib import *
+from msvsphere/additional_packages import *
+from msvsphere/filter_packages import *
+
+# product information
+release_name = 'MSVSphere'
+release_short = 'MSVSphere'
+release_version = '9.5'
+treeinfo_version = '9'
+
+extra_isos = {
+    "OS": [{
+        "include_variants": [],
+        "filename": "{release_short}-9.5-{arch}-certified{suffix}",
+        "skip_src": True,
+        "arches": ['x86_64'],
+        "failable_arches": ['i386'],
+        "extra_files": [
+            {   
+                'scm': 'git',
+                'repo': 'http://git.inferitos.ru/rpms/sphere-release.git',
+                'branch': 'i9',
+                'file': [
+                    'SOURCES/EULA-CERTIFIED',
+                    'SOURCES/RPM-GPG-KEY-MSVSphere-9'
+                ]
+            }
+        ]
+    }]
+}

msvsphere/additional_packages.conf

@@ -0,0 +1,74 @@
+additional_packages = [
+    (
+        '^OS$', {
+            '*': [
+                "aide",
+                "anaconda-live",
+                "audispd-plugins",
+                "bats",
+                "chromium",
+                "dnf-automatic",
+                "epel-release",
+                "fapolicyd",
+                "fontconfig-enhanced-defaults",
+                "fontconfig-font-replacements",
+                "glibc-gconv-extra.i686",
+                "gnome-shell-extension-appindicator",
+                "gnome-shell-extension-arcmenu",
+                "gnome-shell-extension-dash-to-panel",
+                "gnome-shell-extension-no-overview",
+                "gnutls-utils",
+                "google-roboto-fonts",
+                "gutenprint-selinux",
+                "hardinfo",
+                "htop",
+                "kbd-legacy",
+                "kernel",
+                "kernel-modules-extra",
+                "kora-icon-theme",
+                "libreswan",
+                "libsss_autofs",
+                "libsss_sudo",
+                "mock",
+                "openvpn",
+                "perl-DBD-SQLite-1.72-2.el9",
+                "pipewire-module-xrdp",
+                "pkcs11-helper",
+                "policycoreutils-python-utils",
+                "rear",
+                "remmina",
+                "remmina-gnome-session",
+                "remmina-plugins-exec",
+                "remmina-plugins-python",
+                "remmina-plugins-rdp",
+                "remmina-plugins-secret",
+                "remmina-plugins-vnc",
+                "remmina-plugins-www",
+                "rng-tools",
+                "rsyslog-gnutls",
+                "salt",
+                "sphere-repos-certified",
+                "sssd-nfs-idmap",
+                "subscription-manager",
+                "usbguard",
+                "yasm"
+            ]
+        }
+    ),
+    (
+        '^Updates$', {
+            '*': [
+                "sphere-repos-certified",
+                "sphere-release-certified"
+             ]
+         }
+    ),
+    (
+        '^Testing$', {
+            '*': [
+                "sphere-repos-certified",
+                "sphere-release-certified"
+             ]
+         }
+    )
+]

msvsphere/filter_packages.conf

@@ -0,0 +1,56 @@
+filter_packages = [
+    (
+        '^OS$', {
+            '*': [
+                "corosync-qnetd",
+                "corosync-qdevice",
+                "gdb",
+                "gdb-headless",
+                "gfs2-utils",
+                "libbabeltrace",
+                "libipt",
+                "libtraceevent",
+                "spausedd",
+                "sphere-keyboard-config",
+                "dbusmenu-qt",
+                "glibc32",
+                "kde-filesystem",
+                "kde-settings",
+                "kdecoration",
+                "kernel*5.14.0*",
+                "bpftool",
+                "kernel-ml*",
+                "kf5",
+                "kf5-*",
+                "kscreenlocker",
+                "kwin",
+                "layer-shell-qt",
+                "libimobiledevice",
+                "libkscreen-qt5",
+                "libplist",
+                "libusbmuxd",
+                "libverto-libevent",
+                "nginx-mod-devel",
+                "perl-DBD-SQLite-1.72-2.el9",
+                "plasma-breeze",
+                "polkit-qt-1",
+                "qaccessibilityclient",
+                "qca",
+                "selinux-policy-minimum",
+                "sphere-release-cinnamon",
+                "sphere-release-arm",
+                "sphere-release-server",
+                "sphere-release-el",
+                "sphere-release-identity-cinnamon",
+                "sphere-release-identity-server",
+                "sphere-release-identity-arm",
+                "sphere-release-identity-kde",
+                "sphere-release-identity-xfce",
+                "sphere-release-kde",
+                "sphere-release-xfce",
+                "sphere-repos",
+                "systemd-standalone-tmpfiles"
+            ]
+        }
+    )
+]

msvsphere/general.conf

@@ -0,0 +1,125 @@
+# use a remote comps.xml file from a git repository
+# alternatively, it's possible to use a local groups file
+comps_file = 'comps.xml'
+
+# use a remote variants.xml file from a git repository
+# alternatively, it's possible to use a local variants file
+variants_file = 'variants.xml'
+
+# use modulemd-defaults from a git repository
+
+gather_backend = 'dnf'
+
+# if set to True, abort the compose if some package has broken dependencies
+check_deps = False
+
+gather_method = {
+    # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
+    "^(?!(Updates|Buildroot)).*$": {
+        "comps": "deps",
+        "json": "deps",
+    },
+    "^(OS|Updates|Testing)$": "hybrid",
+}
+
+hashed_directories = False
+gather_allow_reuse = True
+repoclosure_backend = 'dnf'
+
+# extra packages to be added
+gather_prepopulate = {
+    'scm': 'git',
+    'repo': 'http://git.inferitos.ru/msvsphere/pungi-msvsphere',
+    'branch': 'i9.5-certified',
+    'file': 'prepopulate.json',
+    'command': ''
+}
+
+greedy_method = "build"
+
+sigkeys = ['8BDA73A4', '8bda73a4']
+#sigkeys = ['']
+
+pkgset_source = 'koji'
+# pkgset_koji_tag = ['inferit-9_5-init', 'inferit-9_5-updates', 'inferit-9_5-extras', 'inferit-9_4-extras', 'inferit-9-devel']
+pkgset_koji_tag = ['inferit-9-bootstrap']
+# add modules from those tags to compose
+# pkgset_koji_module_tag = ['inferit-9_5-module-init']
+pkgset_allow_reuse = True
+koji_profile = 'koji'
+runroot_method = "local"
+global_runroot_method = "local"
+createiso_break_hardlinks = True
+iso_hfs_ppc64le_compatible = False
+
+create_optional_isos = False
+createiso_use_xorrisofs = True
+
+createiso_skip = [
+    ("^(OS|Updates|Testing)$", {
+        # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
+        # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
+        # No binary or src ISOs for CRB
+        # No binary or src ISOs for NFV
+        # Note: "*" matches only binary architectures.
+        "*": True,
+        "src":True #RCM-41427 -Disable source iso generation during createiso phase
+    }),
+]
+
+restricted_volid = True
+
+# CREATEREPO
+createrepo_deltas = False
+createrepo_database = True
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_use_xz = True
+createrepo_enable_cache = False
+createrepo_num_threads = 8
+createrepo_num_workers = 4
+createrepo_extra_args = [
+    '--distro=cpe:/o:ncsd:msvsphere:9,MSVSphere 9',
+    '--revision=9.5'
+]
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+create_jigdo = False
+
+# BUILDINSTALL
+# deprecated!
+# bootable = True
+
+buildinstall_method = "lorax"
+
+lorax_options = [
+    ("^.*$", {
+        "*": {
+            "noupgrade": False,
+            "rootfs_size": 3,
+            "version": "9.5"
+        }
+    })
+]
+
+buildinstall_packages = [
+    ('^OS$', {
+        '*': [
+            'sphere-release-server-certified'
+        ],
+    })
+]
+
+buildinstall_skip = [
+    ("^(Updates|Testing)$", {
+        '*': True
+    })
+]
+
+# LOOKASIDE
+variant_as_lookaside = [
+    ("Testing", "OS"),
+    ("Updates", "OS")
+]

msvsphere/multilib.conf

@@ -0,0 +1,72 @@
+multilib = [
+    ("^.*$", {
+        "x86_64": ["devel", "runtime"]
+    }),
+]
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    "*": [
+        "brlapi", # --- BEGIN --- TO BE COMPATIBLE WITH SIBE
+        "libappindicator-gtk3",
+        "libass",
+        "libdbusmenu",
+        "libdbusmenu-gtk3",
+        "libdvdcss",
+        "libindicator-gtk3",
+        "libmysofa",
+        "libsodium",
+        "libunwind",
+        "libvncserver",
+        "libXNVCtrl",
+        "nss-mdns",
+        "openpgm",
+        "zeromq", # --- END --- TO BE COMPATIBLE WITH SIBE
+        "source-highlight",
+        "libvirt*",  # RhBug 1571159
+        "java-*", # RCM-28652
+        "totem", #RCM-43729
+        "ocaml*", # RCM-53665
+        "fwupd*", # ENGCMP-488
+        "freeradius*", #RhBug 1923990
+        "httpd-*", #ENGCMP-716
+        "nginx-*",
+        "php-*",
+        "subversion-*",
+        "mariadb-common", #ENGCMP-1061
+        "mariadb-devel",
+        "mariadb-embedded*",
+        "mariadb-errmsg",
+        "mysql-common",
+        "mysql-devel",
+        "mysql-libs",
+        "mecab",
+        "postgresql-private*", #ENGCMP-1179
+        "postgresql-server*",
+        "bash*", #RhBug 2006138
+        "xapian-core*", #RhBug 2031780
+        "tk*", #RhBug 2053406
+        "tcl*",
+        "ldns-devel*", #RhBug 2058694
+        "postgresql*", #ENGCMP-2185
+        "bash*", #RhBug 2006138
+        "xapian-core*", #RhBug 2031780
+        "tk*", #RhBug 2053406
+        "tcl*",
+        "ldns-devel*", #RhBug 2058694
+        "apr-util-openssl",
+        "compiler-rt",
+        "libomp",
+        "librevenge-gdb",
+        "tracker",
+        "tracker-miners",
+        "gnome-software-devel",
+        "gnome-software",
+        "libfastjson-devel",
+        "liblognorm-devel",
+        "librelp-devel",
+    ],
+}
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {}

variants.xml

@@ -1,71 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE variants PUBLIC "-//MSVSphere//DTD Variants info//EN" "variants2012.dtd">
 <variants>
-  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
+  <variant id="OS" name="OS" type="variant" has_optional="false">
     <arches>
       <arch>x86_64</arch>
     </arches>
     <groups>
-      <group default="false">additional-devel</group>
-      <group default="false">anaconda-tools</group>
-      <group default="false">base</group>
-      <group default="false">conflicts-baseos</group>
-      <group default="false">core</group>
-      <group default="false">development</group>
-      <group default="false">dial-up</group>
-      <group default="false">file-server</group>
-      <group default="false">fonts</group>
-      <group default="false">gnome-desktop</group>
-      <group default="false">graphical-admin-tools</group>
-      <group default="false">hardware-monitoring</group>
-      <group default="false">hardware-support</group>
-      <group default="false">headless-management</group>
-      <group default="false">infiniband</group>
-      <group default="false">large-systems</group>
-      <group default="false">legacy-unix</group>
-      <group default="false">mail-server</group>
-      <group default="false">mainframe-access</group>
-      <group default="false">network-file-system-client</group>
-      <group default="false">network-server</group>
-      <group default="false">network-tools</group>
-      <group default="false">networkmanager-submodules</group>
-      <group default="false">performance</group>
-      <group default="false">python-web</group>
-      <group default="false">remote-system-management</group>
-      <group default="false">scientific</group>
-      <group default="false">security-tools</group>
-      <group default="false">server-product</group>
-      <group default="false">smart-card</group>
-      <group default="false">smb-server</group>
-      <group default="false">standard</group>
-      <group default="false">system-tools</group>
-      <group default="false">workstation-product</group>
-    </groups>
-    <environments>
-      <environment display_order="99">custom-environment</environment>
-      <environment display_order="3">minimal-environment</environment>
-      <environment display_order="2">server-product-environment</environment>
-    </environments>
-  </variant>
-  <variant id="AppStream" name="AppStream" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
-    <groups>
-      <group default="false">additional-devel</group>
       <group default="false">anaconda-tools</group>
       <group default="false">backup-client</group>
-      <group default="false">base</group>
       <group default="false">base-x</group>
+      <group default="false">base</group>
       <group default="false">conflicts-appstream</group>
+      <group default="false">conflicts-baseos</group>
       <group default="false">console-internet</group>
       <group default="false">container-management</group>
       <group default="false">core</group>
-      <group default="false">debugging</group>
-      <group default="false">desktop-debugging</group>
-      <group default="false">development</group>
+      <group default="false">dial-up</group>
       <group default="false">dns-server</group>
-<!--      <group default="false">dotnet</group>-->
       <group default="false">emacs</group>
       <group default="false">file-server</group>
       <group default="false">fonts</group>
@@ -77,15 +28,18 @@
       <group default="false">guest-agents</group>
       <group default="false">guest-desktop-agents</group>
       <group default="false">hardware-monitoring</group>
+      <group default="false">hardware-support</group>
       <group default="false">headless-management</group>
       <group default="false">infiniband</group>
       <group default="false">input-methods</group>
       <group default="false">internet-applications</group>
-      <group default="false">internet-browser</group>
-      <group default="false">java-development</group>
-      <group default="false">java-platform</group>
+      <group default="false">internet-browser-chromium</group>
+      <group default="false">internet-browser-firefox</group>
+      <group default="false">large-systems</group>
+      <group default="false">legacy-unix</group>
       <group default="false">legacy-x</group>
       <group default="false">mail-server</group>
+      <group default="false">mainframe-access</group>
       <group default="false">multimedia</group>
       <group default="false">network-file-system-client</group>
       <group default="false">network-server</group>
@@ -93,19 +47,20 @@
       <group default="false">networkmanager-submodules</group>
       <group default="false">office-suite</group>
       <group default="false">ostree-support</group>
-      <group default="false">performance</group>
-      <group default="false">platform-devel</group>
       <group default="false">platform-kvm</group>
       <group default="false">platform-microsoft</group>
       <group default="false">platform-vmware</group>
       <group default="false">print-client</group>
+      <group default="false">print-server</group>
+      <group default="false">python-web</group>
       <group default="false">remote-desktop-clients</group>
       <group default="false">remote-system-management</group>
-      <group default="false">rpm-development-tools</group>
-      <group default="false">scientific</group>
       <group default="false">security-tools</group>
+      <group default="false">server-product</group>
       <group default="false">smart-card</group>
       <group default="false">smb-server</group>
+      <group default="false">sphere-core-arm-certified</group>
+      <group default="false">sphere-core-server-certified</group>
       <group default="false">standard</group>
       <group default="false">system-tools</group>
       <group default="false">texlive</group>
@@ -117,74 +72,30 @@
       <group default="false">workstation-product</group>
     </groups>
     <environments>
-      <environment display_order="99">custom-environment</environment>
       <environment display_order="1">graphical-server-environment</environment>
-      <environment display_order="3">minimal-environment</environment>
       <environment display_order="2">server-product-environment</environment>
-      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="3">minimal-environment</environment>
       <environment display_order="4">workstation-product-environment</environment>
+      <environment display_order="99">virtualization-host-environment</environment>
     </environments>
-<!--    <modules>-->
-<!--      <module>maven:3.8</module>-->
-<!--      <module>nodejs:18</module>-->
-<!--      <module>php:8.1</module>-->
-<!--      <module>ruby:3.1</module>-->
-<!--    </modules>-->
+    <modules>
+      <!-- <module>maven:3.8</module> -->
+    </modules>
   </variant>
-  <variant id="CRB" name="CRB" type="variant">
+  <variant id="Updates" name="Updates" type="variant">
     <arches>
       <arch>x86_64</arch>
     </arches>
     <groups>
-      <group default="false">crb</group>
+      <group default="false">additional-devel</group>
     </groups>
   </variant>
-  <variant id="Minimal" name="Minimal" type="variant">
+  <variant id="Testing" name="Testing" type="variant">
     <arches>
       <arch>x86_64</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
-      <group default="false">anaconda-tools</group>
-      <group default="false">base</group>
-      <group default="false">conflicts-baseos</group>
-      <group default="false">core</group>
-      <group default="false">development</group>
-      <group default="false">dial-up</group>
-      <group default="false">file-server</group>
-      <group default="false">fonts</group>
-      <group default="false">gnome-desktop</group>
-      <group default="false">hardware-monitoring</group>
-      <group default="false">hardware-support</group>
-      <group default="false">headless-management</group>
-      <group default="false">infiniband</group>
-      <group default="false">large-systems</group>
-      <group default="false">legacy-unix</group>
-      <group default="false">mail-server</group>
-      <group default="false">mainframe-access</group>
-      <group default="false">network-file-system-client</group>
-      <group default="false">network-server</group>
-      <group default="false">network-tools</group>
-      <group default="false">networkmanager-submodules</group>
-      <group default="false">performance</group>
-      <group default="false">python-web</group>
-      <group default="false">remote-system-management</group>
-      <group default="false">scientific</group>
-      <group default="false">security-tools</group>
-      <group default="false">server-product</group>
-      <group default="false">smart-card</group>
-      <group default="false">smb-server</group>
-      <group default="false">standard</group>
-      <group default="false">system-tools</group>
-      <group default="false">workstation-product</group>
     </groups>
-    <environments>
-      <environment display_order="3">minimal-environment</environment>
-    </environments>
-  </variant>
-  <variant id="Extras" name="Extras" type="variant">
-    <arches>
-      <arch>x86_64</arch>
-    </arches>
   </variant>
 </variants>