From ba36e611066227b820d4f79adf1bf26066a2c25e Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 4 Sep 2023 00:55:11 -0700
Subject: [PATCH] consolidate extras and plus

---
 plus-lh.conf       | 36 +++++++++++++++++++-----------------
 plus.conf          | 36 +++++++++++++++++++-----------------
 shared/extras.conf |  8 ++++++++
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/plus-lh.conf b/plus-lh.conf
index 6a30d65..666d6dc 100644
--- a/plus-lh.conf
+++ b/plus-lh.conf
@@ -1,3 +1,5 @@
+from shared/extras import *
+
 release_name = "Rocky-Plus"
 release_short = "Plus"
 release_version = "8"
@@ -51,24 +53,24 @@ koji_profile = "koji"
 
 check_deps = False
 
-filter_packages = [
-    ('^extras$', {
-        '*': [
-            '*',
-        ],
-    }),
-]
+#filter_packages = [
+#    ('^plus$', {
+#        '*': [
+#            '*',
+#        ],
+#    }),
+#]
 
-additional_packages = [
-	('^plus$', {
-    'aarch64': [
-      'open-vm-tools',
-      'open-vm-tools-desktop',
-      'open-vm-tools-sdmp',
-      'open-vm-tools-sdmp-salt-minion',
-    ],
-	}),
-]
+#additional_packages = [
+#	('^plus$', {
+#    'aarch64': [
+#      'open-vm-tools',
+#      'open-vm-tools-desktop',
+#      'open-vm-tools-sdmp',
+#      'open-vm-tools-sdmp-salt-minion',
+#    ],
+#	}),
+#]
 
 createiso_skip = [
 	
diff --git a/plus.conf b/plus.conf
index 21d4327..10fa8bc 100644
--- a/plus.conf
+++ b/plus.conf
@@ -1,3 +1,5 @@
+from shared/extras import *
+
 release_name = "Rocky-Plus"
 release_short = "Plus"
 release_version = "8"
@@ -50,24 +52,24 @@ koji_profile = "koji"
 
 check_deps = False
 
-filter_packages = [
-    ('^extras$', {
-        '*': [
-            '*',
-        ],
-    }),
-]
+#filter_packages = [
+#    ('^extras$', {
+#        '*': [
+#            '*',
+#        ],
+#    }),
+#]
 
-additional_packages = [
-	('^plus$', {
-    'aarch64': [
-      'open-vm-tools',
-      'open-vm-tools-desktop',
-      'open-vm-tools-sdmp',
-      'open-vm-tools-sdmp-salt-minion',
-    ],
-	}),
-]
+#additional_packages = [
+#	('^plus$', {
+#    'aarch64': [
+#      'open-vm-tools',
+#      'open-vm-tools-desktop',
+#      'open-vm-tools-sdmp',
+#      'open-vm-tools-sdmp-salt-minion',
+#    ],
+#	}),
+#]
 
 createiso_skip = [
 	
diff --git a/shared/extras.conf b/shared/extras.conf
index f9b6cbb..5273a3b 100644
--- a/shared/extras.conf
+++ b/shared/extras.conf
@@ -15,6 +15,14 @@ filter_packages = [
 
 additional_packages = [
     # Consolidation
+    ('^plus$', {
+        'aarch64': [
+            'open-vm-tools',
+            'open-vm-tools-desktop',
+            'open-vm-tools-sdmp',
+            'open-vm-tools-sdmp-salt-minion',
+        ],
+    }),
     ('^extras$', {
         '*': [
             'rpaste',