From f32733f450ec742a9b4dcf9cd1397aa67ae49d7d Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 10 Nov 2022 03:16:59 -0700
Subject: [PATCH] playing catchup

---
 common/include-excludes.conf | 63 +++++++++++++++++++++++++++++++-----
 images.conf                  | 14 ++++++++
 r8.conf                      | 10 ++++--
 variants.xml                 | 25 ++++++--------
 4 files changed, 85 insertions(+), 27 deletions(-)
 create mode 100644 images.conf

diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index c49f800..151b02e 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -1,5 +1,5 @@
 filter_packages = [
-    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT|NFV)$", {
+    ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|RT|NFV|extras)$", {
         "*": [
             "python36",  # RCM-42305 - ursine python36 should be only in buildroot
             "gcc-toolset-9-*-testsuite", #RCM-58061
@@ -26,12 +26,18 @@ filter_packages = [
         ]
     }),
 
-    ("^RT$", {
-        "*": [
-            "kernel-rt-kvm-debuginfo", # RCM-33741
-            "kernel-rt-debug-kvm-debuginfo", # RCM-33741
-        ]
-    }),
+#    ("^RT$", {
+#        "*": [
+#            "kernel-rt-kvm-debuginfo", # RCM-33741
+#            "kernel-rt-debug-kvm-debuginfo", # RCM-33741
+#        ]
+#    }),
+
+#    ("^extras$", {
+#        "*": [
+#            "*",
+#        ]
+#    }),
 
     ("^.*$", {
         "*": [
@@ -1112,6 +1118,7 @@ additional_packages = [
         ]
     }),
 
+
     # Consolidation
     ('^plus$', {
         '*': [
@@ -1126,7 +1133,45 @@ additional_packages = [
             'rpaste',
             'epel-release',
             'rpmfusion-free-release',
-            'rocky-release-gluster9',
+            'anaconda-live',
+            'rocky-release-cloud',
+            'centos-release-advanced-virtualization',
+            'centos-release-ansible-29',
+            'centos-release-ceph-nautilus',
+            'centos-release-ceph-octopus',
+            'centos-release-ceph-pacific',
+            'centos-release-ceph-quincy',
+            'centos-release-configmanagement',
+            'centos-release-gluster6',
+            'centos-release-gluster7',
+            'centos-release-gluster8',
+            'centos-release-gluster9',
+            'centos-release-gluster10',
+            'centos-release-kmods',
+            'centos-release-kmods-rebuild',
+            'centos-release-nfs-ganesha28',
+            'centos-release-nfs-ganesha30',
+            'centos-release-nfv-common',
+            'centos-release-nfv-extras',
+            'centos-release-nfv-openvswitch',
+            'centos-release-openstack-train',
+            'centos-release-openstack-ussuri',
+            'centos-release-openstack-victoria',
+            'centos-release-openstack-wallaby',
+            'centos-release-openstack-xena',
+            'centos-release-openstack-yoga',
+            'centos-release-opstools',
+            'centos-release-ovirt44',
+            'centos-release-samba411',
+            'centos-release-samba412',
+            'centos-release-samba413',
+            'centos-release-samba414',
+            'centos-release-samba415',
+            'centos-release-storage-common',
+            'centos-release-virt-common',
+            'centos-release-messaging',
+            'centos-release-qpid-proton',
+            'centos-release-rabbitmq-38'
         ],
     }),
 
@@ -1135,6 +1180,8 @@ additional_packages = [
             'elrepo-release',
         ],
         'aarch64': [
+            'rocky-release-altarch',
+            "rocky-release-rpi",
             "LibRaw",
             "LibRaw-devel",
             "alsa-sof-firmware",
diff --git a/images.conf b/images.conf
new file mode 100644
index 0000000..9f9a077
--- /dev/null
+++ b/images.conf
@@ -0,0 +1,14 @@
+global_ksurl = 'git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8'
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Rocky-Workstation-8',
+                'version': '8.7',
+                'arches': ['x86_64'],
+                'kickstart': 'Rocky-8-Workstation.ks',
+                'title': 'Rocky Linux 8 Workstation',
+                'repo': ['BaseOS', 'AppStream', 'PowerTools', 'extras'],
+                'failable': ['*']
+            }
+        ]
+}
diff --git a/r8.conf b/r8.conf
index af89b70..e842bb2 100644
--- a/r8.conf
+++ b/r8.conf
@@ -1,6 +1,6 @@
 from common/multilib import *
 from common/include-excludes import *
-#from images import *
+from images import *
 
 # PRODUCT INFO 
 release_name = "Rocky Linux" 
@@ -104,7 +104,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV|extras)$", {
        "*": 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)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT|NFV|extras)$', {
         '*': True,
         'src':True
     }),
@@ -156,6 +156,10 @@ variant_as_lookaside = [
     ("RT", "AppStream"),
     ("NFV", "BaseOS"),
     ("NFV", "AppStream"),
+    ("Minimal", "BaseOS"),
+    ("Minimal", "AppStream"),
+    ("extras", "BaseOS"),
+    ("extras", "AppStream"),
 ]
 
 extra_files = [
diff --git a/variants.xml b/variants.xml
index b67d5d2..dd7ac10 100644
--- a/variants.xml
+++ b/variants.xml
@@ -77,8 +77,8 @@
       <group default="true">base-x</group>
       <group default="true">debugging</group>
       <group default="true">development</group>
-      <group default="true">dns-server</group>
       <group default="true">dotnet-core</group>
+      <group default="true">dns-server</group>
       <group default="true">file-server</group>
       <group default="true">ftp-server</group>
       <group default="true">gnome-apps</group>
@@ -267,6 +267,7 @@
       <module>virt-devel:rhel</module>
       <module>python38-devel:3.8</module>
       <module>python39-devel:3.9</module>
+      <module>subversion-devel:1.10</module>
     </modules>
   </variant>
 
@@ -296,13 +297,7 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <!--  <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
-    <arches>
-      <arch>aarch64</arch>
-      <arch>ppc64le</arch>
-      <arch>x86_64</arch>
-    </arches>
-  </variant> -->
+
   <variant id="RT" name="RT" type="variant">
     <arches>
       <arch>x86_64</arch>
@@ -326,21 +321,19 @@
     </groups>
   </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">
+  <variant id="extras" name="extras" type="variant">
     <arches>
       <arch>aarch64</arch>
-      <arch>ppc64le</arch>
       <arch>x86_64</arch>
     </arches>
   </variant>
-  <variant id="Spins" name="Spins" type="variant" is_empty="true">
+
+  <!-- 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">
     <arches>
-      <arch>aarch64</arch>
-      <arch>ppc64le</arch>
       <arch>x86_64</arch>
     </arches>
-  </variant> -->
+  </variant>
 
 </variants>