aarch64/include_exclude.conf

@@ -1,6 +1,6 @@
 filter_packages = [
     (
-        '^(BaseOS|Minimal|AppStream|PowerTools)$', {
+        '^(BaseOS|Minimal|AppStream|CRB)$', {
             'aarch64': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
@@ -28,11 +28,12 @@ filter_packages = [
                 "rhc",
                 "rhc-worker-playbook",
                 "python2-gluster*",
-                "nmstate.noarch",
+                "greenboot-grub2",
-                "libstoragemgmt-nfs-plugin.noarch",
+                "greenboot-reboot",
-                "python3-libstoragemgmt.noarch",
+                "greenboot-rpm-ostree-grub2",
-                "python3-libstoragemgmt-clibs",
+                "greenboot-status",
-                "libstoragemgmt-nfs-plugin-clibs",
+                "qemu-kvm-hw-usbredir",
+                "subscription-manager-rhsm-certificates.aarch64",
             ]
         }
     ),
@@ -45,43 +46,25 @@ filter_packages = [
             ]
         }
     ),
-    (
-        '^(BaseOS)$', {
-            'aarch64': [
-                "libev",
-                "libverto-libev",
-            ]
-        }
-    ),
     (
         '^(AppStream)$', {
             'aarch64': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "sos",
-                "libsmbclient",
-                "libwbclient",
-                "python3-samba",
-                "samba",
-                "samba-client-libs",
-                "samba-common",
-                "samba-common-libs",
-                "samba-common-tools",
-                "samba-libs",
-                "samba-winbind",
-                "samba-winbind-modules",
             ]
         }
-    )
+    ),
 ]
 filter_modules = [
     (
-        '^(BaseOS|AppStream|PowerTools)$', {
+        '^devel$', {
-            'aarch64': [
+            '*': [
-                "jmc:rhel8",
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
             ]
         }
-    )
+    ),
 ]
 
 # Based in distribution-comparison-tool report
@@ -90,7 +73,7 @@ additional_packages = [
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
-                "libreport-almalinux",
+                "lorax-templates-almalinux",
             ]
         }
     ),
