aarch64/include_exclude.conf

@@ -1,6 +1,6 @@
 filter_packages = [
     (
-        '^(BaseOS|Minimal|AppStream|CRB)$', {
+        '^(BaseOS|Minimal|AppStream|PowerTools)$', {
             'aarch64': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
@@ -28,12 +28,12 @@ filter_packages = [
                 "rhc",
                 "rhc-worker-playbook",
                 "python2-gluster*",
-                "greenboot-grub2",
-                "greenboot-reboot",
-                "greenboot-rpm-ostree-grub2",
-                "greenboot-status",
-                "qemu-kvm-hw-usbredir",
-                "subscription-manager-rhsm-certificates.aarch64",
+                "nmstate.noarch",
+                "libstoragemgmt-nfs-plugin.noarch",
+                "python3-libstoragemgmt.noarch",
+                "python3-libstoragemgmt-clibs",
+                "libstoragemgmt-nfs-plugin-clibs",
+                "msv-msv",
             ]
         }
     ),
@@ -46,15 +46,35 @@ 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",
+                "libxdp",
             ]
         }
-    ),
+    )
 ]
 filter_modules = [
     (
@@ -73,7 +93,14 @@ additional_packages = [
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
-                "lorax-templates-almalinux",
+                "libreport-almalinux",
+            ]
+        }
+    ),
+    (
+        '^PowerTools$', {
+            '*': [
+                "libxdp",
             ]
         }
     ),
@@ -86,13 +113,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",
@@ -102,7 +129,6 @@ additional_packages = [
                 "pcsc-lite",
                 "policycoreutils",
                 "policycoreutils-python-utils",
-                "python3-libselinux",
                 "rear",
                 "rng-tools",
                 "rsyslog",
@@ -113,17 +139,15 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
-                "libsss_autofs",
-                "sssd-nfs-idmap",
-                "glibc-gconv-extra",
                 "kbd-legacy",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^ResilientStorage$', {
             '*': [
-                "anaconda-live",
+                "dlm",
+                "cmirror",
             ]
         }
     )

aarch64/modules_defaults/module_defaults/ant.yaml

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

aarch64/modules_defaults/module_defaults/container-tools.yaml

@@ -0,0 +1,16 @@
+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

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

aarch64/modules_defaults/module_defaults/gimp.yaml

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

aarch64/modules_defaults/module_defaults/go-toolset.yaml

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

aarch64/modules_defaults/module_defaults/httpd.yaml

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

aarch64/modules_defaults/module_defaults/idm.yaml

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

aarch64/modules_defaults/module_defaults/inkscape.yaml

@@ -0,0 +1,8 @@
+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

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

aarch64/modules_defaults/module_defaults/javapackages-tools.yaml

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

aarch64/modules_defaults/module_defaults/jaxb.yaml

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

aarch64/modules_defaults/module_defaults/jmc.yaml

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

aarch64/modules_defaults/module_defaults/llvm-toolset.yaml

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

aarch64/modules_defaults/module_defaults/log4j.yaml

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

aarch64/modules_defaults/module_defaults/mailman.yaml

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

aarch64/modules_defaults/module_defaults/mariadb.yaml

@@ -0,0 +1,10 @@
+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,7 +1,13 @@
 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

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

aarch64/modules_defaults/module_defaults/mod_auth_openidc.yaml

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

aarch64/modules_defaults/module_defaults/mysql.yaml

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

aarch64/modules_defaults/module_defaults/nginx.yaml

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

aarch64/modules_defaults/module_defaults/nodejs.yaml

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

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

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

aarch64/modules_defaults/module_defaults/perl-FCGI.yaml

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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

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

aarch64/modules_defaults/module_defaults/perl.yaml

@@ -0,0 +1,14 @@
+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,7 +1,14 @@
 data:
   module: php
   profiles:
-    '8.1':
+    '7.2':
     - 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,7 +1,16 @@
 data:
   module: postgresql
   profiles:
+    '10':
+    - server
+    '12':
+    - server
+    '13':
+    - server
     '15':
     - server
+    '9.6':
+    - server
+  stream: '10'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/python27.yaml

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

