aarch64/comps.xml

@@ -150,6 +150,7 @@
       <packagereq variant="AppStream" type="mandatory">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gnutls-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="AppStream" type="mandatory">gsl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gvfs-devel</packagereq>
@@ -158,7 +159,6 @@
       <packagereq variant="AppStream" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libacl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libaio-devel</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libarchive-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libattr-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libblkid-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libcanberra-devel</packagereq>
@@ -1608,8 +1608,6 @@
       <packagereq variant="CRB" type="default">beust-jcommander</packagereq>
       <packagereq variant="CRB" type="default">bind-devel</packagereq>
       <packagereq variant="CRB" type="default">bind-doc</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-devel</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-doc</packagereq>
       <packagereq variant="CRB" type="default">bison-devel</packagereq>
       <packagereq variant="CRB" type="default">blas-devel</packagereq>
       <packagereq variant="CRB" type="default">bluez-libs-devel</packagereq>
@@ -1641,7 +1639,6 @@
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
-      <packagereq variant="CRB" type="default">cjose-devel</packagereq>
       <packagereq variant="CRB" type="default">clucene-core-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel-docs</packagereq>
@@ -1654,10 +1651,8 @@
       <packagereq variant="CRB" type="default">criu-devel</packagereq>
       <packagereq variant="CRB" type="default">CUnit-devel</packagereq>
       <packagereq variant="CRB" type="default">cups-filters-devel</packagereq>
-      <packagereq variant="CRB" type="default">cxl-devel</packagereq>
       <packagereq variant="CRB" type="default">daxctl-devel</packagereq>
       <packagereq variant="CRB" type="default">dblatex</packagereq>
-      <packagereq variant="CRB" type="default">dbus-python-devel</packagereq>
       <packagereq variant="CRB" type="default">dconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dejagnu</packagereq>
       <packagereq variant="CRB" type="default">devhelp-devel</packagereq>
@@ -1670,7 +1665,6 @@
       <packagereq variant="CRB" type="default">docbook5-schemas</packagereq>
       <packagereq variant="CRB" type="default">dotconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dotnet-sdk-7.0-source-built-artifacts</packagereq>
-      <packagereq variant="CRB" type="default">dotnet-sdk-8.0-source-built-artifacts</packagereq>
       <packagereq variant="CRB" type="default">double-conversion-devel</packagereq>
       <packagereq variant="CRB" type="default">dovecot-devel</packagereq>
       <packagereq variant="CRB" type="default">doxygen</packagereq>
@@ -1685,7 +1679,6 @@
       <packagereq variant="CRB" type="default">edk2-ovmf</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools-doc</packagereq>
-      <packagereq variant="CRB" type="default">egl-wayland-devel</packagereq>
       <packagereq variant="CRB" type="default">eglexternalplatform-devel</packagereq>
       <packagereq variant="CRB" type="default">eigen3-devel</packagereq>
       <packagereq variant="CRB" type="default">emacs-cython-mode</packagereq>
@@ -1700,7 +1693,6 @@
       <packagereq variant="CRB" type="default">exempi-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-doc</packagereq>
-      <packagereq variant="CRB" type="default">expect-devel</packagereq>
       <packagereq variant="CRB" type="default">fdk-aac-free-devel</packagereq>
       <packagereq variant="CRB" type="default">felix-utils</packagereq>
       <packagereq variant="CRB" type="default">fftw-doc</packagereq>
@@ -1734,7 +1726,6 @@
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq variant="CRB" type="default">gdm-devel</packagereq>
-      <packagereq variant="CRB" type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-demos</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-devel</packagereq>
       <packagereq variant="CRB" type="default">ghostscript-doc</packagereq>
@@ -1775,13 +1766,11 @@
       <packagereq variant="CRB" type="default">graphviz-gd</packagereq>
       <packagereq variant="CRB" type="default">graphviz-python3</packagereq>
       <packagereq variant="CRB" type="default">grilo-devel</packagereq>
-      <packagereq variant="CRB" type="default">gsl-devel</packagereq>
       <packagereq variant="CRB" type="default">gsm-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-doc</packagereq>
       <packagereq variant="CRB" type="default">gstreamer1-plugins-bad-free-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk-doc</packagereq>
-      <packagereq variant="CRB" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-devel</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-doc</packagereq>
@@ -1798,7 +1787,6 @@
       <packagereq variant="CRB" type="default">hyphen-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel-docs</packagereq>
-      <packagereq variant="CRB" type="default">ibus-gtk4</packagereq>
       <packagereq variant="CRB" type="default">ima-evm-utils-devel</packagereq>
       <packagereq variant="CRB" type="default">inih-devel</packagereq>
       <packagereq variant="CRB" type="default">iproute-devel</packagereq>
@@ -1850,14 +1838,13 @@
       <packagereq variant="CRB" type="default">ldns-devel</packagereq>
       <packagereq variant="CRB" type="default">ldns-doc</packagereq>
       <packagereq variant="CRB" type="default">ldns-utils</packagereq>
-      <packagereq variant="CRB" type="default">ledmon-devel</packagereq>
       <packagereq variant="CRB" type="default">leptonica</packagereq>
       <packagereq variant="CRB" type="default">leptonica-devel</packagereq>
       <packagereq variant="CRB" type="default">liba52-devel</packagereq>
       <packagereq variant="CRB" type="default">libabigail</packagereq>
-      <packagereq variant="CRB" type="default">libadwaita-devel</packagereq>
       <packagereq variant="CRB" type="default">libao-devel</packagereq>
       <packagereq variant="CRB" type="default">libappstream-glib-devel</packagereq>
+      <packagereq variant="CRB" type="default">libarchive-devel</packagereq>
       <packagereq variant="CRB" type="default">libassuan-devel</packagereq>
       <packagereq variant="CRB" type="default">libasyncns-devel</packagereq>
       <packagereq variant="CRB" type="default">libatasmart-devel</packagereq>
@@ -1868,7 +1855,6 @@
       <packagereq variant="CRB" type="default">libbpf-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-static</packagereq>
       <packagereq variant="CRB" type="default">libburn-devel</packagereq>
-      <packagereq variant="CRB" type="default">libbytesize-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-paranoia-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdr-devel</packagereq>
@@ -1925,7 +1911,6 @@
       <packagereq variant="CRB" type="default">libidn2-devel</packagereq>
       <packagereq variant="CRB" type="default">libini_config-devel</packagereq>
       <packagereq variant="CRB" type="default">libinput-devel</packagereq>
-      <packagereq variant="CRB" type="default">libiptcdata-devel</packagereq>
       <packagereq variant="CRB" type="default">libiscsi-devel</packagereq>
       <packagereq variant="CRB" type="default">libisoburn-devel</packagereq>
       <packagereq variant="CRB" type="default">libisofs-devel</packagereq>
@@ -2015,7 +2000,6 @@
       <packagereq variant="CRB" type="default">libsolv-tools</packagereq>
       <packagereq variant="CRB" type="default">libspectre-devel</packagereq>
       <packagereq variant="CRB" type="default">libsrtp-devel</packagereq>
-      <packagereq variant="CRB" type="default">libss-devel</packagereq>
       <packagereq variant="CRB" type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq variant="CRB" type="default">libstdc++-static</packagereq>
       <packagereq variant="CRB" type="default">libstemmer-devel</packagereq>
@@ -2025,7 +2009,6 @@
       <packagereq variant="CRB" type="default">libthai-devel</packagereq>
       <packagereq variant="CRB" type="default">libtheora-devel</packagereq>
       <packagereq variant="CRB" type="default">libtiff-tools</packagereq>
-      <packagereq variant="CRB" type="default">libtimezonemap-devel</packagereq>
       <packagereq variant="CRB" type="default">libtool-ltdl-devel</packagereq>
       <packagereq variant="CRB" type="default">libtracecmd-devel</packagereq>
       <packagereq variant="CRB" type="default">libtraceevent-devel</packagereq>
@@ -2181,8 +2164,6 @@
       <packagereq variant="CRB" type="default">objectweb-asm</packagereq>
       <packagereq variant="CRB" type="default">objenesis</packagereq>
       <packagereq variant="CRB" type="default">ocaml</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas-devel</packagereq>
       <packagereq variant="CRB" type="default">ocaml-brlapi</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar-devel</packagereq>
@@ -2265,7 +2246,6 @@
       <packagereq variant="CRB" type="default">papi-testsuite</packagereq>
       <packagereq variant="CRB" type="default">parted-devel</packagereq>
       <packagereq variant="CRB" type="default">pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">pcre2-tools</packagereq>
       <packagereq variant="CRB" type="default">pcsc-lite-devel</packagereq>
       <packagereq variant="CRB" type="default">perl-AnyEvent</packagereq>
       <packagereq variant="CRB" type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -2327,7 +2307,6 @@
       <packagereq variant="CRB" type="default">perl-IPC-Run3</packagereq>
       <packagereq variant="CRB" type="default">perl-JSON-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-ldns</packagereq>
-      <packagereq variant="CRB" type="default">perl-libxml-perl</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-Locale-gettext</packagereq>
@@ -2416,7 +2395,6 @@
       <packagereq variant="CRB" type="default">poppler-data-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-glib-devel</packagereq>
-      <packagereq variant="CRB" type="default">poppler-glib-doc</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="CRB" type="default">postgresql-docs</packagereq>
@@ -2448,7 +2426,6 @@
       <packagereq variant="CRB" type="default">python3-capstone</packagereq>
       <packagereq variant="CRB" type="default">python3-Cython</packagereq>
       <packagereq variant="CRB" type="default">python3-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3-flit-core</packagereq>
       <packagereq variant="CRB" type="default">python3-gobject-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-greenlet-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-hivex</packagereq>
@@ -2503,24 +2480,6 @@
       <packagereq variant="CRB" type="default">python3.11-setuptools-rust</packagereq>
       <packagereq variant="CRB" type="default">python3.11-test</packagereq>
       <packagereq variant="CRB" type="default">python3.11-wheel-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-Cython</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-flit-core</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-idle</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-iniconfig</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-packaging</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pluggy</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11-devel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pytest</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-scipy-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-semantic_version</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-rust</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-test</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-wheel-wheel</packagereq>
       <packagereq variant="CRB" type="default">qdox</packagereq>
       <packagereq variant="CRB" type="default">qgpgme</packagereq>
       <packagereq variant="CRB" type="default">qgpgme-devel</packagereq>
