tools/out-of-tree
1
0
Fork 0
Code Releases Activity

refactor: use the same name as in config

Browse Source
This commit is contained in:
dump_stack()
2023-05-18 18:27:51 +00:00
parent 6385ce92e3
commit d551cc8fc4
15 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kernel.go
View File

@ -31,7 +31,7 @@ import (
"code.dumpstack.io/tools/out-of-tree/fs"
)
func MatchPackages(km config.KernelMask) (pkgs []string, err error) {
func MatchPackages(km config.Target) (pkgs []string, err error) {
// TODO interface for kernels match
switch km.Distro.ID {
case distro.Ubuntu:
@ -65,7 +65,7 @@ func vsyscallAvailable() (available bool, err error) {
}
func GenerateBaseDockerImage(registry string, commands []config.DockerCommand,
sk config.KernelMask, forceUpdate bool) (err error) {
sk config.Target, forceUpdate bool) (err error) {
imagePath := container.ImagePath(sk)
dockerPath := imagePath + "/Dockerfile"
@ -175,7 +175,7 @@ func GenerateBaseDockerImage(registry string, commands []config.DockerCommand,
return
}
func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (err error) {
func installKernel(sk config.Target, pkgname string, force, headers bool) (err error) {
slog := log.With().
Str("distro_type", sk.Distro.ID.String()).
Str("distro_release", sk.Distro.Release).
@ -510,7 +510,7 @@ func SetSigintHandler(variable *bool) {
}
// FIXME too many parameters
func GenerateKernels(km config.KernelMask, registry string,
func GenerateKernels(km config.Target, registry string,
commands []config.DockerCommand, max, retries int64,
download, force, headers, shuffle, update bool,
shutdown *bool) (err error) {

2
kernel/kernel_linux.go
View File

@ -47,7 +47,7 @@ func genHostKernels(download bool) (kcfg config.KernelConfig, err error) {
// only for compatibility, docker is not really used
dii := container.Image{
Name: config.KernelMask{
Name: config.Target{
Distro: distro.Distro{
ID: distroType,
Release: si.OS.Version,