aarch64/modules_defaults/module_defaults/python36.yaml

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

aarch64/modules_defaults/module_defaults/python38.yaml

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

aarch64/modules_defaults/module_defaults/python39.yaml

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

aarch64/modules_defaults/module_defaults/redis.yaml

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

aarch64/modules_defaults/module_defaults/rhn-tools.yaml

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

aarch64/modules_defaults/module_defaults/ruby.yaml

@@ -1,7 +1,16 @@
 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

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

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

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

aarch64/modules_defaults/module_defaults/scala.yaml

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

aarch64/modules_defaults/module_defaults/squid.yaml

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

aarch64/modules_defaults/module_defaults/subversion.yaml

@@ -0,0 +1,10 @@
+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,7 +1,12 @@
 data:
   module: swig
   profiles:
+    '3.0':
+    - common
+    '4.0':
+    - common
     '4.1':
     - common
+  stream: '3.0'
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/varnish.yaml

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

aarch64/modules_defaults/module_defaults/virt.yaml

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

aarch64/variants.xml

@@ -16,7 +16,6 @@
       <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>
@@ -30,6 +29,7 @@
       <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,33 +58,29 @@
       <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">dotnet-core</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>
@@ -93,7 +89,6 @@
       <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>
@@ -102,14 +97,10 @@
       <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>
@@ -118,29 +109,114 @@
       <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>jaxb:4</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>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>nginx:1.22</module>
+      <module>nodejs:10</module>
+      <module>nodejs:12</module>
+      <module>nodejs:14</module>
+      <module>nodejs:16</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>php:8.1</module>
+      <module>parfait:0.5</module>
+      <module>perl-App-cpanminus:1.7044</module>
+      <module>perl-DBD-MySQL:4.046</module>
+      <module>perl-DBD-Pg:3.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>postgresql:10</module>
+      <module>postgresql:12</module>
+      <module>postgresql:13</module>
       <module>postgresql:15</module>
-      <module>redis:7</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>swig:4.1</module>
+      <module>varnish:6</module>
+      <module>virt:rhel</module>
     </modules>
   </variant>
-  <variant id="CRB" name="CRB" type="variant">
+  <variant id="PowerTools" name="PowerTools" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">crb</group>
+      <group default="false">powertools</group>
     </groups>
     <modules>
-      <module>swig:4.1</module>
+      <module>javapackages-tools:201801</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">
@@ -211,6 +287,7 @@
       <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>
@@ -231,25 +308,56 @@
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">gnome-apps</group>
-      <group default="false">office-suite</group>
-      <group default="false">platform-vmware</group>
+      <group default="false">powertools</group>
     </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
     <modules>
+      <module>389-ds-devel:1.4</module>
+      <module>container-tools-devel:3.0</module>
+      <module>container-tools-devel:4.0</module>
+      <module>container-tools-devel:rhel8</module>
+      <module>freeradius-devel:3.0</module>
+      <module>go-toolset-devel:rhel8</module>
+      <module>golang-ecosystem:1.0</module>
+      <module>httpd-devel:2.4</module>
+      <module>idm-devel:DL1</module>
+      <module>idm-devel:client</module>
+      <module>javapackages-tools-devel:201902</module>
       <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:201902</module>
       <module>javapackages-tools:202201</module>
+      <module>jaxb-devel:4</module>
+      <module>llvm-toolset-devel:rhel8</module>
+      <module>log4j-devel:2</module>
+      <module>mariadb-devel:10.5</module>
+      <module>maven-devel:3.6</module>
       <module>maven-devel:3.8</module>
+      <module>mercurial-devel:6.2</module>
+      <module>mod_auth_openidc-devel:2.3</module>
+      <module>mysql-devel:8.0</module>
       <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:14</module>
+      <module>nodejs-devel:16</module>
       <module>nodejs-devel:18</module>
-      <module>nodejs-devel:20</module>
-      <module>php-devel:8.1</module>
+      <module>perl-devel:5.32</module>
+      <module>php-devel:7.4</module>
+      <module>php-devel:8.0</module>
+      <module>pki-core-devel:10.6</module>
+      <module>pki-deps-devel:10.6</module>
+      <module>postgresql-devel:10</module>
+      <module>postgresql-devel:12</module>
+      <module>postgresql-devel:13</module>
       <module>postgresql-devel:15</module>