@@ -2560,8 +2519,6 @@
       <packagereq variant="CRB" type="default">sblim-sfcc-devel</packagereq>
       <packagereq variant="CRB" type="default">sdl12-compat-devel</packagereq>
       <packagereq variant="CRB" type="default">SDL2-static</packagereq>
-      <packagereq variant="CRB" type="default">seabios-bin</packagereq>
-      <packagereq variant="CRB" type="default">seavgabios-bin</packagereq>
       <packagereq variant="CRB" type="default">sendmail-milter-devel</packagereq>
       <packagereq variant="CRB" type="default">sg3_utils-devel</packagereq>
       <packagereq variant="CRB" type="default">shadow-utils-subid-devel</packagereq>
@@ -2572,7 +2529,6 @@
       <packagereq variant="CRB" type="default">sombok</packagereq>
       <packagereq variant="CRB" type="default">sombok-devel</packagereq>
       <packagereq variant="CRB" type="default">soundtouch-devel</packagereq>
-      <packagereq variant="CRB" type="default">source-highlight-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-doc</packagereq>
       <packagereq variant="CRB" type="default">speex-devel</packagereq>
@@ -2584,7 +2540,6 @@
       <packagereq variant="CRB" type="default">swig</packagereq>
       <packagereq variant="CRB" type="default">swig-doc</packagereq>
       <packagereq variant="CRB" type="default">swig-gdb</packagereq>
-      <packagereq variant="CRB" type="default">system-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">systemd-boot-unsigned</packagereq>
       <packagereq variant="CRB" type="default">taglib-devel</packagereq>
       <packagereq variant="CRB" type="default">tesseract-devel</packagereq>
@@ -2620,11 +2575,9 @@
       <packagereq variant="CRB" type="default">varnish-devel</packagereq>
       <packagereq variant="CRB" type="default">volume_key-devel</packagereq>
       <packagereq variant="CRB" type="default">vte291-devel</packagereq>
-      <packagereq variant="CRB" type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq variant="CRB" type="default">WALinuxAgent-cvm</packagereq>
       <packagereq variant="CRB" type="default">wavpack-devel</packagereq>
       <packagereq variant="CRB" type="default">web-assets-filesystem</packagereq>
-      <packagereq variant="CRB" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="CRB" type="default">wireshark-devel</packagereq>
       <packagereq variant="CRB" type="default">woff2-devel</packagereq>
       <packagereq variant="CRB" type="default">wpebackend-fdo-devel</packagereq>
@@ -2658,7 +2611,6 @@
       <packagereq variant="CRB" type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-source</packagereq>
-      <packagereq variant="CRB" type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-util-macros</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq variant="CRB" type="default">xxhash-devel</packagereq>
@@ -3531,7 +3483,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="AppStream" type="optional">dotnet-sdk-6.0</packagereq>
-      <packagereq variant="AppStream" type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

aarch64/include_exclude.conf

@@ -117,7 +117,6 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
-                "container-selinux",
             ]
         }
     ),

aarch64/modules_defaults/module_defaults/mariadb.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.11':
-    - server
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/maven.yaml

@@ -1,10 +1,7 @@
 data:
-  modified: '202501231030'
   module: maven
   profiles:
     '3.8':
     - common
-    '3.9':
-    - common
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/mysql.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.4':
-    - server
-document: modulemd-defaults
-version: '1'

aarch64/modules_defaults/module_defaults/nginx.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '1.22':
     - common
-    '1.24':
-    - common
-    '1.26':
-    - common
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/nodejs.yaml

@@ -5,7 +5,5 @@ data:
     - common
     '20':
     - common
-    '22':
-    - common
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/php.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '8.1':
     - common
-    '8.2':
-    - common
-    '8.3':
-    - common
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/postgresql.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '15':
     - server
-    '16':
-    - server
 document: modulemd-defaults
 version: '1'

aarch64/modules_defaults/module_defaults/ruby.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '3.1':
     - common
-    '3.3':
-    - common
 document: modulemd-defaults
 version: '1'

aarch64/variants.xml

@@ -122,20 +122,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>nodejs:22</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -248,20 +242,13 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
-      <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>nodejs-devel:22</module>
       <module>php-devel:8.1</module>
-      <module>php-devel:8.2</module>
       <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
-      <module>ruby-devel:3.1</module>
-      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>

aarch64/variants_options.json

