add logic to kernel version

Author: samueltaripin

image-templates/azl3-x86_64-edge-raw.yml

@@ -86,7 +86,7 @@ systemConfig:
 
   # Kernel Configuration
   kernel:
-    version: "6.12"
+    version: "6.6"
     cmdline: "console=ttyS0,115200 console=tty0 loglevel=7"
     #packages:
     #  - kernel-azure

image-templates/ubuntu24-x86_64-minimal-raw.yml

@@ -82,7 +82,7 @@ systemConfig:
     - systemd-timesyncd
 
   kernel:
-    version: "6.17"
+    version: "6.14"
     cmdline: "console=ttyS0,115200 console=tty0 loglevel=7"
     packages:
-      - linux-image-generic-hwe-24.04
+      - linux-image-generic*

internal/ospackage/debutils/download.go

@@ -56,15 +56,31 @@ type pkgChecksum struct {
 }
 
 var (
-	RepoCfg      RepoConfig
-	RepoCfgs     []RepoConfig // Support for multiple repositories
-	PkgChecksum  []pkgChecksum
-	GzHref       string
-	Architecture string
-	UserRepo     []config.PackageRepository
-	ReportPath   = "builds"
+	RepoCfg        RepoConfig
+	RepoCfgs       []RepoConfig // Support for multiple repositories
+	PkgChecksum    []pkgChecksum
+	GzHref         string
+	Architecture   string
+	UserRepo       []config.PackageRepository
+	KernelVersion  string
+	KernelPackages = make(map[string]struct{})
+	ReportPath     = "builds"
 )
 
