smbioslib: Build from crates.io on non-UEFI

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

Cargo.lock

@@ -40,12 +40,12 @@ uefi = { version = "0.20", features = ["alloc"] }
 uefi-services = "0.17"
 plain = "0.2.3"
 redox_hwio = { version = "0.1.6", default-features = false }
-smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }
+smbios-lib-no-std = { package = "smbios-lib", git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }
 guid-create-no-std = { package = "guid-create", git = "https://github.com/FrameworkComputer/guid-create", branch = "no_std", default-features = false }
 
 [target.'cfg(windows)'.dependencies]
 wmi = "0.15.0"
-smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
+smbios-lib = "0.9.2"
 env_logger = "0.11"
 clap = { version = "4.5", features = ["derive", "cargo"] }
 clap-num = { version = "1.2.0" }
@@ -56,7 +56,7 @@ guid-create = "0.4.1"
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.155"
 nix = { version = "0.29.0", features = ["ioctl", "user"] }
-smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
+smbios-lib = "0.9.2"
 env_logger = "0.11"
 clap = { version = "4.5", features = ["derive", "cargo"] }
 clap-num = { version = "1.2.0" }

framework_lib/Cargo.toml

@@ -69,6 +69,9 @@ use crate::util::{self, Config, Platform, PlatformFamily};
 use hidapi::HidApi;
 use sha2::{Digest, Sha256, Sha384, Sha512};
 //use smbioslib::*;
+#[cfg(feature = "uefi")]
+use smbios_lib_no_std::{DefinedStruct, SMBiosInformation};
+#[cfg(not(feature = "uefi"))]
 use smbioslib::{DefinedStruct, SMBiosInformation};
 
 use crate::chromium_ec::{CrosEc, CrosEcDriverType, HardwareDeviceType};

framework_lib/src/commandline/mod.rs

@@ -9,6 +9,9 @@ use crate::util::Config;
 pub use crate::util::{Platform, PlatformFamily};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
+#[cfg(feature = "uefi")]
+use smbios_lib_no_std::*;
+#[cfg(not(feature = "uefi"))]
 use smbioslib::*;
 #[cfg(feature = "uefi")]
 use spin::Mutex;