Fix SAA: set CWD=/usr/local/bin; include all SAA package binaries
- saa_dmi.go: set cmd.Dir=/usr/local/bin on all saa exec calls so acpica_bin/acpidump is found relative to correct working directory - build.sh: copy all saa companion dirs (acpica_bin, ExternalData, tool, stunnel, GO_SNMP) to /usr/local/bin/ preserving structure - iso/vendor: add acpica_bin/acpiexec, ExternalData/, tool/gpu/nVidia/x64/, tool/USBController/, stunnel/, GO_SNMP/ from SAA 1.5.0 release package Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -91,7 +91,9 @@ func (h *handler) handleAPISAADMIRead(w http.ResponseWriter, r *http.Request) {
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
dmiFile := filepath.Join(tmpDir, "DMI.txt")
|
||||
out, err := exec.CommandContext(ctx, "saa", "-c", "GetDmiInfo", "--file", dmiFile, "--overwrite").CombinedOutput()
|
||||
cmd := exec.CommandContext(ctx, "saa", "-c", "GetDmiInfo", "--file", dmiFile, "--overwrite")
|
||||
cmd.Dir = "/usr/local/bin"
|
||||
out, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
msg := strings.TrimSpace(string(out))
|
||||
if msg == "" {
|
||||
@@ -168,7 +170,9 @@ func runSAADMIWriteTask(ctx context.Context, j *jobState, exportDir string, p ta
|
||||
dmiFile := filepath.Join(tmpDir, "DMI.txt")
|
||||
|
||||
j.append("Reading current DMI configuration...")
|
||||
if err := streamCmdJob(j, exec.CommandContext(ctx, "saa", "-c", "GetDmiInfo", "--file", dmiFile, "--overwrite")); err != nil {
|
||||
getCmd := exec.CommandContext(ctx, "saa", "-c", "GetDmiInfo", "--file", dmiFile, "--overwrite")
|
||||
getCmd.Dir = "/usr/local/bin"
|
||||
if err := streamCmdJob(j, getCmd); err != nil {
|
||||
return fmt.Errorf("GetDmiInfo: %w", err)
|
||||
}
|
||||
|
||||
@@ -190,13 +194,16 @@ func runSAADMIWriteTask(ctx context.Context, j *jobState, exportDir string, p ta
|
||||
for _, c := range p.SAADmiChanges {
|
||||
j.append("Setting " + c.Shn + " = " + c.Value)
|
||||
cmd := exec.CommandContext(ctx, "saa", "-c", "EditDmiInfo", "--file", dmiFile, "--shn", c.Shn, "--value", c.Value)
|
||||
cmd.Dir = "/usr/local/bin"
|
||||
if err := streamCmdJob(j, cmd); err != nil {
|
||||
return fmt.Errorf("EditDmiInfo %s: %w", c.Shn, err)
|
||||
}
|
||||
}
|
||||
|
||||
j.append("Applying changes to hardware...")
|
||||
if err := streamCmdJob(j, exec.CommandContext(ctx, "saa", "-c", "ChangeDmiInfo", "--file", dmiFile)); err != nil {
|
||||
changeCmd := exec.CommandContext(ctx, "saa", "-c", "ChangeDmiInfo", "--file", dmiFile)
|
||||
changeCmd.Dir = "/usr/local/bin"
|
||||
if err := streamCmdJob(j, changeCmd); err != nil {
|
||||
return fmt.Errorf("ChangeDmiInfo: %w", err)
|
||||
}
|
||||
|
||||
|
||||
@@ -1483,15 +1483,16 @@ for tool in storcli64 sas2ircu sas3ircu arcconf ssacli saa; do
|
||||
fi
|
||||
done
|
||||
|
||||
# saa requires acpica_bin/acpidump relative to its own location
|
||||
if [ -f "${VENDOR_DIR}/acpica_bin/acpidump" ]; then
|
||||
mkdir -p "${OVERLAY_STAGE_DIR}/usr/local/bin/acpica_bin"
|
||||
cp "${VENDOR_DIR}/acpica_bin/acpidump" "${OVERLAY_STAGE_DIR}/usr/local/bin/acpica_bin/acpidump"
|
||||
chmod +x "${OVERLAY_STAGE_DIR}/usr/local/bin/acpica_bin/acpidump" || true
|
||||
echo "vendor tool: acpica_bin/acpidump (included)"
|
||||
else
|
||||
echo "vendor tool: acpica_bin/acpidump (not found, skipped)"
|
||||
fi
|
||||
# saa companion directories — saa searches for these relative to CWD (/usr/local/bin)
|
||||
for saa_subdir in acpica_bin ExternalData tool stunnel GO_SNMP; do
|
||||
if [ -d "${VENDOR_DIR}/${saa_subdir}" ]; then
|
||||
cp -r "${VENDOR_DIR}/${saa_subdir}" "${OVERLAY_STAGE_DIR}/usr/local/bin/"
|
||||
find "${OVERLAY_STAGE_DIR}/usr/local/bin/${saa_subdir}" -type f -exec chmod +x {} \; 2>/dev/null || true
|
||||
echo "vendor saa: ${saa_subdir}/ (included)"
|
||||
else
|
||||
echo "vendor saa: ${saa_subdir}/ (not found, skipped)"
|
||||
fi
|
||||
done
|
||||
|
||||
# --- NVIDIA kernel modules and userspace libs ---
|
||||
if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
|
||||
|
||||
1131
iso/vendor/ExternalData/SMCIPID.txt
vendored
Normal file
1131
iso/vendor/ExternalData/SMCIPID.txt
vendored
Normal file
File diff suppressed because it is too large
Load Diff
2333
iso/vendor/ExternalData/VENID.txt
vendored
Normal file
2333
iso/vendor/ExternalData/VENID.txt
vendored
Normal file
File diff suppressed because it is too large
Load Diff
37
iso/vendor/ExternalData/supportAutoDST
vendored
Normal file
37
iso/vendor/ExternalData/supportAutoDST
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
(UTC-10:00) Aleutian Islands
|
||||
(UTC-09:00) Alaska
|
||||
(UTC-08:00) Baja California
|
||||
(UTC-08:00) Pacific Time (US & Canada)
|
||||
(UTC-07:00) Mountain Time (US & Canada)
|
||||
(UTC-06:00) Central Time (US & Canada)
|
||||
(UTC-06:00) Easter Island
|
||||
(UTC-05:00) Eastern Time (US & Canada)
|
||||
(UTC-05:00) Haiti
|
||||
(UTC-05:00) Havana
|
||||
(UTC-05:00) Indiana (East)
|
||||
(UTC-05:00) Turks and Caicos
|
||||
(UTC-04:00) Asuncion
|
||||
(UTC-04:00) Atlantic Time (Canada)
|
||||
(UTC-04:00) Santiago
|
||||
(UTC-03:30) Newfoundland
|
||||
(UTC-03:00) Saint Pierre and Miquelon
|
||||
(UTC-01:00) Azores
|
||||
(UTC+00:00) Dublin, Edinburgh, Lisbon, London
|
||||
(UTC+01:00) Casablanca
|
||||
(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
|
||||
(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague
|
||||
(UTC+01:00) Brussels, Copenhagen, Madrid, Paris
|
||||
(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb
|
||||
(UTC+02:00) Athens, Bucharest
|
||||
(UTC+02:00) Beirut
|
||||
(UTC+02:00) Chisinau
|
||||
(UTC+02:00) Gaza, Hebron
|
||||
(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius
|
||||
(UTC+02:00) Jerusalem
|
||||
(UTC+09:30) Adelaide
|
||||
(UTC+10:00) Canberra, Melbourne, Sydney
|
||||
(UTC+10:00) Hobart
|
||||
(UTC+10:30) Lord Howe Island
|
||||
(UTC+11:00) Norfolk Island
|
||||
(UTC+12:00) Auckland, Wellington
|
||||
(UTC+12:45) Chatham Islands
|
||||
139
iso/vendor/ExternalData/timezone.txt
vendored
Normal file
139
iso/vendor/ExternalData/timezone.txt
vendored
Normal file
@@ -0,0 +1,139 @@
|
||||
(UTC-12:00) International Date Line West
|
||||
(UTC-11:00) Coordinated Universal Time-11
|
||||
(UTC-10:00) Aleutian Islands
|
||||
(UTC-10:00) Hawaii
|
||||
(UTC-09:30) Marquesas Islands
|
||||
(UTC-09:00) Alaska
|
||||
(UTC-09:00) Coordinated Universal Time-09
|
||||
(UTC-08:00) Baja California
|
||||
(UTC-08:00) Coordinated Universal Time-08
|
||||
(UTC-08:00) Pacific Time (US & Canada)
|
||||
(UTC-07:00) Arizona
|
||||
(UTC-07:00) Chihuahua, La Paz, Mazatlan
|
||||
(UTC-07:00) Mountain Time (US & Canada)
|
||||
(UTC-07:00) Yukon
|
||||
(UTC-06:00) Central America
|
||||
(UTC-06:00) Central Time (US & Canada)
|
||||
(UTC-06:00) Easter Island
|
||||
(UTC-06:00) Guadalajara, Mexico City, Monterrey
|
||||
(UTC-06:00) Saskatchewan
|
||||
(UTC-05:00) Bogota, Lima, Quito, Rio Branco
|
||||
(UTC-05:00) Chetumal
|
||||
(UTC-05:00) Eastern Time (US & Canada)
|
||||
(UTC-05:00) Haiti
|
||||
(UTC-05:00) Havana
|
||||
(UTC-05:00) Indiana (East)
|
||||
(UTC-05:00) Turks and Caicos
|
||||
(UTC-04:00) Atlantic Time (Canada)
|
||||
(UTC-04:00) Caracas
|
||||
(UTC-04:00) Cuiaba
|
||||
(UTC-04:00) Georgetown, La Paz, Manaus, San Juan
|
||||
(UTC-04:00) Santiago
|
||||
(UTC-03:30) Newfoundland
|
||||
(UTC-03:00) Asuncion
|
||||
(UTC-03:00) Araguaina
|
||||
(UTC-03:00) Brasilia
|
||||
(UTC-03:00) Cayenne, Fortaleza
|
||||
(UTC-03:00) City of Buenos Aires
|
||||
(UTC-03:00) Greenland
|
||||
(UTC-03:00) Montevideo
|
||||
(UTC-03:00) Punta Arenas
|
||||
(UTC-03:00) Saint Pierre and Miquelon
|
||||
(UTC-03:00) Salvador
|
||||
(UTC-02:00) Coordinated Universal Time-02
|
||||
(UTC-01:00) Azores
|
||||
(UTC-01:00) Cabo Verde Is.
|
||||
(UTC+00:00) Coordinated Universal Time
|
||||
(UTC+00:00) Dublin, Edinburgh, Lisbon, London
|
||||
(UTC+00:00) Monrovia, Reykjavik
|
||||
(UTC+00:00) Sao Tome
|
||||
(UTC+01:00) Casablanca
|
||||
(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
|
||||
(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague
|
||||
(UTC+01:00) Brussels, Copenhagen, Madrid, Paris
|
||||
(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb
|
||||
(UTC+01:00) West Central Africa
|
||||
(UTC+02:00) Amman
|
||||
(UTC+02:00) Athens, Bucharest
|
||||
(UTC+02:00) Beirut
|
||||
(UTC+02:00) Cairo
|
||||
(UTC+02:00) Chisinau
|
||||
(UTC+02:00) Damascus
|
||||
(UTC+02:00) Gaza, Hebron
|
||||
(UTC+02:00) Harare, Pretoria
|
||||
(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius
|
||||
(UTC+02:00) Jerusalem
|
||||
(UTC+02:00) Juba
|
||||
(UTC+02:00) Kaliningrad
|
||||
(UTC+02:00) Khartoum
|
||||
(UTC+02:00) Tripoli
|
||||
(UTC+02:00) Windhoek
|
||||
(UTC+03:00) Baghdad
|
||||
(UTC+03:00) Istanbul
|
||||
(UTC+03:00) Kuwait, Riyadh
|
||||
(UTC+03:00) Minsk
|
||||
(UTC+03:00) Moscow, St. Petersburg
|
||||
(UTC+03:00) Nairobi
|
||||
(UTC+03:00) Volgograd
|
||||
(UTC+03:30) Tehran
|
||||
(UTC+04:00) Abu Dhabi, Muscat
|
||||
(UTC+04:00) Astrakhan, Ulyanovsk
|
||||
(UTC+04:00) Baku
|
||||
(UTC+04:00) Izhevsk, Samara
|
||||
(UTC+04:00) Port Louis
|
||||
(UTC+04:00) Saratov
|
||||
(UTC+04:00) Tbilisi
|
||||
(UTC+04:00) Yerevan
|
||||
(UTC+04:30) Kabul
|
||||
(UTC+05:00) Ashgabat, Tashkent
|
||||
(UTC+05:00) Astana
|
||||
(UTC+05:00) Ekaterinburg
|
||||
(UTC+05:00) Islamabad, Karachi
|
||||
(UTC+05:00) Qyzylorda
|
||||
(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi
|
||||
(UTC+05:30) Sri Jayawardenepura
|
||||
(UTC+05:45) Kathmandu
|
||||
(UTC+06:00) Dhaka
|
||||
(UTC+06:00) Omsk
|
||||
(UTC+06:30) Yangon (Rangoon)
|
||||
(UTC+07:00) Bangkok, Hanoi, Jakarta
|
||||
(UTC+07:00) Barnaul, Gorno-Altaysk
|
||||
(UTC+07:00) Hovd
|
||||
(UTC+07:00) Krasnoyarsk
|
||||
(UTC+07:00) Novosibirsk
|
||||
(UTC+07:00) Tomsk
|
||||
(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi
|
||||
(UTC+08:00) Irkutsk
|
||||
(UTC+08:00) Kuala Lumpur, Singapore
|
||||
(UTC+08:00) Perth
|
||||
(UTC+08:00) Taipei
|
||||
(UTC+08:00) Ulaanbaatar
|
||||
(UTC+08:45) Eucla
|
||||
(UTC+09:00) Chita
|
||||
(UTC+09:00) Osaka, Sapporo, Tokyo
|
||||
(UTC+09:00) Pyongyang
|
||||
(UTC+09:00) Seoul
|
||||
(UTC+09:00) Yakutsk
|
||||
(UTC+09:30) Adelaide
|
||||
(UTC+09:30) Darwin
|
||||
(UTC+10:00) Brisbane
|
||||
(UTC+10:00) Canberra, Melbourne, Sydney
|
||||
(UTC+10:00) Guam, Port Moresby
|
||||
(UTC+10:00) Hobart
|
||||
(UTC+10:00) Vladivostok
|
||||
(UTC+10:30) Lord Howe Island
|
||||
(UTC+11:00) Bougainville Island
|
||||
(UTC+11:00) Chokurdakh
|
||||
(UTC+11:00) Magadan
|
||||
(UTC+11:00) Norfolk Island
|
||||
(UTC+11:00) Sakhalin
|
||||
(UTC+11:00) Solomon Is., New Caledonia
|
||||
(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky
|
||||
(UTC+12:00) Auckland, Wellington
|
||||
(UTC+12:00) Coordinated Universal Time+12
|
||||
(UTC+12:00) Fiji
|
||||
(UTC+12:45) Chatham Islands
|
||||
(UTC+13:00) Coordinated Universal Time+13
|
||||
(UTC+13:00) Nuku'alofa
|
||||
(UTC+13:00) Samoa
|
||||
(UTC+14:00) Kiritimati Island
|
||||
BIN
iso/vendor/ExternalData/tui.fnt
vendored
Normal file
BIN
iso/vendor/ExternalData/tui.fnt
vendored
Normal file
Binary file not shown.
BIN
iso/vendor/GO_SNMP/AlertServer
vendored
Executable file
BIN
iso/vendor/GO_SNMP/AlertServer
vendored
Executable file
Binary file not shown.
BIN
iso/vendor/acpica_bin/acpiexec
vendored
Executable file
BIN
iso/vendor/acpica_bin/acpiexec
vendored
Executable file
Binary file not shown.
BIN
iso/vendor/stunnel/stunnel64
vendored
Executable file
BIN
iso/vendor/stunnel/stunnel64
vendored
Executable file
Binary file not shown.
BIN
iso/vendor/tool/USBController/ASMedia/114xfwdl
vendored
Executable file
BIN
iso/vendor/tool/USBController/ASMedia/114xfwdl
vendored
Executable file
Binary file not shown.
BIN
iso/vendor/tool/gpu/nVidia/x64/nvuflash
vendored
Executable file
BIN
iso/vendor/tool/gpu/nVidia/x64/nvuflash
vendored
Executable file
Binary file not shown.
BIN
iso/vendor/tool/gpu/nVidia/x64/setrom
vendored
Executable file
BIN
iso/vendor/tool/gpu/nVidia/x64/setrom
vendored
Executable file
Binary file not shown.
Reference in New Issue
Block a user