@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_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 }}{{ image_name_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,
             "extra_files": [{
                 "scm": "git",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+        "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 }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+            "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",

i686/comps.xml

@@ -150,6 +150,7 @@
       <packagereq variant="AppStream" type="mandatory">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gnutls-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="AppStream" type="mandatory">gsl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gvfs-devel</packagereq>
@@ -158,7 +159,6 @@
       <packagereq variant="AppStream" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libacl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libaio-devel</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libarchive-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libattr-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libblkid-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libcanberra-devel</packagereq>
@@ -1658,8 +1658,6 @@
       <packagereq variant="CRB" type="default">beust-jcommander</packagereq>
       <packagereq variant="CRB" type="default">bind-devel</packagereq>
       <packagereq variant="CRB" type="default">bind-doc</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-devel</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-doc</packagereq>
       <packagereq variant="CRB" type="default">bison-devel</packagereq>
       <packagereq variant="CRB" type="default">blas-devel</packagereq>
       <packagereq variant="CRB" type="default">bluez-libs-devel</packagereq>
@@ -1691,7 +1689,6 @@
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
-      <packagereq variant="CRB" type="default">cjose-devel</packagereq>
       <packagereq variant="CRB" type="default">clucene-core-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel-docs</packagereq>
@@ -1707,7 +1704,6 @@
       <packagereq variant="CRB" type="default">cxl-devel</packagereq>
       <packagereq variant="CRB" type="default">daxctl-devel</packagereq>
       <packagereq variant="CRB" type="default">dblatex</packagereq>
-      <packagereq variant="CRB" type="default">dbus-python-devel</packagereq>
       <packagereq variant="CRB" type="default">dconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dejagnu</packagereq>
       <packagereq variant="CRB" type="default">devhelp-devel</packagereq>
@@ -1720,7 +1716,6 @@
       <packagereq variant="CRB" type="default">docbook5-schemas</packagereq>
       <packagereq variant="CRB" type="default">dotconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dotnet-sdk-7.0-source-built-artifacts</packagereq>
-      <packagereq variant="CRB" type="default">dotnet-sdk-8.0-source-built-artifacts</packagereq>
       <packagereq variant="CRB" type="default">double-conversion-devel</packagereq>
       <packagereq variant="CRB" type="default">dovecot-devel</packagereq>
       <packagereq variant="CRB" type="default">doxygen</packagereq>
@@ -1735,7 +1730,6 @@
       <packagereq variant="CRB" type="default">edk2-aarch64</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools-doc</packagereq>
-      <packagereq variant="CRB" type="default">egl-wayland-devel</packagereq>
       <packagereq variant="CRB" type="default">eglexternalplatform-devel</packagereq>
       <packagereq variant="CRB" type="default">eigen3-devel</packagereq>
       <packagereq variant="CRB" type="default">emacs-cython-mode</packagereq>
@@ -1750,7 +1744,6 @@
       <packagereq variant="CRB" type="default">exempi-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-doc</packagereq>
-      <packagereq variant="CRB" type="default">expect-devel</packagereq>
       <packagereq variant="CRB" type="default">fdk-aac-free-devel</packagereq>
       <packagereq variant="CRB" type="default">felix-utils</packagereq>
       <packagereq variant="CRB" type="default">fftw-doc</packagereq>
@@ -1784,7 +1777,6 @@
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq variant="CRB" type="default">gdm-devel</packagereq>
-      <packagereq variant="CRB" type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq variant="CRB" type="default">gegl04-devel</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-demos</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-devel</packagereq>
@@ -1826,13 +1818,11 @@
       <packagereq variant="CRB" type="default">graphviz-gd</packagereq>
       <packagereq variant="CRB" type="default">graphviz-python3</packagereq>
       <packagereq variant="CRB" type="default">grilo-devel</packagereq>
-      <packagereq variant="CRB" type="default">gsl-devel</packagereq>
       <packagereq variant="CRB" type="default">gsm-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-doc</packagereq>
       <packagereq variant="CRB" type="default">gstreamer1-plugins-bad-free-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk-doc</packagereq>
-      <packagereq variant="CRB" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-devel</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-doc</packagereq>
@@ -1849,7 +1839,6 @@
       <packagereq variant="CRB" type="default">hyphen-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel-docs</packagereq>
-      <packagereq variant="CRB" type="default">ibus-gtk4</packagereq>
       <packagereq variant="CRB" type="default">ima-evm-utils-devel</packagereq>
       <packagereq variant="CRB" type="default">inih-devel</packagereq>
       <packagereq variant="CRB" type="default">intel-cmt-cat-devel</packagereq>
@@ -1904,14 +1893,13 @@
       <packagereq variant="CRB" type="default">ldns-devel</packagereq>
       <packagereq variant="CRB" type="default">ldns-doc</packagereq>
       <packagereq variant="CRB" type="default">ldns-utils</packagereq>
-      <packagereq variant="CRB" type="default">ledmon-devel</packagereq>
       <packagereq variant="CRB" type="default">leptonica</packagereq>
       <packagereq variant="CRB" type="default">leptonica-devel</packagereq>
       <packagereq variant="CRB" type="default">liba52-devel</packagereq>
       <packagereq variant="CRB" type="default">libabigail</packagereq>
-      <packagereq variant="CRB" type="default">libadwaita-devel</packagereq>
       <packagereq variant="CRB" type="default">libao-devel</packagereq>
       <packagereq variant="CRB" type="default">libappstream-glib-devel</packagereq>
+      <packagereq variant="CRB" type="default">libarchive-devel</packagereq>
       <packagereq variant="CRB" type="default">libassuan-devel</packagereq>
       <packagereq variant="CRB" type="default">libasyncns-devel</packagereq>
       <packagereq variant="CRB" type="default">libatasmart-devel</packagereq>
@@ -1922,7 +1910,6 @@
       <packagereq variant="CRB" type="default">libbpf-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-static</packagereq>
       <packagereq variant="CRB" type="default">libburn-devel</packagereq>
-      <packagereq variant="CRB" type="default">libbytesize-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-paranoia-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdr-devel</packagereq>
@@ -1979,7 +1966,6 @@
       <packagereq variant="CRB" type="default">libidn2-devel</packagereq>
       <packagereq variant="CRB" type="default">libini_config-devel</packagereq>
       <packagereq variant="CRB" type="default">libinput-devel</packagereq>
-      <packagereq variant="CRB" type="default">libiptcdata-devel</packagereq>
       <packagereq variant="CRB" type="default">libiscsi-devel</packagereq>
       <packagereq variant="CRB" type="default">libisoburn-devel</packagereq>
       <packagereq variant="CRB" type="default">libisofs-devel</packagereq>
@@ -2078,7 +2064,6 @@
       <packagereq variant="CRB" type="default">libsolv-tools</packagereq>
       <packagereq variant="CRB" type="default">libspectre-devel</packagereq>
       <packagereq variant="CRB" type="default">libsrtp-devel</packagereq>
-      <packagereq variant="CRB" type="default">libss-devel</packagereq>
       <packagereq variant="CRB" type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq variant="CRB" type="default">libstdc++-static</packagereq>
       <packagereq variant="CRB" type="default">libstemmer-devel</packagereq>
@@ -2088,7 +2073,6 @@
       <packagereq variant="CRB" type="default">libthai-devel</packagereq>
       <packagereq variant="CRB" type="default">libtheora-devel</packagereq>
       <packagereq variant="CRB" type="default">libtiff-tools</packagereq>
-      <packagereq variant="CRB" type="default">libtimezonemap-devel</packagereq>
       <packagereq variant="CRB" type="default">libtool-ltdl-devel</packagereq>
       <packagereq variant="CRB" type="default">libtracecmd-devel</packagereq>
       <packagereq variant="CRB" type="default">libtraceevent-devel</packagereq>
@@ -2204,8 +2188,6 @@
       <packagereq variant="CRB" type="default">mingw32-libffi</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pcre</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">mingw32-pcre2</packagereq>
-      <packagereq variant="CRB" type="default">mingw32-pcre2-static</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pixman</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pkg-config</packagereq>
       <packagereq variant="CRB" type="default">mingw32-termcap</packagereq>
@@ -2229,8 +2211,6 @@
       <packagereq variant="CRB" type="default">mingw64-libffi</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pcre</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">mingw64-pcre2</packagereq>
-      <packagereq variant="CRB" type="default">mingw64-pcre2-static</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pixman</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pkg-config</packagereq>
       <packagereq variant="CRB" type="default">mingw64-termcap</packagereq>
@@ -2279,8 +2259,6 @@
       <packagereq variant="CRB" type="default">objectweb-asm</packagereq>
       <packagereq variant="CRB" type="default">objenesis</packagereq>
       <packagereq variant="CRB" type="default">ocaml</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas-devel</packagereq>
       <packagereq variant="CRB" type="default">ocaml-brlapi</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar-devel</packagereq>
@@ -2363,7 +2341,6 @@
       <packagereq variant="CRB" type="default">papi-testsuite</packagereq>
       <packagereq variant="CRB" type="default">parted-devel</packagereq>
       <packagereq variant="CRB" type="default">pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">pcre2-tools</packagereq>
       <packagereq variant="CRB" type="default">pcsc-lite-devel</packagereq>
       <packagereq variant="CRB" type="default">perl-AnyEvent</packagereq>
       <packagereq variant="CRB" type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -2425,7 +2402,6 @@
       <packagereq variant="CRB" type="default">perl-IPC-Run3</packagereq>
       <packagereq variant="CRB" type="default">perl-JSON-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-ldns</packagereq>
-      <packagereq variant="CRB" type="default">perl-libxml-perl</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-Locale-gettext</packagereq>
@@ -2514,7 +2490,6 @@
       <packagereq variant="CRB" type="default">poppler-data-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-glib-devel</packagereq>
-      <packagereq variant="CRB" type="default">poppler-glib-doc</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="CRB" type="default">postgresql-docs</packagereq>
@@ -2546,7 +2521,6 @@
       <packagereq variant="CRB" type="default">python3-capstone</packagereq>
       <packagereq variant="CRB" type="default">python3-Cython</packagereq>
       <packagereq variant="CRB" type="default">python3-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3-flit-core</packagereq>
       <packagereq variant="CRB" type="default">python3-gobject-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-greenlet-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-hivex</packagereq>
@@ -2601,24 +2575,6 @@
       <packagereq variant="CRB" type="default">python3.11-setuptools-rust</packagereq>
       <packagereq variant="CRB" type="default">python3.11-test</packagereq>
       <packagereq variant="CRB" type="default">python3.11-wheel-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-Cython</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-flit-core</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-idle</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-iniconfig</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-packaging</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pluggy</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11-devel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pytest</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-scipy-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-semantic_version</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-rust</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-test</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-wheel-wheel</packagereq>
       <packagereq variant="CRB" type="default">qatlib-devel</packagereq>
       <packagereq variant="CRB" type="default">qatlib-tests</packagereq>
       <packagereq variant="CRB" type="default">qatzip-devel</packagereq>
@@ -2672,7 +2628,6 @@
       <packagereq variant="CRB" type="default">sombok</packagereq>
       <packagereq variant="CRB" type="default">sombok-devel</packagereq>
       <packagereq variant="CRB" type="default">soundtouch-devel</packagereq>
-      <packagereq variant="CRB" type="default">source-highlight-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-doc</packagereq>
       <packagereq variant="CRB" type="default">speex-devel</packagereq>
@@ -2684,7 +2639,6 @@
       <packagereq variant="CRB" type="default">swig</packagereq>
       <packagereq variant="CRB" type="default">swig-doc</packagereq>
       <packagereq variant="CRB" type="default">swig-gdb</packagereq>
-      <packagereq variant="CRB" type="default">system-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">systemd-boot-unsigned</packagereq>
       <packagereq variant="CRB" type="default">taglib-devel</packagereq>
       <packagereq variant="CRB" type="default">tesseract-devel</packagereq>
@@ -2723,11 +2677,9 @@
       <packagereq variant="CRB" type="default">virt-v2v-man-pages-uk</packagereq>
       <packagereq variant="CRB" type="default">volume_key-devel</packagereq>
       <packagereq variant="CRB" type="default">vte291-devel</packagereq>
-      <packagereq variant="CRB" type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq variant="CRB" type="default">WALinuxAgent-cvm</packagereq>
       <packagereq variant="CRB" type="default">wavpack-devel</packagereq>
       <packagereq variant="CRB" type="default">web-assets-filesystem</packagereq>
-      <packagereq variant="CRB" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="CRB" type="default">wireshark-devel</packagereq>
       <packagereq variant="CRB" type="default">woff2-devel</packagereq>
       <packagereq variant="CRB" type="default">wpebackend-fdo-devel</packagereq>
@@ -2761,7 +2713,6 @@
       <packagereq variant="CRB" type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-source</packagereq>
-      <packagereq variant="CRB" type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-util-macros</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq variant="CRB" type="default">xxhash-devel</packagereq>
@@ -3634,7 +3585,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="AppStream" type="optional">dotnet-sdk-6.0</packagereq>
-      <packagereq variant="AppStream" type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

i686/modules_defaults/module_defaults/mariadb.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.11':
-    - server
-document: modulemd-defaults
-version: '1'

i686/modules_defaults/module_defaults/maven.yaml

@@ -1,10 +1,7 @@
 data:
-  modified: '202501231030'
   module: maven
   profiles:
     '3.8':
     - common
-    '3.9':
-    - common
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/mysql.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.4':
-    - server
-document: modulemd-defaults
-version: '1'

i686/modules_defaults/module_defaults/nginx.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '1.22':
     - common
-    '1.24':
-    - common
-    '1.26':
-    - common
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/nodejs.yaml

@@ -5,7 +5,5 @@ data:
     - common
     '20':
     - common
-    '22':
-    - common
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/php.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '8.1':
     - common
-    '8.2':
-    - common
-    '8.3':
-    - common
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/postgresql.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '15':
     - server
-    '16':
-    - server
 document: modulemd-defaults
 version: '1'

i686/modules_defaults/module_defaults/ruby.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '3.1':
     - common
-    '3.3':
-    - common
 document: modulemd-defaults
 version: '1'

i686/variants.xml

@@ -125,20 +125,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>nodejs:22</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -261,19 +255,13 @@
     </arches>
     <modules>
       <module>javapackages-tools-devel:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>nginx-devel:1.22</module>
-      <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>nodejs-devel:22</module>
       <module>php-devel:8.1</module>
-      <module>php-devel:8.2</module>
       <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
-      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>

ppc64le/comps.xml

@@ -150,6 +150,7 @@
       <packagereq variant="AppStream" type="mandatory">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gnutls-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="AppStream" type="mandatory">gsl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gvfs-devel</packagereq>
@@ -158,7 +159,6 @@
       <packagereq variant="AppStream" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libacl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libaio-devel</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libarchive-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libattr-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libblkid-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libcanberra-devel</packagereq>
@@ -1616,8 +1616,6 @@
       <packagereq variant="CRB" type="default">beust-jcommander</packagereq>
       <packagereq variant="CRB" type="default">bind-devel</packagereq>
       <packagereq variant="CRB" type="default">bind-doc</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-devel</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-doc</packagereq>
       <packagereq variant="CRB" type="default">bison-devel</packagereq>
       <packagereq variant="CRB" type="default">blas-devel</packagereq>
       <packagereq variant="CRB" type="default">bluez-libs-devel</packagereq>
@@ -1649,7 +1647,6 @@
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
-      <packagereq variant="CRB" type="default">cjose-devel</packagereq>
       <packagereq variant="CRB" type="default">clucene-core-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel-docs</packagereq>
@@ -1662,10 +1659,8 @@
       <packagereq variant="CRB" type="default">criu-devel</packagereq>
       <packagereq variant="CRB" type="default">CUnit-devel</packagereq>
       <packagereq variant="CRB" type="default">cups-filters-devel</packagereq>
-      <packagereq variant="CRB" type="default">cxl-devel</packagereq>
       <packagereq variant="CRB" type="default">daxctl-devel</packagereq>
       <packagereq variant="CRB" type="default">dblatex</packagereq>
-      <packagereq variant="CRB" type="default">dbus-python-devel</packagereq>
       <packagereq variant="CRB" type="default">dconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dejagnu</packagereq>
       <packagereq variant="CRB" type="default">devhelp-devel</packagereq>
@@ -1678,7 +1673,6 @@
       <packagereq variant="CRB" type="default">docbook5-schemas</packagereq>
       <packagereq variant="CRB" type="default">dotconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dotnet-sdk-7.0-source-built-artifacts</packagereq>
-      <packagereq variant="CRB" type="default">dotnet-sdk-8.0-source-built-artifacts</packagereq>
       <packagereq variant="CRB" type="default">double-conversion-devel</packagereq>
       <packagereq variant="CRB" type="default">dovecot-devel</packagereq>
       <packagereq variant="CRB" type="default">doxygen</packagereq>
@@ -1692,7 +1686,6 @@
       <packagereq variant="CRB" type="default">easymock</packagereq>
       <packagereq variant="CRB" type="default">edk2-aarch64</packagereq>
       <packagereq variant="CRB" type="default">edk2-ovmf</packagereq>
-      <packagereq variant="CRB" type="default">egl-wayland-devel</packagereq>
       <packagereq variant="CRB" type="default">eglexternalplatform-devel</packagereq>
       <packagereq variant="CRB" type="default">eigen3-devel</packagereq>
       <packagereq variant="CRB" type="default">emacs-cython-mode</packagereq>
@@ -1707,7 +1700,6 @@
       <packagereq variant="CRB" type="default">exempi-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-doc</packagereq>
-      <packagereq variant="CRB" type="default">expect-devel</packagereq>
       <packagereq variant="CRB" type="default">fdk-aac-free-devel</packagereq>
       <packagereq variant="CRB" type="default">felix-utils</packagereq>
       <packagereq variant="CRB" type="default">fftw-doc</packagereq>
@@ -1741,7 +1733,6 @@
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq variant="CRB" type="default">gdm-devel</packagereq>
-      <packagereq variant="CRB" type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq variant="CRB" type="default">gegl04-devel</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-demos</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-devel</packagereq>
@@ -1781,13 +1772,11 @@
       <packagereq variant="CRB" type="default">graphviz-gd</packagereq>
       <packagereq variant="CRB" type="default">graphviz-python3</packagereq>
       <packagereq variant="CRB" type="default">grilo-devel</packagereq>
-      <packagereq variant="CRB" type="default">gsl-devel</packagereq>
       <packagereq variant="CRB" type="default">gsm-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-doc</packagereq>
       <packagereq variant="CRB" type="default">gstreamer1-plugins-bad-free-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk-doc</packagereq>
-      <packagereq variant="CRB" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-devel</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-doc</packagereq>
@@ -1804,7 +1793,6 @@
       <packagereq variant="CRB" type="default">hyphen-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel-docs</packagereq>
-      <packagereq variant="CRB" type="default">ibus-gtk4</packagereq>
       <packagereq variant="CRB" type="default">ima-evm-utils-devel</packagereq>
       <packagereq variant="CRB" type="default">inih-devel</packagereq>
       <packagereq variant="CRB" type="default">iproute-devel</packagereq>
@@ -1856,25 +1844,22 @@
       <packagereq variant="CRB" type="default">ldns-devel</packagereq>
       <packagereq variant="CRB" type="default">ldns-doc</packagereq>
       <packagereq variant="CRB" type="default">ldns-utils</packagereq>
-      <packagereq variant="CRB" type="default">ledmon-devel</packagereq>
       <packagereq variant="CRB" type="default">leptonica</packagereq>
       <packagereq variant="CRB" type="default">leptonica-devel</packagereq>
       <packagereq variant="CRB" type="default">liba52-devel</packagereq>
       <packagereq variant="CRB" type="default">libabigail</packagereq>
-      <packagereq variant="CRB" type="default">libadwaita-devel</packagereq>
       <packagereq variant="CRB" type="default">libao-devel</packagereq>
       <packagereq variant="CRB" type="default">libappstream-glib-devel</packagereq>
+      <packagereq variant="CRB" type="default">libarchive-devel</packagereq>
       <packagereq variant="CRB" type="default">libassuan-devel</packagereq>
       <packagereq variant="CRB" type="default">libasyncns-devel</packagereq>
       <packagereq variant="CRB" type="default">libatasmart-devel</packagereq>
       <packagereq variant="CRB" type="default">libatomic_ops-devel</packagereq>
       <packagereq variant="CRB" type="default">libbabeltrace-devel</packagereq>
       <packagereq variant="CRB" type="default">libbasicobjects-devel</packagereq>
-      <packagereq variant="CRB" type="default">libblkio-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-static</packagereq>
       <packagereq variant="CRB" type="default">libburn-devel</packagereq>
-      <packagereq variant="CRB" type="default">libbytesize-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-paranoia-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdr-devel</packagereq>
@@ -1926,7 +1911,6 @@
       <packagereq variant="CRB" type="default">libidn2-devel</packagereq>
       <packagereq variant="CRB" type="default">libini_config-devel</packagereq>
       <packagereq variant="CRB" type="default">libinput-devel</packagereq>
-      <packagereq variant="CRB" type="default">libiptcdata-devel</packagereq>
       <packagereq variant="CRB" type="default">libiscsi-devel</packagereq>
       <packagereq variant="CRB" type="default">libisoburn-devel</packagereq>
       <packagereq variant="CRB" type="default">libisofs-devel</packagereq>
@@ -2023,7 +2007,6 @@
       <packagereq variant="CRB" type="default">libsolv-tools</packagereq>
       <packagereq variant="CRB" type="default">libspectre-devel</packagereq>
       <packagereq variant="CRB" type="default">libsrtp-devel</packagereq>
-      <packagereq variant="CRB" type="default">libss-devel</packagereq>
       <packagereq variant="CRB" type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq variant="CRB" type="default">libstdc++-static</packagereq>
       <packagereq variant="CRB" type="default">libstemmer-devel</packagereq>
@@ -2033,7 +2016,6 @@
       <packagereq variant="CRB" type="default">libthai-devel</packagereq>
       <packagereq variant="CRB" type="default">libtheora-devel</packagereq>
       <packagereq variant="CRB" type="default">libtiff-tools</packagereq>
-      <packagereq variant="CRB" type="default">libtimezonemap-devel</packagereq>
       <packagereq variant="CRB" type="default">libtool-ltdl-devel</packagereq>
       <packagereq variant="CRB" type="default">libtracecmd-devel</packagereq>
       <packagereq variant="CRB" type="default">libtraceevent-devel</packagereq>
@@ -2187,8 +2169,6 @@
       <packagereq variant="CRB" type="default">objectweb-asm</packagereq>
       <packagereq variant="CRB" type="default">objenesis</packagereq>
       <packagereq variant="CRB" type="default">ocaml</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas-devel</packagereq>
       <packagereq variant="CRB" type="default">ocaml-brlapi</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar-devel</packagereq>
@@ -2268,7 +2248,6 @@
       <packagereq variant="CRB" type="default">papi-testsuite</packagereq>
       <packagereq variant="CRB" type="default">parted-devel</packagereq>
       <packagereq variant="CRB" type="default">pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">pcre2-tools</packagereq>
       <packagereq variant="CRB" type="default">pcsc-lite-devel</packagereq>
       <packagereq variant="CRB" type="default">perl-AnyEvent</packagereq>
       <packagereq variant="CRB" type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -2330,7 +2309,6 @@
       <packagereq variant="CRB" type="default">perl-IPC-Run3</packagereq>
       <packagereq variant="CRB" type="default">perl-JSON-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-ldns</packagereq>
-      <packagereq variant="CRB" type="default">perl-libxml-perl</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-Locale-gettext</packagereq>
@@ -2418,7 +2396,6 @@
       <packagereq variant="CRB" type="default">poppler-data-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-glib-devel</packagereq>
-      <packagereq variant="CRB" type="default">poppler-glib-doc</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="CRB" type="default">postgresql-docs</packagereq>
@@ -2450,7 +2427,6 @@
       <packagereq variant="CRB" type="default">python3-capstone</packagereq>
       <packagereq variant="CRB" type="default">python3-Cython</packagereq>
       <packagereq variant="CRB" type="default">python3-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3-flit-core</packagereq>
       <packagereq variant="CRB" type="default">python3-gobject-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-greenlet-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-hivex</packagereq>
@@ -2505,24 +2481,6 @@
       <packagereq variant="CRB" type="default">python3.11-setuptools-rust</packagereq>
       <packagereq variant="CRB" type="default">python3.11-test</packagereq>
       <packagereq variant="CRB" type="default">python3.11-wheel-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-Cython</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-flit-core</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-idle</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-iniconfig</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-packaging</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pluggy</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11-devel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pytest</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-scipy-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-semantic_version</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-rust</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-test</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-wheel-wheel</packagereq>
       <packagereq variant="CRB" type="default">qdox</packagereq>
       <packagereq variant="CRB" type="default">qgpgme</packagereq>
       <packagereq variant="CRB" type="default">qgpgme-devel</packagereq>
@@ -2561,8 +2519,6 @@
       <packagereq variant="CRB" type="default">sblim-sfcc-devel</packagereq>
       <packagereq variant="CRB" type="default">sdl12-compat-devel</packagereq>
       <packagereq variant="CRB" type="default">SDL2-static</packagereq>
-      <packagereq variant="CRB" type="default">seabios-bin</packagereq>
-      <packagereq variant="CRB" type="default">seavgabios-bin</packagereq>
       <packagereq variant="CRB" type="default">sendmail-milter-devel</packagereq>
       <packagereq variant="CRB" type="default">sg3_utils-devel</packagereq>
       <packagereq variant="CRB" type="default">shadow-utils-subid-devel</packagereq>
@@ -2572,7 +2528,6 @@
       <packagereq variant="CRB" type="default">sombok</packagereq>
       <packagereq variant="CRB" type="default">sombok-devel</packagereq>
       <packagereq variant="CRB" type="default">soundtouch-devel</packagereq>
-      <packagereq variant="CRB" type="default">source-highlight-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-doc</packagereq>
       <packagereq variant="CRB" type="default">speex-devel</packagereq>
@@ -2583,7 +2538,6 @@
       <packagereq variant="CRB" type="default">swig</packagereq>
       <packagereq variant="CRB" type="default">swig-doc</packagereq>
       <packagereq variant="CRB" type="default">swig-gdb</packagereq>
-      <packagereq variant="CRB" type="default">system-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">taglib-devel</packagereq>
       <packagereq variant="CRB" type="default">tesseract-devel</packagereq>
       <packagereq variant="CRB" type="default">texi2html</packagereq>
@@ -2619,11 +2573,9 @@
       <packagereq variant="CRB" type="default">varnish-devel</packagereq>
       <packagereq variant="CRB" type="default">volume_key-devel</packagereq>
       <packagereq variant="CRB" type="default">vte291-devel</packagereq>
-      <packagereq variant="CRB" type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq variant="CRB" type="default">WALinuxAgent-cvm</packagereq>
       <packagereq variant="CRB" type="default">wavpack-devel</packagereq>
       <packagereq variant="CRB" type="default">web-assets-filesystem</packagereq>
-      <packagereq variant="CRB" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="CRB" type="default">wireshark-devel</packagereq>
       <packagereq variant="CRB" type="default">woff2-devel</packagereq>
       <packagereq variant="CRB" type="default">wpebackend-fdo-devel</packagereq>
@@ -2657,7 +2609,6 @@
       <packagereq variant="CRB" type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-source</packagereq>
-      <packagereq variant="CRB" type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-util-macros</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq variant="CRB" type="default">xxhash-devel</packagereq>
@@ -3521,14 +3472,14 @@
       <packagereq variant="AppStream" type="optional">unbound</packagereq>
     </packagelist>
   </group>
-  <group variant="AppStream">
+  <group variant="devel">
     <id>dotnet</id>
     <name>.NET Development</name>
     <description>Tools to develop and/or run .NET applications</description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq variant="AppStream" type="optional">dotnet-sdk-8.0</packagereq>
+      <packagereq variant="devel" type="optional">dotnet-sdk-6.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

ppc64le/include_exclude.conf

@@ -124,7 +124,6 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
-                "container-selinux",
             ]
         }
     ),

ppc64le/modules_defaults/module_defaults/mariadb.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.11':
-    - server
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/maven.yaml

@@ -1,10 +1,7 @@
 data:
-  modified: '202501231030'
   module: maven
   profiles:
     '3.8':
     - common
-    '3.9':
-    - common
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/mysql.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.4':
-    - server
-document: modulemd-defaults
-version: '1'

ppc64le/modules_defaults/module_defaults/nginx.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '1.22':
     - common
-    '1.24':
-    - common
-    '1.26':
-    - common
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/nodejs.yaml

@@ -5,7 +5,5 @@ data:
     - common
     '20':
     - common
-    '22':
-    - common
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/php.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '8.1':
     - common
-    '8.2':
-    - common
-    '8.3':
-    - common
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/postgresql.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '15':
     - server
-    '16':
-    - server
 document: modulemd-defaults
 version: '1'

ppc64le/modules_defaults/module_defaults/ruby.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '3.1':
     - common
-    '3.3':
-    - common
 document: modulemd-defaults
 version: '1'

ppc64le/variants.xml

@@ -65,7 +65,6 @@
       <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>
@@ -120,20 +119,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>nodejs:22</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -235,6 +228,7 @@
       <arch>ppc64le</arch>
     </arches>
     <groups>
+      <group default="false">dotnet</group>
       <group default="false">office-suite</group>
       <group default="false">platform-microsoft</group>
       <group default="false">platform-vmware</group>
@@ -247,20 +241,13 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
-      <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>nodejs-devel:22</module>
       <module>php-devel:8.1</module>
-      <module>php-devel:8.2</module>
       <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
-      <module>ruby-devel:3.1</module>
-      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>

ppc64le/variants_options.json

@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_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 }}{{ image_name_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,
             "extra_files": [{
                 "scm": "git",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+        "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 }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+            "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",

pungi-build.conf.j2

@@ -46,7 +46,7 @@ tree_arches = ['{{ arch }}']
 
 # PKGSET
 pkgset_source = "kojimock"
-koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}_{{ arch }}"
+koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}"
 
 # PKGSET - KOJI
 pkgset_koji_tag = "dist-c8-compose"
@@ -140,7 +140,7 @@ image_name_format = {
     "^{{ variant }}$": "{{ options['image_name_format'] }}",
         {% endif %}
     {% endfor %}
-    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
+    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
 }
 
 image_volid_formats = [

s390x/comps.xml

@@ -150,6 +150,7 @@
       <packagereq variant="AppStream" type="mandatory">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gnutls-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="AppStream" type="mandatory">gsl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gvfs-devel</packagereq>
@@ -158,7 +159,6 @@
       <packagereq variant="AppStream" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libacl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libaio-devel</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libarchive-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libattr-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libblkid-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libcanberra-devel</packagereq>
@@ -1604,8 +1604,6 @@
       <packagereq variant="CRB" type="default">beust-jcommander</packagereq>
       <packagereq variant="CRB" type="default">bind-devel</packagereq>
       <packagereq variant="CRB" type="default">bind-doc</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-devel</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-doc</packagereq>
       <packagereq variant="CRB" type="default">bison-devel</packagereq>
       <packagereq variant="CRB" type="default">blas-devel</packagereq>
       <packagereq variant="CRB" type="default">bluez-libs-devel</packagereq>
@@ -1637,7 +1635,6 @@
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
-      <packagereq variant="CRB" type="default">cjose-devel</packagereq>
       <packagereq variant="CRB" type="default">clucene-core-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel-docs</packagereq>
@@ -1650,10 +1647,8 @@
       <packagereq variant="CRB" type="default">criu-devel</packagereq>
       <packagereq variant="CRB" type="default">CUnit-devel</packagereq>
       <packagereq variant="CRB" type="default">cups-filters-devel</packagereq>
-      <packagereq variant="CRB" type="default">cxl-devel</packagereq>
       <packagereq variant="CRB" type="default">daxctl-devel</packagereq>
       <packagereq variant="CRB" type="default">dblatex</packagereq>
-      <packagereq variant="CRB" type="default">dbus-python-devel</packagereq>
       <packagereq variant="CRB" type="default">dconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dejagnu</packagereq>
       <packagereq variant="CRB" type="default">devhelp-devel</packagereq>
@@ -1666,7 +1661,6 @@
       <packagereq variant="CRB" type="default">docbook5-schemas</packagereq>
       <packagereq variant="CRB" type="default">dotconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dotnet-sdk-7.0-source-built-artifacts</packagereq>
-      <packagereq variant="CRB" type="default">dotnet-sdk-8.0-source-built-artifacts</packagereq>
       <packagereq variant="CRB" type="default">double-conversion-devel</packagereq>
       <packagereq variant="CRB" type="default">dovecot-devel</packagereq>
       <packagereq variant="CRB" type="default">doxygen</packagereq>
@@ -1677,7 +1671,6 @@
       <packagereq variant="CRB" type="default">easymock</packagereq>
       <packagereq variant="CRB" type="default">edk2-aarch64</packagereq>
       <packagereq variant="CRB" type="default">edk2-ovmf</packagereq>
-      <packagereq variant="CRB" type="default">egl-wayland-devel</packagereq>
       <packagereq variant="CRB" type="default">eglexternalplatform-devel</packagereq>
       <packagereq variant="CRB" type="default">eigen3-devel</packagereq>
       <packagereq variant="CRB" type="default">emacs-cython-mode</packagereq>
@@ -1692,7 +1685,6 @@
       <packagereq variant="CRB" type="default">exempi-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-doc</packagereq>
-      <packagereq variant="CRB" type="default">expect-devel</packagereq>
       <packagereq variant="CRB" type="default">fdk-aac-free-devel</packagereq>
       <packagereq variant="CRB" type="default">felix-utils</packagereq>
       <packagereq variant="CRB" type="default">fftw-doc</packagereq>
@@ -1726,7 +1718,6 @@
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq variant="CRB" type="default">gdm-devel</packagereq>
-      <packagereq variant="CRB" type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-demos</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-devel</packagereq>
       <packagereq variant="CRB" type="default">ghostscript-doc</packagereq>
@@ -1764,13 +1755,11 @@
       <packagereq variant="CRB" type="default">graphviz-gd</packagereq>
       <packagereq variant="CRB" type="default">graphviz-python3</packagereq>
       <packagereq variant="CRB" type="default">grilo-devel</packagereq>
-      <packagereq variant="CRB" type="default">gsl-devel</packagereq>
       <packagereq variant="CRB" type="default">gsm-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-doc</packagereq>
       <packagereq variant="CRB" type="default">gstreamer1-plugins-bad-free-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk-doc</packagereq>
-      <packagereq variant="CRB" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-devel</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-doc</packagereq>
@@ -1787,7 +1776,6 @@
       <packagereq variant="CRB" type="default">hyphen-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel-docs</packagereq>
-      <packagereq variant="CRB" type="default">ibus-gtk4</packagereq>
       <packagereq variant="CRB" type="default">ima-evm-utils-devel</packagereq>
       <packagereq variant="CRB" type="default">inih-devel</packagereq>
       <packagereq variant="CRB" type="default">iproute-devel</packagereq>
@@ -1831,25 +1819,22 @@
       <packagereq variant="CRB" type="default">ldns-devel</packagereq>
       <packagereq variant="CRB" type="default">ldns-doc</packagereq>
       <packagereq variant="CRB" type="default">ldns-utils</packagereq>
-      <packagereq variant="CRB" type="default">ledmon-devel</packagereq>
       <packagereq variant="CRB" type="default">leptonica</packagereq>
       <packagereq variant="CRB" type="default">leptonica-devel</packagereq>
       <packagereq variant="CRB" type="default">liba52-devel</packagereq>
       <packagereq variant="CRB" type="default">libabigail</packagereq>
-      <packagereq variant="CRB" type="default">libadwaita-devel</packagereq>
       <packagereq variant="CRB" type="default">libao-devel</packagereq>
       <packagereq variant="CRB" type="default">libappstream-glib-devel</packagereq>
+      <packagereq variant="CRB" type="default">libarchive-devel</packagereq>
       <packagereq variant="CRB" type="default">libassuan-devel</packagereq>
       <packagereq variant="CRB" type="default">libasyncns-devel</packagereq>
       <packagereq variant="CRB" type="default">libatasmart-devel</packagereq>
       <packagereq variant="CRB" type="default">libatomic_ops-devel</packagereq>
       <packagereq variant="CRB" type="default">libbabeltrace-devel</packagereq>
       <packagereq variant="CRB" type="default">libbasicobjects-devel</packagereq>
-      <packagereq variant="CRB" type="default">libblkio-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-static</packagereq>
       <packagereq variant="CRB" type="default">libburn-devel</packagereq>
-      <packagereq variant="CRB" type="default">libbytesize-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-paranoia-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdr-devel</packagereq>
@@ -1906,7 +1891,6 @@
       <packagereq variant="CRB" type="default">libidn2-devel</packagereq>
       <packagereq variant="CRB" type="default">libini_config-devel</packagereq>
       <packagereq variant="CRB" type="default">libinput-devel</packagereq>
-      <packagereq variant="CRB" type="default">libiptcdata-devel</packagereq>
       <packagereq variant="CRB" type="default">libiscsi-devel</packagereq>
       <packagereq variant="CRB" type="default">libisoburn-devel</packagereq>
       <packagereq variant="CRB" type="default">libisofs-devel</packagereq>
@@ -1996,7 +1980,6 @@
       <packagereq variant="CRB" type="default">libsolv-tools</packagereq>
       <packagereq variant="CRB" type="default">libspectre-devel</packagereq>
       <packagereq variant="CRB" type="default">libsrtp-devel</packagereq>
-      <packagereq variant="CRB" type="default">libss-devel</packagereq>
       <packagereq variant="CRB" type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq variant="CRB" type="default">libstdc++-static</packagereq>
       <packagereq variant="CRB" type="default">libstemmer-devel</packagereq>
@@ -2006,7 +1989,6 @@
       <packagereq variant="CRB" type="default">libthai-devel</packagereq>
       <packagereq variant="CRB" type="default">libtheora-devel</packagereq>
       <packagereq variant="CRB" type="default">libtiff-tools</packagereq>
-      <packagereq variant="CRB" type="default">libtimezonemap-devel</packagereq>
       <packagereq variant="CRB" type="default">libtool-ltdl-devel</packagereq>
       <packagereq variant="CRB" type="default">libtracecmd-devel</packagereq>
       <packagereq variant="CRB" type="default">libtraceevent-devel</packagereq>
@@ -2164,8 +2146,6 @@
       <packagereq variant="CRB" type="default">objectweb-asm</packagereq>
       <packagereq variant="CRB" type="default">objenesis</packagereq>
       <packagereq variant="CRB" type="default">ocaml</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas-devel</packagereq>
       <packagereq variant="CRB" type="default">ocaml-brlapi</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar-devel</packagereq>
@@ -2246,7 +2226,6 @@
       <packagereq variant="CRB" type="default">pangomm-doc</packagereq>
       <packagereq variant="CRB" type="default">parted-devel</packagereq>
       <packagereq variant="CRB" type="default">pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">pcre2-tools</packagereq>
       <packagereq variant="CRB" type="default">pcsc-lite-devel</packagereq>
       <packagereq variant="CRB" type="default">perl-AnyEvent</packagereq>
       <packagereq variant="CRB" type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -2308,7 +2287,6 @@
       <packagereq variant="CRB" type="default">perl-IPC-Run3</packagereq>
       <packagereq variant="CRB" type="default">perl-JSON-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-ldns</packagereq>
-      <packagereq variant="CRB" type="default">perl-libxml-perl</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-Locale-gettext</packagereq>
@@ -2397,7 +2375,6 @@
       <packagereq variant="CRB" type="default">poppler-data-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-glib-devel</packagereq>
-      <packagereq variant="CRB" type="default">poppler-glib-doc</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="CRB" type="default">postgresql-docs</packagereq>
@@ -2429,7 +2406,6 @@
       <packagereq variant="CRB" type="default">python3-capstone</packagereq>
       <packagereq variant="CRB" type="default">python3-Cython</packagereq>
       <packagereq variant="CRB" type="default">python3-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3-flit-core</packagereq>
       <packagereq variant="CRB" type="default">python3-gobject-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-greenlet-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-hivex</packagereq>
@@ -2484,24 +2460,6 @@
       <packagereq variant="CRB" type="default">python3.11-setuptools-rust</packagereq>
       <packagereq variant="CRB" type="default">python3.11-test</packagereq>
       <packagereq variant="CRB" type="default">python3.11-wheel-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-Cython</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-flit-core</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-idle</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-iniconfig</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-packaging</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pluggy</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11-devel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pytest</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-scipy-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-semantic_version</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-rust</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-test</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-wheel-wheel</packagereq>
       <packagereq variant="CRB" type="default">qclib-devel</packagereq>
       <packagereq variant="CRB" type="default">qdox</packagereq>
       <packagereq variant="CRB" type="default">qgpgme</packagereq>
@@ -2543,8 +2501,6 @@
       <packagereq variant="CRB" type="default">sblim-sfcc-devel</packagereq>
       <packagereq variant="CRB" type="default">sdl12-compat-devel</packagereq>
       <packagereq variant="CRB" type="default">SDL2-static</packagereq>
-      <packagereq variant="CRB" type="default">seabios-bin</packagereq>
-      <packagereq variant="CRB" type="default">seavgabios-bin</packagereq>
       <packagereq variant="CRB" type="default">sendmail-milter-devel</packagereq>
       <packagereq variant="CRB" type="default">sg3_utils-devel</packagereq>
       <packagereq variant="CRB" type="default">shadow-utils-subid-devel</packagereq>
@@ -2554,7 +2510,6 @@
       <packagereq variant="CRB" type="default">sombok</packagereq>
       <packagereq variant="CRB" type="default">sombok-devel</packagereq>
       <packagereq variant="CRB" type="default">soundtouch-devel</packagereq>
-      <packagereq variant="CRB" type="default">source-highlight-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-doc</packagereq>
       <packagereq variant="CRB" type="default">speex-devel</packagereq>
@@ -2566,7 +2521,6 @@
       <packagereq variant="CRB" type="default">swig</packagereq>
       <packagereq variant="CRB" type="default">swig-doc</packagereq>
       <packagereq variant="CRB" type="default">swig-gdb</packagereq>
-      <packagereq variant="CRB" type="default">system-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">taglib-devel</packagereq>
       <packagereq variant="CRB" type="default">tesseract-devel</packagereq>
       <packagereq variant="CRB" type="default">texi2html</packagereq>
@@ -2601,11 +2555,9 @@
       <packagereq variant="CRB" type="default">varnish-devel</packagereq>
       <packagereq variant="CRB" type="default">volume_key-devel</packagereq>
       <packagereq variant="CRB" type="default">vte291-devel</packagereq>
-      <packagereq variant="CRB" type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq variant="CRB" type="default">WALinuxAgent-cvm</packagereq>
       <packagereq variant="CRB" type="default">wavpack-devel</packagereq>
       <packagereq variant="CRB" type="default">web-assets-filesystem</packagereq>
-      <packagereq variant="CRB" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="CRB" type="default">wireshark-devel</packagereq>
       <packagereq variant="CRB" type="default">woff2-devel</packagereq>
       <packagereq variant="CRB" type="default">wpebackend-fdo-devel</packagereq>
@@ -2639,7 +2591,6 @@
       <packagereq variant="CRB" type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-source</packagereq>
-      <packagereq variant="CRB" type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-util-macros</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq variant="CRB" type="default">xxhash-devel</packagereq>
@@ -3509,7 +3460,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="AppStream" type="optional">dotnet-sdk-6.0</packagereq>
-      <packagereq variant="AppStream" type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

s390x/include_exclude.conf

@@ -33,12 +33,13 @@ filter_packages = [
                 "greenboot-rpm-ostree-grub2",
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
+                "pcp-pmda-bpf",
                 "subscription-manager-rhsm-certificates.s390x",
             ]
         }
     ),
     (
-        '^(BaseOS)$', {
+        '^(BaseOS|Minimal)$', {
             's390x': [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
@@ -59,9 +60,6 @@ filter_packages = [
         '^(extras)$', {
             '*': [
                 "centos-release-*",
-                "centos-release-cloud.noarch",
-                "centos-release-ovirt45-testing.noarch",
-                "centos-release-openstack-yoga.noarch",
             ]
         }
     )
@@ -143,7 +141,6 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
-                "container-selinux",
             ]
         }
     ),

s390x/modules_defaults/module_defaults/mariadb.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.11':
-    - server
-document: modulemd-defaults
-version: '1'

s390x/modules_defaults/module_defaults/maven.yaml

@@ -1,10 +1,7 @@
 data:
-  modified: '202501231030'
   module: maven
   profiles:
     '3.8':
     - common
-    '3.9':
-    - common
 document: modulemd-defaults
 version: '1'

s390x/modules_defaults/module_defaults/mysql.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.4':
-    - server
-document: modulemd-defaults
-version: '1'

s390x/modules_defaults/module_defaults/nginx.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '1.22':
     - common
-    '1.24':
-    - common
-    '1.26':
-    - common
 document: modulemd-defaults
 version: '1'

s390x/modules_defaults/module_defaults/nodejs.yaml

@@ -5,7 +5,5 @@ data:
     - common
     '20':
     - common
-    '22':
-    - common
 document: modulemd-defaults
 version: '1'

s390x/modules_defaults/module_defaults/php.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '8.1':
     - common
-    '8.2':
-    - common
-    '8.3':
-    - common
 document: modulemd-defaults
 version: '1'

s390x/modules_defaults/module_defaults/postgresql.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '15':
     - server
-    '16':
-    - server
 document: modulemd-defaults
 version: '1'

s390x/modules_defaults/module_defaults/ruby.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '3.1':
     - common
-    '3.3':
-    - common
 document: modulemd-defaults
 version: '1'

s390x/variants.xml

@@ -116,20 +116,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>nodejs:22</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -246,20 +240,13 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
-      <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>nodejs-devel:22</module>
       <module>php-devel:8.1</module>
-      <module>php-devel:8.2</module>
       <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
-      <module>ruby-devel:3.1</module>
-      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>

s390x/variants_options.json

@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_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 }}{{ image_name_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,
             "extra_files": [{
                 "scm": "git",
@@ -88,12 +88,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+        "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 }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+            "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",

x86_64/comps.xml

@@ -150,6 +150,7 @@
       <packagereq variant="AppStream" type="mandatory">gnome-desktop3-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gnutls-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gpm-devel</packagereq>
+      <packagereq variant="AppStream" type="mandatory">gsl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gstreamer1-plugins-base-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">gvfs-devel</packagereq>
@@ -158,7 +159,6 @@
       <packagereq variant="AppStream" type="mandatory">java-1.8.0-openjdk-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libacl-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libaio-devel</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libarchive-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libattr-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libblkid-devel</packagereq>
       <packagereq variant="AppStream" type="mandatory">libcanberra-devel</packagereq>
@@ -1659,8 +1659,6 @@
       <packagereq variant="CRB" type="default">beust-jcommander</packagereq>
       <packagereq variant="CRB" type="default">bind-devel</packagereq>
       <packagereq variant="CRB" type="default">bind-doc</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-devel</packagereq>
-      <packagereq variant="CRB" type="default">bind9.18-doc</packagereq>
       <packagereq variant="CRB" type="default">bison-devel</packagereq>
       <packagereq variant="CRB" type="default">blas-devel</packagereq>
       <packagereq variant="CRB" type="default">bluez-libs-devel</packagereq>
@@ -1692,7 +1690,6 @@
       <packagereq variant="CRB" type="default">catatonit</packagereq>
       <packagereq variant="CRB" type="default">cglib</packagereq>
       <packagereq variant="CRB" type="default">cifs-utils-devel</packagereq>
-      <packagereq variant="CRB" type="default">cjose-devel</packagereq>
       <packagereq variant="CRB" type="default">clucene-core-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel</packagereq>
       <packagereq variant="CRB" type="default">colord-devel-docs</packagereq>
@@ -1708,7 +1705,6 @@
       <packagereq variant="CRB" type="default">cxl-devel</packagereq>
       <packagereq variant="CRB" type="default">daxctl-devel</packagereq>
       <packagereq variant="CRB" type="default">dblatex</packagereq>
-      <packagereq variant="CRB" type="default">dbus-python-devel</packagereq>
       <packagereq variant="CRB" type="default">dconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dejagnu</packagereq>
       <packagereq variant="CRB" type="default">devhelp-devel</packagereq>
@@ -1721,7 +1717,6 @@
       <packagereq variant="CRB" type="default">docbook5-schemas</packagereq>
       <packagereq variant="CRB" type="default">dotconf-devel</packagereq>
       <packagereq variant="CRB" type="default">dotnet-sdk-7.0-source-built-artifacts</packagereq>
-      <packagereq variant="CRB" type="default">dotnet-sdk-8.0-source-built-artifacts</packagereq>
       <packagereq variant="CRB" type="default">double-conversion-devel</packagereq>
       <packagereq variant="CRB" type="default">dovecot-devel</packagereq>
       <packagereq variant="CRB" type="default">doxygen</packagereq>
@@ -1736,7 +1731,6 @@
       <packagereq variant="CRB" type="default">edk2-aarch64</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools</packagereq>
       <packagereq variant="CRB" type="default">edk2-tools-doc</packagereq>
-      <packagereq variant="CRB" type="default">egl-wayland-devel</packagereq>
       <packagereq variant="CRB" type="default">eglexternalplatform-devel</packagereq>
       <packagereq variant="CRB" type="default">eigen3-devel</packagereq>
       <packagereq variant="CRB" type="default">emacs-cython-mode</packagereq>
@@ -1751,7 +1745,6 @@
       <packagereq variant="CRB" type="default">exempi-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-devel</packagereq>
       <packagereq variant="CRB" type="default">exiv2-doc</packagereq>
-      <packagereq variant="CRB" type="default">expect-devel</packagereq>
       <packagereq variant="CRB" type="default">fdk-aac-free-devel</packagereq>
       <packagereq variant="CRB" type="default">felix-utils</packagereq>
       <packagereq variant="CRB" type="default">fftw-doc</packagereq>
@@ -1785,7 +1778,6 @@
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib</packagereq>
       <packagereq variant="CRB" type="default">gdk-pixbuf2-xlib-devel</packagereq>
       <packagereq variant="CRB" type="default">gdm-devel</packagereq>
-      <packagereq variant="CRB" type="default">gdm-pam-extensions-devel</packagereq>
       <packagereq variant="CRB" type="default">gegl04-devel</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-demos</packagereq>
       <packagereq variant="CRB" type="default">geoclue2-devel</packagereq>
@@ -1827,13 +1819,11 @@
       <packagereq variant="CRB" type="default">graphviz-gd</packagereq>
       <packagereq variant="CRB" type="default">graphviz-python3</packagereq>
       <packagereq variant="CRB" type="default">grilo-devel</packagereq>
-      <packagereq variant="CRB" type="default">gsl-devel</packagereq>
       <packagereq variant="CRB" type="default">gsm-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-devel</packagereq>
       <packagereq variant="CRB" type="default">gspell-doc</packagereq>
       <packagereq variant="CRB" type="default">gstreamer1-plugins-bad-free-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk-doc</packagereq>
-      <packagereq variant="CRB" type="default">gtk-vnc2-devel</packagereq>
       <packagereq variant="CRB" type="default">gtk3-devel-docs</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-devel</packagereq>
       <packagereq variant="CRB" type="default">gtkmm30-doc</packagereq>
@@ -1850,7 +1840,6 @@
       <packagereq variant="CRB" type="default">hyphen-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel</packagereq>
       <packagereq variant="CRB" type="default">ibus-devel-docs</packagereq>
-      <packagereq variant="CRB" type="default">ibus-gtk4</packagereq>
       <packagereq variant="CRB" type="default">ima-evm-utils-devel</packagereq>
       <packagereq variant="CRB" type="default">inih-devel</packagereq>
       <packagereq variant="CRB" type="default">intel-cmt-cat-devel</packagereq>
@@ -1905,14 +1894,13 @@
       <packagereq variant="CRB" type="default">ldns-devel</packagereq>
       <packagereq variant="CRB" type="default">ldns-doc</packagereq>
       <packagereq variant="CRB" type="default">ldns-utils</packagereq>
-      <packagereq variant="CRB" type="default">ledmon-devel</packagereq>
       <packagereq variant="CRB" type="default">leptonica</packagereq>
       <packagereq variant="CRB" type="default">leptonica-devel</packagereq>
       <packagereq variant="CRB" type="default">liba52-devel</packagereq>
       <packagereq variant="CRB" type="default">libabigail</packagereq>
-      <packagereq variant="CRB" type="default">libadwaita-devel</packagereq>
       <packagereq variant="CRB" type="default">libao-devel</packagereq>
       <packagereq variant="CRB" type="default">libappstream-glib-devel</packagereq>
+      <packagereq variant="CRB" type="default">libarchive-devel</packagereq>
       <packagereq variant="CRB" type="default">libassuan-devel</packagereq>
       <packagereq variant="CRB" type="default">libasyncns-devel</packagereq>
       <packagereq variant="CRB" type="default">libatasmart-devel</packagereq>
@@ -1923,7 +1911,6 @@
       <packagereq variant="CRB" type="default">libbpf-devel</packagereq>
       <packagereq variant="CRB" type="default">libbpf-static</packagereq>
       <packagereq variant="CRB" type="default">libburn-devel</packagereq>
-      <packagereq variant="CRB" type="default">libbytesize-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdio-paranoia-devel</packagereq>
       <packagereq variant="CRB" type="default">libcdr-devel</packagereq>
@@ -1980,7 +1967,6 @@
       <packagereq variant="CRB" type="default">libidn2-devel</packagereq>
       <packagereq variant="CRB" type="default">libini_config-devel</packagereq>
       <packagereq variant="CRB" type="default">libinput-devel</packagereq>
-      <packagereq variant="CRB" type="default">libiptcdata-devel</packagereq>
       <packagereq variant="CRB" type="default">libiscsi-devel</packagereq>
       <packagereq variant="CRB" type="default">libisoburn-devel</packagereq>
       <packagereq variant="CRB" type="default">libisofs-devel</packagereq>
@@ -2079,7 +2065,6 @@
       <packagereq variant="CRB" type="default">libsolv-tools</packagereq>
       <packagereq variant="CRB" type="default">libspectre-devel</packagereq>
       <packagereq variant="CRB" type="default">libsrtp-devel</packagereq>
-      <packagereq variant="CRB" type="default">libss-devel</packagereq>
       <packagereq variant="CRB" type="default">libsss_nss_idmap-devel</packagereq>
       <packagereq variant="CRB" type="default">libstdc++-static</packagereq>
       <packagereq variant="CRB" type="default">libstemmer-devel</packagereq>
@@ -2089,7 +2074,6 @@
       <packagereq variant="CRB" type="default">libthai-devel</packagereq>
       <packagereq variant="CRB" type="default">libtheora-devel</packagereq>
       <packagereq variant="CRB" type="default">libtiff-tools</packagereq>
-      <packagereq variant="CRB" type="default">libtimezonemap-devel</packagereq>
       <packagereq variant="CRB" type="default">libtool-ltdl-devel</packagereq>
       <packagereq variant="CRB" type="default">libtracecmd-devel</packagereq>
       <packagereq variant="CRB" type="default">libtraceevent-devel</packagereq>
@@ -2205,8 +2189,6 @@
       <packagereq variant="CRB" type="default">mingw32-libffi</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pcre</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">mingw32-pcre2</packagereq>
-      <packagereq variant="CRB" type="default">mingw32-pcre2-static</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pixman</packagereq>
       <packagereq variant="CRB" type="default">mingw32-pkg-config</packagereq>
       <packagereq variant="CRB" type="default">mingw32-termcap</packagereq>
@@ -2230,8 +2212,6 @@
       <packagereq variant="CRB" type="default">mingw64-libffi</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pcre</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">mingw64-pcre2</packagereq>
-      <packagereq variant="CRB" type="default">mingw64-pcre2-static</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pixman</packagereq>
       <packagereq variant="CRB" type="default">mingw64-pkg-config</packagereq>
       <packagereq variant="CRB" type="default">mingw64-termcap</packagereq>
@@ -2280,8 +2260,6 @@
       <packagereq variant="CRB" type="default">objectweb-asm</packagereq>
       <packagereq variant="CRB" type="default">objenesis</packagereq>
       <packagereq variant="CRB" type="default">ocaml</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas</packagereq>
-      <packagereq variant="CRB" type="default">ocaml-augeas-devel</packagereq>
       <packagereq variant="CRB" type="default">ocaml-brlapi</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar</packagereq>
       <packagereq variant="CRB" type="default">ocaml-calendar-devel</packagereq>
@@ -2364,7 +2342,6 @@
       <packagereq variant="CRB" type="default">papi-testsuite</packagereq>
       <packagereq variant="CRB" type="default">parted-devel</packagereq>
       <packagereq variant="CRB" type="default">pcre-static</packagereq>
-      <packagereq variant="CRB" type="default">pcre2-tools</packagereq>
       <packagereq variant="CRB" type="default">pcsc-lite-devel</packagereq>
       <packagereq variant="CRB" type="default">perl-AnyEvent</packagereq>
       <packagereq variant="CRB" type="default">perl-B-Hooks-EndOfScope</packagereq>
@@ -2426,7 +2403,6 @@
       <packagereq variant="CRB" type="default">perl-IPC-Run3</packagereq>
       <packagereq variant="CRB" type="default">perl-JSON-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-ldns</packagereq>
-      <packagereq variant="CRB" type="default">perl-libxml-perl</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils</packagereq>
       <packagereq variant="CRB" type="default">perl-List-MoreUtils-XS</packagereq>
       <packagereq variant="CRB" type="default">perl-Locale-gettext</packagereq>
@@ -2515,7 +2491,6 @@
       <packagereq variant="CRB" type="default">poppler-data-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-devel</packagereq>
       <packagereq variant="CRB" type="default">poppler-glib-devel</packagereq>
-      <packagereq variant="CRB" type="default">poppler-glib-doc</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5</packagereq>
       <packagereq variant="CRB" type="default">poppler-qt5-devel</packagereq>
       <packagereq variant="CRB" type="default">postgresql-docs</packagereq>
@@ -2547,7 +2522,6 @@
       <packagereq variant="CRB" type="default">python3-capstone</packagereq>
       <packagereq variant="CRB" type="default">python3-Cython</packagereq>
       <packagereq variant="CRB" type="default">python3-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3-flit-core</packagereq>
       <packagereq variant="CRB" type="default">python3-gobject-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-greenlet-devel</packagereq>
       <packagereq variant="CRB" type="default">python3-hivex</packagereq>
@@ -2602,24 +2576,6 @@
       <packagereq variant="CRB" type="default">python3.11-setuptools-rust</packagereq>
       <packagereq variant="CRB" type="default">python3.11-test</packagereq>
       <packagereq variant="CRB" type="default">python3.11-wheel-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-Cython</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-flit-core</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-idle</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-iniconfig</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-packaging</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pluggy</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-debug</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-psycopg2-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pybind11-devel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-pytest</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-scipy-tests</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-semantic_version</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-rust</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-setuptools-wheel</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-test</packagereq>
-      <packagereq variant="CRB" type="default">python3.12-wheel-wheel</packagereq>
       <packagereq variant="CRB" type="default">qatlib-devel</packagereq>
       <packagereq variant="CRB" type="default">qatlib-tests</packagereq>
       <packagereq variant="CRB" type="default">qatzip-devel</packagereq>
@@ -2672,7 +2628,6 @@
       <packagereq variant="CRB" type="default">sombok</packagereq>
       <packagereq variant="CRB" type="default">sombok-devel</packagereq>
       <packagereq variant="CRB" type="default">soundtouch-devel</packagereq>
-      <packagereq variant="CRB" type="default">source-highlight-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-devel</packagereq>
       <packagereq variant="CRB" type="default">speech-dispatcher-doc</packagereq>
       <packagereq variant="CRB" type="default">speex-devel</packagereq>
@@ -2684,7 +2639,6 @@
       <packagereq variant="CRB" type="default">swig</packagereq>
       <packagereq variant="CRB" type="default">swig-doc</packagereq>
       <packagereq variant="CRB" type="default">swig-gdb</packagereq>
-      <packagereq variant="CRB" type="default">system-sb-certs</packagereq>
       <packagereq variant="CRB" type="default">systemd-boot-unsigned</packagereq>
       <packagereq variant="CRB" type="default">taglib-devel</packagereq>
       <packagereq variant="CRB" type="default">tesseract-devel</packagereq>
@@ -2723,11 +2677,9 @@
       <packagereq variant="CRB" type="default">virt-v2v-man-pages-uk</packagereq>
       <packagereq variant="CRB" type="default">volume_key-devel</packagereq>
       <packagereq variant="CRB" type="default">vte291-devel</packagereq>
-      <packagereq variant="CRB" type="default">vulkan-utility-libraries-devel</packagereq>
       <packagereq variant="CRB" type="default">WALinuxAgent-cvm</packagereq>
       <packagereq variant="CRB" type="default">wavpack-devel</packagereq>
       <packagereq variant="CRB" type="default">web-assets-filesystem</packagereq>
-      <packagereq variant="CRB" type="default">webrtc-audio-processing-devel</packagereq>
       <packagereq variant="CRB" type="default">wireshark-devel</packagereq>
       <packagereq variant="CRB" type="default">woff2-devel</packagereq>
       <packagereq variant="CRB" type="default">wpebackend-fdo-devel</packagereq>
@@ -2761,7 +2713,6 @@
       <packagereq variant="CRB" type="default">xorg-x11-drv-wacom-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-server-source</packagereq>
-      <packagereq variant="CRB" type="default">xorg-x11-server-Xwayland-devel</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-util-macros</packagereq>
       <packagereq variant="CRB" type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq variant="CRB" type="default">xxhash-devel</packagereq>
@@ -3634,7 +3585,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq variant="AppStream" type="optional">dotnet-sdk-6.0</packagereq>
-      <packagereq variant="AppStream" type="optional">dotnet-sdk-8.0</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

x86_64/include_exclude.conf

@@ -45,10 +45,6 @@ filter_packages = [
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
                 "subscription-manager-rhsm-certificates.x86_64",
-                "kernel-rt-core.x86_64",
-                "kernel-rt-modules-core.x86_64",
-                "gnome-software-devel.i686",
-                "gnome-software.i686",
             ]
         }
     ),
@@ -135,7 +131,6 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
-                "container-selinux",
             ]
         }
     ),

