From 712dd3a5dae95ec0eba7643b522a06301097b841 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Thu, 28 Mar 2024 15:46:25 +0100 Subject: [PATCH] fix(pkg/driverbuilder): fixed debian `rpi` and `rt` flavors kernel urls fetching. Signed-off-by: Federico Di Pierro --- pkg/driverbuilder/builder/debian.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/driverbuilder/builder/debian.go b/pkg/driverbuilder/builder/debian.go index a634a4eb..f7f680a9 100644 --- a/pkg/driverbuilder/builder/debian.go +++ b/pkg/driverbuilder/builder/debian.go @@ -17,6 +17,7 @@ package builder import ( _ "embed" "fmt" + "io" "io/ioutil" "net/http" "regexp" @@ -134,9 +135,18 @@ func fetchDebianHeadersURLFromRelease(baseURL string, kr kernelrelease.KernelRel matchExtraGroupCommon := "common" // match for kernel versions like 4.19.0-6-cloud-amd64 - if strings.Contains(kr.FullExtraversion, "-cloud") { - extraVersionPartial = strings.TrimSuffix(extraVersionPartial, "-cloud") - matchExtraGroup = "cloud-" + matchExtraGroup + supportedExtraFlavors := []string{"cloud", "rt", "rpi"} + for _, supportedExtraFlavor := range supportedExtraFlavors { + if strings.Contains(kr.FullExtraversion, "-"+supportedExtraFlavor) { + extraVersionPartial = strings.TrimSuffix(extraVersionPartial, "-"+supportedExtraFlavor) + matchExtraGroup = supportedExtraFlavor + "-" + matchExtraGroup + + // rpi and rt have a different common package, named `common-{rt,rpi}` + if supportedExtraFlavor == "rt" || supportedExtraFlavor == "rpi" { + matchExtraGroupCommon += "-" + supportedExtraFlavor + } + break + } } // download index @@ -145,7 +155,7 @@ func fetchDebianHeadersURLFromRelease(baseURL string, kr kernelrelease.KernelRel return nil, err } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err }