+// ConfigureKernelSelection sets the kernel package requests and version used
+// during top-level package matching.
+func ConfigureKernelSelection(kernelPackages []string, kernelVersion string) {
+	KernelVersion = kernelVersion
+	KernelPackages = make(map[string]struct{}, len(kernelPackages))
+	for _, pkg := range kernelPackages {
+		pkg = strings.TrimSpace(pkg)
+		if pkg == "" {
+			continue
+		}
+		KernelPackages[pkg] = struct{}{}
+	}
+}
+
 // Packages returns the list of base packages
 func Packages() ([]ospackage.PackageInfo, error) {
 	log := logger.Logger()
@@ -365,11 +381,37 @@ func MatchRequested(requests []string, all []ospackage.PackageInfo) ([]ospackage
 	log := logger.Logger()
 
 	var out []ospackage.PackageInfo
+	seen := make(map[string]struct{})
 	var requestedPkgs []string
 	gotMissingPkg := false
 
 	for _, want := range requests {
+		if isGlobPattern(want) {
+			pkgs, found := ResolveWildcardPackageConflicts(want, all)
+			if !found {
+				requestedPkgs = append(requestedPkgs, want)
+				log.Warnf("requested package '%q' not found in repo", want)
+				gotMissingPkg = true
+				continue
+			}
+
+			for _, pkg := range pkgs {
+				key := fmt.Sprintf("%s=%s", pkg.Name, pkg.Version)
+				if _, ok := seen[key]; ok {
+					continue
+				}
+				seen[key] = struct{}{}
+				out = append(out, pkg)
+			}
+			continue
+		}
+
 		if pkg, found := ResolveTopPackageConflicts(want, all); found {
+			key := fmt.Sprintf("%s=%s", pkg.Name, pkg.Version)
+			if _, ok := seen[key]; ok {
+				continue
+			}
+			seen[key] = struct{}{}
 			out = append(out, pkg)
 		} else {
 			requestedPkgs = append(requestedPkgs, want)

internal/ospackage/debutils/download_test.go

@@ -672,6 +672,37 @@ func TestMatchRequested(t *testing.T) {
 	}
 }
 
+func TestMatchRequestedKernelWildcardVersion(t *testing.T) {
+	ConfigureKernelSelection([]string{"linux-image-generic*"}, "6.14")
+	defer ConfigureKernelSelection(nil, "")
+
+	all := []ospackage.PackageInfo{
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.13.0-10.10~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.13/linux-image-generic-hwe-24.04_6.13.0-10.10~24.04.1_amd64.deb",
+		},
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.14.2.1.0",
+			URL:     "pool/main/l/linux-meta-hwe-6.14/linux-image-generic-hwe-24.04_6.14.2.1.0_amd64.deb",
+		},
+	}
+
+	matched, err := MatchRequested([]string{"linux-image-generic*"}, all)
+	if err != nil {
+		t.Fatalf("expected wildcard kernel request to resolve, got error: %v", err)
+	}
+
+	if len(matched) != 1 {
+		t.Fatalf("expected one resolved package, got %d", len(matched))
+	}
+
+	if matched[0].Version != "6.14.2.1.0" {
+		t.Fatalf("expected kernel version-compatible package, got %q", matched[0].Version)
+	}
+}
+
 // TestWriteArrayToFile tests the WriteArrayToFile function
 func TestWriteArrayToFile(t *testing.T) {
 	// Save original ReportPath

internal/ospackage/debutils/resolver.go

@@ -1045,9 +1045,69 @@ func compareVersions(v1, v2 string) int {
 	return cmp
 }
 
+func isKernelPackageRequest(want string) bool {
+	for pattern := range KernelPackages {
+		if pattern == want {
+			return true
+		}
+
+		if !isGlobPattern(pattern) {
+			continue
+		}
+
+		matched, err := path.Match(pattern, want)
+		if err == nil && matched {
+			return true
+		}
+	}
+
+	return false
+}
+
+func stripEpoch(version string) string {
+	if colonIdx := strings.Index(version, ":"); colonIdx != -1 {
+		return version[colonIdx+1:]
+	}
+	return version
+}
+
+func matchesKernelVersion(candidateVersion string) bool {
+	if KernelVersion == "" {
+		return false
+	}
+
+	versionNoEpoch := stripEpoch(candidateVersion)
+	if versionNoEpoch == KernelVersion {
+		return true
+	}
+
+	if !strings.HasPrefix(versionNoEpoch, KernelVersion) {
+		return false
+	}
+
+	if len(versionNoEpoch) == len(KernelVersion) {
+		return true
+	}
+
+	nextChar := versionNoEpoch[len(KernelVersion)]
+	return nextChar == '.' || nextChar == '-' || nextChar == '_' || nextChar == '+' || nextChar == '~'
+}
+
+func filterKernelCandidates(candidates []ospackage.PackageInfo) []ospackage.PackageInfo {
+	var matched []ospackage.PackageInfo
+	for _, candidate := range candidates {
+		if matchesKernelVersion(candidate.Version) {
+			matched = append(matched, candidate)
+		}
+	}
+	return matched
+}
+
 // ResolvePackage finds the best matching package for a given package name
 func ResolveTopPackageConflicts(want string, all []ospackage.PackageInfo) (ospackage.PackageInfo, bool) {
+	log := logger.Logger()
 	var candidates []ospackage.PackageInfo
+	isKernelPackage := isKernelPackageRequest(want)
 	for _, pi := range all {
 		// 1) exact name and version matched with .deb filenamae, e.g. acct_7.6.4-5+b1_amd64
 		if filepath.Base(pi.URL) == want+".deb" {
@@ -1137,6 +1197,21 @@ func ResolveTopPackageConflicts(want string, all []ospackage.PackageInfo) (ospac
 		return ospackage.PackageInfo{}, false
 	}
 
+	if isKernelPackage && KernelVersion != "" {
+		var beforeFilter []ospackage.PackageInfo
+		beforeFilter = append(beforeFilter, candidates...)
+		candidates = filterKernelCandidates(candidates)
+		if len(candidates) == 0 {
+			var availableVersions []string
+			for _, pkg := range beforeFilter {
+				availableVersions = append(availableVersions, pkg.Version)
+			}
+			log.Errorf("kernel version mismatch: package %q requires kernel version %q, but available versions are: %v",
+				want, KernelVersion, availableVersions)
+			return ospackage.PackageInfo{}, false
+		}
+	}
+
 	// If we got an exact match in step (1), it's the only candidate
 	if len(candidates) == 1 && (candidates[0].Name == want || candidates[0].Name == want+".deb") {
 		return candidates[0], true
@@ -1146,6 +1221,52 @@ func ResolveTopPackageConflicts(want string, all []ospackage.PackageInfo) (ospac
 	return candidates[0], true
 }
 
+// ResolveWildcardPackageConflicts expands a wildcard request to the best package
+// for each matched base package name.
+func ResolveWildcardPackageConflicts(want string, all []ospackage.PackageInfo) ([]ospackage.PackageInfo, bool) {
+	if !isGlobPattern(want) {
+		pkg, found := ResolveTopPackageConflicts(want, all)
+		if !found {
+			return nil, false
+		}
+		return []ospackage.PackageInfo{pkg}, true
+	}
+
+	baseNames := make(map[string]struct{})
+	for _, pi := range all {
+		matched, err := path.Match(want, pi.Name)
+		if err != nil || !matched {
+			continue
+		}
+		baseNames[pi.Name] = struct{}{}
+	}
+
+	if len(baseNames) == 0 {
+		return nil, false
+	}
+
+	var results []ospackage.PackageInfo
+	for baseName := range baseNames {
+		pkg, found := ResolveTopPackageConflicts(baseName, all)
+		if found {
+			results = append(results, pkg)
+		}
+	}
+
+	if len(results) == 0 {
+		return nil, false
+	}
+
+	sort.Slice(results, func(i, j int) bool {
+		if results[i].Name == results[j].Name {
+			return compareVersions(results[i].Version, results[j].Version) > 0
+		}
+		return results[i].Name < results[j].Name
+	})
+
+	return results, true
+}
+
 // Helper function to find all candidates for a dependency
 func findAllCandidates(depName string, all []ospackage.PackageInfo) []ospackage.PackageInfo {
 	var candidates []ospackage.PackageInfo

internal/ospackage/debutils/resolver_test.go

@@ -451,3 +451,105 @@ func TestResolveTopPackageConflicts(t *testing.T) {
 		})
 	}
 }
+
+func TestResolveTopPackageConflictsKernelVersionSelection(t *testing.T) {
+	debutils.ConfigureKernelSelection([]string{"linux-image-generic-hwe-24.04"}, "6.17")
+	defer debutils.ConfigureKernelSelection(nil, "")
+
+	all := []ospackage.PackageInfo{
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.18.0-10.10~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.18/linux-image-generic-hwe-24.04_6.18.0-10.10~24.04.1_amd64.deb",
+		},
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.17.0-5.5~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.17/linux-image-generic-hwe-24.04_6.17.0-5.5~24.04.1_amd64.deb",
+		},
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "1:6.17.0-6.6~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.17/linux-image-generic-hwe-24.04_6.17.0-6.6~24.04.1_amd64.deb",
+		},
+	}
+
+	result, found := debutils.ResolveTopPackageConflicts("linux-image-generic-hwe-24.04", all)
+	if !found {
+		t.Fatal("expected kernel package to be found")
+	}
+	if result.Version != "1:6.17.0-6.6~24.04.1" {
+		t.Errorf("expected kernel-version-matching package, got %q", result.Version)
+	}
+}
+
+func TestResolveTopPackageConflictsKernelVersionMissing(t *testing.T) {
+	debutils.ConfigureKernelSelection([]string{"linux-image-generic-hwe-24.04"}, "6.17")
+	defer debutils.ConfigureKernelSelection(nil, "")
+
+	all := []ospackage.PackageInfo{
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.18.0-10.10~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.18/linux-image-generic-hwe-24.04_6.18.0-10.10~24.04.1_amd64.deb",
+		},
+	}
+
+	_, found := debutils.ResolveTopPackageConflicts("linux-image-generic-hwe-24.04", all)
+	if found {
+		t.Fatal("expected kernel package resolution to fail when no candidate matches kernel version")
+	}
+}
+
+func TestResolveTopPackageConflictsKernelVersionPrefixMatch(t *testing.T) {
+	debutils.ConfigureKernelSelection([]string{"linux-image-generic-hwe-24.04"}, "6.17")
+	defer debutils.ConfigureKernelSelection(nil, "")
+
+	all := []ospackage.PackageInfo{
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.170.1.1.0",
+			URL:     "pool/main/l/linux-meta-hwe-6.170/linux-image-generic-hwe-24.04_6.170.1.1.0_amd64.deb",
+		},
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.17.1.1.0",
+			URL:     "pool/main/l/linux-meta-hwe-6.17/linux-image-generic-hwe-24.04_6.17.1.1.0_amd64.deb",
+		},
+	}
+
+	result, found := debutils.ResolveTopPackageConflicts("linux-image-generic-hwe-24.04", all)
+	if !found {
+		t.Fatal("expected kernel package to be found")
+	}
+	if result.Version != "6.17.1.1.0" {
+		t.Errorf("expected dotted patch version to match kernel version prefix, got %q", result.Version)
+	}
+}
+
+func TestResolveTopPackageConflictsKernelVersionWildcardPattern(t *testing.T) {
+	debutils.ConfigureKernelSelection([]string{"linux-image-generic*"}, "6.14")
+	defer debutils.ConfigureKernelSelection(nil, "")
+
+	all := []ospackage.PackageInfo{
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.15.0-1.1~24.04.1",
+			URL:     "pool/main/l/linux-meta-hwe-6.15/linux-image-generic-hwe-24.04_6.15.0-1.1~24.04.1_amd64.deb",
+		},
+		{
+			Name:    "linux-image-generic-hwe-24.04",
+			Version: "6.14.3.2.0",
+			URL:     "pool/main/l/linux-meta-hwe-6.14/linux-image-generic-hwe-24.04_6.14.3.2.0_amd64.deb",
+		},
+	}
+
+	result, found := debutils.ResolveTopPackageConflicts("linux-image-generic-hwe-24.04", all)
+	if !found {
+		t.Fatal("expected kernel wildcard pattern to match package request")
+	}
+
+	if result.Version != "6.14.3.2.0" {
+		t.Errorf("expected wildcard kernel pattern to enforce kernel version filter, got %q", result.Version)
+	}
+}