-      <module>redis-devel:7</module>
+      <module>python27-devel:2.7</module>
+      <module>python36-devel:3.6</module>
+      <module>redis-devel:6</module>
+      <module>ruby-devel:2.5</module>
+      <module>ruby-devel:2.7</module>
+      <module>ruby-devel:3.1</module>
+      <module>rust-toolset-devel:rhel8</module>
+      <module>squid-devel:4</module>
+      <module>subversion-devel:1.14</module>
       <module>swig-devel:4.1</module>
+      <module>tycho:rhel8</module>
     </modules>
   </variant>
 </variants>

aarch64/variants_options.json

@@ -15,9 +15,9 @@
                 "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
                 "branch": "a{{ distribution_major_version }}",
                 "file": [
-                        "LICENSE",
+                        "GPL",
                         "EULA",
-                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                        "RPM-GPG-KEY-AlmaLinux"
                 ]
             }]
         }]
@@ -30,7 +30,7 @@
             "BaseOS"
         ]
     },
-    "CRB": {
+    "PowerTools": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
@@ -66,6 +66,27 @@
             "AppStream"
         ]
     },
+    "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": [
+                        "GPL",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux"
+                ]
+            }]
+        }]
+    },
     "SAPHANA": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -86,27 +107,6 @@
             "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,
@@ -114,7 +114,7 @@
         "variant_as_lookaside": [
             "BaseOS",
             "AppStream",
-            "CRB",
+            "PowerTools",
             "SAP",
             "SAPHANA",
             "extras",

i686/include_exclude.conf

@@ -1,6 +1,6 @@
 filter_packages = [
     (
-        '^(BaseOS|Minimal|AppStream|CRB)$', {
+        '^(BaseOS|Minimal|AppStream|PowerTools)$', {
             '*': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
@@ -39,12 +39,19 @@ filter_packages = [
                 "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",
+                "sblim-gather.i686",
+                "nmstate.noarch",
+                "glassfish-jaxb-bom",
+                "glassfish-jaxb-bom-ext",
+                "glassfish-jaxb-codemodel-parent",
+                "glassfish-jaxb-parent",
+                "glassfish-jaxb-external-parent",
+                "glassfish-jaxb-runtime-parent",
+                "glassfish-jaxb-txw-parent",
+                "libstoragemgmt-nfs-plugin.noarch",
+                "python3-libstoragemgmt.noarch",
+                "python3-libstoragemgmt-clibs",
+                "libstoragemgmt-nfs-plugin-clibs",
             ]
         }
     ),
@@ -54,8 +61,29 @@ filter_packages = [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
-                "python-unversioned-command",
-                "python.i686",
+            ]
+        }
+    ),
+    (
+        '^(BaseOS)$', {
+            '*': [
+                "libev.i686",
+                "libverto-libev.i686",
+                "glusterfs.i686",
+                "glusterfs-api-debuginfo.i686",
+                "glusterfs-client-xlators.i686",
+                "glusterfs-client-xlators-debuginfo.i686",
+                "glusterfs-debugsource.i686",
+                "glusterfs-libs.i686",
+                "glusterfs-libs-debuginfo.i686",
+            ]
+        }
+    ),
+    (
+        '^(PowerTools)$', {
+            '*': [
+                "glusterfs-api-devel.i686",
+                "glusterfs-devel.i686",
             ]
         }
     ),
@@ -66,22 +94,29 @@ filter_packages = [
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "libvirt-glib.i686",
                 "sos",
+                "libsmbclient",
+                "libwbclient",
+                "python3-samba",
+                "samba",
+                "samba-client-libs",
+                "samba-common",
+                "samba-common-libs",
+                "samba-common-tools",
+                "samba-libs",
+                "samba-winbind",
+                "samba-winbind-modules",
+                "glusterfs-api.i686",
             ]
         }
-    ),
+    )
 ]
