From 4a91f94733f21655527e645a820d14882df7937f Mon Sep 17 00:00:00 2001
From: Stepan Oksanichenko <soksanichenko@almalinux.org>
Date: Tue, 19 Nov 2024 16:59:29 +0200
Subject: [PATCH] Replace `extras-common` by `extras`

---
 aarch64/include_exclude.conf    | 2 +-
 aarch64/variants_options.json   | 2 +-
 ppc64le/include_exclude.conf    | 2 +-
 ppc64le/variants_options.json   | 2 +-
 s390x/include_exclude.conf      | 2 +-
 s390x/variants_options.json     | 2 +-
 x86_64/include_exclude.conf     | 2 +-
 x86_64/variants_options.json    | 2 +-
 x86_64_v2/include_exclude.conf  | 2 +-
 x86_64_v2/variants_options.json | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aarch64/include_exclude.conf b/aarch64/include_exclude.conf
index 807a192..5b5a193 100644
--- a/aarch64/include_exclude.conf
+++ b/aarch64/include_exclude.conf
@@ -116,7 +116,7 @@ additional_packages = [
         }
     ),
     (
-        '^extras-common$', {
+        '^extras$', {
             '*': [
                 "anaconda-live",
                 "epel-release",
diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json
index 1897947..bbde052 100644
--- a/aarch64/variants_options.json
+++ b/aarch64/variants_options.json
@@ -98,7 +98,7 @@
             }]
         }]
     },
-    "extras-common": {
+    "extras": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf
index 694b314..1a6b776 100644
--- a/ppc64le/include_exclude.conf
+++ b/ppc64le/include_exclude.conf
@@ -113,7 +113,7 @@ additional_packages = [
         }
     ),
     (
-        '^extras-common$', {
+        '^extras$', {
             '*': [
                 "anaconda-live",
                 "epel-release",
diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json
index 1897947..bbde052 100644
--- a/ppc64le/variants_options.json
+++ b/ppc64le/variants_options.json
@@ -98,7 +98,7 @@
             }]
         }]
     },
-    "extras-common": {
+    "extras": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf
index cabd2a5..9e8a066 100644
--- a/s390x/include_exclude.conf
+++ b/s390x/include_exclude.conf
@@ -124,7 +124,7 @@ additional_packages = [
         }
     ),
     (
-        '^extras-common$', {
+        '^extras$', {
             '*': [
                 "anaconda-live",
                 "epel-release",
diff --git a/s390x/variants_options.json b/s390x/variants_options.json
index e019774..9b1e631 100644
--- a/s390x/variants_options.json
+++ b/s390x/variants_options.json
@@ -98,7 +98,7 @@
             }]
         }]
     },
-    "extras-common": {
+    "extras": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
diff --git a/x86_64/include_exclude.conf b/x86_64/include_exclude.conf
index 764163e..363c0a6 100644
--- a/x86_64/include_exclude.conf
+++ b/x86_64/include_exclude.conf
@@ -113,7 +113,7 @@ additional_packages = [
         }
     ),
     (
-        '^extras-common$', {
+        '^extras$', {
             '*': [
                 "anaconda-live",
                 "epel-release",
diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json
index bbe72f9..795f740 100644
--- a/x86_64/variants_options.json
+++ b/x86_64/variants_options.json
@@ -116,7 +116,7 @@
             }]
         }]
     },
-    "extras-common": {
+    "extras": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
diff --git a/x86_64_v2/include_exclude.conf b/x86_64_v2/include_exclude.conf
index 764163e..363c0a6 100644
--- a/x86_64_v2/include_exclude.conf
+++ b/x86_64_v2/include_exclude.conf
@@ -113,7 +113,7 @@ additional_packages = [
         }
     ),
     (
-        '^extras-common$', {
+        '^extras$', {
             '*': [
                 "anaconda-live",
                 "epel-release",
diff --git a/x86_64_v2/variants_options.json b/x86_64_v2/variants_options.json
index bbe72f9..795f740 100644
--- a/x86_64_v2/variants_options.json
+++ b/x86_64_v2/variants_options.json
@@ -116,7 +116,7 @@
             }]
         }]
     },
-    "extras-common": {
+    "extras": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,