From 79aa71ed7a08ff1bd41805fed0f9c70f7ade74b6 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: May 27 2021 23:25:23 +0000
Subject: Sync multilib and variants with RHEL 8.4


---

diff --git a/multilib.conf b/multilib.conf
index 75712ea..9d92484 100644
--- a/multilib.conf
+++ b/multilib.conf
@@ -6,6 +6,8 @@ multilib_blacklist = {
         "totem",
         "ocaml*",
         "fwupd*",
+        "gcc-toolset-10-systemtap*",
+        "gcc-toolset-10-dyninst-*",
     ],
 }
 
@@ -14,7 +16,8 @@ multilib_whitelist = {
     "*": [
          "valgrind",
          "papi",
-	 "gcc-toolset-9-valgrind",
+         "gcc-toolset-9-valgrind",
+         "gcc-toolset-10-valgrind",
          "p11-kit-trust",
     ],
 }
diff --git a/variants.xml b/variants.xml
index 7b7d64a..714203c 100644
--- a/variants.xml
+++ b/variants.xml
@@ -156,6 +156,7 @@
       <module>perl-libwww-perl:6.34</module>
       <module>container-tools:1.0</module>
       <module>container-tools:2.0</module>
+      <module>container-tools:3.0</module>
       <module>container-tools:rhel8</module>
       <!-- <module>eclipse:rhel8</module> -->
       <module>freeradius:3.0</module>
@@ -237,9 +238,8 @@
     </environments>
   </variant>
 
-
   <variant id="PowerTools" name="PowerTools" type="variant">
-    <!-- List of architectures for Powertools compose variant -->
+    <!-- List of architectures for PowerTools compose variant -->
     <arches>
       <arch>aarch64</arch>
       <arch>ppc64le</arch>
@@ -248,12 +248,12 @@
     <groups>
       <group default="true">centos-powertools</group>
     </groups>
-    <!-- List of modules that should be part of CRB compose variant -->
+    <!-- List of modules that should be part of PowerTools compose variant -->
     <modules>
       <module>javapackages-tools:201801</module>
       <!-- List AppStream modules for which we want -devel version. AppStream is
-      used as lookaside for CRB, so the module will not actually get into
-      CRB, but it's needed here for creating the -devel module.
+      used as lookaside for PowerTools, so the module will not actually get into
+      PowerTools, but it's needed here for creating the -devel module.
       -->
       <module>mariadb-devel:10.3</module>
       <module>virt-devel:rhel</module>
@@ -262,8 +262,10 @@
     </modules>
   </variant>
 
+
   <!-- ADDONS (Defined as variants in RHEL-8) -->
 
+
   <variant id="HighAvailability" name="High Availability" type="variant">
     <arches>
       <arch>aarch64</arch>
@@ -275,12 +277,13 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
+
   <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
     <arches>
       <arch>aarch64</arch>
       <arch>ppc64le</arch>
-      <arch>s390x</arch>
       <arch>x86_64</arch>
     </arches>
   </variant>
+
 </variants>