+
 filter_modules = [
-    (
-        '^AppStream$', {
-            '*': [
-                "maven:3.8",
-            ]
-        }
-    ),
     (
         '^devel$', {
             '*': [
-                "javapackages-tools:202201",
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
             ]
         }
     ),
@@ -92,7 +127,25 @@ additional_packages = [
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
-                "lorax-templates-almalinux",
+                "libreport-almalinux",
+                "almalinux-logos-ipa.noarch",
+                "dpdk-doc.noarch",
+                "fence-agents-zvm.noarch",
+                "insights-client.noarch",
+                "make-latest.i686",
+                "stratis-cli.noarch",
+                "synce4l.i686",
+                "synce4l-debuginfo.i686",
+                "synce4l-debugsource.i686",
+            ]
+        }
+    ),
+    (
+        '^ResilientStorage$', {
+            '*': [
+                "dlm",
+                "cmirror",
+                "xfsprogs.i686",
             ]
         }
     ),
@@ -105,13 +158,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",
@@ -121,7 +174,6 @@ additional_packages = [
                 "pcsc-lite",
                 "policycoreutils",
                 "policycoreutils-python-utils",
-                "python3-libselinux",
                 "rear",
                 "rng-tools",
                 "rsyslog",
@@ -132,17 +184,14 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
-                "libsss_autofs",
-                "sssd-nfs-idmap",
-                "glibc-gconv-extra",
                 "kbd-legacy",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^HighAvailability$', {
             '*': [
-                "anaconda-live",
+                "xfsprogs.i686",
             ]
         }
     )

i686/modules_defaults/module_defaults/ant.yaml

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

i686/modules_defaults/module_defaults/container-tools.yaml

@@ -0,0 +1,16 @@
+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'

i686/modules_defaults/module_defaults/eclipse.yaml

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

i686/modules_defaults/module_defaults/freeradius.yaml

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

i686/modules_defaults/module_defaults/gimp.yaml

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

i686/modules_defaults/module_defaults/go-toolset.yaml

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

i686/modules_defaults/module_defaults/httpd.yaml

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

i686/modules_defaults/module_defaults/idm.yaml

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

i686/modules_defaults/module_defaults/inkscape.yaml

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

i686/modules_defaults/module_defaults/javapackages-runtime.yaml

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

i686/modules_defaults/module_defaults/javapackages-tools.yaml

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

i686/modules_defaults/module_defaults/jaxb.yaml

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

i686/modules_defaults/module_defaults/jmc.yaml

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

i686/modules_defaults/module_defaults/llvm-toolset.yaml

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

i686/modules_defaults/module_defaults/log4j.yaml

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

i686/modules_defaults/module_defaults/mailman.yaml

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

i686/modules_defaults/module_defaults/mariadb.yaml

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

i686/modules_defaults/module_defaults/maven.yaml

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

i686/modules_defaults/module_defaults/mercurial.yaml

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

i686/modules_defaults/module_defaults/mod_auth_openidc.yaml

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

i686/modules_defaults/module_defaults/mysql.yaml

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

i686/modules_defaults/module_defaults/nginx.yaml

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

i686/modules_defaults/module_defaults/nodejs.yaml

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

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

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

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

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

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

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

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

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

i686/modules_defaults/module_defaults/perl-DBI.yaml

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

i686/modules_defaults/module_defaults/perl-FCGI.yaml

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

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

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

i686/modules_defaults/module_defaults/perl-YAML.yaml

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

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

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

i686/modules_defaults/module_defaults/perl.yaml

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

i686/modules_defaults/module_defaults/php.yaml

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

i686/modules_defaults/module_defaults/postgresql.yaml

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

i686/modules_defaults/module_defaults/python27.yaml

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

i686/modules_defaults/module_defaults/python36.yaml

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

i686/modules_defaults/module_defaults/python38.yaml

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

i686/modules_defaults/module_defaults/python39.yaml

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

i686/modules_defaults/module_defaults/redis.yaml

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

i686/modules_defaults/module_defaults/rhn-tools.yaml

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

i686/modules_defaults/module_defaults/ruby.yaml

@@ -1,7 +1,16 @@
 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'

i686/modules_defaults/module_defaults/rust-toolset.yaml

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

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

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