particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel: remove legacy member from architecture struct

Browse source 
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>
This commit is contained in:
Tomáš Hozza 2023-05-17 13:57:12 +02:00 • committed by Achilleas Koutsou
parent dd6f9fdbcf
commit 3569936aba
5 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel7/distro.go
View file

@ -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(

1
internal/distro/rhel8/arch.go
View file

@ -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 {

2
internal/distro/rhel8/distro.go
View file

@ -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{

1
internal/distro/rhel9/arch.go
View file

@ -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 {

3
internal/distro/rhel9/distro.go
View file

@ -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,