Sync changes from CentOS Stream 9

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

fedora/variables.conf

@@ -1,11 +1,9 @@
+# This file sets the values of variables defined in
+# the `../shared/variables.conf`.
+
 RELEASE_NAME = "Fedora-ELN"
 RELEASE_SHORT = "Fedora-ELN"
-RELEASE_VERSION = "Rawhide"
-RELEASE_VERSION_X = "9"
-RELEASE_VERSION_Y = "0"
-RELEASE_VERSION_Z = "0"
-RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y)
-RELEASE_VERSION_XYZ = "%s.%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y, RELEASE_VERSION_Z)
+RELEASE_VERSION = "10"
 
 
 COMPS_REPO = "https://pagure.io/fedora-comps.git"

shared/createiso.conf

@@ -1,4 +1,5 @@
 create_optional_isos = False
+createiso_use_xorrisofs = True
 
 createiso_skip = [
     ("^(BaseOS|AppStream|CRB|NFV)$", {

shared/extra_isos.conf

@@ -1,3 +1,4 @@
+iso_hfs_ppc64le_compatible = False
 
 extra_isos = {
     "BaseOS": [{

shared/general.conf

@@ -7,6 +7,8 @@ link_type = "abspath-symlink"
 product_id_allow_missing = True
 productimg = False
 
+create_jigdo = False
+
 # Wait for 60 * 20 seconds (20 minutes) for packages to sign.
 signed_packages_wait = 60
 signed_packages_retries = 20

shared/multilib.conf

@@ -13,6 +13,26 @@ multilib_blacklist = {
         "totem", #RCM-43729
         "ocaml*", # RCM-53665
         "fwupd*", # ENGCMP-488
+        "freeradius*", #RhBug 1923990
+        "httpd-*", #ENGCMP-716
+        "nginx-*",
+        "php-*",
+        "subversion-*",
+        "mariadb-common", #ENGCMP-1061
+        "mariadb-devel",
+        "mariadb-embedded*",
+        "mariadb-errmsg",
+        "mysql-common",
+        "mysql-devel",
+        "mysql-libs",
+        "mecab",
+        "postgresql-private*", #ENGCMP-1179
+        "postgresql-server*",
+        "bash*", #RhBug 2006138
+        "xapian-core*", #RhBug 2031780
+        "tk*", #RhBug 2053406
+        "tcl*",
+        "ldns-devel*", #RhBug 2058694
     ],
 }
 

shared/variables.conf

@@ -33,3 +33,5 @@ global EXTRA_FILES
 EXTRA_FILES = []
 global EXTRA_ISOS_ARCHES
 EXTRA_ISOS_ARCHES = []
+global IMAGE_BUILD_SCRATCH
+IMAGE_BUILD_SCRATCH = False

variants.xml

@@ -3,7 +3,6 @@
 <variants>
 
     <!-- General variants built also in Fedora. -->
-
     <variant id="Everything" name="Everything" type="variant">
         <arches>
             <arch>aarch64</arch>
@@ -49,7 +48,6 @@
             <group default="true">mail-server</group>
             <group default="true">mainframe-access</group>
             <group default="true">multimedia</group>
-            <group default="true">dns-server</group>
             <group default="true">smart-card</group>
             <group default="true">smb-server</group>
             <group default="true">network-tools</group>
@@ -91,7 +89,8 @@
             <group default="true">console-internet</group>
             <group default="true">debugging</group>
             <group default="true">development</group>
-            <group default="true">dotnet-core</group>
+            <group default="true">dotnet</group>
+            <group default="true">dns-server</group>
             <group default="true">emacs</group>
             <group default="true">file-server</group>
             <group default="true">ftp-server</group>
@@ -124,6 +123,7 @@
             <group default="true">guest-desktop-agents</group>
             <group default="true">headless-management</group>
             <group default="true">java-platform</group>
+            <group default="true">java-development</group>
             <group default="true">gnome-apps</group>
             <group default="true">internet-applications</group>
             <group default="true">office-suite</group>
@@ -160,20 +160,7 @@
             <environment display_order="4">workstation-product-environment</environment>
         </environments>
         <modules>
-            <module>ant:1.10</module>
-            <module>httpd:2.4</module>
-            <module>jmc:7</module>
-            <module>mariadb:10.5</module>
-            <module>maven:3.6</module>
-            <module>nginx:1.18</module>
-            <module>nodejs:12</module>
-            <module>nodejs:14</module>
-            <module>perl:5.30</module>
-            <module>perl:5.32</module>
-            <module>ruby:2.5</module>
-            <module>subversion:1.14</module>
-            <module>swig:4.0</module>
-            <module>varnish:6.0</module>
+		<!--            <module>container-tools:latest</module> -->
         </modules>
     </variant>
     <variant id="CRB" name="CodeReady Builder" type="variant">