@@ -103,13 +86,13 @@ additional_packages = [
                 "chrony",
                 "crypto-policies",
                 "dnf-automatic",
-                "dnf-plugin-subscription-manager",
                 "fapolicyd",
                 "firewalld",
                 "gnutls-utils",
                 "kernel-modules-extra",
                 "libreswan",
                 "libselinux",
+                "libsss_sudo",
                 "opensc",
                 "openscap",
                 "openscap-scanner",
@@ -119,6 +102,7 @@ additional_packages = [
                 "pcsc-lite",
                 "policycoreutils",
                 "policycoreutils-python-utils",
+                "python3-libselinux",
                 "rear",
                 "rng-tools",
                 "rsyslog",
@@ -129,14 +113,17 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),
     (
-        '^ResilientStorage$', {
+        '^extras$', {
             '*': [
-                "dlm",
+                "anaconda-live",
-                "cmirror",
             ]
         }
     )

aarch64/modules_defaults/module_defaults/ant.yaml

@@ -1,8 +0,0 @@
-data:
-  module: ant
-  profiles:
-    '1.10':
-    - common
-  stream: '1.10'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/container-tools.yaml

@@ -1,16 +0,0 @@
-data:
-  module: container-tools
-  profiles:
-    '1.0':
-    - common
-    '2.0':
-    - common
-    '3.0':
-    - common
-    '4.0':
-    - common
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/freeradius.yaml

@@ -1,8 +0,0 @@
-data:
-  module: freeradius
-  profiles:
-    '3.0':
-    - server
-  stream: '3.0'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/gimp.yaml

@@ -1,8 +0,0 @@
-data:
-  module: gimp
-  profiles:
-    '2.8':
-    - common
-  stream: '2.8'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/go-toolset.yaml

@@ -1,8 +0,0 @@
-data:
-  module: go-toolset
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/httpd.yaml

@@ -1,8 +0,0 @@
-data:
-  module: httpd
-  profiles:
-    '2.4':
-    - common
-  stream: '2.4'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/inkscape.yaml

@@ -1,8 +0,0 @@
-data:
-  module: inkscape
-  profiles:
-    0.92.3:
-    - common
-  stream: 0.92.3
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/javapackages-runtime.yaml

@@ -1,8 +0,0 @@
-data:
-  module: javapackages-runtime
-  profiles:
-    '201801':
-    - common
-  stream: '201801'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/javapackages-tools.yaml

@@ -1,7 +0,0 @@
-data:
-  module: javapackages-tools
-  profiles:
-    '202201':
-    - default
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/jmc.yaml

@@ -1,8 +0,0 @@
-data:
-  module: jmc
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/llvm-toolset.yaml

@@ -1,8 +0,0 @@
-data:
-  module: llvm-toolset
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/mailman.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mailman
-  profiles:
-    '2.1':
-    - common
-  stream: '2.1'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/mariadb.yaml

@@ -1,10 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.3':
-    - server
-    '10.5':
-    - server
-  stream: '10.3'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/maven.yaml

@@ -1,13 +1,7 @@
 data:
-  modified: '201912051051'
   module: maven
   profiles:
-    '3.5':
-    - common
-    '3.6':
-    - common
     '3.8':
     - common
-  stream: '3.5'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/mercurial.yaml

@@ -1,10 +0,0 @@
-data:
-  module: mercurial
-  profiles:
-    '4.8':
-    - common
-    '6.2':
-    - common
-  stream: '4.8'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/mod_auth_openidc.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mod_auth_openidc
-  profiles:
-    '2.3':
-    - default
-  stream: '2.3'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/mysql.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.0':
-    - server
-  stream: '8.0'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/nginx.yaml

@@ -1,14 +1,7 @@
 data:
   module: nginx
   profiles:
-    '1.14':
+    '1.22':
     - common
-    '1.16':
-    - common
-    '1.18':
-    - common
-    '1.20':
-    - common
-  stream: '1.14'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/nodejs.yaml

@@ -1,16 +1,9 @@
 data:
   module: nodejs
   profiles:
-    '10':
-    - common
-    '12':
-    - common
-    '14':
-    - common
-    '16':
-    - common
     '18':
     - common
-  stream: '10'
+    '20':
+    - common
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/perl-App-cpanminus.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-App-cpanminus
-  profiles:
-    '1.7044':
-    - common
-  stream: '1.7044'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-DBD-MySQL.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-MySQL
-  profiles:
-    '4.046':
-    - common
-  stream: '4.046'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-DBD-Pg.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-Pg
-  profiles:
-    '3.7':
-    - common
-  stream: '3.7'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-DBD-SQLite.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-SQLite
-  profiles:
-    '1.58':
-    - common
-  stream: '1.58'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-DBI.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBI
-  profiles:
-    '1.641':
-    - common
-  stream: '1.641'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-FCGI.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-FCGI
-  profiles:
-    '0.78':
-    - common
-  stream: '0.78'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-IO-Socket-SSL.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-IO-Socket-SSL
-  profiles:
-    '2.066':
-    - common
-  stream: '2.066'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-YAML.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-YAML
-  profiles:
-    '1.24':
-    - common
-  stream: '1.24'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl-libwww-perl.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-libwww-perl
-  profiles:
-    '6.34':
-    - common
-  stream: '6.34'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/perl.yaml

@@ -1,14 +0,0 @@
-data:
-  module: perl
-  profiles:
-    '5.24':
-    - common
-    '5.26':
-    - common
-    '5.30':
-    - common
-    '5.32':
-    - common
-  stream: '5.26'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/php.yaml

@@ -1,14 +1,7 @@
 data:
   module: php
   profiles:
-    '7.2':
+    '8.1':
     - common
-    '7.3':
-    - common
-    '7.4':
-    - common
-    '8.0':
-    - common
-  stream: '7.2'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/postgresql.yaml

@@ -1,14 +1,7 @@
 data:
   module: postgresql
   profiles:
-    '10':
+    '15':
     - server
-    '12':
-    - server
-    '13':
-    - server
-    '9.6':
-    - server
-  stream: '10'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/python27.yaml

@@ -1,8 +0,0 @@
-data:
-  module: python27
-  profiles:
-    '2.7':
-    - common
-  stream: '2.7'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/python36.yaml

@@ -1,8 +0,0 @@
-data:
-  module: python36
-  profiles:
-    '3.6':
-    - common
-  stream: '3.6'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/python38.yaml

@@ -1,8 +0,0 @@
-data:
-  module: python38
-  profiles:
-    '3.8':
-    - common
-  stream: '3.8'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/python39.yaml

@@ -1,8 +0,0 @@
-data:
-  module: python39
-  profiles:
-    '3.9':
-    - common
-  stream: '3.9'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/redis.yaml

@@ -1,10 +1,7 @@
 data:
   module: redis
   profiles:
-    '5':
+    '7':
     - common
-    '6':
-    - common
-  stream: '5'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/rhn-tools.yaml

@@ -1,8 +0,0 @@
-data:
-  module: rhn-tools
-  profiles:
-    '1.0':
-    - common
-  stream: '1.0'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/ruby.yaml

@@ -1,16 +1,7 @@
 data:
   module: ruby
   profiles:
-    '2.5':
-    - common
-    '2.6':
-    - common
-    '2.7':
-    - common
-    '3.0':
-    - common
     '3.1':
     - common
-  stream: '2.5'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/rust-toolset.yaml

@@ -1,8 +0,0 @@
-data:
-  module: rust-toolset
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/satellite-5-client.yaml

@@ -1,8 +0,0 @@
-data:
-  module: satellite-5-client
-  profiles:
-    '1.0':
-    - common
-  stream: '1.0'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/scala.yaml

@@ -1,8 +0,0 @@
-data:
-  module: scala
-  profiles:
-    '2.10':
-    - common
-  stream: '2.10'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/subversion.yaml

@@ -1,10 +0,0 @@
-data:
-  module: subversion
-  profiles:
-    '1.10':
-    - common
-    '1.14':
-    - common
-  stream: '1.10'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/swig.yaml

@@ -1,10 +1,7 @@
 data:
   module: swig
   profiles:
-    '3.0':
+    '4.1':
     - common
-    '4.0':
-    - common
-  stream: '3.0'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/varnish.yaml

@@ -1,8 +0,0 @@
-data:
-  module: varnish
-  profiles:
-    '6':
-    - common
-  stream: '6'
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/virt.yaml

@@ -1,8 +0,0 @@
-data:
-  module: virt
-  profiles:
-    rhel:
-    - common
-  stream: rhel
-document: modulemd-defaults
-version: '1'

aarch64/variants.xml

@@ -16,6 +16,7 @@
       <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>
@@ -29,7 +30,6 @@
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
       <group default="false">performance</group>
-      <group default="false">platform-devel</group>
       <group default="false">python-web</group>
       <group default="false">remote-system-management</group>
       <group default="false">scientific</group>
@@ -58,29 +58,33 @@
       <group default="false">base</group>
       <group default="false">base-x</group>
       <group default="false">conflicts-appstream</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">dns-server</group>
-      <group default="false">dotnet-core</group>
+      <group default="false">dotnet</group>
+      <group default="false">emacs</group>
       <group default="false">file-server</group>
       <group default="false">fonts</group>
       <group default="false">ftp-server</group>
       <group default="false">gnome-desktop</group>
+      <group default="false">graphical-admin-tools</group>
       <group default="false">graphics</group>
       <group default="false">guest-agents</group>
       <group default="false">guest-desktop-agents</group>
+      <group default="false">hardware-monitoring</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">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>
@@ -89,6 +93,7 @@
       <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">print-client</group>
       <group default="false">remote-desktop-clients</group>
@@ -97,10 +102,14 @@
       <group default="false">scientific</group>
       <group default="false">security-tools</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">texlive</group>
       <group default="false">virtualization-client</group>
+      <group default="false">virtualization-hypervisor</group>
+      <group default="false">virtualization-platform</group>
+      <group default="false">virtualization-tools</group>
       <group default="false">web-server</group>
       <group default="false">workstation-product</group>
     </groups>
@@ -109,110 +118,29 @@
       <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="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>389-ds:1.4</module>
-      <module>ant:1.10</module>
-      <module>container-tools:1.0</module>
-      <module>container-tools:2.0</module>
-      <module>container-tools:3.0</module>
-      <module>container-tools:4.0</module>
-      <module>container-tools:rhel8</module>
-      <module>freeradius:3.0</module>
-      <module>gimp:2.8</module>
-      <module>go-toolset:rhel8</module>
-      <module>httpd:2.4</module>
-      <module>idm:DL1</module>
-      <module>idm:client</module>
-      <module>inkscape:0.92.3</module>
-      <module>javapackages-runtime:201801</module>
-      <module>jmc:rhel8</module>
-      <module>libselinux-python:2.8</module>
-      <module>llvm-toolset:rhel8</module>
-      <module>log4j:2</module>
-      <module>mailman:2.1</module>
-      <module>mariadb:10.3</module>
-      <module>mariadb:10.5</module>
-      <module>maven:3.5</module>
-      <module>maven:3.6</module>
       <module>maven:3.8</module>
-      <module>mercurial:4.8</module>
+      <module>nginx:1.22</module>
-      <module>mercurial:6.2</module>
-      <module>mod_auth_openidc:2.3</module>
-      <module>mysql:8.0</module>
-      <module>nginx:1.14</module>
-      <module>nginx:1.16</module>
-      <module>nginx:1.18</module>
-      <module>nginx:1.20</module>
-      <module>nodejs:10</module>
-      <module>nodejs:12</module>
-      <module>nodejs:14</module>
-      <module>nodejs:16</module>
       <module>nodejs:18</module>
-      <module>parfait:0.5</module>
+      <module>nodejs:20</module>
-      <module>perl-App-cpanminus:1.7044</module>
+      <module>php:8.1</module>
-      <module>perl-DBD-MySQL:4.046</module>
+      <module>postgresql:15</module>
-      <module>perl-DBD-Pg:3.7</module>
+      <module>redis:7</module>
-      <module>perl-DBD-SQLite:1.58</module>
-      <module>perl-DBI:1.641</module>
-      <module>perl-FCGI:0.78</module>
-      <module>perl-IO-Socket-SSL:2.066</module>
-      <module>perl-YAML:1.24</module>
-      <module>perl-libwww-perl:6.34</module>
-      <module>perl:5.24</module>
-      <module>perl:5.26</module>
-      <module>perl:5.30</module>
-      <module>perl:5.32</module>
-      <module>php:7.2</module>
-      <module>php:7.3</module>
-      <module>php:7.4</module>
-      <module>php:8.0</module>
-      <module>pki-core:10.6</module>
-      <module>pki-deps:10.6</module>
-      <module>pmdk:1-fileformat-v6</module>
-      <module>pmdk:1_fileformat_v6</module>
-      <module>postgresql:10</module>
-      <module>postgresql:12</module>
-      <module>postgresql:13</module>
-      <module>postgresql:9.6</module>
-      <module>python27:2.7</module>
-      <module>python36:3.6</module>
-      <module>python38:3.8</module>
-      <module>python39:3.9</module>
-      <module>redis:5</module>
-      <module>redis:6</module>
-      <module>rhn-tools:1.0</module>
-      <module>ruby:2.5</module>
-      <module>ruby:2.6</module>
-      <module>ruby:2.7</module>
-      <module>ruby:3.0</module>
       <module>ruby:3.1</module>
-      <module>rust-toolset:rhel8</module>
-      <module>satellite-5-client:1.0</module>
-      <module>scala:2.10</module>
-      <module>squid:4</module>
-      <module>subversion:1.10</module>
-      <module>subversion:1.14</module>
-      <module>swig:3.0</module>
-      <module>swig:4.0</module>
-      <module>varnish:6</module>
-      <module>virt:rhel</module>
     </modules>
   </variant>
-  <variant id="PowerTools" name="PowerTools" type="variant">
+  <variant id="CRB" name="CRB" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">powertools</group>
+      <group default="false">crb</group>
     </groups>
     <modules>
-      <module>javapackages-tools:201801</module>
+      <module>swig:4.1</module>
-      <module>mariadb-devel:10.3</module>
-      <module>python38-devel:3.8</module>
-      <module>python39-devel:3.9</module>
-      <module>subversion-devel:1.10</module>
-      <module>virt-devel:rhel</module>
     </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
@@ -224,21 +152,37 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-  </variant>
   <variant id="ResilientStorage" name="ResilientStorage" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="true">ha</group>
+      <group default="false">ha</group>
-      <group default="true">ha-devel</group>
+      <group default="false">ha-devel</group>
-      <group default="true">resilient-storage</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras" name="extras" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+  </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
       <arch>aarch64</arch>
@@ -267,7 +211,6 @@
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
       <group default="false">performance</group>
-      <group default="false">platform-devel</group>
       <group default="false">python-web</group>
       <group default="false">remote-system-management</group>
       <group default="false">scientific</group>
@@ -283,20 +226,30 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
-  <variant id="SAP" name="SAP" type="variant">
+  <variant id="devel" name="devel" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">sap</group>
+      <group default="false">gnome-apps</group>
-    </groups>
+      <group default="false">office-suite</group>
-  </variant>
+      <group default="false">platform-vmware</group>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
     </groups>
+    <environments>
+      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="4">workstation-product-environment</environment>
+    </environments>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:202201</module>
+      <module>maven-devel:3.8</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>swig-devel:4.1</module>
+    </modules>
   </variant>
 </variants>

aarch64/variants_options.json

@@ -2,14 +2,24 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -20,7 +30,7 @@
             "BaseOS"
         ]
     },
