Skip to content

Commit 92eabdd

Browse files
fntlnzleodido
authored andcommitted
update(pkg/driverbuilder): debian support for cloud-amd64 extraversion
Co-Authored-By: Leonardo Di Donato <[email protected]> Signed-off-by: Lorenzo Fontana <[email protected]>
1 parent 535132e commit 92eabdd

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

pkg/driverbuilder/builder/debian.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,19 @@ func debianHeadersURLFromRelease(kr kernelrelease.KernelRelease) ([]string, erro
158158
}
159159

160160
func fetchDebianHeadersURLFromRelease(baseURL string, kr kernelrelease.KernelRelease) ([]string, error) {
161+
rmatch := `href="(linux-headers-%s\.%s\.%s%s-(%s)_.*(amd64|all)\.deb)"`
162+
163+
// match for kernel versions like 4.19.0-6-amd64
161164
extraVersionPartial := strings.TrimSuffix(kr.FullExtraversion, "-amd64")
162-
rmatch := `href="(linux-headers-%s\.%s\.%s%s-(amd64|common)_.*(amd64|all)\.deb)"`
163-
fullregex := fmt.Sprintf(rmatch, kr.Version, kr.PatchLevel, kr.Sublevel, extraVersionPartial)
165+
matchExtraGroup := "amd64|common"
166+
167+
// match for kernel versions like 4.19.0-6-cloud-amd64
168+
if strings.Contains(kr.FullExtraversion, "-cloud") {
169+
extraVersionPartial = strings.TrimSuffix(extraVersionPartial, "-cloud")
170+
matchExtraGroup = "cloud-amd64|common"
171+
}
172+
173+
fullregex := fmt.Sprintf(rmatch, kr.Version, kr.PatchLevel, kr.Sublevel, extraVersionPartial, matchExtraGroup)
164174
pattern := regexp.MustCompile(fullregex)
165175
resp, err := http.Get(baseURL)
166176
if err != nil {

0 commit comments

Comments
 (0)