x86_64/modules_defaults/module_defaults/mariadb.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mariadb
-  profiles:
-    '10.11':
-    - server
-document: modulemd-defaults
-version: '1'

x86_64/modules_defaults/module_defaults/maven.yaml

@@ -1,10 +1,7 @@
 data:
-  modified: '202501231030'
   module: maven
   profiles:
     '3.8':
     - common
-    '3.9':
-    - common
 document: modulemd-defaults
 version: '1'

x86_64/modules_defaults/module_defaults/mysql.yaml

@@ -1,7 +0,0 @@
-data:
-  module: mysql
-  profiles:
-    '8.4':
-    - server
-document: modulemd-defaults
-version: '1'

x86_64/modules_defaults/module_defaults/nginx.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '1.22':
     - common
-    '1.24':
-    - common
-    '1.26':
-    - common
 document: modulemd-defaults
 version: '1'

x86_64/modules_defaults/module_defaults/nodejs.yaml

@@ -5,7 +5,5 @@ data:
     - common
     '20':
     - common
-    '22':
-    - common
 document: modulemd-defaults
 version: '1'

x86_64/modules_defaults/module_defaults/php.yaml

@@ -3,9 +3,5 @@ data:
   profiles:
     '8.1':
     - common
-    '8.2':
-    - common
-    '8.3':
-    - common
 document: modulemd-defaults
 version: '1'

