From 18d9c279251460a9543f658f1e42fac9c0f59998 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Tue, 14 Jun 2022 09:46:41 -0700
Subject: [PATCH] sync from upstream

---
 reset-prepopulate.py                       | 15 +++++++++++++++
 shared/additional_and_filter_packages.conf |  4 ++++
 2 files changed, 19 insertions(+)
 create mode 100644 reset-prepopulate.py

diff --git a/reset-prepopulate.py b/reset-prepopulate.py
new file mode 100644
index 0000000..b62f4bc
--- /dev/null
+++ b/reset-prepopulate.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+
+import json
+
+remove_these = [
+        'rhc',
+        'insights-client'
+]
+
+arches = [
+        'x86_64',
+        'aarch64',
+        'ppc64le',
+        's390x'
+]
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 56a22c1..5a93e1a 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -64,11 +64,15 @@ additional_packages = [
      }),
     ("^AppStream$", {
         "*": [
+            "adobe-source-code-pro-fonts", #ENGCMP-2390
             "dpdk-devel", #ENGCMP-2205
             "freeglut-devel", #ENGCMP-2073
+            "gcc-toolset-12", #ENGCMP-2391
             "gcc-toolset-12-annobin-annocheck", #ENGCMP-2384
             "gcc-toolset-12-annobin-docs", #ENGCMP-2384
             "gcc-toolset-12-annobin-plugin-gcc", #ENGCMP-2384
+            "gcc-toolset-12-build", #ENGCMP-2391
+            "gcc-toolset-12-runtime", #ENGCMP-2391
             "libzdnn", #ENGCMP-2244
             "libzdnn-devel", #ENGCMP-2297
             "mkpasswd", #ENGCMP-2259