From c4c18a494d7372be008e7a1f1c2395b31a3b8dbf Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 1 Feb 2024 02:31:27 -0700
Subject: [PATCH] sync from upstream

---
 shared/additional_and_filter_packages.conf | 5 ++++-
 shared/createiso.conf                      | 4 ++++
 variants.xml                               | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 81bea36..af8d38b 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -52,7 +52,7 @@ additional_packages = [
             "python3-gobject-base-noarch", #ENGCMP-2400
             "python3-samba-dc", #ENGCMP-3007
             "python3.9-debuginfo", #ENGCMP-1433, ENGCMP-2994
-            "samba-gpupdate", #ENGCMP-3659
+            "rhel-net-naming-sysattrs", #ENGCMP-3784
             "samba-tools", #ENGCMP-3007
             "samba-usershares", #ENGCMP-3007
             "sssd-passkey", #ENGCMP-3467
@@ -310,6 +310,8 @@ additional_packages = [
             "rtla", #ENGCMP-2799
             "rust-analyzer", #ENGCMP-2839
             "rv", #ENGCMP-3263
+            "s390utils-se-data", #ENGCMP-3789
+            "samba-gpupdate", #ENGCMP-3659, ENGCMP-3720
             "sip6", #ENGCMP-2239
             "sssd-idp", #ENGCMP-2276
             "stratisd-tools", #ENGCMP-3210
@@ -324,6 +326,7 @@ additional_packages = [
             "tomcat-servlet-4.0-api", #ENGCMP-2927
             "tomcat-webapps", #ENGCMP-2927
             "tuned-profiles-postgresql", #ENGCMP-2126
+            "uki-direct", #ENGCMP-3698
             "usbredir-server", #ENGCMP-2719
             "vulkan-volk-devel", #ENGCMP-3668
             "xcb-util-cursor", #ENGCMP-3426
diff --git a/shared/createiso.conf b/shared/createiso.conf
index 8963457..ae8edb6 100644
--- a/shared/createiso.conf
+++ b/shared/createiso.conf
@@ -11,6 +11,10 @@ createiso_skip = [
         "*": True,
         "src":True #RCM-41427 -Disable source iso generation during createiso phase
     }),
+    ("^HighAvailability$", {
+        # HA iso is not shipped in aarch64 - ENGCMP-3657
+        "aarch64": True,
+    }),
 ]
 
 restricted_volid = True
diff --git a/variants.xml b/variants.xml
index b140ee2..7504ae8 100644
--- a/variants.xml
+++ b/variants.xml
@@ -152,6 +152,7 @@
             <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>nodejs:18</module>