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

distro/rhel85: remove rhel86 alias

Browse source 
Remove alias for RHEL 8.6 from RHEL 8.5 and update the registry to point
to the new rhel86 subpackage.
This commit is contained in:
Achilleas Koutsou 2021-09-29 11:34:24 +02:00 • committed by Ondřej Budai
parent 513b7f94b9
commit c3077ede4a
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/distro/rhel85/distro.go
View file

@ -17,7 +17,6 @@ import (
)
const defaultName = "rhel-85"
const rhel86Name = "rhel-86"
const osVersion = "8.5"
const releaseVersion = "8"
const modulePlatformID = "platform:el8"
@ -462,10 +461,6 @@ func New() distro.Distro {
return newDistro(defaultName, modulePlatformID, ostreeRef)
}
func NewRHEL86() distro.Distro {
return newDistro(rhel86Name, modulePlatformID, ostreeRef)
}
func NewHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
return newDistro(name, modulePlatformID, ostreeRef)
}

3
internal/distroregistry/distroregistry.go
View file

@ -10,6 +10,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro/rhel8"
"github.com/osbuild/osbuild-composer/internal/distro/rhel84"
"github.com/osbuild/osbuild-composer/internal/distro/rhel85"
"github.com/osbuild/osbuild-composer/internal/distro/rhel86"
"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
)
@ -24,7 +25,7 @@ var supportedDistros = []supportedDistro{
{rhel84.New, rhel84.NewHostDistro},
{rhel84.NewCentos, rhel84.NewCentosHostDistro},
{rhel85.New, rhel85.NewHostDistro},
{rhel85.NewRHEL86, rhel85.NewHostDistro},
{rhel86.New, rhel86.NewHostDistro},
{rhel90.New, rhel90.NewHostDistro},
}