remove extras

common/include-excludes.conf

@@ -1,5 +1,5 @@
 filter_packages = [
-    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT|NFV|extras)$", {
+    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT|NFV)$", {
         "*": [
             "python36",  # RCM-42305 - ursine python36 should be only in buildroot
             "gcc-toolset-9-*-testsuite", #RCM-58061
@@ -31,12 +31,6 @@ filter_packages = [
 #            "kernel-rt-kvm-debuginfo", # RCM-33741
 #            "kernel-rt-debug-kvm-debuginfo", # RCM-33741
 #        ]
-#    }),
-
-#    ("^extras$", {
-#        "*": [
-#            "*",
-#        ]
 #    }),
 
     ("^.*$", {

r8.conf

@@ -104,7 +104,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV|extras)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", {
        "*": True
        }),
 ]
@@ -121,7 +121,7 @@ image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV|extras)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$', {
         '*': True,
         'src':True
     }),
@@ -158,8 +158,6 @@ variant_as_lookaside = [
     ("NFV", "AppStream"),
     ("Minimal", "BaseOS"),
     ("Minimal", "AppStream"),
-    ("extras", "BaseOS"),
-    ("extras", "AppStream"),
 ]
 
 extra_files = [

variants.xml

@@ -321,13 +321,6 @@
     </groups>
   </variant>
 
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-      <arch>x86_64</arch>
-    </arches>
-  </variant>
-
   <!-- Live Variants, loosely borrowed from Fedora
   Usually these variants are set to always be empty -->
   <variant id="Workstation" name="Workstation" type="variant" is_empty="true">