Skip to content

Commit 0989d18

Browse files
committed
fix dependencies issue
1 parent 9653f83 commit 0989d18

2 files changed

Lines changed: 6 additions & 16 deletions

File tree

image-templates/ubuntu24-x86_64-minimal-ptl-pv.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ disk:
5252
packageRepositories:
5353
# Intel overlay repository (aligned with installer script)
5454
- codename: "noble"
55-
url: "https://download.01.org/intel-linux-overlay/ubuntu/"
55+
url: "https://download.01.org/intel-linux-overlay/ubuntu"
5656
pkey: "https://download.01.org/intel-linux-overlay/ubuntu/E6FA98203588250569758E97D176E3162086EE4C.gpg"
5757
component: "multimedia main non-free"
5858
priority: 2000
@@ -200,7 +200,6 @@ systemConfig:
200200
- mesa-vdpau-drivers
201201
- mesa-vulkan-drivers
202202
- libvpl-dev
203-
- libvpl2
204203
- libvpl-tools
205204
- libmfx-gen-dev
206205
- onevpl-tools
@@ -302,9 +301,6 @@ systemConfig:
302301
- socat
303302
- virt-viewer
304303
- spice-client-gtk
305-
- util-linux-extra
306-
- dbus-x11
307-
- sg3-utils
308304
- rpm
309305
# additional packages
310306
- tcpdump
@@ -325,15 +321,6 @@ systemConfig:
325321
packages:
326322
- linux-image-6.17
327323
- linux-headers-6.17
328-
users:
329-
- name: rbfadmin
330-
password: "jaiZ6dai"
331-
- name: user
332-
password: user1234
333-
groups: ["sudo"]
334-
- name: vpu-user
335-
password: vpu-user
336-
groups: ["render"]
337324

338325
configurations:
339326
# Install pinned iproute2 version for PTL (from installer PPAUpdate)

internal/ospackage/debutils/resolver.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,16 +336,19 @@ func getRepositoryPriority(packageURL string) int {
336336
}
337337

338338
// Check global RepoCfgs for priority
339+
// Normalize trailing slashes before comparing, since user-supplied URLs may include them
340+
// but extractRepoBase always returns a URL without a trailing slash.
341+
repoBaseNorm := strings.TrimSuffix(repoBase, "/")
339342
if len(RepoCfgs) > 0 {
340343
for _, repoCfg := range RepoCfgs {
341-
if repoCfg.PkgPrefix == repoBase {
344+
if strings.TrimSuffix(repoCfg.PkgPrefix, "/") == repoBaseNorm {
342345
return repoCfg.Priority
343346
}
344347
}
345348
}
346349

347350
// Check single RepoCfg for backward compatibility
348-
if RepoCfg.PkgPrefix == repoBase {
351+
if strings.TrimSuffix(RepoCfg.PkgPrefix, "/") == repoBaseNorm {
349352
return RepoCfg.Priority
350353
}
351354

0 commit comments

Comments
 (0)