From 94a34d22acf37316ae8b1b57971a2acb69bf6476 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Feb 12 2021 01:08:01 +0000
Subject: Update stream extras compose


- Clarify name
- Change koji tag
- Filter centos-release-hyperscale out on non-x86_64 arches
- Add variants-Extras.xml file

---

diff --git a/extras.conf b/extras.conf
index 89066c8..d4027aa 100644
--- a/extras.conf
+++ b/extras.conf
@@ -1,5 +1,5 @@
-release_name = "CentOS-Extras"
-release_short = "Extras"
+release_name = "CentOS Stream Extras"
+release_short = "Stream-Extras"
 release_version = "8"
 release_is_layered = False
 
@@ -9,7 +9,7 @@ create_jigdo = False
 
 pkgset_source='koji'
 
-pkgset_koji_tag='dist-c8-extras'
+pkgset_koji_tag='dist-c8-stream-extras-compose'
 gather_method = {
     '^.*': {                # For all variants
         'comps': 'deps',    # resolve dependencies for packages from comps file
@@ -23,6 +23,19 @@ koji_profile = "mbox"
 
 check_deps = False
 
+filter_packages = [
+    ('^extras$', {
+        'aarch64': [
+            # Hyperscale SIG is x86_64 only.
+            'centos-release-hyperscale'
+        ],
+        'ppc64le': [
+            # Hyperscale SIG is x86_64 only.
+            'centos-release-hyperscale'
+        ],
+    }),
+]
+
 additional_packages = [
 	('^extras$', {
 		'*': [ 
diff --git a/variants-Extras.xml b/variants-Extras.xml
new file mode 100644
index 0000000..8741a16
--- /dev/null
+++ b/variants-Extras.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+    <variant id="extras" name="extras" type="variant">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>ppc64le</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
+</variants>