Merge branch 'main' into repo_config

Author: elvin03

image-templates/azl3-x86_64-dlstreamer.yml

@@ -19,6 +19,14 @@ packageRepositories:
     url: "https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpm/3.0/"
     pkey: "https://raw.githubusercontent.com/open-edge-platform/edge-microvisor-toolkit/refs/heads/3.0/SPECS/edge-repos/INTEL-RPM-GPG-KEY" # Uncomment and replace in real config
 
+  - codename: "OpenVINO"
+    url: "https://yum.repos.intel.com/openvino/"
+    pkey: "https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" # Uncomment and replace in real config
+
+  - codename: "mariner"
+    url: "https://packages.microsoft.com/yumrepos/cbl-mariner-2.0-prod-extended-x86_64/"
+    pkey: "https://packages.microsoft.com/azurelinux/3.0/prod/base/x86_64/repodata/repomd.xml.key" # Uncomment and replace in real config
+
 disk:
   name: Minimal_Raw # 1:1 mapping to the systemConfigs name
   artifacts:
@@ -67,6 +75,7 @@ systemConfig:
     - gstreamer
     - opencv
     - intel-dlstreamer
+    - openvino
 
   kernel:
     version: "6.12"

image-templates/emt3-x86_64-dlstreamer.yml

@@ -15,6 +15,14 @@ packageRepositories:
     url: "https://yum.repos.intel.com/edgeai/"
     pkey: "https://yum.repos.intel.com/edgeai/GPG-PUB-KEY-INTEL-DLS.gpg" # Uncomment and replace in real config
 
+  - codename: "OpenVINO"
+    url: "https://yum.repos.intel.com/openvino/"
+    pkey: "https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" # Uncomment and replace in real config
+
+  - codename: "mariner"
+    url: "https://packages.microsoft.com/yumrepos/cbl-mariner-2.0-prod-extended-x86_64/"
+    pkey: "https://packages.microsoft.com/azurelinux/3.0/prod/base/x86_64/repodata/repomd.xml.key" # Uncomment and replace in real config
+
 disk:
   name: Minimal_Raw # 1:1 mapping to the systemConfigs name
   artifacts:
@@ -65,6 +73,7 @@ systemConfig:
     - gstreamer
     - opencv
     - intel-dlstreamer
+    - openvino
 
   # Kernel Configuration
   kernel:

internal/ospackage/rpmutils/helper.go

