From ca1b559e3028c54d32aa69b0263028fa2c99727e Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Thu, 30 Jun 2022 15:01:58 +0200
Subject: [PATCH] Move RHEL 8.4 definition to the common rhel8 package

---
 internal/distro/rhel8/distro.go           | 20 ++++++++++++++++++++
 internal/distroregistry/distroregistry.go |  3 +--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go
index 7a6b5de2e..0ee59ad7d 100644
--- a/internal/distro/rhel8/distro.go
+++ b/internal/distro/rhel8/distro.go
@@ -116,6 +116,18 @@ var distroMap = map[string]distribution{
 		runner:             "org.osbuild.rhel86",
 		defaultImageConfig: defaultDistroImageConfig,
 	},
+	"rhel-84": {
+		name:               "rhel-84",
+		product:            "Red Hat Enterprise Linux",
+		osVersion:          "8.4",
+		releaseVersion:     "8",
+		modulePlatformID:   "platform:el8",
+		vendor:             "redhat",
+		ostreeRefTmpl:      "rhel/8/%s/edge",
+		isolabelTmpl:       "RHEL-8-4-0-BaseOS-%s",
+		runner:             "org.osbuild.rhel84",
+		defaultImageConfig: defaultDistroImageConfig,
+	},
 	"rhel-85": {
 		name:               "rhel-85",
 		product:            "Red Hat Enterprise Linux",
@@ -624,6 +636,14 @@ func NewHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
 	return newDistro("rhel-8")
 }
 
+func NewRHEL84() distro.Distro {
+	return newDistro("rhel-84")
+}
+
+func NewRHEL84HostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
+	return newDistro("rhel-84")
+}
+
 func NewRHEL85() distro.Distro {
 	return newDistro("rhel-85")
 }
diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go
index 6ca3ec8d4..7631ad802 100644
--- a/internal/distroregistry/distroregistry.go
+++ b/internal/distroregistry/distroregistry.go
@@ -10,7 +10,6 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/distro/fedora"
 	"github.com/osbuild/osbuild-composer/internal/distro/rhel7"
 	"github.com/osbuild/osbuild-composer/internal/distro/rhel8"
-	"github.com/osbuild/osbuild-composer/internal/distro/rhel84"
 	"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
 )
 
@@ -21,8 +20,8 @@ var supportedDistros = []supportedDistro{
 	{fedora.NewF35, fedora.NewHostDistro},
 	{fedora.NewF36, fedora.NewHostDistro},
 	{rhel7.New, rhel7.NewHostDistro},
-	{rhel84.New, rhel84.NewHostDistro},
 	{rhel8.New, rhel8.NewHostDistro},
+	{rhel8.NewRHEL84, rhel8.NewRHEL84HostDistro},
 	{rhel8.NewRHEL85, rhel8.NewRHEL85HostDistro},
 	{rhel8.NewRHEL86, rhel8.NewRHEL86HostDistro},
 	{rhel8.NewRHEL87, rhel8.NewRHEL87HostDistro},