From 3569936aba4f7324d9863746c4252745bcda643c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
Date: Wed, 17 May 2023 13:57:12 +0200
Subject: [PATCH] distro/rhel: remove `legacy` member from architecture struct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the `legacy` from `architecture` struct, since this information
is already contained in the platform associated with the image.

This reflects changes which were done in Fedora when it was ported to
the "new" image definitions, but were not ported to RHEL.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
---
 internal/distro/rhel7/distro.go | 2 --
 internal/distro/rhel8/arch.go   | 1 -
 internal/distro/rhel8/distro.go | 2 --
 internal/distro/rhel9/arch.go   | 1 -
 internal/distro/rhel9/distro.go | 3 +--
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/internal/distro/rhel7/distro.go b/internal/distro/rhel7/distro.go
index 5d74f398a..109f072a9 100644
--- a/internal/distro/rhel7/distro.go
+++ b/internal/distro/rhel7/distro.go
@@ -147,7 +147,6 @@ type architecture struct {
 	name             string
 	imageTypes       map[string]distro.ImageType
 	imageTypeAliases map[string]string
-	legacy           string
 }
 
 func (a *architecture) Name() string {
@@ -579,7 +578,6 @@ func newDistro(distroName string) distro.Distro {
 	x86_64 := architecture{
 		name:   distro.X86_64ArchName,
 		distro: &rd,
-		legacy: "i386-pc",
 	}
 
 	x86_64.addImageTypes(
diff --git a/internal/distro/rhel8/arch.go b/internal/distro/rhel8/arch.go
index aad738105..7ae9991dc 100644
--- a/internal/distro/rhel8/arch.go
+++ b/internal/distro/rhel8/arch.go
@@ -14,7 +14,6 @@ type architecture struct {
 	name             string
 	imageTypes       map[string]distro.ImageType
 	imageTypeAliases map[string]string
-	legacy           string
 }
 
 func (a *architecture) Name() string {
diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go
index e520bb258..7962dc1f8 100644
--- a/internal/distro/rhel8/distro.go
+++ b/internal/distro/rhel8/distro.go
@@ -196,7 +196,6 @@ func newDistro(name string, minor int) *distribution {
 	x86_64 := architecture{
 		name:   distro.X86_64ArchName,
 		distro: &rd,
-		legacy: "i386-pc",
 	}
 
 	aarch64 := architecture{
@@ -206,7 +205,6 @@ func newDistro(name string, minor int) *distribution {
 
 	ppc64le := architecture{
 		distro: &rd,
-		legacy: "powerpc-ieee1275",
 		name:   distro.Ppc64leArchName,
 	}
 	s390x := architecture{
diff --git a/internal/distro/rhel9/arch.go b/internal/distro/rhel9/arch.go
index c78480bb7..a5da238fe 100644
--- a/internal/distro/rhel9/arch.go
+++ b/internal/distro/rhel9/arch.go
@@ -14,7 +14,6 @@ type architecture struct {
 	name             string
 	imageTypes       map[string]distro.ImageType
 	imageTypeAliases map[string]string
-	legacy           string
 }
 
 func (a *architecture) Name() string {
diff --git a/internal/distro/rhel9/distro.go b/internal/distro/rhel9/distro.go
index 7e16c0773..b10ec0b8b 100644
--- a/internal/distro/rhel9/distro.go
+++ b/internal/distro/rhel9/distro.go
@@ -188,7 +188,6 @@ func newDistro(name string, minor int) *distribution {
 	x86_64 := architecture{
 		name:   distro.X86_64ArchName,
 		distro: &rd,
-		legacy: "i386-pc",
 	}
 
 	aarch64 := architecture{
@@ -199,8 +198,8 @@ func newDistro(name string, minor int) *distribution {
 	ppc64le := architecture{
 		distro: &rd,
 		name:   distro.Ppc64leArchName,
-		legacy: "powerpc-ieee1275",
 	}
+
 	s390x := architecture{
 		distro: &rd,
 		name:   distro.S390xArchName,