@@ -3,7 +3,6 @@ package rpmutils
 import (
 	"fmt"
 	"net/url"
-	"path/filepath"
 	"sort"
 	"strings"
 	"unicode"
@@ -222,8 +221,19 @@ func extractBasePackageNameFromFile(fullName string) string {
 	// Find the first part that looks like a version (starts with digit)
 	for i := 1; i < len(parts); i++ {
 		if len(parts[i]) > 0 && (parts[i][0] >= '0' && parts[i][0] <= '9') {
-			// Everything before this index is the package name
-			return strings.Join(parts[:i], "-")
+			// get the name
+			maybe_name := strings.Join(parts[:i], "-")
+			// check if version is part of the name
+			// full name contains version, if package name has version,
+			// it will be repeated in the full name
+			for j := i + 1; j < len(parts); j++ {
+				if len(parts[j]) > 0 && strings.Contains(parts[j], parts[i]) {
+					maybe_name = strings.Join(parts[:j], "-")
+					break
+				}
+			}
+			// return name or name-version
+			return maybe_name
 		}
 	}
 
@@ -295,15 +305,10 @@ func findAllCandidates(parent ospackage.PackageInfo, depName string, all []ospac
 }
 
 // ResolvePackage finds the best matching package for a given package name
-func ResolveTopPackageConflicts(want, pkgType string, all []ospackage.PackageInfo) (ospackage.PackageInfo, bool) {
+func ResolveTopPackageConflicts(want string, all []ospackage.PackageInfo) (ospackage.PackageInfo, bool) {
 	var candidates []ospackage.PackageInfo
 	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+"."+pkgType {
-			candidates = append(candidates, pi)
-			break
-		}
-		// 2) exact name, e.g. acct-205-25.azl3.noarch.rpm
+		// 1) exact name, e.g. acct-205-25.azl3.noarch.rpm
 		if pi.Name == want {
 			candidates = append(candidates, pi)
 			break
@@ -314,28 +319,27 @@ func ResolveTopPackageConflicts(want, pkgType string, all []ospackage.PackageInf
 			candidates = append(candidates, pi)
 			continue
 		}
-		// // 3) prefix by want-version ("acl-")
-		// if strings.HasPrefix(pi.Name, want+"-") {
-		// 	candidates = append(candidates, pi)
-		// 	continue
-		// }
-		// // 4) prefix by want.release ("acl-2.3.1-2.")
-		// if strings.HasPrefix(cleanName, want+".") {
-		// 	candidates = append(candidates, pi)
-		// 	continue
-		// }
-		// // 5) Debian package format (packagename_version_arch.deb)
-		// if strings.HasPrefix(cleanName, want+"_") {
-		// 	candidates = append(candidates, pi)
-		// }
+		// 3) prefix by want-version ("acl-")
+		// expected pi.Name should look like openvino-2025.3.0-2025.3.0.19807-1.noarch.rpm
+		// want = openvino-2025.3.0
+		if strings.HasPrefix(pi.Name, want) {
+			// Extract string after "-" and compare with pi.Version
+			if dashIdx := strings.LastIndex(want, "-"); dashIdx != -1 {
+				verStr := want[dashIdx+1:]
+				if strings.Contains(pi.Version, verStr) {
+					candidates = append(candidates, pi)
+					continue
+				}
+			}
+		}
 	}
 
 	if len(candidates) == 0 {
 		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+"."+pkgType) {
+	if len(candidates) == 1 && (candidates[0].Name == want || extractBasePackageNameFromFile(candidates[0].Name) == want) {
 		return candidates[0], true
 	}
 

internal/ospackage/rpmutils/helper_test.go

@@ -477,9 +477,9 @@ func TestResolveTopPackageConflicts(t *testing.T) {
 
 	allPackages := []ospackage.PackageInfo{
 		{
-			Name:    "acct",
+			Name:    "acct-6.6.4-5+b1-amd64.rpm",
 			Version: "6.6.4-5+b1",
-			URL:     "https://example.com/acct_6.6.4-5+b1_amd64.deb",
+			URL:     "https://example.com/acct-6.6.4-5+b1-amd64.rpm",
 		},
 		{
 			Name:    "acct-205-25.azl3.noarch.rpm",
@@ -509,32 +509,28 @@ func TestResolveTopPackageConflicts(t *testing.T) {
 	}{
 		{
 			name:        "Exact match with file extension",
-			want:        "acct_6.6.4-5+b1_amd64",
-			pkgType:     "deb",
+			want:        "acct-6.6.4-5+b1-amd64.rpm",
 			dist:        "",
-			expectedPkg: "acct",
+			expectedPkg: "acct-6.6.4-5+b1-amd64.rpm",
 			expectFound: true,
 		},
 		{
 			name:        "Base name match",
 			want:        "acct",
-			pkgType:     "rpm",
 			dist:        "",
-			expectedPkg: "acct", // Should find the first acct package
+			expectedPkg: "acct-205-25.azl3.noarch.rpm", // Should find the first acct package
 			expectFound: true,
 		},
 		{
 			name:        "Base name match with dist filter",
 			want:        "acct",
-			pkgType:     "rpm",
 			dist:        "azl3",
-			expectedPkg: "acct", // The exact package name returned might be different due to filtering logic
+			expectedPkg: "acct-205-25.azl3.noarch.rpm", // The exact package name returned might be different due to filtering logic
 			expectFound: true,
 		},
 		{
 			name:        "No match",
 			want:        "nonexistent",
-			pkgType:     "rpm",
 			dist:        "",
 			expectFound: false,
 		},
@@ -543,7 +539,7 @@ func TestResolveTopPackageConflicts(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			Dist = tt.dist
-			pkg, found := ResolveTopPackageConflicts(tt.want, tt.pkgType, allPackages)
+			pkg, found := ResolveTopPackageConflicts(tt.want, allPackages)
 			if found != tt.expectFound {
 				t.Errorf("ResolveTopPackageConflicts() found = %v, want %v", found, tt.expectFound)
 			}

internal/ospackage/rpmutils/resolver.go

@@ -432,7 +432,7 @@ func MatchRequested(requests []string, all []ospackage.PackageInfo) ([]ospackage
 	var out []ospackage.PackageInfo
 
 	for _, want := range requests {
-		if pkg, found := ResolveTopPackageConflicts(want, "rpm", all); found {
+		if pkg, found := ResolveTopPackageConflicts(want, all); found {
 			out = append(out, pkg)
 
 		} else {