From f78e8759ec562d0c4fb525b0fe8378f1a152d0dc Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Aug 25 2021 16:44:28 +0000
Subject: Sync with RHEL 8.5


---

diff --git a/c8-stream.conf b/c8-stream.conf
index 326470b..767fd17 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -140,17 +140,17 @@ restricted_volid = True
 
 # LOOKASIDE
 variant_as_lookaside = [
-    ('AppStream', 'BaseOS'),
-    ('PowerTools', 'BaseOS'),
-    ('PowerTools', 'AppStream'),
-    ('HighAvailability', 'BaseOS'),
-    ('HighAvailability', 'AppStream'),
+    ("AppStream", "BaseOS"),
+    ("HighAvailability", "BaseOS"),
+    ("HighAvailability", "AppStream"),
     ("ResilientStorage", "BaseOS"),
     ("ResilientStorage", "AppStream"),
     ("RT", "BaseOS"),
     ("RT", "AppStream"),
     ("NFV", "BaseOS"),
     ("NFV", "AppStream"),
+    ("PowerTools", "BaseOS"),
+    ("PowerTools", "AppStream"),
 ]
 
 extra_files = [
diff --git a/multilib.conf b/multilib.conf
index 8efffc3..9ab1390 100644
--- a/multilib.conf
+++ b/multilib.conf
@@ -8,6 +8,7 @@ multilib_blacklist = {
         "fwupd*", # RCM-76022
         "gcc-toolset-10-systemtap*", # Jira: RHELCMP-1270
         "gcc-toolset-10-dyninst-*", # Jira: RHELCMP-2173
+        "sblim-gather-*"
     ],
 }
 
diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf
index fbb1db6..ee291df 100644
--- a/stream-include-excludes.conf
+++ b/stream-include-excludes.conf
@@ -142,6 +142,16 @@ additional_packages = [
             "sevctl", #RHBug 1986032, RHELCMP-6101
             "coreos-installer-bootinfra", #RHELCMP-6277
             "gcc-toolset-11-gcc-plugin-devel", #RHELCMP-6247
+            "java-17-openjdk-demo", # RHELCMP-6345
+            "java-17-openjdk-devel", # RHELCMP-6345
+            "java-17-openjdk-jmods", # RHELCMP-6345
+            "java-17-openjdk-src", # RHELCMP-6345
+            "java-17-openjdk-static-libs", # RHELCMP-6345
+            "java-17-openjdk-javadoc", # RHELCMP-6345
+            "java-17-openjdk-javadoc-zip", # RHELCMP-6345
+            "gcc-toolset-11-libgccjit", # RHELCMP-6355
+            "gcc-toolset-11-libgccjit-devel", # RHELCMP-6355
+            "pcm", # RHELCMP-6356
         ]
     }),
     ("^BaseOS$", {
@@ -196,21 +206,35 @@ additional_packages = [
         "aarch64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
         ],
         "ppc64le": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
         ],
         "x86_64": [
             "java-1.8.0-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*slowdebug*", # Jira: RHELCMP-4189
             "dotnet5.0-build-reference-packages",
+            "java-17-openjdk-*slowdebug*", # Jira: RHELCMP-6345
         ],
     }),
     ("^PowerTools$", {
         "x86_64": [
             "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-4189
             "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-4189
+            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
+        ],
+        "aarch64": [
+            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
+            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
+            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
+        ],
+        "ppc64le": [
+            "java-1.8.0-openjdk-*fastdebug*", # Jira: RHELCMP-6347
+            "java-11-openjdk-*fastdebug*", # Jira: RHELCMP-6347
+            "java-17-openjdk-*fastdebug*", # Jira: RHELCMP-6345
         ]
     }),
 ]
diff --git a/variants-stream.xml b/variants-stream.xml
index 359fc96..efe313c 100644
--- a/variants-stream.xml
+++ b/variants-stream.xml
@@ -180,9 +180,11 @@
       <module>nginx:1.14</module>
       <module>nginx:1.16</module>
       <module>nginx:1.18</module>
+      <module>nginx:1.20</module>
       <module>nodejs:10</module>
       <module>nodejs:12</module>
       <module>nodejs:14</module>
+      <module>nodejs:16</module>
       <module>parfait:0.5</module>
       <module>perl:5.24</module>
       <module>perl:5.26</module>
@@ -208,6 +210,7 @@
       <module>ruby:2.5</module>
       <module>ruby:2.6</module>
       <module>ruby:2.7</module>
+      <module>ruby:3.0</module>
       <module>rust-toolset:rhel8</module>
       <module>satellite-5-client:1.0</module>
       <module>scala:2.10</module>
@@ -250,6 +253,7 @@
 
   <!-- ADDONS (Defined as variants in RHEL-8) -->
 
+
   <variant id="ResilientStorage" name="Resilient Storage" type="variant">
     <arches>
       <arch>x86_64</arch>
@@ -273,6 +277,8 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
+
+
   <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
     <arches>
       <arch>aarch64</arch>