-    "PowerTools": {
+    "CRB": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
@@ -56,17 +66,6 @@
             "AppStream"
         ]
     },
-    "Minimal": {
-        "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-        "buildinstall_skip": false,
-        "createiso_skip": true,
-        "extra_isos": [{
-            "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
-        }]
-    },
     "SAPHANA": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -86,5 +85,42 @@
             "AppStream",
             "HighAvailability"
         ]
+    },
+    "Minimal": {
+        "gather_methods": "hybrid",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "buildinstall_skip": false,
+        "createiso_skip": true,
+        "extra_isos": [{
+            "include_variants": [],
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
+        }]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
     }
 }

i686/extra_options.conf

@@ -0,0 +1,5 @@
+skip_phases = [
+    'buildinstall',
+    'createiso',
+    'extra_isos',
+]

i686/include_exclude.conf

@@ -0,0 +1,149 @@
+filter_packages = [
+    (
+        '^(BaseOS|Minimal|AppStream|CRB)$', {
+            '*': [
+                "insights-client",
+                "libreport-plugin-rhtsupport",
+                "libreport-rhel",
+                "libreport-rhel-anaconda-bugzilla",
+                "libreport-rhel-bugzilla",
+                "redhat-backgrounds",
+                "redhat-logos",
+                "redhat-logos-httpd",
+                "redhat-logos-ipa",
+                "redhat-release-eula",
+                "redhat-support-lib-python",
+                "redhat-support-tool",
+                "spice-client-win-x64",
+                "spice-client-win-x86",
+                "spice-qxl-wddm-dod",
+                "spice-vdagent-win-x64",
+                "spice-vdagent-win-x86",
+                "virt-who",
+                "virtio-win",
+                "subscription-manager-cockpit",
+                "subscription-manager-initial-setup-addon",
+                "rhsm-gtk",
+                "rhsm-icons",
+                "rhc",
+                "rhc-worker-playbook",
+                "python2-gluster*",
+                "gcc-toolset-10-dyninst-devel.i686",
+                "gcc-toolset-10-systemtap-devel.i686",
+                "gcc-toolset-10-systemtap-sdt-devel.i686",
+                "ocaml-camlp4.i686",
+                "ocaml-camlp4-devel.i686",
+                "ocaml-extlib-devel.i686",
+                "ocaml-findlib-devel.i686",
+                "ocaml-labltk.i686",
+                "ocaml-labltk-devel.i686",
+                "ocaml-ocamlbuild.i686",
+                "ocaml-ocamlbuild-devel.i686",
+                "greenboot-grub2",
+                "greenboot-reboot",
+                "greenboot-rpm-ostree-grub2",
+                "greenboot-status",
+                "qemu-kvm-hw-usbredir",
+                "subscription-manager-rhsm-certificates.i686",
+            ]
+        }
+    ),
+    (
+        '^(BaseOS|Minimal)$', {
+            '*': [
+                "perl-Net-SSLeay",
+                "perl-Mozilla-CA",
+                "perl-IO-Socket-SSL",
+                "python-unversioned-command",
+                "python.i686",
+            ]
+        }
+    ),
+    (
+        '^(AppStream)$', {
+            '*': [
+                "java-1.8.0-openjdk-slowdebug",
+                "java-1.8.0-openjdk-headless-slowdebug",
+                "libvirt-glib.i686",
+                "sos",
+            ]
+        }
+    ),
+]
+filter_modules = [
+    (
+        '^AppStream$', {
+            '*': [
+                "maven:3.8",
+            ]
+        }
+    ),
+    (
+        '^devel$', {
+            '*': [
+                "javapackages-tools:202201",
+            ]
+        }
+    ),
+]
+
+additional_packages = [
+    (
+        '^AppStream$', {
+            '*': [
+                "almalinux-backgrounds",
+                "lorax-templates-almalinux",
+            ]
+        }
+    ),
+    (
+        '^Minimal$', {
+            '*': [
+                "aide",
+                "audispd-plugins",
+                "audit",
+                "chrony",
+                "crypto-policies",
+                "dnf-automatic",
+                "fapolicyd",
+                "firewalld",
+                "gnutls-utils",
+                "kernel-modules-extra",
+                "libreswan",
+                "libselinux",
+                "libsss_sudo",
+                "opensc",
+                "openscap",
+                "openscap-scanner",
+                "openssh-clients",
+                "openssh-server",
+                "openssl-pkcs11",
+                "pcsc-lite",
+                "policycoreutils",
+                "policycoreutils-python-utils",
+                "python3-libselinux",
+                "rear",
+                "rng-tools",
+                "rsyslog",
+                "rsyslog-gnutls",
+                "scap-security-guide",
+                "subscription-manager",
+                "sudo",
+                "tmux",
+                "usbguard",
+                "kernel",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
+            ]
+        }
+    ),
+    (
+        '^extras$', {
+            '*': [
+                "anaconda-live",
+            ]
+        }
+    )
+]

