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

feat!: new kernel config structure

Browse Source 
BREAKING CHANGE: kernel definition in the configuration files has switched

from

  [[targets]]
  distro = { id = "Ubuntu", release = "18.04" }
  release_mask = ".*"

to

  [[targets]]
  distro = { id = "Ubuntu", release = "18.04" }
  kernel = { regex = ".*" }
This commit is contained in:
dump_stack()
2023-05-18 18:48:09 +00:00
parent d551cc8fc4
commit 73f5df2425
15 changed files with 61 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distro/debian/debian.go
View File

@ -120,7 +120,7 @@ func Match(km config.Target) (pkgs []string, err error) {
release := releaseFromString(km.Distro.Release)
r := regexp.MustCompile(km.ReleaseMask)
r := regexp.MustCompile(km.Kernel.Regex)
for _, dk := range kernels {
p := strings.Replace(dk.Image.Deb.Name, ".deb", "", -1)

4
distro/debian/debian_test.go
View File

@ -25,8 +25,8 @@ func TestMatch(t *testing.T) {
config.Directory = tmp
km := config.Target{
ReleaseMask: "3.2.0-4",
Distro: distro.Distro{Release: "7"},
Distro: distro.Distro{Release: "7"},
Kernel: config.Kernel{Regex: "3.2.0-4"},
}
pkgs, err := Match(km)

4
distro/oraclelinux/oraclelinux.go
View File

@ -57,13 +57,13 @@ func Match(km config.Target) (pkgs []string, err error) {
return
}
r, err := regexp.Compile("kernel-" + km.ReleaseMask)
r, err := regexp.Compile("kernel-" + km.Kernel.Regex)
if err != nil {
return
}
for _, pkg := range strings.Fields(output) {
if r.MatchString(pkg) || strings.Contains(pkg, km.ReleaseMask) {
if r.MatchString(pkg) || strings.Contains(pkg, km.Kernel.Regex) {
log.Trace().Msg(pkg)
pkgs = append(pkgs, pkg)
}

4
distro/ubuntu/ubuntu.go
View File

@ -69,13 +69,13 @@ func Match(km config.Target) (pkgs []string, err error) {
return
}
r, err := regexp.Compile("linux-image-" + km.ReleaseMask)
r, err := regexp.Compile("linux-image-" + km.Kernel.Regex)
if err != nil {
return
}
for _, pkg := range strings.Fields(output) {
if r.MatchString(pkg) || strings.Contains(pkg, km.ReleaseMask) {
if r.MatchString(pkg) || strings.Contains(pkg, km.Kernel.Regex) {
pkgs = append(pkgs, pkg)
}
}