Skip to content

Commit 9d6055a

Browse files
committed
Replace smbios-lib with dmidecode
It support no_std out of the box Signed-off-by: Daniel Schaefer <dhs@frame.work>
1 parent 70e02ff commit 9d6055a

7 files changed

Lines changed: 318 additions & 447 deletions

File tree

Cargo.lock

Lines changed: 18 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@
8383
isIncludedRoot || builtins.elem baseName includedFiles;
8484
};
8585

86-
# Git dependency output hashes
87-
gitDependencyHashes = {
88-
"smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
89-
};
90-
9186
# Build function for the CLI tool (Linux/macOS)
9287
buildFrameworkTool = { release ? false, features ? [] }:
9388
let
@@ -102,7 +97,6 @@
10297

10398
cargoLock = {
10499
lockFile = ./Cargo.lock;
105-
outputHashes = gitDependencyHashes;
106100
};
107101

108102
buildType = profile;
@@ -156,7 +150,6 @@
156150

157151
cargoLock = {
158152
lockFile = ./Cargo.lock;
159-
outputHashes = gitDependencyHashes;
160153
};
161154

162155
buildType = profile;
@@ -207,7 +200,6 @@
207200

208201
cargoLock = {
209202
lockFile = ./Cargo.lock;
210-
outputHashes = gitDependencyHashes;
211203
};
212204

213205
buildType = profile;

framework_lib/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ built = { version = "0.8", features = ["chrono", "git2"] }
2424

2525
[dependencies]
2626
lazy_static = "1.4.0"
27+
dmidecode = { version = "1", default-features = false }
2728
sha2 = { version = "0.10.8", default-features = false, features = [ "force-soft" ] }
2829
regex = { version = "1.11.1", default-features = false }
2930
num = { version = "0.4", default-features = false }
@@ -40,11 +41,9 @@ guid-create = { version = "0.5.0", default-features = false }
4041
uefi = { version = "0.36.1", features = ["alloc", "global_allocator", "panic_handler", "logger"] }
4142
uefi-raw = "0.13"
4243
plain = "0.2.3"
43-
smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std", default-features = false }
4444

4545
[target.'cfg(windows)'.dependencies]
4646
wmi = "0.18"
47-
smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
4847
env_logger = "0.11"
4948
clap = { version = "4.5", features = ["derive", "cargo"] }
5049
clap-num = { version = "1.2.0" }
@@ -57,7 +56,6 @@ nvml-wrapper = { version = "0.11.0", optional = true }
5756
[target.'cfg(unix)'.dependencies]
5857
libc = "0.2.155"
5958
nix = { version = "0.30", features = ["ioctl", "user"] }
60-
smbios-lib = { git = "https://github.com/FrameworkComputer/smbios-lib.git", branch = "no-std" }
6159
env_logger = "0.11"
6260
clap = { version = "4.5", features = ["derive", "cargo"] }
6361
clap-num = { version = "1.2.0" }
@@ -73,6 +71,7 @@ features = [
7371
"Win32_Security",
7472
"Win32_System_IO",
7573
"Win32_System_Ioctl",
74+
"Win32_System_SystemInformation",
7675
"Win32_System_SystemServices",
7776
# For HID devices
7877
"Win32_Devices_DeviceAndDriverInstallation",

0 commit comments

Comments
 (0)