i686/modules_defaults/module_defaults/maven.yaml

@@ -1,8 +1,7 @@
 data:
-  module: python38
+  module: maven
   profiles:
     '3.8':
     - common
-  stream: '3.8'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/nginx.yaml

@@ -1,8 +1,7 @@
 data:
-  module: log4j
+  module: nginx
   profiles:
-    '2':
+    '1.22':
     - common
-  stream: '2'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/nodejs.yaml

@@ -1,10 +1,9 @@
 data:
-  module: idm
+  module: nodejs
   profiles:
-    DL1:
+    '18':
     - common
-    client:
+    '20':
     - common
-  stream: client
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/php.yaml

@@ -1,8 +1,7 @@
 data:
-  module: squid
+  module: php
   profiles:
-    '4':
+    '8.1':
     - common
-  stream: '4'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/postgresql.yaml

@@ -1,8 +1,7 @@
 data:
-  module: mysql
+  module: postgresql
   profiles:
-    '8.0':
+    '15':
     - server
-  stream: '8.0'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/redis.yaml

@@ -1,8 +1,7 @@
 data:
-  module: squid
+  module: redis
   profiles:
-    '4':
+    '7':
     - common
-  stream: '4'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/ruby.yaml

@@ -1,8 +1,7 @@
 data:
