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>
This commit is contained in:
Adam Williamson 2021-02-19 11:29:25 -08:00
parent 6eb79f76f9
commit 5d6842d146
2 changed files with 4 additions and 6 deletions

View File

@ -483,11 +483,9 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
elif release.lower() == 'stable': elif release.lower() == 'stable':
# this means "all current stable releases" # this means "all current stable releases"
rels = fedfind.helpers.get_current_stables() 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: elif release != 'rawhide' and int(release) < 0:
# negative release indicates 'relative to next release' # negative release indicates 'relative to next release'
# -1 is CURRREL, -2 is PREVREL
if not nextrel: if not nextrel:
nextrel = fedfind.helpers.get_current_release() + 1 nextrel = fedfind.helpers.get_current_release() + 1
rels = [int(nextrel) + int(release)] rels = [int(nextrel) + int(release)]

View File

@ -138,7 +138,7 @@
{ {
"name" : "minimal-uefi", "name" : "minimal-uefi",
"releases" : { "releases" : {
"-1" : ["x86_64"], "-1" : ["x86_64", "aarch64"],
"-2" : ["x86_64"], "-2" : ["x86_64"],
"branched": ["x86_64"] "branched": ["x86_64"]
}, },
@ -149,7 +149,7 @@
{ {
"name" : "desktop", "name" : "desktop",
"releases" : { "releases" : {
"current" : ["aarch64", "ppc64le"], "-1" : ["aarch64", "ppc64le"],
"32": ["aarch64", "ppc64le"], "32": ["aarch64", "ppc64le"],
"stable" : ["x86_64"], "stable" : ["x86_64"],
"branched": ["x86_64"] "branched": ["x86_64"]
@ -189,7 +189,7 @@
{ {
"name" : "support", "name" : "support",
"releases" : { "releases" : {
"current" : ["x86_64", "ppc64le", "aarch64"] "-1" : ["x86_64", "ppc64le", "aarch64"]
}, },
"size" : "11", "size" : "11",
"imgver" : "5" "imgver" : "5"