ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-13 18:07:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prefer DeviceGroup arch for Dell client drivers

Browse Source 
Use DeviceGroup OperatingSystem osArch when selecting Dell client driver packages, falling back to SupportedOperatingSystems when DeviceGroup metadata is absent. This keeps existing server catalog behavior unchanged.
This commit is contained in:
rbalsleyMSFT
2026-06-05 10:41:00 -07:00
parent 9fb9e81701
commit 895728ebe8
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/FFU.Common/FFU.Common.Drivers.Dell.psm1
+21 -4
View File
@@ -26,6 +26,26 @@ function Compare-DellVendorVersion {
return 0
}
function Test-DellDriverComponentOsArch {
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)][System.Xml.XmlElement]$Component,
[Parameter(Mandatory=$true)][ValidateSet('x64', 'x86', 'ARM64')][string]$WindowsArch
)
$deviceGroupOsNodes = @($Component.SelectNodes("*[local-name()='DeviceGroup']/*[local-name()='OperatingSystem']"))
if ($deviceGroupOsNodes.Count -gt 0) {
$validDeviceGroupOs = $deviceGroupOsNodes | Where-Object { $_.GetAttribute('osArch') -eq $WindowsArch } | Select-Object -First 1
return $null -ne $validDeviceGroupOs
}
$supportedOsNodes = @($Component.SelectNodes("*[local-name()='SupportedOperatingSystems']/*[local-name()='OperatingSystem']"))
if ($supportedOsNodes.Count -eq 0) { return $false }
$validSupportedOs = $supportedOsNodes | Where-Object { $_.GetAttribute('osArch') -eq $WindowsArch } | Select-Object -First 1
return $null -ne $validSupportedOs
}
function Get-DellCatalogIndex {
[CmdletBinding()]
param(
@@ -155,10 +175,7 @@ function Get-DellLatestDriverPackages {
if ($ctype.GetAttribute('value') -ne 'DRVR') { continue }
# OS filtering (arch only – release filtering intentionally minimal for now)
$osNodes = @($comp.SelectNodes("*[local-name()='SupportedOperatingSystems']/*[local-name()='OperatingSystem']"))
if (-not $osNodes) { continue }
$validOS = $osNodes | Where-Object { $_.GetAttribute('osArch') -eq $WindowsArch } | Select-Object -First 1
if (-not $validOS) { continue }
if (-not (Test-DellDriverComponentOsArch -Component $comp -WindowsArch $WindowsArch)) { continue }
$path = $comp.GetAttribute('path')
if (-not $path) { continue }