-  module: log4j
+  module: ruby
   profiles:
-    '2':
+    '3.1':
     - common
-  stream: '2'
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/swig.yaml

@@ -0,0 +1,7 @@
+data:
+  module: swig
+  profiles:
+    '4.1':
+    - common
+document: modulemd-defaults
+version: '1'

i686/multilib.conf

@@ -0,0 +1,3 @@
+multilib_blacklist = {}
+multilib_whitelist = {}
+multilib = []

i686/variants.xml

@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//AlmaLinux//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
+    <arches>
+      <arch>i686</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>i686</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">conflicts-appstream</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">dns-server</group>
+      <group default="false">dotnet</group>
+      <group default="false">emacs</group>
+      <group default="false">file-server</group>
+      <group default="false">fonts</group>
+      <group default="false">ftp-server</group>
+      <group default="false">gnome-apps</group>
+      <group default="false">gnome-desktop</group>
+      <group default="false">graphical-admin-tools</group>
+      <group default="false">graphics</group>
+      <group default="false">guest-agents</group>
+      <group default="false">guest-desktop-agents</group>
+      <group default="false">hardware-monitoring</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">legacy-x</group>
+      <group default="false">mail-server</group>
+      <group default="false">multimedia</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">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">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">smart-card</group>
+      <group default="false">smb-server</group>
+      <group default="false">standard</group>
+      <group default="false">system-tools</group>
+      <group default="false">texlive</group>
+      <group default="false">virtualization-client</group>
+      <group default="false">virtualization-hypervisor</group>
+      <group default="false">virtualization-platform</group>
+      <group default="false">virtualization-tools</group>
+      <group default="false">web-server</group>
+      <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="4">workstation-product-environment</environment>
+    </environments>
+    <modules>
+      <module>maven:3.8</module>
+      <module>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
+  </variant>
+  <variant id="CRB" name="CRB" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">crb</group>
+    </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
+  </variant>
+  <variant id="HighAvailability" name="HighAvailability" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="true">ha</group>
+      <group default="true">ha-devel</group>
+    </groups>
+  </variant>
+  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
+    </groups>
+  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="RT" name="RT" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">rt</group>
+      <group default="false">rt-debug</group>
+    </groups>
+  </variant>
+  <variant id="NFV" name="NFV" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">nfv</group>
+      <group default="false">nfv-debug</group>
+      <group default="false">rt</group>
+      <group default="false">rt-debug</group>
+    </groups>
+  </variant>
+  <variant id="extras" name="extras" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+  <variant id="Minimal" name="Minimal" type="variant">
+    <arches>
+      <arch>i686</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="devel" name="devel" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>ruby-devel:3.1</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
+</variants>

