1
0

Implement Oracle Linux support

This commit is contained in:
dump_stack() 2023-05-09 14:40:06 +00:00
parent e291352925
commit 0e85866822
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
2 changed files with 82 additions and 2 deletions

View File

@ -205,10 +205,17 @@ const (
CentOS CentOS
// Debian https://www.debian.org/ // Debian https://www.debian.org/
Debian Debian
// OracleLinux https://www.oracle.com/linux/
OracleLinux
) )
// DistroTypeStrings is the string version of enum DistroType // DistroTypeStrings is the string version of enum DistroType
var DistroTypeStrings = [...]string{"Ubuntu", "CentOS", "Debian"} var DistroTypeStrings = [...]string{
"Ubuntu",
"CentOS",
"Debian",
"OracleLinux",
}
// NewDistroType is create new Distro object // NewDistroType is create new Distro object
func NewDistroType(dType string) (dt DistroType, err error) { func NewDistroType(dType string) (dt DistroType, err error) {
@ -229,6 +236,8 @@ func (dt *DistroType) UnmarshalTOML(data []byte) (err error) {
*dt = CentOS *dt = CentOS
} else if strings.EqualFold(sDistro, "Debian") { } else if strings.EqualFold(sDistro, "Debian") {
*dt = Debian *dt = Debian
} else if strings.EqualFold(sDistro, "OracleLinux") {
*dt = OracleLinux
} else { } else {
err = fmt.Errorf("Distro %s is unsupported", sDistro) err = fmt.Errorf("Distro %s is unsupported", sDistro)
} }
@ -245,6 +254,8 @@ func (dt DistroType) MarshalTOML() (data []byte, err error) {
s = "CentOS" s = "CentOS"
case Debian: case Debian:
s = "Debian" s = "Debian"
case OracleLinux:
s = "OracleLinux"
default: default:
err = fmt.Errorf("Cannot marshal %d", dt) err = fmt.Errorf("Cannot marshal %d", dt)
} }

View File

@ -238,6 +238,40 @@ func matchCentOSDevelPkg(container, mask string, generic bool) (
return return
} }
func matchOracleLinuxPkg(container, mask string) (
pkgs []string, err error) {
cmd := "yum search kernel --showduplicates " +
"| grep '^kernel-[0-9]\\|^kernel-uek-[0-9]' " +
"| grep -v src " +
"| cut -d ' ' -f 1"
// FIXME timeout should be in global out-of-tree config
c, err := NewContainer(container, time.Hour)
if err != nil {
return
}
output, err := c.Run(tempDirBase, cmd)
if err != nil {
return
}
r, err := regexp.Compile("kernel-" + mask)
if err != nil {
return
}
for _, pkg := range strings.Fields(output) {
if r.MatchString(pkg) || strings.Contains(pkg, mask) {
log.Trace().Msg(pkg)
pkgs = append(pkgs, pkg)
}
}
return
}
func dockerImagePath(sk config.KernelMask) (path string, err error) { func dockerImagePath(sk config.KernelMask) (path string, err error) {
usr, err := user.Current() usr, err := user.Current()
if err != nil { if err != nil {
@ -377,6 +411,16 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
"$(echo $PKGNAME | sed 's/-devel//') "+ "$(echo $PKGNAME | sed 's/-devel//') "+
"$(echo $PKGNAME | sed 's/-devel/-modules/') "+ "$(echo $PKGNAME | sed 's/-devel/-modules/') "+
"$(echo $PKGNAME | sed 's/-devel/-core/') %s\n", flags) "$(echo $PKGNAME | sed 's/-devel/-core/') %s\n", flags)
case config.OracleLinux:
if sk.DistroRelease < "6" {
err = fmt.Errorf("no support for pre-EL6")
return
}
d += "RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/*\n"
d += "RUN sed -i 's;installonly_limit=;installonly_limit=100500;' /etc/yum.conf /etc/dnf/dnf.conf || true\n"
d += "RUN yum -y update\n"
d += "RUN yum -y groupinstall 'Development Tools'\n"
d += "RUN yum -y install linux-firmware grubby\n"
default: default:
err = fmt.Errorf("%s not yet supported", sk.DistroType.String()) err = fmt.Errorf("%s not yet supported", sk.DistroType.String())
return return
@ -465,7 +509,30 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
cmd += fmt.Sprintf(" && yum -y install %s %s", imagepkg, cmd += fmt.Sprintf(" && yum -y install %s %s", imagepkg,
pkgname) pkgname)
cmd += fmt.Sprintf(" && dracut --add-drivers 'e1000 ext4' -f "+ cmd += fmt.Sprintf(" && dracut --add-drivers 'e1000 ext4' -fv "+
"/boot/initramfs-%s.img %s", version, version)
case config.OracleLinux:
var headerspkg string
if headers {
if strings.Contains(pkgname, "uek") {
headerspkg = strings.Replace(pkgname,
"kernel-uek", "kernel-uek-devel", -1)
} else {
headerspkg = strings.Replace(pkgname,
"kernel", "kernel-devel", -1)
}
}
cmd += fmt.Sprintf(" && yum -y install %s %s", pkgname, headerspkg)
var version string
if strings.Contains(pkgname, "uek") {
version = strings.Replace(pkgname, "kernel-uek-", "", -1)
} else {
version = strings.Replace(pkgname, "kernel-", "", -1)
}
cmd += fmt.Sprintf(" && dracut --add-drivers 'e1000 ext4' -f -v "+
"/boot/initramfs-%s.img %s", version, version) "/boot/initramfs-%s.img %s", version, version)
default: default:
err = fmt.Errorf("%s not yet supported", sk.DistroType.String()) err = fmt.Errorf("%s not yet supported", sk.DistroType.String())
@ -722,6 +789,8 @@ func generateKernels(km config.KernelMask, registry string,
case config.CentOS: case config.CentOS:
pkgs, err = matchCentOSDevelPkg(km.DockerName(), pkgs, err = matchCentOSDevelPkg(km.DockerName(),
km.ReleaseMask, true) km.ReleaseMask, true)
case config.OracleLinux:
pkgs, err = matchOracleLinuxPkg(km.DockerName(), km.ReleaseMask)
default: default:
err = fmt.Errorf("%s not yet supported", km.DistroType.String()) err = fmt.Errorf("%s not yet supported", km.DistroType.String())
} }