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

Move RHEL 8.4 definition to the common rhel8 package

Browse source
This commit is contained in:
Achilleas Koutsou 2022-06-30 15:01:58 +02:00 • committed by Tom Gundersen
parent a8b0a5f0bd
commit ca1b559e30
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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")
}

3
internal/distroregistry/distroregistry.go
View file

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