i686/variants_options.json

@@ -0,0 +1,112 @@
+{
+    "BaseOS": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true
+    },
+    "AppStream": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS"
+        ]
+    },
+    "CRB": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "HighAvailability": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "ResilientStorage": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "Minimal": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true
+    },
+    "NFV": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "RT": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "SAP": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "HighAvailability"
+        ]
+    },
+    "SAPHANA": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "HighAvailability"
+        ]
+    },
+    "extras": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "RT",
+            "NFV",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
+    }
+}

ppc64le/include_exclude.conf

@@ -1,6 +1,6 @@
 filter_packages = [
     (
-        '^(BaseOS|Minimal|AppStream|PowerTools)$', {
+        '^(BaseOS|Minimal|AppStream|CRB)$', {
             'ppc64le': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
@@ -28,13 +28,12 @@ filter_packages = [
                 "rhc",
                 "rhc-worker-playbook",
                 "python2-gluster*",
-                "nmstate.noarch",
+                "greenboot-grub2",
-                "glassfish-jaxb-bom",
+                "greenboot-reboot",
-                "glassfish-jaxb-bom-ext",
+                "greenboot-rpm-ostree-grub2",
-                "glassfish-jaxb-codemodel-parent",
+                "greenboot-status",
-                "glassfish-jaxb-external-parent",
+                "qemu-kvm-hw-usbredir",
-                "glassfish-jaxb-runtime-parent",
+                "subscription-manager-rhsm-certificates.ppc64le",
-                "glassfish-jaxb-txw-parent",
             ]
         }
     ),
@@ -47,14 +46,6 @@ filter_packages = [
             ]
         }
     ),
