From fa0cde1fbb885655988a17ea9f4cb4381dd98727 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Mon, 28 Jun 2021 19:08:52 -0700
Subject: [PATCH] stop bringing in GARBAGE

---
 common/include-excludes.conf | 7 ++-----
 r8.conf                      | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index 561e0b1..98eb85c 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -1,5 +1,5 @@
 filter_packages = [
-    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage)$", {
+    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|extras|Devel|plus)$", {
         "*": [
             "python36",
             "gcc-toolset-9-*-testsuite", 
@@ -878,9 +878,6 @@ additional_packages = [
         'x86_64': [
             'elrepo-release',
         ],
-    }),
-
-    ('^extras$', {
         'aarch64': [
             "LibRaw",
             "LibRaw-devel",
@@ -1121,7 +1118,7 @@ additional_packages = [
             "totem",
             "totem-nautilus",
             "virtio-win",
-        ],
+        ]
     }),
 
     ("^BaseOS$", {
diff --git a/r8.conf b/r8.conf
index cee88f3..bd3dcbb 100644
--- a/r8.conf
+++ b/r8.conf
@@ -104,7 +104,7 @@ lorax_options = [
 
 buildinstall_skip = [
     #("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
-    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|extras|Devel|Plus)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|extras|Devel|plus)$", {
        "*": True
        }),
 ]
@@ -122,7 +122,7 @@ create_optional_isos = False
 
 createiso_skip = [
     #('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', {
-    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|extras|Devel|Plus)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|extras|Devel|plus)$', {
         '*': True,
         'src':True
     }),