x86_64/modules_defaults/module_defaults/postgresql.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '15':
     - server
-    '16':
-    - server
 document: modulemd-defaults
 version: '1'

x86_64/modules_defaults/module_defaults/ruby.yaml

@@ -3,7 +3,5 @@ data:
   profiles:
     '3.1':
     - common
-    '3.3':
-    - common
 document: modulemd-defaults
 version: '1'

x86_64/multilib.conf

@@ -31,11 +31,6 @@ multilib_blacklist = {
         "librevenge-gdb",
         "tracker",
         "tracker-miners",
-        "gnome-software-devel",
-        "gnome-software",
-        "libfastjson-devel",
-        "liblognorm-devel",
-        "librelp-devel",
     ],
 }
 multilib_whitelist = {}

x86_64/variants.xml

@@ -125,20 +125,14 @@
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
     <modules>
-      <module>mariadb:10.11</module>
       <module>maven:3.8</module>
       <module>nginx:1.22</module>
-      <module>nginx:1.24</module>
       <module>nodejs:18</module>
       <module>nodejs:20</module>
-      <module>nodejs:22</module>
       <module>php:8.1</module>
-      <module>php:8.2</module>
       <module>postgresql:15</module>
-      <module>postgresql:16</module>
       <module>redis:7</module>
       <module>ruby:3.1</module>
-      <module>ruby:3.3</module>
     </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
@@ -262,20 +256,13 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
-      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
-      <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
       <module>nodejs-devel:20</module>
-      <module>nodejs-devel:22</module>
       <module>php-devel:8.1</module>
-      <module>php-devel:8.2</module>
       <module>postgresql-devel:15</module>
-      <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
-      <module>ruby-devel:3.1</module>
-      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>

x86_64/variants_options.json

@@ -2,13 +2,13 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_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 }}{{ image_name_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,
             "extra_files": [{
                 "scm": "git",
@@ -106,12 +106,12 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+        "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 }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}",
+            "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",