From 5d6842d146929bb3297c3a8366934c6a9518da51 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 19 Feb 2021 11:29:25 -0800
Subject: [PATCH] Add current minimal-uefi for aarch64, stop allowing "current"

"current" is just a synonym for "-1" but made the code more
complex. Let's ditch it and just note in a comment that -1 is
CURRREL and -2 is PREVREL. We need minimal-uefi for aarch64 as
install_blivet_btrfs_preserve_home_uefi uses it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 createhdds.py | 4 +---
 hdds.json     | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/createhdds.py b/createhdds.py
index 8c8906d..2c4d0b3 100755
--- a/createhdds.py
+++ b/createhdds.py
@@ -483,11 +483,9 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
         elif release.lower() == 'stable':
             # this means "all current stable releases"
             rels = fedfind.helpers.get_current_stables()
-        elif release.lower() == 'current':
-            # this means "current stable release"
-            rels = [fedfind.helpers.get_current_release(branched=False)]
         elif release != 'rawhide' and int(release) < 0:
             # negative release indicates 'relative to next release'
+            # -1 is CURRREL, -2 is PREVREL
             if not nextrel:
                 nextrel = fedfind.helpers.get_current_release() + 1
             rels = [int(nextrel) + int(release)]
diff --git a/hdds.json b/hdds.json
index 86e483c..ea19595 100644
--- a/hdds.json
+++ b/hdds.json
@@ -138,7 +138,7 @@
         {
             "name" : "minimal-uefi",
             "releases" : {
-                "-1" : ["x86_64"],
+                "-1" : ["x86_64", "aarch64"],
                 "-2" : ["x86_64"],
                 "branched": ["x86_64"]
             },
@@ -149,7 +149,7 @@
         {
             "name" : "desktop",
             "releases" : {
-                "current" : ["aarch64", "ppc64le"],
+                "-1" : ["aarch64", "ppc64le"],
                 "32": ["aarch64", "ppc64le"],
                 "stable" : ["x86_64"],
                 "branched": ["x86_64"]
@@ -189,7 +189,7 @@
         {
             "name" : "support",
             "releases" : {
-                "current" : ["x86_64", "ppc64le", "aarch64"]
+                "-1" : ["x86_64", "ppc64le", "aarch64"]
             },
             "size" : "11",
             "imgver" : "5"