Enable publishing of 5.10 probes (#72)

* Retrieve kernelRelease from kernel package name and kernelMachine * Enable download of 5.10 probes * Fix kernelMachine typo
thought-machine · Nov 1, 2023 · 8a60eec · 8a60eec
1 parent 7f78488
commit 8a60eec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pkg/operatingsystem/amazonlinux2/kernel-package.go b/pkg/operatingsystem/amazonlinux2/kernel-package.go
@@ -107,12 +107,6 @@ func addKernelReleaseAndVersionAndMachine(dockerClient *docker.Client, kp *opera
 		return err
 	}
 
-	kernelRelease, err := getKernelRelease(dockerClient, kp.KernelSources, kernelSrcPath)
-	if err != nil {
-		return err
-	}
-	kp.KernelRelease = kernelRelease
-
 	kernelVersion, err := getKernelVersion(dockerClient, kp.KernelSources, kernelSrcPath)
 	if err != nil {
 		return err
@@ -125,6 +119,8 @@ func addKernelReleaseAndVersionAndMachine(dockerClient *docker.Client, kp *opera
 	}
 	kp.KernelMachine = kernelMachine
 
+	kp.KernelRelease = kp.Name + "." + kp.KernelMachine
+
 	return nil
 }
 

diff --git a/pkg/operatingsystem/amazonlinux2/yum-downloader.go b/pkg/operatingsystem/amazonlinux2/yum-downloader.go
@@ -11,7 +11,7 @@ import (
 // via amazon-linux-extras (when we know they will compile).
 const YumDownloaderDockerfile = `FROM amazonlinux:2
 RUN yum install -y yum-utils 
-RUN export REPOS="kernel-5.4" \
+RUN export REPOS="kernel-5.4 kernel-5.10" \
 	&& for r in $REPOS; do \
 		amazon-linux-extras enable $r && \
 		# disable to allow us to obtain repositories which overlap.