-    (
-        '^(BaseOS)$', {
-            'ppc64le': [
-                "libev",
-                "libverto-libev",
-            ]
-        }
-    ),
     (
         '^(AppStream)$', {
             'ppc64le': [
@@ -63,16 +54,33 @@ filter_packages = [
                 "sos",
             ]
         }
-    )
+    ),
+]
+filter_modules = [
+    (
+        '^devel$', {
+            '*': [
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
+            ]
+        }
+    ),
 ]
-filter_modules = []
 
 additional_packages = [
     (
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
-                "libreport-almalinux",
+                "keylime-selinux",
+                "lorax-templates-almalinux",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "xorg-x11-server-source",
             ]
         }
     ),
@@ -85,13 +93,13 @@ additional_packages = [
                 "chrony",
                 "crypto-policies",
                 "dnf-automatic",
-                "dnf-plugin-subscription-manager",
                 "fapolicyd",
                 "firewalld",
                 "gnutls-utils",
                 "kernel-modules-extra",
                 "libreswan",
                 "libselinux",
+                "libsss_sudo",
                 "opensc",
                 "openscap",
                 "openscap-scanner",
@@ -101,6 +109,7 @@ additional_packages = [
                 "pcsc-lite",
                 "policycoreutils",
                 "policycoreutils-python-utils",
+                "python3-libselinux",
                 "rear",
                 "rng-tools",
                 "rsyslog",
@@ -111,14 +120,17 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),
     (
-        '^ResilientStorage$', {
+        '^extras$', {
             '*': [
-                "dlm",
+                "anaconda-live",
-                "cmirror",
             ]
         }
     )

ppc64le/modules_defaults/module_defaults/ant.yaml

@@ -1,8 +0,0 @@
-data:
-  module: ant
-  profiles:
-    '1.10':
-    - common
-  stream: '1.10'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/container-tools.yaml

@@ -1,16 +0,0 @@
-data:
-  module: container-tools
-  profiles:
-    '1.0':
-    - common
-    '2.0':
-    - common
-    '3.0':
-    - common
-    '4.0':
-    - common
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/freeradius.yaml

@@ -1,8 +0,0 @@
-data:
-  module: freeradius
-  profiles:
-    '3.0':
-    - server
-  stream: '3.0'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/gimp.yaml

@@ -1,8 +0,0 @@
-data:
-  module: gimp
-  profiles:
-    '2.8':
-    - common
-  stream: '2.8'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/go-toolset.yaml

@@ -1,8 +0,0 @@
-data:
-  module: go-toolset
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/httpd.yaml

@@ -1,8 +0,0 @@
-data:
-  module: httpd
-  profiles:
-    '2.4':
-    - common
-  stream: '2.4'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/idm.yaml

@@ -1,10 +0,0 @@
-data:
-  module: idm
-  profiles:
-    DL1:
-    - common
-    client:
-    - common
-  stream: client
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/inkscape.yaml

@@ -1,8 +0,0 @@
-data:
-  module: inkscape
-  profiles:
-    0.92.3:
-    - common
-  stream: 0.92.3
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/javapackages-runtime.yaml

@@ -1,8 +0,0 @@
-data:
-  module: javapackages-runtime
-  profiles:
-    '201801':
-    - common
-  stream: '201801'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/javapackages-tools.yaml

@@ -1,7 +0,0 @@
-data:
-  module: javapackages-tools
-  profiles:
-    '202201':
-    - default
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/jmc.yaml

@@ -1,8 +0,0 @@
-data:
-  module: jmc
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/llvm-toolset.yaml

@@ -1,8 +0,0 @@
-data:
-  module: llvm-toolset
-  profiles:
-    rhel8:
-    - common
-  stream: rhel8
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/mailman.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mailman
-  profiles:
-    '2.1':
-    - common
-  stream: '2.1'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/mariadb.yaml

@@ -1,10 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.3':
-    - server
-    '10.5':
-    - server
-  stream: '10.3'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/maven.yaml

@@ -1,13 +1,7 @@
 data:
-  modified: '201912051051'
   module: maven
   profiles:
-    '3.5':
-    - common
-    '3.6':
-    - common
     '3.8':
     - common
-  stream: '3.5'
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/mercurial.yaml

@@ -1,10 +0,0 @@
-data:
-  module: mercurial
-  profiles:
-    '4.8':
-    - common
-    '6.2':
-    - common
-  stream: '4.8'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/mod_auth_openidc.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mod_auth_openidc
-  profiles:
-    '2.3':
-    - default
-  stream: '2.3'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/mysql.yaml

@@ -1,8 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.0':
-    - server
-  stream: '8.0'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/nginx.yaml

@@ -1,14 +1,7 @@
 data:
   module: nginx
   profiles:
-    '1.14':
+    '1.22':
     - common
-    '1.16':
-    - common
-    '1.18':
-    - common
-    '1.20':
-    - common
-  stream: '1.14'
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/nodejs.yaml

@@ -1,16 +1,9 @@
 data:
   module: nodejs
   profiles:
-    '10':
-    - common
-    '12':
-    - common
-    '14':
-    - common
-    '16':
-    - common
     '18':
     - common
-  stream: '10'
+    '20':
+    - common
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/perl-App-cpanminus.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-App-cpanminus
-  profiles:
-    '1.7044':
-    - common
-  stream: '1.7044'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-DBD-MySQL.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-MySQL
-  profiles:
-    '4.046':
-    - common
-  stream: '4.046'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-DBD-Pg.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-Pg
-  profiles:
-    '3.7':
-    - common
-  stream: '3.7'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-DBD-SQLite.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBD-SQLite
-  profiles:
-    '1.58':
-    - common
-  stream: '1.58'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-DBI.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-DBI
-  profiles:
-    '1.641':
-    - common
-  stream: '1.641'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-FCGI.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-FCGI
-  profiles:
-    '0.78':
-    - common
-  stream: '0.78'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-IO-Socket-SSL.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-IO-Socket-SSL
-  profiles:
-    '2.066':
-    - common
-  stream: '2.066'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-YAML.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-YAML
-  profiles:
-    '1.24':
-    - common
-  stream: '1.24'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl-libwww-perl.yaml

@@ -1,8 +0,0 @@
-data:
-  module: perl-libwww-perl
-  profiles:
-    '6.34':
-    - common
-  stream: '6.34'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/perl.yaml

@@ -1,14 +0,0 @@
-data:
-  module: perl
-  profiles:
-    '5.24':
-    - common
-    '5.26':
-    - common
-    '5.30':
-    - common
-    '5.32':
-    - common
-  stream: '5.26'
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/php.yaml

@@ -1,14 +1,7 @@
 data:
   module: php
   profiles:
-    '7.2':
+    '8.1':
     - common
-    '7.3':
-    - common
-    '7.4':
-    - common
-    '8.0':
-    - common
-  stream: '7.2'
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/postgresql.yaml

@@ -1,14 +1,7 @@
 data:
   module: postgresql
   profiles:
-    '10':
+    '15':
     - server
-    '12':
-    - server
-    '13':
-    - server
-    '9.6':
-    - server
-  stream: '10'
 document: modulemd-defaults
 version: '1'